Cross compile MFS ramdisk

diff --git a/build.sh b/build.sh
index ee0863d721aca5202bcda677250a0163681bb832..b63b2adfa10081a4f59a108f36763a8158a8302d 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -1674,7 +1674,7 @@ EOF
                eval cat <<EOF
 MAKEWRAPPERMACHINE=${makewrappermachine:-${MACHINE}}; export MAKEWRAPPERMACHINE
 USETOOLS=yes; export USETOOLS
-MKBUILDEXT2RD=yes; export MKBUILDEXT2RD
+MKINSTALLBOOT=no; export MKINSTALLBOOT
 EOF
        } | eval sort -u "${makewrapout}"
        eval cat <<EOF "${makewrapout}"

diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile
index 2763f23d5296020b57cd8d8162d3a4b45e7df550..f28f7c59a844b2528f0819af1ac3b86651648c85 100644 (file)
--- a/drivers/ramdisk/Makefile
+++ b/drivers/ramdisk/Makefile
@@ -32,13 +32,13 @@ CLEANFILES += $(PROGRAMS) $(SCRIPTS) $(EXTRA) image image.c t proto.gen
 CLEANFILES += $(LIBRARIES) pwd.db spwd.db
 
 image: proto.gen mtab rc $(EXTRA) pwd.db spwd.db passwd
-       mkfs.mfs image proto.gen || { rm -f image; false; }
-       if fsck.mfs -s image | grep -q CLEAN;   \
-       then    : ;     \
-       else    echo "CLEAN sanity check of image failed."      ;       \
-               echo "(Perhaps install current mkfs and fsck.)" ;       \
-               rm -f image; false;             \
-       fi
+       ${TOOL_MKFSMFS} image proto.gen || { rm -f image; false; }
+#      if fsck.mfs -s image | grep -q CLEAN;   \
+#      then    : ;     \
+#      else    echo "CLEAN sanity check of image failed."      ;       \
+#              echo "(Perhaps install current mkfs and fsck.)" ;       \
+#              rm -f image; false;             \
+#      fi
 
 .for driver in $(PROG_DRIVERS)
 $(driver): ../$(driver)/$(driver)
@@ -85,7 +85,7 @@ $(server): ../../servers/$(server)/$(server)
 pwd.db spwd.db passwd: ../../etc/master.passwd ../../usr.sbin/pwd_mkdb/pwd_mkdb
        rm -f ../../etc/master.passwd.orig ../../etc/passwd.orig
        rm -f ../../etc/pwd.db.tmp ../../etc/spwd.db.tmp
-       ../../usr.sbin/pwd_mkdb/pwd_mkdb -V 0 -p -d ../../ ../../etc/master.passwd
+       ${TOOL_PWD_MKDB} -V 0 -p -d ../../ ../../etc/master.passwd
        ${INSTALL} ../../etc/$@ $@
 
 proto.gen: $(PROGRAMS) proto.sh ${PROTO} proto.common.etc proto.common.dynamic proto.sh

diff --git a/drivers/ramdisk/proto.dev b/drivers/ramdisk/proto.dev
new file mode 100644 (file)
index 0000000..5bb9167
--- /dev/null
+++ b/drivers/ramdisk/proto.dev
@@ -0,0 +1,371 @@
+               boot b--600 0 8 1 4 
+               c0d0 b--600 0 0 3 0 
+               c0d0p0 b--600 0 0 3 1 
+               c0d0p0s0 b--600 0 0 3 128 
+               c0d0p0s1 b--600 0 0 3 129 
+               c0d0p0s2 b--600 0 0 3 130 
+               c0d0p0s3 b--600 0 0 3 131 
+               c0d0p1 b--600 0 0 3 2 
+               c0d0p1s0 b--600 0 0 3 132 
+               c0d0p1s1 b--600 0 0 3 133 
+               c0d0p1s2 b--600 0 0 3 134 
+               c0d0p1s3 b--600 0 0 3 135 
+               c0d0p2 b--600 0 0 3 3 
+               c0d0p2s0 b--600 0 0 3 136 
+               c0d0p2s1 b--600 0 0 3 137 
+               c0d0p2s2 b--600 0 0 3 138 
+               c0d0p2s3 b--600 0 0 3 139 
+               c0d0p3 b--600 0 0 3 4 
+               c0d0p3s0 b--600 0 0 3 140 
+               c0d0p3s1 b--600 0 0 3 141 
+               c0d0p3s2 b--600 0 0 3 142 
+               c0d0p3s3 b--600 0 0 3 143 
+               c0d1 b--600 0 0 3 5 
+               c0d1p0 b--600 0 0 3 6 
+               c0d1p0s0 b--600 0 0 3 144 
+               c0d1p0s1 b--600 0 0 3 145 
+               c0d1p0s2 b--600 0 0 3 146 
+               c0d1p0s3 b--600 0 0 3 147 
+               c0d1p1 b--600 0 0 3 7 
+               c0d1p1s0 b--600 0 0 3 148 
+               c0d1p1s1 b--600 0 0 3 149 
+               c0d1p1s2 b--600 0 0 3 150 
+               c0d1p1s3 b--600 0 0 3 151 
+               c0d1p2 b--600 0 0 3 8 
+               c0d1p2s0 b--600 0 0 3 152 
+               c0d1p2s1 b--600 0 0 3 153 
+               c0d1p2s2 b--600 0 0 3 154 
+               c0d1p2s3 b--600 0 0 3 155 
+               c0d1p3 b--600 0 0 3 9 
+               c0d1p3s0 b--600 0 0 3 156 
+               c0d1p3s1 b--600 0 0 3 157 
+               c0d1p3s2 b--600 0 0 3 158 
+               c0d1p3s3 b--600 0 0 3 159 
+               c0d2 b--600 0 0 3 10 
+               c0d2p0 b--600 0 0 3 11 
+               c0d2p0s0 b--600 0 0 3 160 
+               c0d2p0s1 b--600 0 0 3 161 
+               c0d2p0s2 b--600 0 0 3 162 
+               c0d2p0s3 b--600 0 0 3 163 
+               c0d2p1 b--600 0 0 3 12 
+               c0d2p1s0 b--600 0 0 3 164 
+               c0d2p1s1 b--600 0 0 3 165 
+               c0d2p1s2 b--600 0 0 3 166 
+               c0d2p1s3 b--600 0 0 3 167 
+               c0d2p2 b--600 0 0 3 13 
+               c0d2p2s0 b--600 0 0 3 168 
+               c0d2p2s1 b--600 0 0 3 169 
+               c0d2p2s2 b--600 0 0 3 170 
+               c0d2p2s3 b--600 0 0 3 171 
+               c0d2p3 b--600 0 0 3 14 
+               c0d2p3s0 b--600 0 0 3 172 
+               c0d2p3s1 b--600 0 0 3 173 
+               c0d2p3s2 b--600 0 0 3 174 
+               c0d2p3s3 b--600 0 0 3 175 
+               c0d3 b--600 0 0 3 15 
+               c0d3p0 b--600 0 0 3 16 
+               c0d3p0s0 b--600 0 0 3 176 
+               c0d3p0s1 b--600 0 0 3 177 
+               c0d3p0s2 b--600 0 0 3 178 
+               c0d3p0s3 b--600 0 0 3 179 
+               c0d3p1 b--600 0 0 3 17 
+               c0d3p1s0 b--600 0 0 3 180 
+               c0d3p1s1 b--600 0 0 3 181 
+               c0d3p1s2 b--600 0 0 3 182 
+               c0d3p1s3 b--600 0 0 3 183 
+               c0d3p2 b--600 0 0 3 18 
+               c0d3p2s0 b--600 0 0 3 184 
+               c0d3p2s1 b--600 0 0 3 185 
+               c0d3p2s2 b--600 0 0 3 186 
+               c0d3p2s3 b--600 0 0 3 187 
+               c0d3p3 b--600 0 0 3 19 
+               c0d3p3s0 b--600 0 0 3 188 
+               c0d3p3s1 b--600 0 0 3 189 
+               c0d3p3s2 b--600 0 0 3 190 
+               c0d3p3s3 b--600 0 0 3 191 
+               c0d4 b--600 0 0 3 20 
+               c0d4p0 b--600 0 0 3 21 
+               c0d4p0s0 b--600 0 0 3 192 
+               c0d4p0s1 b--600 0 0 3 193 
+               c0d4p0s2 b--600 0 0 3 194 
+               c0d4p0s3 b--600 0 0 3 195 
+               c0d4p1 b--600 0 0 3 22 
+               c0d4p1s0 b--600 0 0 3 196 
+               c0d4p1s1 b--600 0 0 3 197 
+               c0d4p1s2 b--600 0 0 3 198 
+               c0d4p1s3 b--600 0 0 3 199 
+               c0d4p2 b--600 0 0 3 23 
+               c0d4p2s0 b--600 0 0 3 200 
+               c0d4p2s1 b--600 0 0 3 201 
+               c0d4p2s2 b--600 0 0 3 202 
+               c0d4p2s3 b--600 0 0 3 203 
+               c0d4p3 b--600 0 0 3 24 
+               c0d4p3s0 b--600 0 0 3 204 
+               c0d4p3s1 b--600 0 0 3 205 
+               c0d4p3s2 b--600 0 0 3 206 
+               c0d4p3s3 b--600 0 0 3 207 
+               c0d5 b--600 0 0 3 25 
+               c0d5p0 b--600 0 0 3 26 
+               c0d5p0s0 b--600 0 0 3 208 
+               c0d5p0s1 b--600 0 0 3 209 
+               c0d5p0s2 b--600 0 0 3 210 
+               c0d5p0s3 b--600 0 0 3 211 
+               c0d5p1 b--600 0 0 3 27 
+               c0d5p1s0 b--600 0 0 3 212 
+               c0d5p1s1 b--600 0 0 3 213 
+               c0d5p1s2 b--600 0 0 3 214 
+               c0d5p1s3 b--600 0 0 3 215 
+               c0d5p2 b--600 0 0 3 28 
+               c0d5p2s0 b--600 0 0 3 216 
+               c0d5p2s1 b--600 0 0 3 217 
+               c0d5p2s2 b--600 0 0 3 218 
+               c0d5p2s3 b--600 0 0 3 219 
+               c0d5p3 b--600 0 0 3 29 
+               c0d5p3s0 b--600 0 0 3 220 
+               c0d5p3s1 b--600 0 0 3 221 
+               c0d5p3s2 b--600 0 0 3 222 
+               c0d5p3s3 b--600 0 0 3 223 
+               c0d6 b--600 0 0 3 30 
+               c0d6p0 b--600 0 0 3 31 
+               c0d6p0s0 b--600 0 0 3 224 
+               c0d6p0s1 b--600 0 0 3 225 
+               c0d6p0s2 b--600 0 0 3 226 
+               c0d6p0s3 b--600 0 0 3 227 
+               c0d6p1 b--600 0 0 3 32 
+               c0d6p1s0 b--600 0 0 3 228 
+               c0d6p1s1 b--600 0 0 3 229 
+               c0d6p1s2 b--600 0 0 3 230 
+               c0d6p1s3 b--600 0 0 3 231 
+               c0d6p2 b--600 0 0 3 33 
+               c0d6p2s0 b--600 0 0 3 232 
+               c0d6p2s1 b--600 0 0 3 233 
+               c0d6p2s2 b--600 0 0 3 234 
+               c0d6p2s3 b--600 0 0 3 235 
+               c0d6p3 b--600 0 0 3 34 
+               c0d6p3s0 b--600 0 0 3 236 
+               c0d6p3s1 b--600 0 0 3 237 
+               c0d6p3s2 b--600 0 0 3 238 
+               c0d6p3s3 b--600 0 0 3 239 
+               c0d7 b--600 0 0 3 35 
+               c0d7p0 b--600 0 0 3 36 
+               c0d7p0s0 b--600 0 0 3 240 
+               c0d7p0s1 b--600 0 0 3 241 
+               c0d7p0s2 b--600 0 0 3 242 
+               c0d7p0s3 b--600 0 0 3 243 
+               c0d7p1 b--600 0 0 3 37 
+               c0d7p1s0 b--600 0 0 3 244 
+               c0d7p1s1 b--600 0 0 3 245 
+               c0d7p1s2 b--600 0 0 3 246 
+               c0d7p1s3 b--600 0 0 3 247 
+               c0d7p2 b--600 0 0 3 38 
+               c0d7p2s0 b--600 0 0 3 248 
+               c0d7p2s1 b--600 0 0 3 249 
+               c0d7p2s2 b--600 0 0 3 250 
+               c0d7p2s3 b--600 0 0 3 251 
+               c0d7p3 b--600 0 0 3 39 
+               c0d7p3s0 b--600 0 0 3 252 
+               c0d7p3s1 b--600 0 0 3 253 
+               c0d7p3s2 b--600 0 0 3 254 
+               c0d7p3s3 b--600 0 0 3 255 
+               c1d0 b--600 0 0 8 0 
+               c1d0p0 b--600 0 0 8 1 
+               c1d0p0s0 b--600 0 0 8 128 
+               c1d0p0s1 b--600 0 0 8 129 
+               c1d0p0s2 b--600 0 0 8 130 
+               c1d0p0s3 b--600 0 0 8 131 
+               c1d0p1 b--600 0 0 8 2 
+               c1d0p1s0 b--600 0 0 8 132 
+               c1d0p1s1 b--600 0 0 8 133 
+               c1d0p1s2 b--600 0 0 8 134 
+               c1d0p1s3 b--600 0 0 8 135 
+               c1d0p2 b--600 0 0 8 3 
+               c1d0p2s0 b--600 0 0 8 136 
+               c1d0p2s1 b--600 0 0 8 137 
+               c1d0p2s2 b--600 0 0 8 138 
+               c1d0p2s3 b--600 0 0 8 139 
+               c1d0p3 b--600 0 0 8 4 
+               c1d0p3s0 b--600 0 0 8 140 
+               c1d0p3s1 b--600 0 0 8 141 
+               c1d0p3s2 b--600 0 0 8 142 
+               c1d0p3s3 b--600 0 0 8 143 
+               c1d1 b--600 0 0 8 5 
+               c1d1p0 b--600 0 0 8 6 
+               c1d1p0s0 b--600 0 0 8 144 
+               c1d1p0s1 b--600 0 0 8 145 
+               c1d1p0s2 b--600 0 0 8 146 
+               c1d1p0s3 b--600 0 0 8 147 
+               c1d1p1 b--600 0 0 8 7 
+               c1d1p1s0 b--600 0 0 8 148 
+               c1d1p1s1 b--600 0 0 8 149 
+               c1d1p1s2 b--600 0 0 8 150 
+               c1d1p1s3 b--600 0 0 8 151 
+               c1d1p2 b--600 0 0 8 8 
+               c1d1p2s0 b--600 0 0 8 152 
+               c1d1p2s1 b--600 0 0 8 153 
+               c1d1p2s2 b--600 0 0 8 154 
+               c1d1p2s3 b--600 0 0 8 155 
+               c1d1p3 b--600 0 0 8 9 
+               c1d1p3s0 b--600 0 0 8 156 
+               c1d1p3s1 b--600 0 0 8 157 
+               c1d1p3s2 b--600 0 0 8 158 
+               c1d1p3s3 b--600 0 0 8 159 
+               c1d2 b--600 0 0 8 10 
+               c1d2p0 b--600 0 0 8 11 
+               c1d2p0s0 b--600 0 0 8 160 
+               c1d2p0s1 b--600 0 0 8 161 
+               c1d2p0s2 b--600 0 0 8 162 
+               c1d2p0s3 b--600 0 0 8 163 
+               c1d2p1 b--600 0 0 8 12 
+               c1d2p1s0 b--600 0 0 8 164 
+               c1d2p1s1 b--600 0 0 8 165 
+               c1d2p1s2 b--600 0 0 8 166 
+               c1d2p1s3 b--600 0 0 8 167 
+               c1d2p2 b--600 0 0 8 13 
+               c1d2p2s0 b--600 0 0 8 168 
+               c1d2p2s1 b--600 0 0 8 169 
+               c1d2p2s2 b--600 0 0 8 170 
+               c1d2p2s3 b--600 0 0 8 171 
+               c1d2p3 b--600 0 0 8 14 
+               c1d2p3s0 b--600 0 0 8 172 
+               c1d2p3s1 b--600 0 0 8 173 
+               c1d2p3s2 b--600 0 0 8 174 
+               c1d2p3s3 b--600 0 0 8 175 
+               c1d3 b--600 0 0 8 15 
+               c1d3p0 b--600 0 0 8 16 
+               c1d3p0s0 b--600 0 0 8 176 
+               c1d3p0s1 b--600 0 0 8 177 
+               c1d3p0s2 b--600 0 0 8 178 
+               c1d3p0s3 b--600 0 0 8 179 
+               c1d3p1 b--600 0 0 8 17 
+               c1d3p1s0 b--600 0 0 8 180 
+               c1d3p1s1 b--600 0 0 8 181 
+               c1d3p1s2 b--600 0 0 8 182 
+               c1d3p1s3 b--600 0 0 8 183 
+               c1d3p2 b--600 0 0 8 18 
+               c1d3p2s0 b--600 0 0 8 184 
+               c1d3p2s1 b--600 0 0 8 185 
+               c1d3p2s2 b--600 0 0 8 186 
+               c1d3p2s3 b--600 0 0 8 187 
+               c1d3p3 b--600 0 0 8 19 
+               c1d3p3s0 b--600 0 0 8 188 
+               c1d3p3s1 b--600 0 0 8 189 
+               c1d3p3s2 b--600 0 0 8 190 
+               c1d3p3s3 b--600 0 0 8 191 
+               c1d4 b--600 0 0 8 20 
+               c1d4p0 b--600 0 0 8 21 
+               c1d4p0s0 b--600 0 0 8 192 
+               c1d4p0s1 b--600 0 0 8 193 
+               c1d4p0s2 b--600 0 0 8 194 
+               c1d4p0s3 b--600 0 0 8 195 
+               c1d4p1 b--600 0 0 8 22 
+               c1d4p1s0 b--600 0 0 8 196 
+               c1d4p1s1 b--600 0 0 8 197 
+               c1d4p1s2 b--600 0 0 8 198 
+               c1d4p1s3 b--600 0 0 8 199 
+               c1d4p2 b--600 0 0 8 23 
+               c1d4p2s0 b--600 0 0 8 200 
+               c1d4p2s1 b--600 0 0 8 201 
+               c1d4p2s2 b--600 0 0 8 202 
+               c1d4p2s3 b--600 0 0 8 203 
+               c1d4p3 b--600 0 0 8 24 
+               c1d4p3s0 b--600 0 0 8 204 
+               c1d4p3s1 b--600 0 0 8 205 
+               c1d4p3s2 b--600 0 0 8 206 
+               c1d4p3s3 b--600 0 0 8 207 
+               c1d5 b--600 0 0 8 25 
+               c1d5p0 b--600 0 0 8 26 
+               c1d5p0s0 b--600 0 0 8 208 
+               c1d5p0s1 b--600 0 0 8 209 
+               c1d5p0s2 b--600 0 0 8 210 
+               c1d5p0s3 b--600 0 0 8 211 
+               c1d5p1 b--600 0 0 8 27 
+               c1d5p1s0 b--600 0 0 8 212 
+               c1d5p1s1 b--600 0 0 8 213 
+               c1d5p1s2 b--600 0 0 8 214 
+               c1d5p1s3 b--600 0 0 8 215 
+               c1d5p2 b--600 0 0 8 28 
+               c1d5p2s0 b--600 0 0 8 216 
+               c1d5p2s1 b--600 0 0 8 217 
+               c1d5p2s2 b--600 0 0 8 218 
+               c1d5p2s3 b--600 0 0 8 219 
+               c1d5p3 b--600 0 0 8 29 
+               c1d5p3s0 b--600 0 0 8 220 
+               c1d5p3s1 b--600 0 0 8 221 
+               c1d5p3s2 b--600 0 0 8 222 
+               c1d5p3s3 b--600 0 0 8 223 
+               c1d6 b--600 0 0 8 30 
+               c1d6p0 b--600 0 0 8 31 
+               c1d6p0s0 b--600 0 0 8 224 
+               c1d6p0s1 b--600 0 0 8 225 
+               c1d6p0s2 b--600 0 0 8 226 
+               c1d6p0s3 b--600 0 0 8 227 
+               c1d6p1 b--600 0 0 8 32 
+               c1d6p1s0 b--600 0 0 8 228 
+               c1d6p1s1 b--600 0 0 8 229 
+               c1d6p1s2 b--600 0 0 8 230 
+               c1d6p1s3 b--600 0 0 8 231 
+               c1d6p2 b--600 0 0 8 33 
+               c1d6p2s0 b--600 0 0 8 232 
+               c1d6p2s1 b--600 0 0 8 233 
+               c1d6p2s2 b--600 0 0 8 234 
+               c1d6p2s3 b--600 0 0 8 235 
+               c1d6p3 b--600 0 0 8 34 
+               c1d6p3s0 b--600 0 0 8 236 
+               c1d6p3s1 b--600 0 0 8 237 
+               c1d6p3s2 b--600 0 0 8 238 
+               c1d6p3s3 b--600 0 0 8 239 
+               c1d7 b--600 0 0 8 35 
+               c1d7p0 b--600 0 0 8 36 
+               c1d7p0s0 b--600 0 0 8 240 
+               c1d7p0s1 b--600 0 0 8 241 
+               c1d7p0s2 b--600 0 0 8 242 
+               c1d7p0s3 b--600 0 0 8 243 
+               c1d7p1 b--600 0 0 8 37 
+               c1d7p1s0 b--600 0 0 8 244 
+               c1d7p1s1 b--600 0 0 8 245 
+               c1d7p1s2 b--600 0 0 8 246 
+               c1d7p1s3 b--600 0 0 8 247 
+               c1d7p2 b--600 0 0 8 38 
+               c1d7p2s0 b--600 0 0 8 248 
+               c1d7p2s1 b--600 0 0 8 249 
+               c1d7p2s2 b--600 0 0 8 250 
+               c1d7p2s3 b--600 0 0 8 251 
+               c1d7p3 b--600 0 0 8 39 
+               c1d7p3s0 b--600 0 0 8 252 
+               c1d7p3s1 b--600 0 0 8 253 
+               c1d7p3s2 b--600 0 0 8 254 
+               c1d7p3s3 b--600 0 0 8 255 
+               console c--600 0 4 4 0 
+               fbd b--600 0 0 14 0 
+               fd0 b--666 0 0 2 0 
+               filter b--644 0 0 11 0 
+               hello c--644 0 0 17 0 
+               imgrd b--600 0 8 1 6 
+               kbd c--660 0 0 4 127 
+               kbdaux c--660 0 0 4 126 
+               klog c--600 0 0 15 0 
+               kmem c--640 0 8 1 2 
+               log c--222 0 0 4 15 
+               lp c--200 1 1 6 0 
+               mem c--640 0 8 1 1 
+               null c--666 0 8 1 3 
+               ram b--600 0 8 1 0 
+               ram0 b--600 0 8 1 7 
+               ram1 b--600 0 8 1 8 
+               ram2 b--600 0 8 1 9 
+               ram3 b--600 0 8 1 10 
+               ram4 b--600 0 8 1 11 
+               ram5 b--600 0 8 1 12 
+               random c--644 0 0 16 0 
+               tty c--666 0 0 5 0 
+               tty00 c--666 0 4 4 16 
+               tty01 c--666 0 4 4 17 
+               tty02 c--666 0 4 4 18 
+               tty03 c--666 0 4 4 19 
+               ttyc1 c--600 0 4 4 1 
+               ttyc2 c--600 0 0 4 2 
+               ttyc3 c--600 0 0 4 3 
+               uds c--666 0 0 18 0 
+               urandom c--644 0 0 16 0 
+               video c--600 0 0 4 125 
+               zero c--644 0 8 1 5 

diff --git a/drivers/ramdisk/proto.sh b/drivers/ramdisk/proto.sh
index 630fcdc1edebe2492f5c366dcd59c9d8570e62b9..daa4eaa2985731f7ae4d2d1c5a83029153732c26 100644 (file)
--- a/drivers/ramdisk/proto.sh
+++ b/drivers/ramdisk/proto.sh
@@ -10,13 +10,7 @@ then
 echo "         acpi ---755 0 0 acpi"
 fi
 sed -n '/@ACPI/,/@DEV/p' <${PROTO}  | grep -v -e @ACPI@ -e @DEV@
-(
-cd /dev
-ls -aln | grep '^[bc]' | egrep -v ' (fd1|fd0p|tcp|eth|ip|udp|tty[pq]|pty)' | grep -v 13, | \
-sed    -e 's/^[bc]/& /' -e 's/rw-/6/g' -e 's/r--/4/g' \
-       -e 's/-w-/2/g'  -e 's/---/0/g' | \
-awk '{ printf "\t\t%s %s--%s %d %d %d %d \n", $11, $1, $2, $4, $5, $6, $7; }'
-)
+cat proto.dev
 sed -n '/@DEV/,$p' <${PROTO}  | grep -v @DEV@
 cat proto.common.etc
 if [ -x /libexec/ld.elf_so ]

diff --git a/releasetools/Makefile b/releasetools/Makefile
index 0eedc6f996fbd1e2f61c298e6ee5713391769ee8..2172b816aa7ddc99b415171c7090057ea8accd0b 100644 (file)
--- a/releasetools/Makefile
+++ b/releasetools/Makefile
@@ -94,8 +94,13 @@ hdboot: services
        done
        cp ../kernel/kernel ${DESTDIR}/boot/minix/.temp/
        strip -s ${DESTDIR}/boot/minix/.temp/kernel
-       sh mkboot $@
-       sh ../commands/update_bootcfg/update_bootcfg.sh
+       if [ "${MKINSTALLBOOT}" != "no" ] ; then                \
+       sh mkboot $@;                                           \
+       sh ../commands/update_bootcfg/update_bootcfg.sh;        \
+       else                                                    \
+       ${INSTALL_DIR} ${DESTDIR}/multiboot;                    \
+       cp ${DESTDIR}/boot/minix/.temp/* ${DESTDIR}/multiboot;  \
+       fi
 
 fdboot:
        exec su root mkboot $@

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 97cb3404512aa8120514990f0c3930a0edc94340..629eb84b23e5fcbc59a4adb821da7bca5f5a0625 100644 (file)
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -290,6 +290,7 @@ TOOL_MENUC=         MENUDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}menuc
 TOOL_MIPSELF2ECOFF=    ${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff
 TOOL_MKCSMAPPER=       ${TOOLDIR}/bin/${_TOOL_PREFIX}mkcsmapper
 TOOL_MKESDB=           ${TOOLDIR}/bin/${_TOOL_PREFIX}mkesdb
+TOOL_MKFSMFS=          ${TOOLDIR}/bin/${_TOOL_PREFIX}mkfs.mfs
 TOOL_MKLOCALE=         ${TOOLDIR}/bin/${_TOOL_PREFIX}mklocale
 TOOL_MKMAGIC=          ${TOOLDIR}/bin/${_TOOL_PREFIX}file
 TOOL_MKTEMP=           ${TOOLDIR}/bin/${_TOOL_PREFIX}mktemp
@@ -362,6 +363,7 @@ TOOL_MENUC=         menuc
 TOOL_MIPSELF2ECOFF=    mips-elf2ecoff
 TOOL_MKCSMAPPER=       mkcsmapper
 TOOL_MKESDB=           mkesdb
+TOOL_MKFSMFS=          mkfs.mfs
 TOOL_MKLOCALE=         mklocale
 TOOL_MKMAGIC=          file
 TOOL_MKTEMP=           mktemp
@@ -747,7 +749,7 @@ _MKVARS.yes= \
 #MINIX-specific vars
 _MKVARS.yes+= \
        MKWATCHDOG MKACPI MKAPIC MKMCONTEXT MKDEBUGREG MKSYSDEBUG \
-       MKLIVEUPDATE MKSTATECTL MKTRACE 
+       MKLIVEUPDATE MKSTATECTL MKTRACE MKINSTALLBOOT
 .for var in ${_MKVARS.yes}
 ${var}?=       yes
 .endfor