From be26956e3e67a8b301dd47adb0b5697e12af14ca Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Tue, 4 Jul 2023 17:04:46 +0300 Subject: [PATCH] Add a PKG_ARCH variable, reuse packages built from feed base --- .buildbot/openwrt/build.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh index c0e6c7a..cf359c8 100755 --- a/.buildbot/openwrt/build.sh +++ b/.buildbot/openwrt/build.sh @@ -45,12 +45,14 @@ tar -xJf /Downloads/openwrt-imagebuilder-${OPENWRT_VERSION}-*.tar.xz PROFILE=rpi-4 BINPATH=bin/targets/${OPENWRT_TARGET}/${OPENWRT_DEVICE} IMAGE_PATH=${BINPATH}/openwrt-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}-${PROFILE} +PKG_ARCH=aarch64_cortex-a72 cd openwrt-imagebuilder-*/ cp ${sdkdir}/${BINPATH}/packages/*.ipk packages/ -cp ${sdkdir}/bin/packages/aarch64_cortex-a72/packages/*.ipk packages/ -cp ${sdkdir}/bin/packages/aarch64_cortex-a72/telephony/*.ipk packages/ -cp ${sdkdir}/bin/packages/aarch64_cortex-a72/local/*.ipk packages/ +cp ${sdkdir}/bin/packages/${PKG_ARCH}/base/*.ipk packages/ +cp ${sdkdir}/bin/packages/${PKG_ARCH}/packages/*.ipk packages/ +cp ${sdkdir}/bin/packages/${PKG_ARCH}/telephony/*.ipk packages/ +cp ${sdkdir}/bin/packages/${PKG_ARCH}/local/*.ipk packages/ make info @@ -96,7 +98,7 @@ PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-i2c-mux-pinctrl \ BOOTSOURCE=target/linux/${OPENWRT_TARGET}/image BOOTCONFIG=${BOOTSOURCE}/config.txt -KERNELSOURCE=build_dir/target-aarch64_cortex-a72_musl/linux-${OPENWRT_TARGET}_${OPENWRT_DEVICE}/linux-5.10.146 +KERNELSOURCE=build_dir/target-${PKG_ARCH}_musl/linux-${OPENWRT_TARGET}_${OPENWRT_DEVICE}/linux-5.10.146 OVERLAYSOURCE=${KERNELSOURCE}/arch/arm64/boot/dts/overlays # Setup files