diff options
| author | Juan RP <xtraeme@voidlinux.eu> | 2015-05-26 11:00:52 +0200 |
|---|---|---|
| committer | Juan RP <xtraeme@voidlinux.eu> | 2015-05-26 11:00:52 +0200 |
| commit | 41fbde8a5b1aa4862e108c4233b0a7aa93baf7b1 (patch) | |
| tree | a16c9129e9dd7e60df3a9072e7e3209d3fd40428 /mkrootfs.sh.in | |
| parent | b1e2685aef3e3b4656faf76fe9ba07f22239fee3 (diff) | |
| download | hrmpf-41fbde8a5b1aa4862e108c4233b0a7aa93baf7b1.tar.gz hrmpf-41fbde8a5b1aa4862e108c4233b0a7aa93baf7b1.tar.xz hrmpf-41fbde8a5b1aa4862e108c4233b0a7aa93baf7b1.zip | |
mk{image,rootfs}: accept musl targets and fix image creation with two partitions.
Diffstat (limited to 'mkrootfs.sh.in')
| -rw-r--r-- | mkrootfs.sh.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mkrootfs.sh.in b/mkrootfs.sh.in index f595a12..0487ba5 100644 --- a/mkrootfs.sh.in +++ b/mkrootfs.sh.in @@ -91,7 +91,7 @@ register_binfmt() { fi mountpoint -q /proc/sys/fs/binfmt_misc || modprobe -q binfmt_misc; mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc case "${_ARCH}" in - armv?l) + armv?l*) echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:' > /proc/sys/fs/binfmt_misc/register cp -f $(which qemu-arm-static) $rootfs/usr/bin || die "failed to copy qemu-arm-static to the rootfs" ;; @@ -137,6 +137,7 @@ case "$PLATFORM" in i686-musl) _ARCH="i686-musl"; QEMU_BIN=qemu-i386-static;; odroid-u2) _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;; rpi) _ARCH="armv6l"; QEMU_BIN=qemu-arm-static;; + rpi-musl) _ARCH="armv6l-musl"; SUBPLATFORM="rpi"; QEMU_BIN=qemu-arm-static;; rpi2) SUBPLATFORM="rpi"; _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;; usbarmory) _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;; x86_64) _ARCH="x86_64"; QEMU_BIN=qemu-x86_64-static;; @@ -189,8 +190,10 @@ mount_pseudofs run_cmd_target "xbps-install -S $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -r $rootfs -y ${PKGS}" # Enable en_US.UTF-8 locale and generate it into the target rootfs. -LOCALE=en_US.UTF-8 -sed -e "s/\#\(${LOCALE}.*\)/\1/g" -i $rootfs/etc/default/libc-locales +if [ -e $rootfs/etc/default/libc-locales ]; then + LOCALE=en_US.UTF-8 + sed -e "s/\#\(${LOCALE}.*\)/\1/g" -i $rootfs/etc/default/libc-locales +fi # # Reconfigure packages for target architecture: must be reconfigured |