Skip to content

Commit cc3d9a1

Browse files
committed
Find kernel config using find instead of using a wildcard
Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
1 parent 743edff commit cc3d9a1

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

droid-hal-device.inc

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -414,10 +414,19 @@ ubu-chroot -r /srv/mer/sdks/ubu ${bash} "set -o errexit; cd %android_root; %{?pr
414414
rm -rf tmp
415415
mkdir tmp
416416

417+
echo Find kernel config
418+
kernel_config=$(find %{android_root}/out/target/product/%{device} -name .config -type f | \
419+
while read -r kernel_config ; do
420+
if grep -q -E 'Linux/.* Kernel Configuration' $kernel_config ; then
421+
echo $kernel_config
422+
break
423+
fi
424+
done)
425+
417426
echo Verifying kernel config
418-
# AOSP seems to use .../obj/kernel/.config not obj/KERNEL_OBJ/.config like CM : so wildcard it
427+
419428
hybris/mer-kernel-check/mer_verify_kernel_config \
420-
%{android_root}/out/target/product/%{device}/obj/*/.config
429+
$kernel_config
421430

422431

423432
android_version_major=$(awk '/PLATFORM_VERSION([A-Z0-9.]*|_LAST_STABLE) := ([0-9.]+)/ { print $3; }' \
@@ -880,7 +889,8 @@ fi
880889

881890
# Kernel and module installation; to
882891
# /boot and modules to /lib as normal
883-
kernel_release=$(sort -u out/target/product/%{device}/*/*/include/config/kernel.release)
892+
kernel_build_dir=$(dirname $kernel_config)
893+
kernel_release=$(sort -u $kernel_build_dir/include/config/kernel.release)
884894
cp out/target/product/%{device}/kernel $RPM_BUILD_ROOT/boot/kernel-$kernel_release
885895
cp out/target/product/%{device}/obj/ROOT/hybris-boot_intermediates/boot-initramfs.gz $RPM_BUILD_ROOT/boot/
886896

@@ -906,8 +916,8 @@ mkdir -p $mod_dir
906916
cp -a out/target/product/%{device}/system/lib/modules/. $mod_dir/. || true
907917
cp -a out/target/product/%{device}/system/vendor/lib/modules/. $mod_dir/. || true
908918
cp -a out/target/product/%{device}/vendor/lib/modules/. $mod_dir/. || true
909-
cp -a out/target/product/%{device}/obj/*/modules.builtin $mod_dir/. || true
910-
cp -a out/target/product/%{device}/obj/*/modules.order $mod_dir/. || true
919+
cp -a $kernel_build_dir/modules.builtin $mod_dir/. || true
920+
cp -a $kernel_build_dir/modules.order $mod_dir/. || true
911921

912922
# on some systems modules are in /lib/modules for some reason, lets move them to right place
913923
mv $RPM_BUILD_ROOT/lib/modules/* $RPM_BUILD_ROOT/lib/modules/$kernel_release || true

0 commit comments

Comments
 (0)