fixed by fuck up

[plan9front.git] / sys / src / 9 / boot / bootmkfile

diff --git a/sys/src/9/boot/bootmkfile b/sys/src/9/boot/bootmkfile
index af1fcb3f600b57f14a59a73be63402f0c8c8bcac..af41e3829645bc1878f9051b45ce3a945c73fb34 100644 (file)
--- a/sys/src/9/boot/bootmkfile
+++ b/sys/src/9/boot/bootmkfile
@@ -1,22 +1,31 @@
 BOOTDIR=../boot
-BOOTLIB=$BOOTDIR/libboot.a$O
 
 BOOTFILES=\
        aux.$O\
        boot.$O\
-
-$BOOTLIB(%.$O):N:      %.$O
-
-$BOOTLIB:      ${BOOTFILES:%=$BOOTLIB(%)}
-       names=`{membername $newprereq}
-       ar vu $BOOTLIB $names
-       rm $names
+       printstub.$O\
 
 $BOOTFILES:    $BOOTDIR/boot.h
 
 %.$O:  $BOOTDIR/%.c
        $CC -I$BOOTDIR $CFLAGS $BOOTDIR/$stem.c
 
-tread: tread.c
-       $CC tread.c
-       $LD -o tread tread.8
+boot:  $BOOTFILES
+       $LD -o $target $BOOTFILES
+
+# look for proto file in order:
+#      1) $CONF.bootfs.proto           (config specific)
+#      2) bootfs.proto                 (kernel specific)
+#      3) $BOOTDIR/bootfs.proto        (default generic)
+#
+BOOTFSPROTO=`{for(i in $CONF.bootfs.proto bootfs.proto $BOOTDIR/bootfs.proto) test -r $i && echo $i && exit}
+
+bootfs.paq:    $BOOTFSPROTO `{disk/mkfs -aos / $BOOTFSPROTO >[2]/dev/null}
+       mkdir -p bootfs
+       disk/mkfs -s / -d bootfs $BOOTFSPROTO
+       @{
+               cd bootfs/$objtype/bin
+               strip * */* */*/* >[2]/dev/null || status=''
+       }
+       mkpaqfs -o $target bootfs
+       rm -rf bootfs