summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-07-02 11:13:45 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-05 10:59:40 +0100
commitef8f5d17cc3e04338734de5f7c2b33019fa4dacf (patch)
tree33268c36057346845451d59a85250568fa195908
parentecd989378be1449fa7c046ee1f93abd3def624b9 (diff)
downloadpoky-ef8f5d17cc3e04338734de5f7c2b33019fa4dacf.tar.gz
kernel-devsrc: fix scripts/prepare for ARM64
There are two new tools in 5.13+ required for on target recreation of the build environment. We conditionally add them to the devsrc recipe to support both 5.13 and older kernels. (From OE-Core rev: cb1b7e76f20dc7f11a667fa00958ab56e680c632) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/kernel-devsrc.bb10
1 files changed, 10 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 84e99233e6..b1837b3a51 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -163,6 +163,14 @@ do_install() {
163 cp -a --parents arch/arm64/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/ 163 cp -a --parents arch/arm64/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/
164 164
165 cp -a --parents arch/arm64/kernel/module.lds $kerneldir/build/ 2>/dev/null || : 165 cp -a --parents arch/arm64/kernel/module.lds $kerneldir/build/ 2>/dev/null || :
166
167 # 5.13+ needs these tools
168 cp -a --parents arch/arm64/tools/gen-cpucaps.awk $kerneldir/build/ 2>/dev/null || :
169 cp -a --parents arch/arm64/tools/cpucaps $kerneldir/build/ 2>/dev/null || :
170
171 if [ -e $kerneldir/build/arch/arm64/tools/gen-cpucaps.awk ]; then
172 sed -i -e "s,#!.*awk.*,#!${USRBINPATH}/env awk," $kerneldir/build/arch/arm64/tools/gen-cpucaps.awk
173 fi
166 fi 174 fi
167 175
168 if [ "${ARCH}" = "powerpc" ]; then 176 if [ "${ARCH}" = "powerpc" ]; then
@@ -307,3 +315,5 @@ RDEPENDS_${PN} += "openssl-dev util-linux"
307RDEPENDS_${PN} += "${@bb.utils.contains('ARCH', 'x86', 'elfutils', '', d)}" 315RDEPENDS_${PN} += "${@bb.utils.contains('ARCH', 'x86', 'elfutils', '', d)}"
308# 5.8+ needs gcc-plugins libmpc-dev 316# 5.8+ needs gcc-plugins libmpc-dev
309RDEPENDS_${PN} += "gcc-plugins libmpc-dev" 317RDEPENDS_${PN} += "gcc-plugins libmpc-dev"
318# 5.13+ needs awk for arm64
319RDEPENDS_${PN}_append_aarch64 = " gawk"