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

Juan RP committed 11 years ago

Commit 3818e6d1 parent b7a39262 files · +12 −17Browse files

Unified · Split

2 files

mkimage.sh.in +11 −10
mkrootfs.sh.in +1 −7

mkimage.sh.in+11−10

     die "need root perms to continue, exiting."
 fi
-IMGSIZE="$2"
+: ${IMGSIZE:=2G}
-if [ -z "$IMGSIZE" ]; then
-    IMGSIZE="2G"
-else
-    IMGSIZE="${2}G"
-fi
 : ${BOOT_FSTYPE:=vfat}
 : ${BOOT_FSSIZE:=64M}
 : ${ROOT_FSTYPE:=ext4}
 parted $FILENAME mktable msdos
 if [ "$BOOT_FSTYPE" = "vfat" ]; then
     _btype="fat32"
-    _args="-I"
+    _args="-I -F16"
 fi
 parted $FILENAME mkpart primary ${_btype} 4096s ${BOOT_FSSIZE}
 parted $FILENAME mkpart primary ext2 ${BOOT_FSSIZE} 100%
 mount ${LOOPDEV}p1 ${ROOTFSDIR}/boot
 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
 BOOT_UUID=$(blkid -o value -s UUID ${LOOPDEV}p1)
 ROOT_UUID=$(blkid -o value -s UUID ${LOOPDEV}p2)
 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
    sed -e "s,rootfstype=ext4,rootfstype=${ROOT_FSTYPE}," -i ${ROOTFSDIR}/boot/cmdline.txt
     dd if=${ROOTFSDIR}/boot/E4412_S.tzsw.signed.bin of=${LOOPDEV} seek=2111 >/dev/null 2>&1
 fi
-umount ${ROOTFSDIR}/boot
+mountpoint -q ${ROOTFSDIR}/boot || umount ${ROOTFSDIR}/boot
 umount $ROOTFSDIR
 partx -d $LOOPDEV
 losetup -d $LOOPDEV

mkrootfs.sh.in+1−7

@@ -217,13 +217,7 @@ if [ -n "${_ARCH}" ]; then · 216 unmodified lines
217	fi	217	fi
218		218
219	tarball=void-${PLATFORM}-rootfs-$(date '+%Y%m%d').tar.xz	219	tarball=void-${PLATFORM}-rootfs-$(date '+%Y%m%d').tar.xz
220		220	run_cmd "tar -cp --posix -C $rootfs . \| $XZ -9 > $tarball "
221	if [ "$PLATFORM" = "beaglebone" ]; then
222	# On Beaglebone make sure that boot/MLO is at the head.
223	run_cmd "tar -cp --posix -C $rootfs ./boot/MLO . \| $XZ -9 > $tarball"
224	else
225	run_cmd "tar -cp --posix -C $rootfs . \| $XZ -9 > $tarball "
226	fi
227		221
228	rm -rf $rootfs	222	rm -rf $rootfs
229		223

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code