diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2017-05-31 16:40:44 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2017-05-31 16:40:44 +0100 |
| commit | f8226efcee0cb0ae3388147e1ed86638b288488a (patch) | |
| tree | 36fc4636a2db839eb709516e023ad8c6855b418d | |
| parent | b4b37772bf2b15677df7d3869505a13831d6679f (diff) | |
busybox: build arch specific binariesarmlt-20170714-001armlt-20170607-00117.06
BusyBox was building "arm" binaries for all variants.
Instead, build using BUSYBOX_ARCH, which defaults to be the same arch as
the kernel. BUSYBOX_ARCH can be over-ridden in the platform config, eg.
to specifically use an ARM/AARCH32 busybox on an AARCH64 system.
Change-Id: Ife7bb26d618c8d7764f84e356e79f21e0eb502e2
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rwxr-xr-x | build-busybox.sh | 12 | ||||
| -rw-r--r-- | filesystems/busybox | 5 |
2 files changed, 10 insertions, 7 deletions
diff --git a/build-busybox.sh b/build-busybox.sh index de1e0d9..b3702c1 100755 --- a/build-busybox.sh +++ b/build-busybox.sh @@ -55,9 +55,10 @@ do_build () fi pushd $TOP_DIR/$BUSYBOX_PATH - make defconfig - sed -i 's/# CONFIG_STATIC is not set/CONFIG_STATIC=y/g' .config - make -j $PARALLELISM install + mkdir -p $BUSYBOX_OUT_DIR + make O=$BUSYBOX_OUT_DIR defconfig + sed -i 's/# CONFIG_STATIC is not set/CONFIG_STATIC=y/g' $BUSYBOX_OUT_DIR/.config + make O=$BUSYBOX_OUT_DIR -j $PARALLELISM install # do some commands to build popd fi @@ -69,7 +70,8 @@ do_clean () export ARCH=$BUSYBOX_ARCH pushd $TOP_DIR/$BUSYBOX_PATH - make clean + mkdir -p $BUSYBOX_OUT_DIR + make O=$BUSYBOX_OUT_DIR clean popd pushd $TOP_DIR/$BUSYBOX_RAMDISK_PATH rm -f ramdisk.img busybox @@ -96,7 +98,7 @@ do_package () pushd ${PLATDIR} for target in $TARGET_BINS_PLATS; do local addr=TARGET_$target[ramdisk] - ${UBOOT_MKIMG} -A $LINUX_ARCH -O linux -C none \ + ${UBOOT_MKIMG} -A $BUSYBOX_ARCH -O linux -C none \ -T ramdisk -n ramdisk \ -a ${!addr} -e ${!addr} \ -n "BusyBox ramdisk" \ diff --git a/filesystems/busybox b/filesystems/busybox index 1494f68..783327b 100644 --- a/filesystems/busybox +++ b/filesystems/busybox @@ -29,9 +29,10 @@ BUSYBOX_BUILD_ENABLED=1 BUILD_SCRIPTS=$BUILD_SCRIPTS"build-busybox.sh " BUSYBOX_PATH=busybox -BUSYBOX_ARCH=arm +BUSYBOX_ARCH=$LINUX_ARCH BUSYBOX_RAMDISK_PATH=ramdisk -BUSYBOX_RAMDISK_BUSYBOX_PATH=$BUSYBOX_PATH/_install/bin/busybox +BUSYBOX_OUT_DIR=out/$LINUX_ARCH +BUSYBOX_RAMDISK_BUSYBOX_PATH=$BUSYBOX_PATH/$BUSYBOX_OUT_DIR/_install/bin/busybox TARGET_BINS_HAS_DTB_RAMDISK=1 TARGET_BINS_HAS_BUSYBOX=1 |