remove references to bootfloppy on machines that don't use one, and use $arch instead of explicitly using /pc/. remove compressed image generation, and unify style. Reference: /n/atom/patch/applied2013/fsmkupd Date: Tue Aug 27 15:14:28 CES 2013 Signed-off-by: quanstro@quanstro.net --- /sys/src/fs/aska/mkfile Tue Aug 27 15:13:20 2013 +++ /sys/src/fs/aska/mkfile Tue Aug 27 15:13:20 2013 @@ -3,6 +3,7 @@ p=9 objtype=386 +arch=pc $TARG'proto' - rm -f $TARG.iso && disk/mk9660 -b bootflp -p $TARG'proto' $TARG.iso - sizes: sizes.$O $LD -o $target sizes.$O -lc -$TARG.$O: ../pc/dosfs.h +$TARG.$O: ../$arch/dosfs.h %.$O: %.c $CC $CFLAGS $stem.c @@ -156,4 +149,4 @@ %.$O: $HFILES clean:V: - rm -f *.[$OS] [$OS].out bootflp *.iso timezone.h sizes $TARG^proto $TARG + rm -f *.[$OS] [$OS].out timezone.h sizes $TARG^proto $TARG --- /sys/src/fs/dahlonega/mkfile Tue Aug 27 15:13:21 2013 +++ /sys/src/fs/dahlonega/mkfile Tue Aug 27 15:13:22 2013 @@ -3,6 +3,7 @@ p=9 objtype=386 +arch=pc $TARG.gz - $TARG: $CONF.c $OBJ $CC $CFLAGS -DDATE'='`{date -n} $CONF.c $LD -o $target -l -T0x30100020 $OBJ $CONF.$O $LIB @@ -134,22 +132,12 @@ /$objtype/%: % cp $stem /$objtype -install:V: /$objtype/$TARG /$objtype/$TARG.gz - -bootflp: $TARG plan9.ini - pc/bootfloppy bootflp plan9.ini $TARG - -fsboot:V: $TARG.gz - cp $TARG.gz conf/9fat - -iso cd: bootflp - { echo bootflp ; echo $TARG ; echo plan9.ini } > $TARG'proto' - rm -f $TARG.iso && disk/mk9660 -b bootflp -p $TARG'proto' $TARG.iso +install:V: /$objtype/$TARG sizes: sizes.$O $LD -o $target sizes.$O -lc -$TARG.$O: ../pc/dosfs.h +$TARG.$O: ../$arch/dosfs.h %.$O: %.c $CC $CFLAGS $stem.c @@ -160,4 +148,4 @@ %.$O: $HFILES clean:V: - rm -f *.[$OS] [$OS].out bootflp *.iso timezone.h sizes $TARG^proto $TARG.gz $TARG + rm -f *.[$OS] [$OS].out timezone.h sizes $TARG^proto $TARG --- /sys/src/fs/fairyland/mkfile Tue Aug 27 15:13:22 2013 +++ /sys/src/fs/fairyland/mkfile Tue Aug 27 15:13:23 2013 @@ -3,6 +3,7 @@ p=9 objtype=386 +arch=pc $TARG.gz - $TARG: $CONF.c $OBJ $CC $CFLAGS -DDATE'='`{date -n} $CONF.c $LD -o $target -l -T0x30100020 $OBJ $CONF.$O $LIB @@ -136,22 +134,12 @@ /$objtype/%: % cp $stem /$objtype -install:V: /$objtype/$TARG /$objtype/$TARG.gz - -bootflp: $TARG plan9.ini - pc/bootfloppy bootflp plan9.ini $TARG - -fsboot:V: $TARG.gz - cp $TARG.gz conf/9fat - -iso cd: bootflp - { echo bootflp ; echo $TARG ; echo plan9.ini } > $TARG'proto' - rm -f $TARG.iso && disk/mk9660 -b bootflp -p $TARG'proto' $TARG.iso +install:V: /$objtype/$TARG sizes: sizes.$O $LD -o $target sizes.$O -lc -$TARG.$O: ../pc/dosfs.h +$TARG.$O: ../$arch/dosfs.h %.$O: %.c $CC $CFLAGS $stem.c @@ -162,4 +150,4 @@ %.$O: $HFILES clean:V: - rm -f *.[$OS] [$OS].out bootflp *.iso timezone.h sizes $TARG^proto $TARG.gz $TARG + rm -f *.[$OS] [$OS].out timezone.h sizes $TARG^proto $TARG --- /sys/src/fs/fs/mkfile Tue Aug 27 15:13:24 2013 +++ /sys/src/fs/fs/mkfile Tue Aug 27 15:13:24 2013 @@ -3,6 +3,7 @@ p=9 objtype=386 +arch=pc $TARG.gz - $TARG: $CONF.c $OBJ $CC $CFLAGS -DDATE'='`{date -n} $CONF.c $LD -o $target -l -T0x30100020 $OBJ $CONF.$O $LIB size $target -install:V: $TARG - cp $TARG /$objtype/ - 9fs stand && cp -x $TARG /n/stand/$objtype +/$objtype/%: % + cp $stem /$objtype + +install:V: /$objtype/$TARG -$TARG.$O: ../pc/dosfs.h +$TARG.$O: ../$arch/dosfs.h %.$O: %.c $CC $CFLAGS $stem.c @@ -152,4 +151,4 @@ %.$O: $HFILES clean:V: - rm -f *.[$OS] [$OS].out bootflp *.iso timezone.h sizes $TARG^proto $TARG.gz $TARG + rm -f *.[$OS] [$OS].out timezone.h sizes $TARG^proto $TARG --- /sys/src/fs/fs64/mkfile Tue Aug 27 15:13:25 2013 +++ /sys/src/fs/fs64/mkfile Tue Aug 27 15:13:25 2013 @@ -3,6 +3,7 @@ p=9 objtype=386 +arch=pc $TARG.gz - $TARG: $CONF.c $OBJ $CC $CFLAGS -DDATE'='`{date -n} $CONF.c $LD -o $target -l -T0x30100020 $OBJ $CONF.$O $LIB size $target -install:V: $TARG - cp $TARG /$objtype/ - 9fs stand && cp -x $TARG /n/stand/$objtype +/$objtype/%: % + cp $stem /$objtype + +install:V: /$objtype/$TARG -$TARG.$O: ../pc/dosfs.h +$TARG.$O: ../$arch/dosfs.h %.$O: %.c $CC $CFLAGS $stem.c @@ -152,4 +151,4 @@ %.$O: $HFILES clean:V: - rm -f *.[$OS] [$OS].out bootflp *.iso timezone.h sizes $TARG^proto $TARG.gz $TARG + rm -f *.[$OS] [$OS].out timezone.h sizes $TARG^proto $TARG --- /sys/src/fs/ila/mkfile Tue Aug 27 15:13:26 2013 +++ /sys/src/fs/ila/mkfile Tue Aug 27 15:13:27 2013 @@ -3,6 +3,7 @@ p=9 objtype=386 +arch=pc $TARG'proto' - rm -f $TARG.iso && disk/mk9660 -b bootflp -p $TARG'proto' $TARG.iso - sizes: sizes.$O $LD -o $target sizes.$O -lc -$TARG.$O: ../pc/dosfs.h +$TARG.$O: ../$arch/dosfs.h %.$O: %.c $CC $CFLAGS $stem.c @@ -157,4 +150,4 @@ %.$O: $HFILES clean:V: - rm -f *.[$OS] [$OS].out bootflp *.iso timezone.h sizes $TARG^proto $TARG + rm -f *.[$OS] [$OS].out timezone.h sizes $TARG^proto $TARG --- /sys/src/fs/wrens/mkfile Tue Aug 27 15:13:28 2013 +++ /sys/src/fs/wrens/mkfile Tue Aug 27 15:13:28 2013 @@ -3,6 +3,7 @@ p=9 objtype=386 +arch=pc $TARG.gz - $TARG: $CONF.c $OBJ $CC $CFLAGS -DDATE'='`{date -n} $CONF.c $LD -o $target -l -T0x30100020 $OBJ $CONF.$O $LIB @@ -135,22 +133,12 @@ /$objtype/%: % cp $stem /$objtype -install:V: /$objtype/$TARG /$objtype/$TARG.gz - -bootflp: $TARG plan9.ini - pc/bootfloppy bootflp plan9.ini $TARG - -fsboot:V: $TARG.gz - cp $TARG.gz conf/9fat - -iso cd: bootflp - { echo bootflp ; echo $TARG ; echo plan9.ini } > $TARG'proto' - rm -f $TARG.iso && disk/mk9660 -b bootflp -p $TARG'proto' $TARG.iso +install:V: /$objtype/$TARG sizes: sizes.$O $LD -o $target sizes.$O -lc -$TARG.$O: ../pc/dosfs.h +$TARG.$O: ../$arch/dosfs.h %.$O: %.c $CC $CFLAGS $stem.c @@ -161,4 +149,4 @@ %.$O: $HFILES clean:V: - rm -f *.[$OS] [$OS].out bootflp *.iso timezone.h sizes $TARG^proto $TARG.gz $TARG + rm -f *.[$OS] [$OS].out timezone.h sizes $TARG^proto $TARG