Re: Creating a 7.x freesbie img on a 6.x host
Dario Freni <[email protected]>
| Newsgroups | gmane.os.freebsd.freesbie |
|---|---|
| Message-ID | <[email protected]> |
Paolo Pisati wrote: > Hi guys, > > did anyone recently build/install a 7.x system on a 6.x host? Dominique Goncalves did. Try the patch attached and see if it works. Bye, Dario -- Dario Freni ([email protected]) FreeSBIE developer (http://www.freesbie.org) GPG Public key at http://www.saturnero.net/saturnero.asc -- FreeSBIE mailing list (http://www.freesbie.org)
freesbie_srcconf-1.diff
(text/plain, 3.2 KB)
diff -ru freesbie2.orig/conf/freesbie.defaults.conf freesbie2/conf/freesbie.defaults.conf
--- freesbie2.orig/conf/freesbie.defaults.conf Thu Apr 6 20:05:05 2006
+++ freesbie2/conf/freesbie.defaults.conf Sun Apr 23 19:07:41 2006
@@ -67,6 +67,11 @@
#
#MAKE_CONF=/etc/make.conf
+# The src.conf file contains settings that will apply to every build
+# involving the FreeBSD source tree; see build(7) and src.conf(5)
+# only for 7.0-CURRENT
+SRC_CONF=${SRC_CONF:-"/dev/null"}
+
# You can specify which files to add to your system one by one. Just
# put the list in a text file and set the absolute path in FILE_LIST
# variable
Only in freesbie2/conf: freesbie.defaults.conf.orig
diff -ru freesbie2.orig/scripts/buildkernel.sh freesbie2/scripts/buildkernel.sh
--- freesbie2.orig/scripts/buildkernel.sh Sun Apr 2 01:06:41 2006
+++ freesbie2/scripts/buildkernel.sh Sun Apr 23 19:08:48 2006
@@ -43,7 +43,7 @@
unset EXTRA
-makeargs="${MAKEOPT:-} ${MAKEJ:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH}"
+makeargs="${MAKEOPT:-} ${MAKEJ:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} SRCCONF=${SRC_CONF}"
(env $MAKE_ENV script -aq $LOGFILE make $makeargs buildkernel || print_error;) | grep '^>>>'
cd $LOCALDIR
diff -ru freesbie2.orig/scripts/buildworld.sh freesbie2/scripts/buildworld.sh
--- freesbie2.orig/scripts/buildworld.sh Sun Apr 2 01:06:41 2006
+++ freesbie2/scripts/buildworld.sh Sun Apr 23 19:07:41 2006
@@ -35,7 +35,7 @@
unset EXTRA
-makeargs="${MAKEOPT:-} ${MAKEJ:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH}"
+makeargs="${MAKEOPT:-} ${MAKEJ:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} SRCCONF=${SRC_CONF}"
(env $MAKE_ENV script -aq $LOGFILE make ${makeargs:-} buildworld || print_error;) | grep '^>>>'
cd $LOCALDIR
diff -ru freesbie2.orig/scripts/installkernel.sh freesbie2/scripts/installkernel.sh
--- freesbie2.orig/scripts/installkernel.sh Thu Jan 5 00:23:10 2006
+++ freesbie2/scripts/installkernel.sh Sun Apr 23 19:07:41 2006
@@ -40,7 +40,7 @@
cd ${SRCDIR}
-makeargs="${MAKEOPT:-} ${MAKEJ:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} DESTDIR=${BASEDIR}"
+makeargs="${MAKEOPT:-} ${MAKEJ:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} DESTDIR=${BASEDIR} SRCCONF=${SRC_CONF}"
(env $MAKE_ENV script -aq $LOGFILE make ${makeargs:-} installkernel || print_error;) | grep '^>>>'
cd ${BASEDIR}/boot/kernel
diff -ru freesbie2.orig/scripts/installworld.sh freesbie2/scripts/installworld.sh
--- freesbie2.orig/scripts/installworld.sh Thu Jan 5 00:23:10 2006
+++ freesbie2/scripts/installworld.sh Sun Apr 23 19:07:41 2006
@@ -30,12 +30,12 @@
cd ${SRCDIR}
-makeargs="${MAKEOPT:-} ${MAKEJ:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} DESTDIR=${BASEDIR}"
+makeargs="${MAKEOPT:-} ${MAKEJ:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} DESTDIR=${BASEDIR} SRCCONF=${SRC_CONF}"
(env $MAKE_ENV script -aq $LOGFILE make ${makeargs:-} installworld || print_error;) | grep '^>>>'
-cd ${SRCDIR}/etc
+#cd ${SRCDIR}/etc
-makeargs="${MAKEOPT:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} DESTDIR=${BASEDIR}"
+makeargs="${MAKEOPT:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} DESTDIR=${BASEDIR} SRCCONF=${SRC_CONF}"
set +e
(env $MAKE_ENV script -aq $LOGFILE make ${makeargs:-} distribution || print_error;) | grep '^>>>'
set -e
signature.asc
(application/pgp-signature, 186 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (Darwin) iD8DBQFEdcFzymi72IiShysRAhnZAKC2Xhb194DiUVpjqOlI0HAzSK9fpQCfdic5 d0gYRS7357WysrDETW3JuT8= =dcSi -----END PGP SIGNATURE-----