From b6d951df17f023a663db6d74484a42701df83489 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Thu, 26 Sep 2013 13:42:31 +0200 Subject: [PATCH] arm_sdimage.sh: use native minix partition util . make filesystems on primary partitions to make it easier on the minix partition util . so sfdisk isn't required as an external tool . also make partition and hitherto x86-only utilities arch-independent Change-Id: Ib4e07e45d038d084dde1858917d3deb7f0616532 --- commands/Makefile | 7 ++-- distrib/sets/lists/minix/md.i386 | 13 -------- distrib/sets/lists/minix/mi | 13 ++++++++ releasetools/arm_sdimage.sh | 57 +++++++++----------------------- releasetools/gen_cmdline.txt.sh | 2 +- 5 files changed, 32 insertions(+), 60 deletions(-) diff --git a/commands/Makefile b/commands/Makefile index bfe16beb3..9adb13532 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -31,13 +31,10 @@ SUBDIR= add_route arp ash at backup btrace \ unstack update uud uue version vol \ whereis which write writeisofs fetch \ zdump zmodem pkgin_cd pkgin_all \ - worldstone updateboot update_bootcfg - -.if ${MACHINE_ARCH} == "i386" -SUBDIR+= atnormalize dosread fdisk loadfont \ + worldstone updateboot update_bootcfg \ + atnormalize dosread fdisk loadfont \ autopart part partition playwave \ recwave repartition screendump -.endif .if ${MACHINE_ARCH} == "earm" SUBDIR+= eepromread diff --git a/distrib/sets/lists/minix/md.i386 b/distrib/sets/lists/minix/md.i386 index 35d8762ec..df78faacc 100644 --- a/distrib/sets/lists/minix/md.i386 +++ b/distrib/sets/lists/minix/md.i386 @@ -25,19 +25,6 @@ ./sbin/hgfs minix-sys ./sbin/vbfs minix-sys ./sbin/virtio_blk minix-sys -./usr/bin/atnormalize minix-sys -./usr/bin/autopart minix-sys -./usr/bin/dosdir minix-sys -./usr/bin/dosread minix-sys -./usr/bin/doswrite minix-sys -./usr/bin/fdisk minix-sys -./usr/bin/loadfont minix-sys -./usr/bin/part minix-sys -./usr/bin/partition minix-sys -./usr/bin/playwave minix-sys -./usr/bin/recwave minix-sys -./usr/bin/repartition minix-sys -./usr/bin/screendump minix-sys ./usr/include/gcc-4.5/abmintrin.h minix-sys gcccmds ./usr/include/gcc-4.5/ammintrin.h minix-sys gcccmds ./usr/include/gcc-4.5/avxintrin.h minix-sys gcccmds diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index 726e1778d..591b55c50 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -224,6 +224,8 @@ ./usr/bin/atf-run minix-sys atf ./usr/bin/atf-sh minix-sys atf ./usr/bin/atf-version minix-sys atf,!kyua +./usr/bin/atnormalize minix-sys +./usr/bin/autopart minix-sys ./usr/bin/awk minix-sys ./usr/bin/backup minix-sys ./usr/bin/badblocks minix-sys obsolete @@ -284,6 +286,9 @@ ./usr/bin/diff minix-sys ./usr/bin/dirname minix-sys ./usr/bin/diskctl minix-sys +./usr/bin/dosdir minix-sys +./usr/bin/dosread minix-sys +./usr/bin/doswrite minix-sys ./usr/bin/du minix-sys ./usr/bin/dumpcore minix-sys ./usr/bin/egrep minix-sys @@ -297,6 +302,7 @@ ./usr/bin/expand minix-sys ./usr/bin/factor minix-sys ./usr/bin/fbdctl minix-sys +./usr/bin/fdisk minix-sys ./usr/bin/fetch minix-sys ./usr/bin/fgrep minix-sys ./usr/bin/file minix-sys @@ -360,6 +366,7 @@ ./usr/bin/lessecho minix-sys ./usr/bin/lesskey minix-sys ./usr/bin/lex minix-sys +./usr/bin/loadfont minix-sys ./usr/bin/loadramdisk minix-sys ./usr/bin/logger minix-sys ./usr/bin/login minix-sys @@ -406,6 +413,8 @@ ./usr/bin/objdump minix-sys binutils ./usr/bin/od minix-sys ./usr/bin/page minix-sys +./usr/bin/part minix-sys +./usr/bin/partition minix-sys ./usr/bin/passwd minix-sys ./usr/bin/paste minix-sys ./usr/bin/patch minix-sys @@ -413,6 +422,7 @@ ./usr/bin/ping minix-sys ./usr/bin/pkgin_all minix-sys ./usr/bin/pkgin_cd minix-sys +./usr/bin/playwave minix-sys ./usr/bin/postinstall minix-sys ./usr/bin/poweroff minix-sys ./usr/bin/pr minix-sys @@ -433,8 +443,10 @@ ./usr/bin/readelf minix-sys binutils ./usr/bin/readlink minix-sys ./usr/bin/reboot minix-sys +./usr/bin/recwave minix-sys ./usr/bin/ref minix-sys obsolete ./usr/bin/remsync minix-sys +./usr/bin/repartition minix-sys ./usr/bin/restore minix-sys ./usr/bin/rev minix-sys ./usr/bin/rget minix-sys @@ -444,6 +456,7 @@ ./usr/bin/rput minix-sys ./usr/bin/rsh minix-sys ./usr/bin/rz minix-sys +./usr/bin/screendump minix-sys ./usr/bin/sed minix-sys ./usr/bin/seq minix-sys ./usr/bin/sha1 minix-sys diff --git a/releasetools/arm_sdimage.sh b/releasetools/arm_sdimage.sh index 9bdebca6b..cc74873dc 100755 --- a/releasetools/arm_sdimage.sh +++ b/releasetools/arm_sdimage.sh @@ -51,7 +51,7 @@ fi export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH -for needed in sfdisk mcopy dd wget mkfs.vfat +for needed in mcopy dd wget mkfs.vfat do if ! which $needed 2>&1 > /dev/null then @@ -95,22 +95,19 @@ sh ${BUILDSH} -V SLOPPY_FLIST=yes -V MKBINUTILS=yes -V MKGCCCMDS=yes -j ${JOBS} # All sized are written in 512 byte blocks # # we create a disk image of about 2 gig's -# for alignement reasons, prefer sizes which are multiples of 4096 bytes -# -: ${IMG_SIZE= $(( 2*(2**30) / 512))} -: ${FAT_SIZE= $(( 10*(2**20) / 512))} -: ${ROOT_SIZE=$(( 64*(2**20) / 512))} -: ${HOME_SIZE=$(( 128*(2**20) / 512))} -: ${USR_SIZE= $((1536*(2**20) / 512))} +: ${IMG_SIZE=$(( 2*(2**30) / 512))} +: ${FAT_SIZE=$(( 10*(2**20) / 512))} +: ${ROOT_SIZE=$(( 64*(2**20) / 512))} +: ${HOME_SIZE=$(( 128*(2**20) / 512))} +: ${USR_SIZE=$(( 1536*(2**20) / 512))} # # create a fstab entry in /etc this is normally done during the # setup phase on x86 # cat >${FSTAB} </d # dd if=/dev/zero of=${IMG} bs=512 count=1 seek=$(($IMG_SIZE -1)) -# # Do some math to determine the start addresses of the partitions. -# Ensure the start of the partitions are always aligned, the end will -# always be as we assume the sizes are multiples of 4096 bytes, which -# is always true as soon as you have an integer multiple of 1MB. -# +# Don't leave holes so the 'partition' invocation later is easy. FAT_START=2048 -EXTENDED_START=$(($FAT_START + $FAT_SIZE)) -EXTENDED_START=$(($EXTENDED_START + 8 - ($EXTENDED_START % 8))) -ROOT_START=$(($EXTENDED_START + 1)) -ROOT_START=$(($ROOT_START + 8 - ($ROOT_START % 8))) -HOME_START=$(($ROOT_START + $ROOT_SIZE + 1)) -HOME_START=$(($HOME_START + 8 - ($HOME_START % 8))) -USR_START=$(($HOME_START + $HOME_SIZE + 1)) -USR_START=$(($USR_START + 8 - ($USR_START % 8))) -EXTENDED_SIZE=$(($USR_START + $USR_SIZE - $EXTENDED_START)) - -# -# Generate the partitions using sfdisk to partition the -# -sfdisk -L --force --no-reread -q ${IMG} 1>/dev/null <