pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/pkgformat/pkg mk: Ensure only the first NetBSD rcsi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2d626347c485
branches:  trunk
changeset: 340292:2d626347c485
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Oct 01 13:01:02 2019 +0000

description:
mk: Ensure only the first NetBSD rcsid is used.

There are a couple of places in pkgsrc where rcsid's are generated, and
these were leaking into "pkg_info -b" output.  This had the side effect of
causing those packages and all their dependencies to be rebuilt for every
bulk build as the output and the respective files always mis-matched.

diffstat:

 mk/pkgformat/pkg/metadata.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r aa6ec3711854 -r 2d626347c485 mk/pkgformat/pkg/metadata.mk
--- a/mk/pkgformat/pkg/metadata.mk      Tue Oct 01 12:46:33 2019 +0000
+++ b/mk/pkgformat/pkg/metadata.mk      Tue Oct 01 13:01:02 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.16 2019/05/28 13:32:06 jperkin Exp $
+# $NetBSD: metadata.mk,v 1.17 2019/10/01 13:01:02 jperkin Exp $
 
 ######################################################################
 ### The targets below are all PRIVATE.
@@ -160,7 +160,7 @@
        ${CAT} ${.TARGET}.tmp |                                         \
        while read file; do                                             \
                ${GREP} '\$$NetBSD' $$file 2>/dev/null |                \
-               ${SED} -e "s|^|$$file:|";                               \
+               ${SED} -e "s|^|$$file:|;q";                             \
        done |                                                          \
        ${AWK} '{ sub("^${PKGSRCDIR}/", "");                            \
                  sub(":.*[$$]NetBSD", ":       $$NetBSD");             \



Home | Main Index | Thread Index | Old Index