From cd3d161904559c1c1b43685b8227f12f6c19dc03 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 30 Jan 2020 09:35:53 +0100 Subject: Revert "u-boot.inc: use python3 for build" For the TK1 U-Boot this fails to build on master where Python 2 is no longer available, but it also fails on zeus where we still can use Python 2. So revert for zeus. This reverts commit 691b4469b3cf94273514f2f41563ab608120643b. Signed-off-by: Max Krummenacher --- recipes-bsp/u-boot/u-boot-tk1.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-tk1.inc b/recipes-bsp/u-boot/u-boot-tk1.inc index 55d8b47..4679a4f 100644 --- a/recipes-bsp/u-boot/u-boot-tk1.inc +++ b/recipes-bsp/u-boot/u-boot-tk1.inc @@ -7,13 +7,14 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS += "kern-tools-native" -inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native +inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 -DEPENDS += "swig-native" +DEPENDS += "swig-native python-native" EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1' EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' -EXTRA_OEMAKE += 'STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}' +EXTRA_OEMAKE += 'PYTHON2=nativepython STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}' +PATH_prepend = "${STAGING_BINDIR_NATIVE}/python-native:" PACKAGECONFIG ??= "openssl" # u-boot will compile its own tools during the build, with specific -- cgit v1.2.3