diff options
-rw-r--r-- | meta/recipes-kernel/linux/kernel-devsrc.bb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 5940cc90ea..0c98535f75 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb | |||
@@ -108,6 +108,11 @@ do_install() { | |||
108 | fi | 108 | fi |
109 | 109 | ||
110 | cp -a include $kerneldir/build/include | 110 | cp -a include $kerneldir/build/include |
111 | |||
112 | # we don't usually copy generated files, since they can be rebuilt on the target, | ||
113 | # but without this file, we get a forced syncconfig run in v5.8+, which prompts and | ||
114 | # breaks workflows. | ||
115 | cp -a --parents include/generated/autoconf.h $kerneldir/build 2>/dev/null || : | ||
111 | ) | 116 | ) |
112 | 117 | ||
113 | # now grab the chunks from the source tree that we need | 118 | # now grab the chunks from the source tree that we need |
@@ -249,6 +254,17 @@ do_install() { | |||
249 | # Copy .config to include/config/auto.conf so "make prepare" is unnecessary. | 254 | # Copy .config to include/config/auto.conf so "make prepare" is unnecessary. |
250 | cp $kerneldir/build/.config $kerneldir/build/include/config/auto.conf | 255 | cp $kerneldir/build/.config $kerneldir/build/include/config/auto.conf |
251 | 256 | ||
257 | # make sure these are at least as old as the .config, or rebuilds will trigger | ||
258 | touch -r $kerneldir/build/.config $kerneldir/build/include/generated/autoconf.h 2>/dev/null || : | ||
259 | touch -r $kerneldir/build/.config $kerneldir/build/include/config/auto.conf* 2>/dev/null || : | ||
260 | |||
261 | if [ -e "$kerneldir/build/include/config/auto.conf.cmd" ]; then | ||
262 | sed -i 's/ifneq "$(CC)" ".*-linux-gcc.*$/ifneq "$(CC)" "gcc"/' "$kerneldir/build/include/config/auto.conf.cmd" | ||
263 | sed -i 's/ifneq "$(LD)" ".*-linux-ld.bfd.*$/ifneq "$(LD)" "ld"/' "$kerneldir/build/include/config/auto.conf.cmd" | ||
264 | sed -i 's/ifneq "$(CC_VERSION_TEXT)".*\(gcc.*\)"/ifneq "$(CC_VERSION_TEXT)" "\1"/' "$kerneldir/build/include/config/auto.conf.cmd" | ||
265 | sed -i 's/ifneq "$(srctree)" ".*"/ifneq "$(srctree)" "."/' "$kerneldir/build/include/config/auto.conf.cmd" | ||
266 | fi | ||
267 | |||
252 | # make the scripts python3 safe. We won't be running these, and if they are | 268 | # make the scripts python3 safe. We won't be running these, and if they are |
253 | # left as /usr/bin/python rootfs assembly will fail, since we only have python3 | 269 | # left as /usr/bin/python rootfs assembly will fail, since we only have python3 |
254 | # in the RDEPENDS (and the python3 package does not include /usr/bin/python) | 270 | # in the RDEPENDS (and the python3 package does not include /usr/bin/python) |