Tue Dec 1 15:49:21 2009 UTC ()
There's no point in adding _PKGTOOLS_VER=$(${PKG_CREATE} -V)
to any syspkg +BUILD_INFO files, since we don't use the pkg_* tools
to create syspkgs. Also remove the definition of PKG_CREATE
from sets.subr, since nothing uses it now.
(apb)
diff -r1.17 -r1.18 src/distrib/sets/regpkg
diff -r1.11 -r1.12 src/distrib/sets/regpkgset
diff -r1.92 -r1.93 src/distrib/sets/sets.subr
--- src/distrib/sets/regpkg 2009/10/17 23:43:22 1.17
+++ src/distrib/sets/regpkg 2009/12/01 15:49:21 1.18
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: regpkg,v 1.17 2009/10/17 23:43:22 agc Exp $
+# $NetBSD: regpkg,v 1.18 2009/12/01 15:49:21 apb Exp $
#
# Copyright (c) 2003,2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -603,10 +603,6 @@
@echo MACHINE_ARCH=${MACHINE_ARCH}
@echo MACHINE_GNU_ARCH=${MACHINE_GNU_ARCH}
EOF
- # XXX: what's the point of reporting _PKGTOOLS_VER
- # when we roll everything by hand without using
- # the pkg tools?
- echo "_PKGTOOLS_VER=$(${PKG_CREATE} -V)"
} > "${SYSPKG_DB_SUBDIR}/+BUILD_INFO"
else
cp "${BUILD_INFO_CACHE}" "${SYSPKG_DB_SUBDIR}/+BUILD_INFO"
@@ -632,7 +628,7 @@
# "@name" line and a lot of "@comment MD5:" lines.
#
{
- rcsid='$NetBSD: regpkg,v 1.17 2009/10/17 23:43:22 agc Exp $'
+ rcsid='$NetBSD: regpkg,v 1.18 2009/12/01 15:49:21 apb Exp $'
utcdate="$(${ENV_CMD} TZ=UTC LOCALE=C \
${DATE} '+%Y-%m-%d %H:%M')"
user="${USER:-root}"
--- src/distrib/sets/regpkgset 2009/10/17 23:43:22 1.11
+++ src/distrib/sets/regpkgset 2009/12/01 15:49:21 1.12
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: regpkgset,v 1.11 2009/10/17 23:43:22 agc Exp $
+# $NetBSD: regpkgset,v 1.12 2009/12/01 15:49:21 apb Exp $
#
# Copyright (c) 2003,2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -142,10 +142,6 @@
@echo MACHINE_ARCH=${MACHINE_ARCH}
@echo MACHINE_GNU_ARCH=${MACHINE_GNU_ARCH}
EOF
- # XXX: what's the point of reporting _PKGTOOLS_VER
- # when we roll everything by hand without using
- # the pkg tools?
- echo "_PKGTOOLS_VER=$(${PKG_CREATE} -V)"
} > "${BUILD_INFO_CACHE}"
fi
--- src/distrib/sets/sets.subr 2009/11/30 16:13:23 1.92
+++ src/distrib/sets/sets.subr 2009/12/01 15:49:21 1.93
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.92 2009/11/30 16:13:23 uebayasi Exp $
+# $NetBSD: sets.subr,v 1.93 2009/12/01 15:49:21 apb Exp $
#
#
@@ -101,7 +101,6 @@
: ${MTREE:=mtree}
: ${PASTE:=paste}
: ${PAX:=pax}
-: ${PKG_CREATE:=pkg_create}
: ${PRINTF:=printf}
: ${SED:=sed}
: ${SORT:=sort}
@@ -242,7 +241,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.92 2009/11/30 16:13:23 uebayasi Exp $
+# # $NetBSD: sets.subr,v 1.93 2009/12/01 15:49:21 apb Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root