Module Name: src Committed By: apb Date: Tue Dec 1 15:49:21 UTC 2009
Modified Files: src/distrib/sets: regpkg regpkgset sets.subr Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/regpkg cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/regpkgset cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/sets.subr Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/regpkg diff -u src/distrib/sets/regpkg:1.17 src/distrib/sets/regpkg:1.18 --- src/distrib/sets/regpkg:1.17 Sat Oct 17 23:43:22 2009 +++ src/distrib/sets/regpkg Tue Dec 1 15:49:21 2009 @@ -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}" Index: src/distrib/sets/regpkgset diff -u src/distrib/sets/regpkgset:1.11 src/distrib/sets/regpkgset:1.12 --- src/distrib/sets/regpkgset:1.11 Sat Oct 17 23:43:22 2009 +++ src/distrib/sets/regpkgset Tue Dec 1 15:49:21 2009 @@ -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 Index: src/distrib/sets/sets.subr diff -u src/distrib/sets/sets.subr:1.92 src/distrib/sets/sets.subr:1.93 --- src/distrib/sets/sets.subr:1.92 Mon Nov 30 16:13:23 2009 +++ src/distrib/sets/sets.subr Tue Dec 1 15:49:21 2009 @@ -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