Module Name: src
Committed By: dyoung
Date: Fri Apr 17 20:38:04 UTC 2009
Modified Files:
src/distrib/sets/lists/comp: md.sparc64
Log Message:
Apply the same keywords to the 32-bit compat files as apply to the
non-compat equivalent files, to stop amd64/sparc64 builds with MKxxx=no
options from failing because files in the DESTDIR are missing from the
METALOG.
amd64 builds, now, with several MKxxx=no options set. sparc64 probably
needs some more work.
FWIW, join(1) saved me some manual labor as I copied keywords from
non-compat to compat files:
1 Collect the files that are missing from the DESTDIR into
compat-i386.files
2 Replicate the first column of compat-i386.files. Remove i386/ from
the first column.
3 sort -k 1,1 distrib/sets/lists/comp/{md.amd64,mi,shl.*}
distrib/sets/lists/base/{md.amd64,mi,module.amd64,module.mi,shl.elf,sh
l.mi} | join -1 1 -2 1 -o '2.2 1.3' - compat-i386.files >
compat-i386.keywords
4 Process distrib/lists/{base,comp}/md.amd64 with join -1 1 -2 1 -o '1.1
1.2 1.3,2.2' -a1 - compat-i386.keywords
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/comp/md.sparc64
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/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.41 src/distrib/sets/lists/comp/md.sparc64:1.42
--- src/distrib/sets/lists/comp/md.sparc64:1.41 Wed Nov 19 14:10:48 2008
+++ src/distrib/sets/lists/comp/md.sparc64 Fri Apr 17 20:38:04 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.41 2008/11/19 14:10:48 pooka Exp $
+# $NetBSD: md.sparc64,v 1.42 2009/04/17 20:38:04 dyoung Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete
@@ -585,34 +585,34 @@
./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug
./usr/libdata/debug/usr/sbin/eeprom.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/ofctl.debug comp-sysutil-debug debug
-./usr/libdata/ldscripts/elf32_sparc.x comp-util-bin
-./usr/libdata/ldscripts/elf32_sparc.xbn comp-util-bin
-./usr/libdata/ldscripts/elf32_sparc.xc comp-util-bin
-./usr/libdata/ldscripts/elf32_sparc.xd comp-util-bin
-./usr/libdata/ldscripts/elf32_sparc.xdc comp-util-bin
-./usr/libdata/ldscripts/elf32_sparc.xdw comp-util-bin
-./usr/libdata/ldscripts/elf32_sparc.xn comp-util-bin
-./usr/libdata/ldscripts/elf32_sparc.xr comp-util-bin
-./usr/libdata/ldscripts/elf32_sparc.xs comp-util-bin
-./usr/libdata/ldscripts/elf32_sparc.xsc comp-util-bin
-./usr/libdata/ldscripts/elf32_sparc.xsw comp-util-bin
-./usr/libdata/ldscripts/elf32_sparc.xu comp-util-bin
-./usr/libdata/ldscripts/elf32_sparc.xw comp-util-bin
-./usr/libdata/ldscripts/elf64_sparc.x comp-util-bin
-./usr/libdata/ldscripts/elf64_sparc.xbn comp-util-bin
-./usr/libdata/ldscripts/elf64_sparc.xc comp-util-bin
-./usr/libdata/ldscripts/elf64_sparc.xd comp-util-bin
-./usr/libdata/ldscripts/elf64_sparc.xdc comp-util-bin
-./usr/libdata/ldscripts/elf64_sparc.xdw comp-util-bin
-./usr/libdata/ldscripts/elf64_sparc.xn comp-util-bin
-./usr/libdata/ldscripts/elf64_sparc.xr comp-util-bin
-./usr/libdata/ldscripts/elf64_sparc.xs comp-util-bin
-./usr/libdata/ldscripts/elf64_sparc.xsc comp-util-bin
-./usr/libdata/ldscripts/elf64_sparc.xsw comp-util-bin
-./usr/libdata/ldscripts/elf64_sparc.xu comp-util-bin
-./usr/libdata/ldscripts/elf64_sparc.xw comp-util-bin
-./usr/libdata/ldscripts/sparcnbsd.x comp-util-bin
-./usr/libdata/ldscripts/sparcnbsd.xbn comp-util-bin
-./usr/libdata/ldscripts/sparcnbsd.xn comp-util-bin
-./usr/libdata/ldscripts/sparcnbsd.xr comp-util-bin
-./usr/libdata/ldscripts/sparcnbsd.xu comp-util-bin
+./usr/libdata/ldscripts/elf32_sparc.x comp-util-bin bfd
+./usr/libdata/ldscripts/elf32_sparc.xbn comp-util-bin bfd
+./usr/libdata/ldscripts/elf32_sparc.xc comp-util-bin bfd
+./usr/libdata/ldscripts/elf32_sparc.xd comp-util-bin bfd
+./usr/libdata/ldscripts/elf32_sparc.xdc comp-util-bin bfd
+./usr/libdata/ldscripts/elf32_sparc.xdw comp-util-bin bfd
+./usr/libdata/ldscripts/elf32_sparc.xn comp-util-bin bfd
+./usr/libdata/ldscripts/elf32_sparc.xr comp-util-bin bfd
+./usr/libdata/ldscripts/elf32_sparc.xs comp-util-bin bfd
+./usr/libdata/ldscripts/elf32_sparc.xsc comp-util-bin bfd
+./usr/libdata/ldscripts/elf32_sparc.xsw comp-util-bin bfd
+./usr/libdata/ldscripts/elf32_sparc.xu comp-util-bin bfd
+./usr/libdata/ldscripts/elf32_sparc.xw comp-util-bin bfd
+./usr/libdata/ldscripts/elf64_sparc.x comp-util-bin bfd
+./usr/libdata/ldscripts/elf64_sparc.xbn comp-util-bin bfd
+./usr/libdata/ldscripts/elf64_sparc.xc comp-util-bin bfd
+./usr/libdata/ldscripts/elf64_sparc.xd comp-util-bin bfd
+./usr/libdata/ldscripts/elf64_sparc.xdc comp-util-bin bfd
+./usr/libdata/ldscripts/elf64_sparc.xdw comp-util-bin bfd
+./usr/libdata/ldscripts/elf64_sparc.xn comp-util-bin bfd
+./usr/libdata/ldscripts/elf64_sparc.xr comp-util-bin bfd
+./usr/libdata/ldscripts/elf64_sparc.xs comp-util-bin bfd
+./usr/libdata/ldscripts/elf64_sparc.xsc comp-util-bin bfd
+./usr/libdata/ldscripts/elf64_sparc.xsw comp-util-bin bfd
+./usr/libdata/ldscripts/elf64_sparc.xu comp-util-bin bfd
+./usr/libdata/ldscripts/elf64_sparc.xw comp-util-bin bfd
+./usr/libdata/ldscripts/sparcnbsd.x comp-util-bin bfd
+./usr/libdata/ldscripts/sparcnbsd.xbn comp-util-bin bfd
+./usr/libdata/ldscripts/sparcnbsd.xn comp-util-bin bfd
+./usr/libdata/ldscripts/sparcnbsd.xr comp-util-bin bfd
+./usr/libdata/ldscripts/sparcnbsd.xu comp-util-bin bfd
