removed ukill.

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

diff --git a/sys/src/9/boot/bootmkfile b/sys/src/9/boot/bootmkfile
old mode 100755 (executable)
new mode 100644 (file)
index c189b82..af41e38
--- a/sys/src/9/boot/bootmkfile
+++ b/sys/src/9/boot/bootmkfile
@@ -1,27 +1,31 @@
 BOOTDIR=../boot
-BOOTLIB=$BOOTDIR/libboot.a$O
 
 BOOTFILES=\
-       bootauth.$O\
        aux.$O\
        boot.$O\
-       bootcache.$O\
-       bootip.$O\
-       local.$O\
-       embed.$O\
-       settime.$O\
-       sac.$O\
-       paq.$O\
        printstub.$O\
 
-$BOOTLIB(%.$O):N:      %.$O
-
-$BOOTLIB:      ${BOOTFILES:%=$BOOTLIB(%)}
-       names=`{membername $newprereq}
-       ar vu $BOOTLIB $names
-       rm $names
-
 $BOOTFILES:    $BOOTDIR/boot.h
 
 %.$O:  $BOOTDIR/%.c
        $CC -I$BOOTDIR $CFLAGS $BOOTDIR/$stem.c
+
+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