If we want to try a bulk-build on a non-NetBSD platform, we need to take

care not to blow away our bootstrap-pkgsrc stuff in the initial phase.
Also mark devel/bmake and devel/mk-files as broken on non-NetBSD so as not
to blow away our precious files from the bootstrap process in the middle
of a bulk-build.  Now let's see if bulk-building works on Linux...

1 files changed, 38 insertions, 6 deletions

diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index b8b30072272..afdb6714544 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-build,v 1.26 2003/05/06 17:42:04 jmmv Exp $
+# $NetBSD: pre-build,v 1.27 2003/06/06 18:28:47 jschauma Exp $
 #
 # Clean up system to be ready for bulk pkg build
 #
@@ -39,7 +39,31 @@ if [ "$BLDLOG" = "" ]; then
 	exit 1
 fi
 
+LOCALBASE=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=LOCALBASE )`;
+X11BASE=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=X11BASE )`;
 
+# On non-NetBSD platforms we need to keep the bootstrap-files!
+if [ x"$BMAKE" = x"bmake" ]; then
+	( cd $LOCALBASE && tar cf /tmp/$$.tar \
+        	sbin/mtree sbin/pkg_add sbin/pkg_admin sbin/pkg_create \
+		sbin/pkg_delete sbin/pkg_info share/mk/sys.mk \
+		share/mk/bsd.dep.mk share/mk/bsd.depall.mk \
+		share/mk/bsd.files.mk share/mk/bsd.hostprog.mk \
+		share/mk/bsd.inc.mk share/mk/bsd.info.mk \
+		share/mk/bsd.kernobj.mk share/mk/bsd.kinc.mk \
+		share/mk/bsd.kmod.mk share/mk/bsd.lib.mk \
+		share/mk/bsd.links.mk share/mk/bsd.man.mk \
+		share/mk/bsd.nls.mk share/mk/bsd.obj.mk \
+		share/mk/bsd.prog.mk share/mk/bsd.subdir.mk \
+		share/mk/bsd.sys.mk share/mk/bsd.own.mk \
+		share/mk/zoularis.mk bin/bmake bin/ftp bin/digest \
+		bin/pax bin/tar bin/cpio man/cat1/ftp.1 man/cat1/pax.0 \
+		man/cat1/tar.0 man/cat1/cpio.0 man/cat1/pkg_add.0 \
+		man/cat1/pkg_admin.0 man/cat1/pkg_create.0 \
+		man/cat1/pkg_delete.0 man/cat1/pkg_info.0 \
+		man/man1/digest.1 man/cat8/mtree.0 \
+		man/cat7/packages.0 )
+fi
 
 #
 # Clean out everything and its mother
@@ -73,11 +97,10 @@ if [ -d ${PKG_DBDIR} ]; then
 	rm -fr *
 fi
 
-LOCALBASE=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=LOCALBASE )`;
-X11BASE=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=X11BASE )`;
-	
-# General cleanout - easy!
-cd $LOCALBASE && rm -fr * && rm -fr .??*
+cd $LOCALBASE && rm -fr * && rm -fr .??*;
+if [ x"$BMAKE" = x"bmake" ]; then
+	( cd $LOCALBASE && tar xf /tmp/$$.tar )
+fi
 
 # Stuff known to be broken
 rm -fr $X11BASE/share/gimp
@@ -167,6 +190,15 @@ yes|YES)
 	;;
 esac
 
+# on non-NetBSD, we don't want these to build as they overwrite
+# bootstrap-pkgsrc generated files and thus would break the following builds.
+
+if [ x"$BMAKE" = x"bmake" ]; then
+	echo "Don't blow away bootstrap-pkgsrc stuff!" > \
+		devel/bmake/${BROKENF}
+	echo "Don't blow away bootstrap-pkgsrc stuff!" > \
+		devel/mk-files/${BROKENF}
+fi
 
 if [ -f mk/bulk/pre-build.local ]; then
 	. mk/bulk/pre-build.local