pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_comp Update to version 1.30.
details: https://anonhg.NetBSD.org/pkgsrc/rev/227220b24308
branches: trunk
changeset: 534605:227220b24308
user: seb <seb%pkgsrc.org@localhost>
date: Sat Oct 27 17:11:24 2007 +0000
description:
Update to version 1.30.
Approved by MAINTAINER, jmmv@.
Add option -N: with the expection of pkgtools/libkver (see manual
page about NETBSD_RELEASE) avoid installation of default packages as well as
INSTALL_PACKAGES and BUILD_PACKAGES during the creation of the chroot.
Note: This is useful for running pbulk in a sandbox created by
pkg_comp as binary packages , possibly very low in the build
dependencies tree like pkgtools/digest, won't be built by pkg_comp
while creating the sandbox hence pbulk won't have to rebuild nearly
all packages otherwise already up-to-date.
The maintainer notes that this seems like abusing pkg_comp to just
create sandboxes. And well... yes indeed!
diffstat:
pkgtools/pkg_comp/Makefile | 4 ++--
pkgtools/pkg_comp/files/pkg_comp.8 | 13 +++++++++++--
pkgtools/pkg_comp/files/pkg_comp.sh | 17 +++++++++++------
3 files changed, 24 insertions(+), 10 deletions(-)
diffs (121 lines):
diff -r 187796814c58 -r 227220b24308 pkgtools/pkg_comp/Makefile
--- a/pkgtools/pkg_comp/Makefile Sat Oct 27 15:16:52 2007 +0000
+++ b/pkgtools/pkg_comp/Makefile Sat Oct 27 17:11:24 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2007/01/07 09:14:08 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2007/10/27 17:11:24 seb Exp $
-DISTNAME= pkg_comp-1.29
+DISTNAME= pkg_comp-1.30
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff -r 187796814c58 -r 227220b24308 pkgtools/pkg_comp/files/pkg_comp.8
--- a/pkgtools/pkg_comp/files/pkg_comp.8 Sat Oct 27 15:16:52 2007 +0000
+++ b/pkgtools/pkg_comp/files/pkg_comp.8 Sat Oct 27 17:11:24 2007 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_comp.8,v 1.30 2006/02/10 23:41:20 salo Exp $
+.\" $NetBSD: pkg_comp.8,v 1.31 2007/10/27 17:11:24 seb Exp $
.\"
.\" pkg_comp - Build packages inside a clean chroot environment
.\" Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv%NetBSD.org@localhost>
@@ -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 10, 2006
+.Dd October 27, 2007
.Dt PKG_COMP 8
.Os
.Sh NAME
@@ -41,6 +41,7 @@
.Ar conf_file
.Oc
.Op Fl n
+.Op Fl N
.Ar target
.Op Ar pkg_name ...
.Sh DESCRIPTION
@@ -78,6 +79,14 @@
and
.Va BUILD_PACKAGES
during the creation of the chroot.
+.It Fl N
+With the exception of pkgtools/libkver ( see
+.Va NETBSD_RELEASE )
+avoid installation of default packages as well as
+.Va INSTALL_PACKAGES
+and
+.Va BUILD_PACKAGES
+during the creation of the chroot.
.El
.Ss What to use it for?
You can use
diff -r 187796814c58 -r 227220b24308 pkgtools/pkg_comp/files/pkg_comp.sh
--- a/pkgtools/pkg_comp/files/pkg_comp.sh Sat Oct 27 15:16:52 2007 +0000
+++ b/pkgtools/pkg_comp/files/pkg_comp.sh Sat Oct 27 17:11:24 2007 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: pkg_comp.sh,v 1.32 2006/06/17 12:18:24 seb Exp $
+# $NetBSD: pkg_comp.sh,v 1.33 2007/10/27 17:11:24 seb Exp $
#
# pkg_comp - Build packages inside a clean chroot environment
# Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv%NetBSD.org@localhost>
@@ -172,7 +172,7 @@
#
usage()
{
- echo "usage: $ProgName [-(c|C) conf_file] [-n] target [pkg_names]" 1>&2
+ echo "usage: $ProgName [-(c|C) conf_file] [-n] [-N] target [pkg_names]" 1>&2
exit 1
}
@@ -528,9 +528,9 @@
trap "echo \"*** Process aborted ***\" ; fsumount ; exit 1" INT QUIT
makeroot_libkver
- makeroot_digest
+ [ "$Nflag" = "no" ] && makeroot_digest
- if [ "$USE_GCC3" = "yes" ]; then
+ if [ "$USE_GCC3" = "yes" -a "$Nflag" = "no" ]; then
if [ -z "`echo $BUILD_PACKAGES $INSTALL_PACKAGES | grep gcc3`" ]; then
AVOID_GCC3=yes pkg_build lang/gcc3
fi
@@ -648,7 +648,7 @@
echo "export XAPPLRESDIR=${LOCALBASE}/lib/X11/app-defaults" >> $DESTDIR/etc/profile
echo "setenv XAPPLRESDIR ${LOCALBASE}/lib/X11/app-defaults" >> $DESTDIR/etc/csh.login
fi
- pkg_build pkgtools/x11-links
+ [ "$Nflag" = "no" ] && pkg_build pkgtools/x11-links
fi
}
@@ -888,13 +888,14 @@
confdir="$HOME/pkg_comp"
# Parse options
-args=`getopt c:C:n $*`
+args=`getopt c:C:nN $*`
if [ $? != 0 ]; then
usage
fi
set -- $args
conffile=
nflag=no
+Nflag=no
while [ $# -gt 0 ]; do
case "$1" in
-c)
@@ -910,6 +911,10 @@
-n)
nflag=yes
;;
+ -N)
+ nflag=yes
+ Nflag=yes
+ ;;
--)
shift; break
;;
Home |
Main Index |
Thread Index |
Old Index