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

mk{image,rootfs}: misc tweaks for beaglebone.

Browse Source
This commit is contained in:
Juan RP 2014-12-05 11:06:39 +01:00
parent b7a3926c5b
commit 3818e6d425
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mkimage.sh.in
View File

@ -102,13 +102,7 @@ if [ "$(id -u)" -ne 0 ]; then
die "need root perms to continue, exiting." die "need root perms to continue, exiting."
fi fi
IMGSIZE="$2" : ${IMGSIZE:=2G}
if [ -z "$IMGSIZE" ]; then
IMGSIZE="2G"
else
IMGSIZE="${2}G"
fi
: ${BOOT_FSTYPE:=vfat} : ${BOOT_FSTYPE:=vfat}
: ${BOOT_FSSIZE:=64M} : ${BOOT_FSSIZE:=64M}
: ${ROOT_FSTYPE:=ext4} : ${ROOT_FSTYPE:=ext4}
@ -143,7 +137,7 @@ info_msg "Creating disk image partitions/filesystems ..."
parted $FILENAME mktable msdos parted $FILENAME mktable msdos
if [ "$BOOT_FSTYPE" = "vfat" ]; then if [ "$BOOT_FSTYPE" = "vfat" ]; then
_btype="fat32" _btype="fat32"
_args="-I" _args="-I -F16"
fi fi
parted $FILENAME mkpart primary ${_btype} 4096s ${BOOT_FSSIZE} parted $FILENAME mkpart primary ${_btype} 4096s ${BOOT_FSSIZE}
parted $FILENAME mkpart primary ext2 ${BOOT_FSSIZE} 100% parted $FILENAME mkpart primary ext2 ${BOOT_FSSIZE} 100%
@ -163,12 +157,19 @@ mkdir -p ${ROOTFSDIR}/boot
mount ${LOOPDEV}p1 ${ROOTFSDIR}/boot mount ${LOOPDEV}p1 ${ROOTFSDIR}/boot
info_msg "Unpacking rootfs tarball ..." info_msg "Unpacking rootfs tarball ..."
if [ "$PLATFORM" = "beaglebone" ]; then
fstab_args=",noauto"
tar xfp $ROOTFS_TARBALL -C $ROOTFSDIR ./boot/MLO
tar xfp $ROOTFS_TARBALL -C $ROOTFSDIR ./boot/u-boot.img
touch $ROOTFSDIR/boot/uEnv.txt
umount $ROOTFSDIR/boot
fi
tar xfp $ROOTFS_TARBALL -C $ROOTFSDIR tar xfp $ROOTFS_TARBALL -C $ROOTFSDIR
BOOT_UUID=$(blkid -o value -s UUID ${LOOPDEV}p1) BOOT_UUID=$(blkid -o value -s UUID ${LOOPDEV}p1)
ROOT_UUID=$(blkid -o value -s UUID ${LOOPDEV}p2) ROOT_UUID=$(blkid -o value -s UUID ${LOOPDEV}p2)
echo "UUID=$ROOT_UUID / $ROOT_FSTYPE defaults 0 1" >> ${ROOTFSDIR}/etc/fstab echo "UUID=$ROOT_UUID / $ROOT_FSTYPE defaults 0 1" >> ${ROOTFSDIR}/etc/fstab
echo "UUID=$BOOT_UUID /boot $BOOT_FSTYPE defaults 0 2" >> ${ROOTFSDIR}/etc/fstab echo "UUID=$BOOT_UUID /boot $BOOT_FSTYPE defaults${fstab_args} 0 2" >> ${ROOTFSDIR}/etc/fstab
if [ -s ${ROOTFSDIR}/boot/cmdline.txt ]; then if [ -s ${ROOTFSDIR}/boot/cmdline.txt ]; then
sed -e "s,rootfstype=ext4,rootfstype=${ROOT_FSTYPE}," -i ${ROOTFSDIR}/boot/cmdline.txt sed -e "s,rootfstype=ext4,rootfstype=${ROOT_FSTYPE}," -i ${ROOTFSDIR}/boot/cmdline.txt
@ -183,7 +184,7 @@ elif [ "$PLATFORM" = "odroid-u2" ]; then
dd if=${ROOTFSDIR}/boot/E4412_S.tzsw.signed.bin of=${LOOPDEV} seek=2111 >/dev/null 2>&1 dd if=${ROOTFSDIR}/boot/E4412_S.tzsw.signed.bin of=${LOOPDEV} seek=2111 >/dev/null 2>&1
fi fi
umount ${ROOTFSDIR}/boot mountpoint -q ${ROOTFSDIR}/boot || umount ${ROOTFSDIR}/boot
umount $ROOTFSDIR umount $ROOTFSDIR
partx -d $LOOPDEV partx -d $LOOPDEV
losetup -d $LOOPDEV losetup -d $LOOPDEV

6
mkrootfs.sh.in
View File

@ -217,13 +217,7 @@ if [ -n "${_ARCH}" ]; then
fi fi
tarball=void-${PLATFORM}-rootfs-$(date '+%Y%m%d').tar.xz tarball=void-${PLATFORM}-rootfs-$(date '+%Y%m%d').tar.xz
if [ "$PLATFORM" = "beaglebone" ]; then
# On Beaglebone make sure that boot/MLO is at the head.
run_cmd "tar -cp --posix -C $rootfs ./boot/MLO . | $XZ -9 > $tarball"
else
run_cmd "tar -cp --posix -C $rootfs . | $XZ -9 > $tarball " run_cmd "tar -cp --posix -C $rootfs . | $XZ -9 > $tarball "
fi
rm -rf $rootfs rm -rf $rootfs