Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

There's no point in adding _PKGTOOLS_VER=$(${PKG_CREATE} -V)

Browse Source 
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.
This commit is contained in:
apb 2009-12-01 15:49:21 +00:00
parent bc6c058985
commit fb5e3559de
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
distrib/sets/regpkg
View File

@ -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 @@ all:
@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 @@ EOF
# "@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}"

6
distrib/sets/regpkgset
View File

@ -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 @@ all:
@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

5
distrib/sets/sets.subr
View File

@ -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 @@ MKVARS="\
: ${MTREE:=mtree}
: ${PASTE:=paste}
: ${PAX:=pax}
: ${PKG_CREATE:=pkg_create}
: ${PRINTF:=printf}
: ${SED:=sed}
: ${SORT:=sort}
@ -242,7 +241,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
# 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