diff options
| -rw-r--r-- | meta/recipes-kernel/linux/kernel-devsrc.bb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 3900489ac5..e17c0ea0ab 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb | |||
| @@ -240,6 +240,15 @@ do_install() { | |||
| 240 | # Copy .config to include/config/auto.conf so "make prepare" is unnecessary. | 240 | # Copy .config to include/config/auto.conf so "make prepare" is unnecessary. |
| 241 | cp $kerneldir/build/.config $kerneldir/build/include/config/auto.conf | 241 | cp $kerneldir/build/.config $kerneldir/build/include/config/auto.conf |
| 242 | 242 | ||
| 243 | # make the scripts python3 safe. We won't be running these, and if they are | ||
| 244 | # left as /usr/bin/python rootfs assembly will fail, since we only have python3 | ||
| 245 | # in the RDEPENDS (and the python3 package does not include /usr/bin/python) | ||
| 246 | for ss in $(find $kerneldir/build/scripts -type f -name '*'); do | ||
| 247 | sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "$ss" | ||
| 248 | sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "$ss" | ||
| 249 | sed -i 's,/usr/bin/python,/usr/bin/env python3,' "$ss" | ||
| 250 | done | ||
| 251 | |||
| 243 | chown -R root:root ${D} | 252 | chown -R root:root ${D} |
| 244 | } | 253 | } |
| 245 | 254 | ||
| @@ -249,7 +258,7 @@ do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock" | |||
| 249 | FILES_${PN} = "${KERNEL_BUILD_ROOT} ${KERNEL_SRC_PATH}" | 258 | FILES_${PN} = "${KERNEL_BUILD_ROOT} ${KERNEL_SRC_PATH}" |
| 250 | FILES_${PN}-dbg += "${KERNEL_BUILD_ROOT}*/build/scripts/*/.debug/*" | 259 | FILES_${PN}-dbg += "${KERNEL_BUILD_ROOT}*/build/scripts/*/.debug/*" |
| 251 | 260 | ||
| 252 | RDEPENDS_${PN} = "bc python flex bison ${TCLIBC}-utils" | 261 | RDEPENDS_${PN} = "bc python3 flex bison ${TCLIBC}-utils" |
| 253 | # 4.15+ needs these next two RDEPENDS | 262 | # 4.15+ needs these next two RDEPENDS |
| 254 | RDEPENDS_${PN} += "openssl-dev util-linux" | 263 | RDEPENDS_${PN} += "openssl-dev util-linux" |
| 255 | # and x86 needs a bit more for 4.15+ | 264 | # and x86 needs a bit more for 4.15+ |
