diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2017-08-09 17:02:35 +0300 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2017-08-09 17:02:35 +0300 |
| commit | 96c456d1fb408bd992f46b9553b49b34b1397e67 (patch) | |
| tree | a21c17530ada08d20758c145a69cf77d45d3d6ad /openembedded-lkft | |
| parent | 89b00fdeab9c12fef25e76480c223378fe9ac0c4 (diff) | |
openembedded-lkft: use distro conf instead of site.conf to override the kernel
meta-ti to set PREFERRED_PROVIDER_virtual/kernel value in the machine
configuration. It's included after site.conf, thus override it.
Use distro conf instead, which is included after the machine configuration
and allow us to override PREFERRED_PROVIDER_virtual/kernel as we want.
Change-Id: Ic2f04a71b164e6b410483695cac31d617ecb0486
Suggested-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'openembedded-lkft')
| -rwxr-xr-x | openembedded-lkft/builders.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/openembedded-lkft/builders.sh b/openembedded-lkft/builders.sh index a875b6de13..a9850cd6b1 100755 --- a/openembedded-lkft/builders.sh +++ b/openembedded-lkft/builders.sh @@ -78,11 +78,12 @@ INHERIT += "buildstats buildstats-summary" EOF # Set the kernel to use -cat << EOF >> conf/site.conf +distro_conf=$(find ../layers/meta-rpb -name rpb.conf) +cat << EOF >> ${distro_conf} PREFERRED_PROVIDER_virtual/kernel = "${KERNEL_RECIPE}" EOF -[ "${KERNEL_RECIPE}" = "linux-hikey-aosp" ] && cat << EOF >> conf/site.conf +[ "${KERNEL_RECIPE}" = "linux-hikey-aosp" ] && cat << EOF >> ${distro_conf} PREFERRED_VERSION_${KERNEL_RECIPE} = "${KERNEL_VERSION}+git%" EOF @@ -122,6 +123,7 @@ sed -i "s|^SRCREV_kernel = .*|SRCREV_kernel = \"${SRCREV_kernel}\"|" ${kernel_re # add useful debug info cat conf/{site,auto}.conf +cat ${distro_conf} bitbake ${IMAGES} |