Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib Merge four separate copies of list2sh.awk runlist.sh...
details: https://anonhg.NetBSD.org/src/rev/d2ab78612e72
branches: trunk
changeset: 747501:d2ab78612e72
user: abs <abs%NetBSD.org@localhost>
date: Fri Sep 18 09:24:58 2009 +0000
description:
Merge four separate copies of list2sh.awk runlist.sh (three identical
and one with slightly less options). Release build verified on amiga,
bebox and evbsh3. Vax build fails for unrelated reason.
diffstat:
distrib/amiga/floppies/inst-common/Makefile.inc | 6 +-
distrib/amiga/floppies/list2sh.awk | 39 -------------
distrib/amiga/floppies/runlist.sh | 13 ----
distrib/bebox/floppies/bootfloppy-common/Makefile.inc | 6 +-
distrib/bebox/floppies/list2sh.awk | 55 -------------------
distrib/bebox/floppies/ramdisk/Makefile | 6 +-
distrib/bebox/floppies/ramdisk/Makefile.inc | 6 +-
distrib/bebox/floppies/runlist.sh | 13 ----
distrib/common/list2sh.awk | 55 +++++++++++++++++++
distrib/common/runlist.sh | 13 ++++
distrib/evbsh3/rom/list2sh.awk | 55 -------------------
distrib/evbsh3/rom/ramdiskeb/Makefile | 8 +-
distrib/evbsh3/rom/ramdiskel/Makefile | 8 +-
distrib/evbsh3/rom/runlist.sh | 13 ----
distrib/vax/inst-common/Makefile.inc | 6 +-
distrib/vax/list2sh.awk | 55 -------------------
distrib/vax/runlist.sh | 13 ----
17 files changed, 91 insertions(+), 279 deletions(-)
diffs (truncated from 522 to 300 lines):
diff -r 126af3f3d8a6 -r d2ab78612e72 distrib/amiga/floppies/inst-common/Makefile.inc
--- a/distrib/amiga/floppies/inst-common/Makefile.inc Thu Sep 17 23:07:12 2009 +0000
+++ b/distrib/amiga/floppies/inst-common/Makefile.inc Fri Sep 18 09:24:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.22 2003/10/26 07:25:33 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.23 2009/09/18 09:24:59 abs Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -26,8 +26,8 @@
mount -t ffs ${VND_DEV} ${MOUNT_POINT}
${TOOL_MTREE} -def ${MTREECONF} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
- KERNOBJDIR=${KERNOBJDIR} \
- TARGDIR=${MOUNT_POINT} ${HOST_SH} ${TOP}/runlist.sh ${LISTS}
+ KERNOBJDIR=${KERNOBJDIR} TARGDIR=${MOUNT_POINT} ${HOST_SH} \
+ ${NETBSDSRCDIR}/distrib/common/runlist.sh ${LISTS}
@echo ""
@df -i ${MOUNT_POINT}
@echo ""
diff -r 126af3f3d8a6 -r d2ab78612e72 distrib/amiga/floppies/list2sh.awk
--- a/distrib/amiga/floppies/list2sh.awk Thu Sep 17 23:07:12 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-# $NetBSD: list2sh.awk,v 1.2 1998/01/06 04:45:01 perry Exp $
-
-BEGIN {
- printf("cd ${CURDIR}\n");
- printf("\n");
-}
-/^$/ || /^#/ {
- print $0;
- next;
-}
-$1 == "COPY" {
- printf("echo '%s'\n", $0);
- printf("cp %s ${TARGDIR}/%s\n", $2, $3);
- next;
-}
-$1 == "LINK" {
- printf("echo '%s'\n", $0);
- printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $3);
- next;
-}
-$1 == "SPECIAL" {
- printf("echo '%s'\n", $0);
- printf("(cd ${TARGDIR};");
- for (i = 2; i <= NF; i++)
- printf(" %s", $i);
- printf(")\n");
- next;
-}
-{
- printf("echo '%s'\n", $0);
- printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
- printf("exit 1\n");
- exit 1;
-}
-END {
- printf("\n");
- printf("exit 0\n");
- exit 0;
-}
diff -r 126af3f3d8a6 -r d2ab78612e72 distrib/amiga/floppies/runlist.sh
--- a/distrib/amiga/floppies/runlist.sh Thu Sep 17 23:07:12 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# $NetBSD: runlist.sh,v 1.2 1998/01/06 04:45:02 perry Exp $
-
-if [ "X$1" = "X-d" ]; then
- SHELLCMD=cat
- shift
-else
- SHELLCMD="sh -e"
-fi
-
-( while [ "X$1" != "X" ]; do
- cat $1
- shift
-done ) | awk -f ${TOPDIR}/list2sh.awk | ${SHELLCMD}
diff -r 126af3f3d8a6 -r d2ab78612e72 distrib/bebox/floppies/bootfloppy-common/Makefile.inc
--- a/distrib/bebox/floppies/bootfloppy-common/Makefile.inc Thu Sep 17 23:07:12 2009 +0000
+++ b/distrib/bebox/floppies/bootfloppy-common/Makefile.inc Fri Sep 18 09:24:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2009/04/03 22:36:34 perry Exp $
+# $NetBSD: Makefile.inc,v 1.12 2009/09/18 09:24:59 abs Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -41,8 +41,8 @@
newfs -B be -m 0 -o space -i ${INO_BYTES} -c 80 ${VND_RDEV} ${DISKTYPE}
mount ${VND_DEV} ${MOUNT_POINT}
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
- KERNOBJDIR=${KERNOBJDIR} \
- TARGDIR=${MOUNT_POINT} ${HOST_SH} ${TOP}/runlist.sh ${LISTS}
+ KERNOBJDIR=${KERNOBJDIR} TARGDIR=${MOUNT_POINT} ${HOST_SH} \
+ ${NETBSDSRCDIR}/distrib/common/runlist.sh ${LISTS}
@echo ""
@df -i ${MOUNT_POINT}
@echo ""
diff -r 126af3f3d8a6 -r d2ab78612e72 distrib/bebox/floppies/list2sh.awk
--- a/distrib/bebox/floppies/list2sh.awk Thu Sep 17 23:07:12 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-# $NetBSD: list2sh.awk,v 1.1 1998/11/19 08:58:02 sakamoto Exp $
-
-BEGIN {
- printf("cd ${CURDIR}\n");
- printf("\n");
-}
-/^$/ || /^#/ {
- print $0;
- next;
-}
-$1 == "COPY" {
- printf("echo '%s'\n", $0);
- printf("rm -f ${TARGDIR}/%s\n", $3);
- printf("cp %s ${TARGDIR}/%s\n", $2, $3);
- next;
-}
-$1 == "LINK" {
- printf("echo '%s'\n", $0);
- printf("rm -f ${TARGDIR}/%s\n", $3);
- printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $3);
- next;
-}
-$1 == "SYMLINK" {
- printf("echo '%s'\n", $0);
- printf("rm -f ${TARGDIR}/%s\n", $3);
- printf("(cd ${TARGDIR}; ln -s %s %s)\n", $2, $3);
- next;
-}
-$1 == "COPYDIR" {
- printf("echo '%s'\n", $0);
- printf("(cd ${TARGDIR}/%s && find . ! -name . | xargs /bin/rm -rf)\n",
- $3);
- printf("(cd %s && find . ! -name . | cpio -pdamu ${TARGDIR}/%s)\n", $2,
- $3);
- next;
-}
-$1 == "SPECIAL" {
- printf("echo '%s'\n", $0);
- printf("(cd ${TARGDIR};");
- for (i = 2; i <= NF; i++)
- printf(" %s", $i);
- printf(")\n");
- next;
-}
-{
- printf("echo '%s'\n", $0);
- printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
- printf("exit 1\n");
- exit 1;
-}
-END {
- printf("\n");
- printf("exit 0\n");
- exit 0;
-}
diff -r 126af3f3d8a6 -r d2ab78612e72 distrib/bebox/floppies/ramdisk/Makefile
--- a/distrib/bebox/floppies/ramdisk/Makefile Thu Sep 17 23:07:12 2009 +0000
+++ b/distrib/bebox/floppies/ramdisk/Makefile Fri Sep 18 09:24:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/10/25 22:27:34 apb Exp $
+# $NetBSD: Makefile,v 1.13 2009/09/18 09:24:59 abs Exp $
TOP= ${.CURDIR}/..
@@ -43,8 +43,8 @@
mount ${VND_DEV} ${MOUNT_POINT}
${TOOL_MTREE} -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
- KERNOBJDIR=${KERNOBJDIR} TARGDIR=${MOUNT_POINT} \
- ${HOST_SH} ${TOP}/runlist.sh ${.CURDIR}/${LISTS}
+ KERNOBJDIR=${KERNOBJDIR} TARGDIR=${MOUNT_POINT} ${HOST_SH} \
+ ${NETBSDSRCDIR}/distrib/common/runlist.sh ${LISTS}
@echo ""
@df -i ${MOUNT_POINT}
@echo ""
diff -r 126af3f3d8a6 -r d2ab78612e72 distrib/bebox/floppies/ramdisk/Makefile.inc
--- a/distrib/bebox/floppies/ramdisk/Makefile.inc Thu Sep 17 23:07:12 2009 +0000
+++ b/distrib/bebox/floppies/ramdisk/Makefile.inc Fri Sep 18 09:24:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2003/10/26 07:25:33 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.11 2009/09/18 09:24:59 abs Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -28,8 +28,8 @@
mount ${VND_DEV} ${MOUNT_POINT}
${TOOL_MTREE} -def ${MTREECONF} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
- KERNOBJDIR=${KERNOBJDIR} \
- TARGDIR=${MOUNT_POINT} ${HOST_SH} ${TOP}/runlist.sh ${LISTS}
+ KERNOBJDIR=${KERNOBJDIR} TARGDIR=${MOUNT_POINT} ${HOST_SH} \
+ ${NETBSDSRCDIR}/distrib/common/runlist.sh ${LISTS}
@echo ""
@df -i ${MOUNT_POINT}
@echo ""
diff -r 126af3f3d8a6 -r d2ab78612e72 distrib/bebox/floppies/runlist.sh
--- a/distrib/bebox/floppies/runlist.sh Thu Sep 17 23:07:12 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# $NetBSD: runlist.sh,v 1.1 1998/11/19 08:58:02 sakamoto Exp $
-
-if [ "X$1" = "X-d" ]; then
- SHELLCMD=cat
- shift
-else
- SHELLCMD="sh -e"
-fi
-
-( while [ "X$1" != "X" ]; do
- cat $1
- shift
-done ) | awk -f ${TOPDIR}/list2sh.awk | ${SHELLCMD}
diff -r 126af3f3d8a6 -r d2ab78612e72 distrib/common/list2sh.awk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/common/list2sh.awk Fri Sep 18 09:24:58 2009 +0000
@@ -0,0 +1,55 @@
+# $NetBSD: list2sh.awk,v 1.1 2009/09/18 09:24:59 abs Exp $
+
+BEGIN {
+ printf("cd ${CURDIR}\n");
+ printf("\n");
+}
+/^$/ || /^#/ {
+ print $0;
+ next;
+}
+$1 == "COPY" {
+ printf("echo '%s'\n", $0);
+ printf("rm -f ${TARGDIR}/%s\n", $3);
+ printf("cp %s ${TARGDIR}/%s\n", $2, $3);
+ next;
+}
+$1 == "LINK" {
+ printf("echo '%s'\n", $0);
+ printf("rm -f ${TARGDIR}/%s\n", $3);
+ printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $3);
+ next;
+}
+$1 == "SYMLINK" {
+ printf("echo '%s'\n", $0);
+ printf("rm -f ${TARGDIR}/%s\n", $3);
+ printf("(cd ${TARGDIR}; ln -s %s %s)\n", $2, $3);
+ next;
+}
+$1 == "COPYDIR" {
+ printf("echo '%s'\n", $0);
+ printf("(cd ${TARGDIR}/%s && find . ! -name . | xargs /bin/rm -rf)\n",
+ $3);
+ printf("(cd %s && find . ! -name . | cpio -pdamu ${TARGDIR}/%s)\n", $2,
+ $3);
+ next;
+}
+$1 == "SPECIAL" {
+ printf("echo '%s'\n", $0);
+ printf("(cd ${TARGDIR};");
+ for (i = 2; i <= NF; i++)
+ printf(" %s", $i);
+ printf(")\n");
+ next;
+}
+{
+ printf("echo '%s'\n", $0);
+ printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
+ printf("exit 1\n");
+ exit 1;
+}
+END {
+ printf("\n");
+ printf("exit 0\n");
+ exit 0;
+}
diff -r 126af3f3d8a6 -r d2ab78612e72 distrib/common/runlist.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/common/runlist.sh Fri Sep 18 09:24:58 2009 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: runlist.sh,v 1.1 2009/09/18 09:24:59 abs Exp $
+
+if [ "X$1" = "X-d" ]; then
+ SHELLCMD=cat
+ shift
+else
+ SHELLCMD="sh -e"
+fi
+
+( while [ "X$1" != "X" ]; do
+ cat $1
+ shift
+done ) | awk -f ${NETBSDSRCDIR}/distrib/common/list2sh.awk | ${SHELLCMD}
diff -r 126af3f3d8a6 -r d2ab78612e72 distrib/evbsh3/rom/list2sh.awk
--- a/distrib/evbsh3/rom/list2sh.awk Thu Sep 17 23:07:12 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-# $NetBSD: list2sh.awk,v 1.1 2000/09/18 07:21:01 msaitoh Exp $
-
-BEGIN {
- printf("cd ${CURDIR}\n");
Home |
Main Index |
Thread Index |
Old Index