mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mk{image,rootfs}: accept musl targets and fix image creation with two partitions.

Browse Source
This commit is contained in:
Juan RP 2015-05-26 11:00:52 +02:00
parent b1e2685aef
commit 41fbde8a5b
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mkimage.sh.in
View File

@ -113,7 +113,7 @@ fi
# double check PLATFORM is supported... # double check PLATFORM is supported...
case "$PLATFORM" in case "$PLATFORM" in
bananapi|beaglebone|cubieboard2|cubietruck|odroid-u2|rpi|rpi2|usbarmory);; bananapi|beaglebone|cubieboard2|cubietruck|odroid-u2|rpi|rpi2|usbarmory|*-musl);;
*) die "The $PLATFORM is not supported, exiting..." *) die "The $PLATFORM is not supported, exiting..."
esac esac
@ -143,7 +143,7 @@ if [ "$BOOT_FSTYPE" = "vfat" ]; then
fi fi
case "$PLATFORM" in case "$PLATFORM" in
cubieboard2|cubietruck) cubieboard2|cubietruck)
parted $FILENAME mkpart primary ext2 2048s ${ROOT_FSSIZE} 100% parted $FILENAME mkpart primary ext2 2048s ${BOOT_FSSIZE} 100%
LOOPDEV=$(losetup --show --find --partscan $FILENAME) LOOPDEV=$(losetup --show --find --partscan $FILENAME)
mkfs.${ROOT_FSTYPE} $disable_journal ${LOOPDEV}p1 >/dev/null 2>&1 mkfs.${ROOT_FSTYPE} $disable_journal ${LOOPDEV}p1 >/dev/null 2>&1
mount ${LOOPDEV}p1 $ROOTFSDIR mount ${LOOPDEV}p1 $ROOTFSDIR
@ -151,7 +151,7 @@ cubieboard2|cubietruck)
;; ;;
*) *)
parted $FILENAME mkpart primary ${_btype} 2048s ${BOOT_FSSIZE} parted $FILENAME mkpart primary ${_btype} 2048s ${BOOT_FSSIZE}
parted $FILENAME mkpart primary ext2 ${ROOT_FSSIZE} 100% parted $FILENAME mkpart primary ext2 ${BOOT_FSSIZE} 100%
parted $FILENAME toggle 1 boot parted $FILENAME toggle 1 boot
LOOPDEV=$(losetup --show --find --partscan $FILENAME) LOOPDEV=$(losetup --show --find --partscan $FILENAME)
mkfs.${BOOT_FSTYPE} $_args ${LOOPDEV}p1 >/dev/null mkfs.${BOOT_FSTYPE} $_args ${LOOPDEV}p1 >/dev/null

9
mkrootfs.sh.in
View File

@ -91,7 +91,7 @@ register_binfmt() {
fi fi
mountpoint -q /proc/sys/fs/binfmt_misc || modprobe -q binfmt_misc; mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc 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 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 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" 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;; i686-musl) _ARCH="i686-musl"; QEMU_BIN=qemu-i386-static;;
odroid-u2) _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;; odroid-u2) _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;;
rpi) _ARCH="armv6l"; 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;; rpi2) SUBPLATFORM="rpi"; _ARCH="armv7l"; QEMU_BIN=qemu-arm-static;;
usbarmory) _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;; 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}" 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. # Enable en_US.UTF-8 locale and generate it into the target rootfs.
LOCALE=en_US.UTF-8 if [ -e $rootfs/etc/default/libc-locales ]; then
sed -e "s/\#\(${LOCALE}.*\)/\1/g" -i $rootfs/etc/default/libc-locales 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 # Reconfigure packages for target architecture: must be reconfigured