Source-Changes-HG archive

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

[src/trunk]: src/distrib Fix listfiles to handle object directories. Patches ...



details:   https://anonhg.NetBSD.org/src/rev/c28b0a8ae9e7
branches:  trunk
changeset: 473167:c28b0a8ae9e7
user:      tron <tron%NetBSD.org@localhost>
date:      Sun May 23 07:31:19 1999 +0000

description:
Fix listfiles to handle object directories. Patches supplied by
Izumi Tsutsui in PR misc/7628.

diffstat:

 distrib/alpha/instkernel/ramdisk/list  |  12 ++++++------
 distrib/arm32/ramdisk/list             |  16 ++++++++--------
 distrib/bebox/floppies/ramdisk/list    |  10 +++++-----
 distrib/i386/floppies/ramdisk/list     |  10 +++++-----
 distrib/mac68k/instkernel/ramdisk/list |   8 ++++----
 distrib/macppc/floppies/ramdisk/list   |   4 ++--
 distrib/mvme68k/ramdisk/list           |  16 ++++++++--------
 distrib/pc532/floppies/inst/list       |  10 +++++-----
 distrib/pc532/floppies/upgr/list       |  10 +++++-----
 distrib/pmax/ramdisk/list              |   8 ++++----
 distrib/utils/Makefile                 |   4 ++--
 distrib/vax/inst/list                  |   6 +++---
 distrib/vax/ramdisk/list               |  12 ++++++------
 distrib/x68k/floppies/ramdisk/list     |  10 +++++-----
 14 files changed, 68 insertions(+), 68 deletions(-)

diffs (truncated from 360 to 300 lines):

diff -r aa32a7b2d29a -r c28b0a8ae9e7 distrib/alpha/instkernel/ramdisk/list
--- a/distrib/alpha/instkernel/ramdisk/list     Sun May 23 07:24:02 1999 +0000
+++ b/distrib/alpha/instkernel/ramdisk/list     Sun May 23 07:31:19 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.8 1999/04/29 18:57:31 ross Exp $
+#      $NetBSD: list,v 1.9 1999/05/23 07:31:19 tron Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY   ${OBJDIR}/ramdiskbin            ramdiskbin
@@ -88,16 +88,16 @@
 COPY   ${CURDIR}/../../../utils/script-installer/dot.instutils    .instutils
 
 # the disktab explanation file
-COPY   disktab.preinstall                      etc/disktab.preinstall
+COPY   ${CURDIR}/disktab.preinstall            etc/disktab.preinstall
 
 # and the installation tools
-COPY   dot.profile                             .profile
-COPY   dot.hdprofile                           tmp/.hdprofile
+COPY   ${CURDIR}/dot.profile                   .profile
+COPY   ${CURDIR}/dot.hdprofile                 tmp/.hdprofile
 
 # old-style installation tools
 
-COPY   ${CURDIR}/../src/install.sh     install
-COPY   ${CURDIR}/../src/upgrade.sh     upgrade
+COPY   ${CURDIR}/../src/install.sh             install
+COPY   ${CURDIR}/../src/upgrade.sh             upgrade
 
 SPECIAL chmod 755 install
 SPECIAL chmod 755 upgrade
diff -r aa32a7b2d29a -r c28b0a8ae9e7 distrib/arm32/ramdisk/list
--- a/distrib/arm32/ramdisk/list        Sun May 23 07:24:02 1999 +0000
+++ b/distrib/arm32/ramdisk/list        Sun May 23 07:31:19 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.2 1998/09/29 03:08:47 mark Exp $
+#      $NetBSD: list,v 1.3 1999/05/23 07:31:19 tron Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY   ${OBJDIR}/ramdiskbin            ramdiskbin
@@ -71,21 +71,21 @@
 SPECIAL        pwd_mkdb -p -d ./ etc/master.passwd
 
 # and the common installation tools
-#COPY  dot.commonutils                 .commonutils
-COPY   termcap.pc3                     usr/share/misc/termcap
+#COPY  ${CURDIR}/dot.commonutils               .commonutils
+COPY   ${CURDIR}/termcap.pc3                   usr/share/misc/termcap
 
 # the disktab explanation file
-COPY   disktab.preinstall              etc/disktab.preinstall
+COPY   ${CURDIR}/disktab.preinstall            etc/disktab.preinstall
 
-#COPY  inst.sh                         usr/local/sbin/inst
+#COPY  ${CURDIR}/inst.sh                       usr/local/sbin/inst
 
 # and the installation tools
-COPY   dot.profile                     .profile
-#COPY  dot.instutils                   .instutils
+COPY   ${CURDIR}/dot.profile           .profile
+#COPY  ${CURDIR}/dot.instutils         .instutils
 #COPY  ${OBJDIR}/install.sh            install
 #COPY  ${OBJDIR}/upgrade.sh            upgrade
 #COPY  ${OBJDIR}/start.sh              start
-COPY   dot.hdprofile                   tmp/.hdprofile
+COPY   ${CURDIR}/dot.hdprofile         tmp/.hdprofile
 #SPECIAL       chmod 755 install
 #SPECIAL       chmod 755 upgrade
 #SPECIAL       chmod 755 start
diff -r aa32a7b2d29a -r c28b0a8ae9e7 distrib/bebox/floppies/ramdisk/list
--- a/distrib/bebox/floppies/ramdisk/list       Sun May 23 07:24:02 1999 +0000
+++ b/distrib/bebox/floppies/ramdisk/list       Sun May 23 07:31:19 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.3 1998/11/28 02:49:45 jonathan Exp $
+#      $NetBSD: list,v 1.4 1999/05/23 07:31:20 tron Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY   ${OBJDIR}/ramdiskbin            ramdiskbin
@@ -68,17 +68,17 @@
 # and the common installation tools
 # COPY ${CURDIR}/../../../utils/script-installer/dot.commonutils  .commonutils
 #COPY  ${CURDIR}/../../../utils/script-installer/dot.instutils    .instutils
-COPY   termcap.pc3                     usr/share/misc/termcap
+COPY   ${CURDIR}/termcap.pc3           usr/share/misc/termcap
 
 # the disktab explanation file
-COPY   disktab.preinstall              etc/disktab.preinstall
+COPY   ${CURDIR}/disktab.preinstall    etc/disktab.preinstall
 
 # and the installation tools
-COPY   dot.profile                     .profile
+COPY   ${CURDIR}/dot.profile           .profile
 # COPY ${OBJDIR}/install.sh            install
 # COPY ${OBJDIR}/upgrade.sh            upgrade
 # COPY ${OBJDIR}/start.sh              start
-COPY   dot.hdprofile                   tmp/.hdprofile
+COPY   ${CURDIR}/dot.hdprofile         tmp/.hdprofile
 # SPECIAL      chmod 755 install
 # SPECIAL      chmod 755 upgrade
 # SPECIAL      chmod 755 start
diff -r aa32a7b2d29a -r c28b0a8ae9e7 distrib/i386/floppies/ramdisk/list
--- a/distrib/i386/floppies/ramdisk/list        Sun May 23 07:24:02 1999 +0000
+++ b/distrib/i386/floppies/ramdisk/list        Sun May 23 07:31:19 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.18 1999/05/06 17:13:08 christos Exp $
+#      $NetBSD: list,v 1.19 1999/05/23 07:31:20 tron Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY   ${OBJDIR}/ramdiskbin            ramdiskbin
@@ -95,10 +95,10 @@
 # and the common installation tools
 # COPY ${CURDIR}/../../../utils/script-installer/dot.commonutils  .commonutils
 # COPY ${CURDIR}/../../../utils/script-installer/dot.instutils    .instutils
-COPY   termcap.mini                    usr/share/misc/termcap
+COPY   ${CURDIR}/termcap.mini          usr/share/misc/termcap
 
 # the disktab explanation file
-COPY   disktab.preinstall              etc/disktab.preinstall
+COPY   ${CURDIR}/disktab.preinstall    etc/disktab.preinstall
 
 #the lists of obsolete files used by sysinst
 COPY dist/base_obsolete dist/base_obsolete
@@ -111,11 +111,11 @@
 COPY dist/xserver_obsolete dist/xserver_obsolete
 
 # and the installation tools
-COPY   dot.profile                     .profile
+COPY   ${CURDIR}/dot.profile           .profile
 # COPY ${OBJDIR}/install.sh            install
 # COPY ${OBJDIR}/upgrade.sh            upgrade
 # COPY ${OBJDIR}/start.sh              start
-COPY   dot.hdprofile                   tmp/.hdprofile
+COPY   ${CURDIR}/dot.hdprofile         tmp/.hdprofile
 # SPECIAL      chmod 755 install
 # SPECIAL      chmod 755 upgrade
 # SPECIAL      chmod 755 start
diff -r aa32a7b2d29a -r c28b0a8ae9e7 distrib/mac68k/instkernel/ramdisk/list
--- a/distrib/mac68k/instkernel/ramdisk/list    Sun May 23 07:24:02 1999 +0000
+++ b/distrib/mac68k/instkernel/ramdisk/list    Sun May 23 07:31:19 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.1 1999/03/26 08:34:37 ender Exp $
+#      $NetBSD: list,v 1.2 1999/05/23 07:31:20 tron Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY   ${OBJDIR}/ramdiskbin            ramdiskbin
@@ -80,11 +80,11 @@
 COPY   ${CURDIR}/../../miniroot/termcap        usr/share/misc/termcap
 
 # the disktab explanation file
-COPY   disktab.preinstall                      etc/disktab.preinstall
+COPY   ${CURDIR}/disktab.preinstall            etc/disktab.preinstall
 
 # and the installation tools
-COPY   dot.profile                             .profile
-COPY   dot.hdprofile                           tmp/.hdprofile
+COPY   ${CURDIR}/dot.profile                   .profile
+COPY   ${CURDIR}/dot.hdprofile                 tmp/.hdprofile
 
 # and a copy of the INSTALL notes
 COPY   ${CURDIR}/../../../notes/mac68k/INSTALL.more    INSTALL.more
diff -r aa32a7b2d29a -r c28b0a8ae9e7 distrib/macppc/floppies/ramdisk/list
--- a/distrib/macppc/floppies/ramdisk/list      Sun May 23 07:24:02 1999 +0000
+++ b/distrib/macppc/floppies/ramdisk/list      Sun May 23 07:31:19 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.3 1999/01/27 13:18:30 tsubai Exp $
+#      $NetBSD: list,v 1.4 1999/05/23 07:31:20 tron Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY   ${OBJDIR}/ramdiskbin            ramdiskbin
@@ -82,7 +82,7 @@
 COPY   ${CURDIR}/../../../../etc/services      etc/services
 
 # the disktab explanation file
-COPY   disktab.preinstall                      etc/disktab.preinstall
+COPY   ${CURDIR}/disktab.preinstall            etc/disktab.preinstall
 
 # and the installation scripts
 COPY   ${CURDIR}/dot.profile                   .profile
diff -r aa32a7b2d29a -r c28b0a8ae9e7 distrib/mvme68k/ramdisk/list
--- a/distrib/mvme68k/ramdisk/list      Sun May 23 07:24:02 1999 +0000
+++ b/distrib/mvme68k/ramdisk/list      Sun May 23 07:31:19 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.1 1997/12/17 22:13:33 scw Exp $
+#      $NetBSD: list,v 1.2 1999/05/23 07:31:20 tron Exp $
 
 # copy the crunched binary, link to it, and kill it
 
@@ -59,13 +59,13 @@
 
 # various files that we need in /etc for the install
 
-COPY   rd.disktab      etc/disktab
-COPY   rd.fstab        etc/fstab
-COPY   rd.protocols    etc/protocols
-COPY   rd.services     etc/services
-COPY   rd.passwd       etc/passwd
+COPY   ${CURDIR}/rd.disktab    etc/disktab
+COPY   ${CURDIR}/rd.fstab      etc/fstab
+COPY   ${CURDIR}/rd.protocols  etc/protocols
+COPY   ${CURDIR}/rd.services   etc/services
+COPY   ${CURDIR}/rd.passwd     etc/passwd
 
 # and the RC file
-COPY   rd.sshrc        .sshrc
-COPY   rd.welcome      .welcome
+COPY   ${CURDIR}/rd.sshrc      .sshrc
+COPY   ${CURDIR}/rd.welcome    .welcome
 
diff -r aa32a7b2d29a -r c28b0a8ae9e7 distrib/pc532/floppies/inst/list
--- a/distrib/pc532/floppies/inst/list  Sun May 23 07:24:02 1999 +0000
+++ b/distrib/pc532/floppies/inst/list  Sun May 23 07:31:19 1999 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: list,v 1.3 1998/01/06 04:45:20 perry Exp $
+#      $NetBSD: list,v 1.4 1999/05/23 07:31:20 tron Exp $
 
 # the disktab explanation file
 COPY   disktab.preinstall              etc
 
 # and the installation tools
-COPY   dot.profile                     .profile
-COPY   dot.instutils                   .instutils
-COPY   install.sh                      install
-COPY   dot.hdprofile                   tmp/.hdprofile
+COPY   ${CURDIR}/dot.profile           .profile
+COPY   ${CURDIR}/dot.instutils         .instutils
+COPY   ${CURDIR}/install.sh            install
+COPY   ${CURDIR}/dot.hdprofile         tmp/.hdprofile
 SPECIAL        chmod 755 install
diff -r aa32a7b2d29a -r c28b0a8ae9e7 distrib/pc532/floppies/upgr/list
--- a/distrib/pc532/floppies/upgr/list  Sun May 23 07:24:02 1999 +0000
+++ b/distrib/pc532/floppies/upgr/list  Sun May 23 07:31:19 1999 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: list,v 1.3 1998/01/06 04:45:34 perry Exp $
+#      $NetBSD: list,v 1.4 1999/05/23 07:31:20 tron Exp $
 
 # and the upgrade tools
-COPY   dot.profile                     .profile
-COPY   dot.upgrutils                   .upgrutils
-COPY   upgrade.sh                      upgrade
-COPY   dot.hdprofile                   tmp/.hdprofile
+COPY   ${CURDIR}/dot.profile           .profile
+COPY   ${CURDIR}/dot.upgrutils         .upgrutils
+COPY   ${CURDIR}/upgrade.sh            upgrade
+COPY   ${CURDIR}/dot.hdprofile         tmp/.hdprofile
 SPECIAL        chmod 755 upgrade
diff -r aa32a7b2d29a -r c28b0a8ae9e7 distrib/pmax/ramdisk/list
--- a/distrib/pmax/ramdisk/list Sun May 23 07:24:02 1999 +0000
+++ b/distrib/pmax/ramdisk/list Sun May 23 07:31:19 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.2 1999/04/05 06:15:30 simonb Exp $
+#      $NetBSD: list,v 1.3 1999/05/23 07:31:20 tron Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY   ${OBJDIR}/ramdiskbin            ramdiskbin
@@ -83,11 +83,11 @@
 COPY   ${ARCHDIR}/termcap.rcons                usr/share/misc/termcap
 
 # the disktab explanation file
-COPY   disktab.preinstall                      etc/disktab.preinstall
+COPY   ${CURDIR}/disktab.preinstall            etc/disktab.preinstall
 
 # and the installation tools
-COPY   dot.profile                             .profile
-COPY   dot.hdprofile                           tmp/.hdprofile
+COPY   ${CURDIR}/dot.profile                   .profile
+COPY   ${CURDIR}/dot.hdprofile                 tmp/.hdprofile
 
 
 # someday put in the release notes too
diff -r aa32a7b2d29a -r c28b0a8ae9e7 distrib/utils/Makefile
--- a/distrib/utils/Makefile    Sun May 23 07:24:02 1999 +0000
+++ b/distrib/utils/Makefile    Sun May 23 07:31:19 1999 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.5 1999/04/16 10:10:24 simonb Exp $
+#      $NetBSD: Makefile,v 1.6 1999/05/23 07:31:20 tron Exp $
 
 SUBDIR=        libhack init_s more ssh tls \
-       x_dd x_ftp x_ifconfig x_route x_sh zcat
+       x_dd x_ftp x_gzip x_ifconfig x_netstat x_route x_sh zcat
 .if exists(sysinst/arch/${MACHINE})
 SUBDIR+=sysinst
 .endif
diff -r aa32a7b2d29a -r c28b0a8ae9e7 distrib/vax/inst/list
--- a/distrib/vax/inst/list     Sun May 23 07:24:02 1999 +0000
+++ b/distrib/vax/inst/list     Sun May 23 07:31:19 1999 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: list,v 1.2 1998/01/06 04:45:43 perry Exp $
+#      $NetBSD: list,v 1.3 1999/05/23 07:31:21 tron Exp $
 
 # the disktab explanation file
-COPY   disktab.preinstall              etc
+COPY   ${CURDIR}/disktab.preinstall    etc
 
 # and the installation tools
-COPY   dot.profile                     .profile
+COPY   ${CURDIR}/dot.profile           .profile
diff -r aa32a7b2d29a -r c28b0a8ae9e7 distrib/vax/ramdisk/list
--- a/distrib/vax/ramdisk/list  Sun May 23 07:24:02 1999 +0000
+++ b/distrib/vax/ramdisk/list  Sun May 23 07:31:19 1999 +0000
@@ -1,4 +1,4 @@



Home | Main Index | Thread Index | Old Index