Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/vax/cdroms/installcd Instead of running MAKEDEV insi...
details: https://anonhg.NetBSD.org/src/rev/62fef74aa81b
branches: trunk
changeset: 329626:62fef74aa81b
user: martin <martin%NetBSD.org@localhost>
date: Sat May 31 10:43:00 2014 +0000
description:
Instead of running MAKEDEV inside the image content dir (which would only
work for root), make it emit a mtree spec file and pass that to makefs.
This should also work for unprivileged builds.
Problem pointed out by Izumi Tsutsui.
diffstat:
distrib/vax/cdroms/installcd/Makefile | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diffs (27 lines):
diff -r 50be1d485daf -r 62fef74aa81b distrib/vax/cdroms/installcd/Makefile
--- a/distrib/vax/cdroms/installcd/Makefile Sat May 31 10:18:47 2014 +0000
+++ b/distrib/vax/cdroms/installcd/Makefile Sat May 31 10:43:00 2014 +0000
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2014/05/30 13:24:22 martin Exp $
+# $NetBSD: Makefile,v 1.6 2014/05/31 10:43:00 martin Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
CDRELEASE_NOISOS=true
+CDMAKEFSEXTRAOPTS+=-F ./fs.spec
+
+CLEANFILES+= fs.spec
# for PRINTOBJDIR
.include <bsd.own.mk>
@@ -29,7 +32,9 @@
${INSTALL} ${COPY} $$f cdrom; \
done
${TOOL_GZIP} -d cdrom/netbsd.gz
- (cd cdrom/dev && ${HOST_SH} ./MAKEDEV all)
+ echo '. type=dir optional' > ./fs.spec
+ echo './dev type=dir optional' >> ./fs.spec
+ ${HOST_SH} cdrom/dev/MAKEDEV -s all | ${TOOL_SED} -e '1d' -e 's:^\./:./dev/:' >> ./fs.spec
${MKDIR} cdrom/var
${MKDIR} cdrom/kern
Home |
Main Index |
Thread Index |
Old Index