Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/sets Fix "build.sh syspkgs" error when creating base...



details:   https://anonhg.NetBSD.org/src/rev/0e5e6e756d8e
branches:  trunk
changeset: 998232:0e5e6e756d8e
user:      uki <uki%NetBSD.org@localhost>
date:      Thu Apr 11 08:34:19 2019 +0000

description:
Fix "build.sh syspkgs" error when creating base-util-root package

diffstat:

 distrib/sets/regpkg |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 8025cc74cba8 -r 0e5e6e756d8e distrib/sets/regpkg
--- a/distrib/sets/regpkg       Thu Apr 11 06:18:43 2019 +0000
+++ b/distrib/sets/regpkg       Thu Apr 11 08:34:19 2019 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: regpkg,v 1.22 2014/05/30 08:37:35 uebayasi Exp $
+# $NetBSD: regpkg,v 1.23 2019/04/11 08:34:19 uki Exp $
 #
 # Copyright (c) 2003,2009 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -628,7 +628,7 @@
        # "@name" line and a lot of "@comment MD5:" lines.
        #
        {
-               rcsid='$NetBSD: regpkg,v 1.22 2014/05/30 08:37:35 uebayasi Exp $'
+               rcsid='$NetBSD: regpkg,v 1.23 2019/04/11 08:34:19 uki Exp $'
                utcdate="$(${ENV_CMD} TZ=UTC LOCALE=C \
                        ${DATE} '+%Y-%m-%d %H:%M')"
                user="${USER:-root}"
@@ -836,8 +836,11 @@
                if [ -n "${metalog}" ]; then
                        names1="${SCRATCH}/names1"
                        names2="${SCRATCH}/names2"
-                       ${AWK} '{print $1}' <"${spec1}" | ${SORT} >"${names1}"
-                       ${AWK} '{print $1}' <"${spec2}" | ${SORT} >"${names2}"
+                       # There is different format between spec1 and spec2 for test(1).
+                       # spec1's format is "./bin/\133" but spec2's format is "./bin/["
+                       # XXX filtering for only '[' now
+                       ${AWK} '{print $1}' <"${spec1}" | ${SORT} | sed -e 's,\\133,\[,g' >"${names1}"
+                       ${AWK} '{print $1}' <"${spec2}" | ${SORT} | sed -e 's,\[,\\133,g' >"${names2}"
                        if ${FGREP} -v -f "${names2}" "${spec1}" >/dev/null
                        then
                                cat >&2 <<EOM



Home | Main Index | Thread Index | Old Index