Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Find kernel config using find instead of using a wildcard #336

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Find kernel config using find instead of using a wildcard #336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions droid-hal-device.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,19 @@ ubu-chroot -r /srv/mer/sdks/ubu ${bash} "set -o errexit; cd %android_root; %{?pr
rm -rf tmp
mkdir tmp

echo Find kernel config
kernel_config=$(find %{android_root}/out/target/product/%{device} -name .config -type f | \
while read -r kernel_config ; do
if grep -q -E 'Linux/.* Kernel Configuration' $kernel_config ; then
echo $kernel_config
break
fi
done)

echo Verifying kernel config
# AOSP seems to use .../obj/kernel/.config not obj/KERNEL_OBJ/.config like CM : so wildcard it

hybris/mer-kernel-check/mer_verify_kernel_config \
%{android_root}/out/target/product/%{device}/obj/*/.config
$kernel_config


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

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

Expand All @@ -906,8 +916,8 @@ mkdir -p $mod_dir
cp -a out/target/product/%{device}/system/lib/modules/. $mod_dir/. || true
cp -a out/target/product/%{device}/system/vendor/lib/modules/. $mod_dir/. || true
cp -a out/target/product/%{device}/vendor/lib/modules/. $mod_dir/. || true
cp -a out/target/product/%{device}/obj/*/modules.builtin $mod_dir/. || true
cp -a out/target/product/%{device}/obj/*/modules.order $mod_dir/. || true
cp -a $kernel_build_dir/modules.builtin $mod_dir/. || true
cp -a $kernel_build_dir/modules.order $mod_dir/. || true

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