summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2010-07-20 16:50:25 +0000
committerjmmv <jmmv@pkgsrc.org>2010-07-20 16:50:25 +0000
commit50fb650cfd128674909365d5817aee2eadea2107 (patch)
tree75e5d0a47266eaf6b7f7a504e0f8033fdaca5c6c /pkgtools
parenta69c003233613b0e54422d9f470a7a13ee2918bc (diff)
downloadpkgsrc-50fb650cfd128674909365d5817aee2eadea2107.tar.gz
Update to 1.34:
- Remove pkg_install version check and rebuild if outdated. pkgsrc is supposed to do that for us. Addresses PR pkg/38323. - Don't bother to explicitly builddigest. pkgsrc DTRT nowadays when PKGSRC_COMPILER includes ccache/distcc.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_comp/Makefile4
-rw-r--r--pkgtools/pkg_comp/files/pkg_comp.sh46
2 files changed, 4 insertions, 46 deletions
diff --git a/pkgtools/pkg_comp/Makefile b/pkgtools/pkg_comp/Makefile
index 6f0ffe04890..6fd7899cf4b 100644
--- a/pkgtools/pkg_comp/Makefile
+++ b/pkgtools/pkg_comp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2010/04/15 09:42:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.46 2010/07/20 16:50:25 jmmv Exp $
-DISTNAME= pkg_comp-1.33
+DISTNAME= pkg_comp-1.34
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkg_comp/files/pkg_comp.sh b/pkgtools/pkg_comp/files/pkg_comp.sh
index 70d9c573e97..74252e32e2e 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.37 2010/04/15 09:42:45 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.38 2010/07/20 16:50:26 jmmv Exp $
#
# pkg_comp - Build packages inside a clean chroot environment
# Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv@NetBSD.org>
@@ -533,7 +533,6 @@ makeroot()
trap "echo \"*** Process aborted ***\" ; fsumount ; exit 1" INT QUIT
makeroot_libkver
- [ "$Nflag" = "no" ] && makeroot_digest
if [ "$USE_GCC3" = "yes" -a "$Nflag" = "no" ]; then
if [ -z "`echo $BUILD_PACKAGES $INSTALL_PACKAGES | grep gcc3`" ]; then
@@ -609,17 +608,6 @@ EOF
fi
}
-# makeroot_digest
-#
-# Ensure digest is always installed, specially because PKGSRC_COMPILER
-# may contain 'ccache' or 'distcc'.
-#
-makeroot_digest()
-{
- ( PKGSRC_COMPILER=gcc; export PKGSRC_COMPILER; \
- build_and_install pkgtools/digest )
-}
-
# makeroot_libkver
#
# If NETBSD_RELEASE is set to a version string, installs libkver
@@ -725,7 +713,7 @@ pkg_build()
# Build them
fsmount
- check_pkg_install # executes copy_vulnerabilities too
+ copy_vulnerabilities
failed=""
for p in $pkgs; do
echo "PKG_COMP ==> Building and installing $p"
@@ -763,36 +751,6 @@ EOF
fi
}
-# check_pkg_install
-#
-# Ensure that the version of pkg_install inside the sandbox is new
-# enough to work with pkgsrc. If not, rebuild it.
-#
-check_pkg_install()
-{
- local script
-
- copy_vulnerabilities
-
- # We assume filesystems are mounted!
-
- echo "PKG_COMP ==> Checking if pkg_install is up to date"
- script=$(mktemp $DESTDIR/pkg_comp/tmp/pkg_comp-XXXXXX).sh
- init_script $script
- cat >> $script <<EOF
-cd /usr/pkgsrc/pkgtools/pkg_comp
-fail=\$(make show-var VARNAME=PKG_FAIL_REASON)
-if echo \$fail | grep "package tools installed on this system are out of date" >/dev/null; then
- echo "PKG_COMP ==> pkg_install is out of date; rebuilding"
- cd /usr/pkgsrc/pkgtools/pkg_install
- make && make install && make clean
-fi
-EOF
- chmod +x $script
- chroot $DESTDIR /pkg_comp/tmp/`basename $script`
- rm $script
-}
-
# build_and_install pkg
#
# Builds a package and ensures it gets installed. The use of destdir to