Make changes to work with multilib toolchain

michaeljclark · Aug 20, 2018 · 5427ac1 · 5427ac1
1 parent 6b516af
commit 5427ac1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/conf/busybear.config b/conf/busybear.config
@@ -2,5 +2,5 @@ BUSYBOX_VERSION=1.27.2
 DROPBEAR_VERSION=2017.75
 COMPILER_PREFIX=riscv64-unknown-linux-gnu
 IMAGE_FILE=busybear.bin
-IMAGE_SIZE=64
+IMAGE_SIZE=128
 ROOT_PASSWORD=busybear
diff --git a/scripts/image.sh b/scripts/image.sh
@@ -12,10 +12,11 @@ dd if=/dev/zero of=${IMAGE_FILE} bs=1M count=${IMAGE_SIZE}
 /sbin/mkfs.ext4 -j -F ${IMAGE_FILE}
 test -d mnt || mkdir mnt
 mount -o loop ${IMAGE_FILE} mnt
-( cd mnt && mkdir -p root bin dev lib lib/modules proc sbin sys tmp usr usr/bin usr/sbin var/run var/log var/tmp etc/dropbear etc/network/if-pre-up.d etc/network/if-up.d etc/network/if-down.d etc/network/if-post-down.d )
+( cd mnt && mkdir -p root bin dev lib lib64 lib/modules proc sbin sys tmp usr usr/bin usr/sbin var/run var/log var/tmp etc/dropbear etc/network/if-pre-up.d etc/network/if-up.d etc/network/if-down.d etc/network/if-post-down.d )
 cp build/busybox-${BUSYBOX_VERSION}/busybox mnt/bin/
 cp build/dropbear-${DROPBEAR_VERSION}/dropbear mnt/sbin/
 rsync -a --exclude ldscripts --exclude '*.la' --exclude '*.a' ${RISCV}/sysroot/lib/ mnt/lib/
+rsync -a --exclude ldscripts --exclude '*.la' --exclude '*.a' ${RISCV}/sysroot/lib64/ mnt/lib64/
 rsync -a etc/ mnt/etc/
 hash=$(openssl passwd -1 -salt xyzzy ${ROOT_PASSWORD})
 sed -i'' "s:\*:${hash}:" mnt/etc/shadow