summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjmmv <jmmv>2004-04-02 18:03:01 +0000
committerjmmv <jmmv>2004-04-02 18:03:01 +0000
commit7dcdaf05efcd56d2750fb3a0e06670620c2bcbf3 (patch)
treed0d6d535c75d46871b06ea01efe00422ef2dc63f /pkgtools
parent6bfac25194598f97df56c6a99167184f20e9ada9 (diff)
downloadpkgsrc-7dcdaf05efcd56d2750fb3a0e06670620c2bcbf3.tar.gz
Update to 1.18:
- Make kern-GENERIC.tgz part of the default SETS value, so that we get a kernel inside the chroot. If the user removes it from the list, and no /netbsd file exists after extraction, create an empty /netbsd kernel. This fixes packages that look for a kernel during compilation, like net-snmp. Found by cube@.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_comp/Makefile4
-rw-r--r--pkgtools/pkg_comp/files/pkg_comp.89
-rw-r--r--pkgtools/pkg_comp/files/pkg_comp.sh6
3 files changed, 12 insertions, 7 deletions
diff --git a/pkgtools/pkg_comp/Makefile b/pkgtools/pkg_comp/Makefile
index c35b5149fbe..c4921b9b1bf 100644
--- a/pkgtools/pkg_comp/Makefile
+++ b/pkgtools/pkg_comp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2004/03/10 13:32:39 xtraeme Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/02 18:03:01 jmmv Exp $
-DISTNAME= pkg_comp-1.17
+DISTNAME= pkg_comp-1.18
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkg_comp/files/pkg_comp.8 b/pkgtools/pkg_comp/files/pkg_comp.8
index 3df1edf7195..66b0ad15e39 100644
--- a/pkgtools/pkg_comp/files/pkg_comp.8
+++ b/pkgtools/pkg_comp/files/pkg_comp.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_comp.8,v 1.20 2004/02/21 13:08:31 jmmv Exp $
+.\" $NetBSD: pkg_comp.8,v 1.21 2004/04/02 18:03:01 jmmv Exp $
.\"
.\" pkg_comp - Build packages inside a clean chroot environment
.\" Copyright (c) 2002, 2003, 2004 Julio M. Merino Vidal <jmmv@NetBSD.org>
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd February 21, 2004
+.Dd April 2, 2004
.Dt PKG_COMP 8
.Os
.Sh NAME
@@ -270,7 +270,10 @@ Defaults to
A list of binary sets to be extracted inside
.Sy DESTDIR .
Defaults to
-.Ql base.tgz comp.tgz etc.tgz text.tgz .
+.Ql base.tgz comp.tgz etc.tgz kern-GENERIC.tgz text.tgz .
+If no kernel is extracted by these sets, an empty
+.Pa /netbsd
+file is created inside the chroot.
.It SETS_X11
A list of binary sets of the X Window system.
This has the same behavior
diff --git a/pkgtools/pkg_comp/files/pkg_comp.sh b/pkgtools/pkg_comp/files/pkg_comp.sh
index 095856da800..98d47a89a29 100644
--- a/pkgtools/pkg_comp/files/pkg_comp.sh
+++ b/pkgtools/pkg_comp/files/pkg_comp.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: pkg_comp.sh,v 1.19 2004/02/21 13:08:31 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.20 2004/04/02 18:03:01 jmmv Exp $
#
# pkg_comp - Build packages inside a clean chroot environment
# Copyright (c) 2002, 2003, 2004 Julio M. Merino Vidal <jmmv@NetBSD.org>
@@ -105,7 +105,7 @@ env_setdefaults()
: ${AUTO_TARGET:=package}
: ${BUILD_TARGET:=package}
: ${DISTRIBDIR:=/var/pub/NetBSD}
- : ${SETS:=base.tgz comp.tgz etc.tgz text.tgz}
+ : ${SETS:=base.tgz comp.tgz etc.tgz kern-GENERIC.tgz text.tgz}
: ${SETS_X11:=xbase.tgz xcomp.tgz xcontrib.tgz xfont.tgz xmisc.tgz xserver.tgz}
: ${REAL_SRC:=/usr/src}
: ${REAL_SRC_OPTS:=-t null -o ro}
@@ -469,6 +469,8 @@ makeroot()
tar xzpf $DISTRIBDIR/binary/sets/$s
done
+ [ -f ${DESTDIR}/netbsd ] || touch ${DESTDIR}/netbsd
+
echo "Making device nodes..."
cd $DESTDIR/dev
./MAKEDEV all