Skip to content

Commit dce7500

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 dce7500

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

droid-hal-device.inc

Lines changed: 11 additions & 2 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; }' \

0 commit comments

Comments
 (0)