Subject: misc/7628: Some list files in distrib do not handle OBJDIR operation
To: None <gnats-bugs@gnats.netbsd.org>
From: None <tsutsui@ceres.dti.ne.jp>
List: netbsd-bugs
Date: 05/22/1999 19:06:50
>Number: 7628
>Category: misc
>Synopsis: Some list files in distrib do not handle OBJDIR operation
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: misc-bug-people (Misc Bug People)
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Sat May 22 19:05:00 1999
>Last-Modified:
>Originator: Izumi Tsutsui
>Organization:
Izumi Tsutsui Himeji City, Japan
>Release: NetBSD-1.4 release
>Environment:
System: NetBSD 1.4
>Description:
Some `list' files don't use `${CURDIR}' to specify files on its directory,
so `make all' would fail on copying files if `obj' directory was created.
Furthermore, distlib/utils/Makefile does not contain x_gzip and x_netstat
in SUBDIR even though some arch use them, so `obj' dirs are not created.
>How-To-Repeat:
make obj and make all in distlib/macppc/floppies/ramdisk or elsewhere.
>Fix:
Use ${CURDIR}/foo to specify files in the `list' files
and add x_gzip and x_netstat to utils/Makefile.
--- distrib/alpha/instkernel/ramdisk/list.orig Fri Apr 30 05:11:55 1999
+++ distrib/alpha/instkernel/ramdisk/list Sun May 23 09:57:02 1999
@@ -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
--- distrib/arm32/ramdisk/list.orig Tue Sep 29 12:08:47 1998
+++ distrib/arm32/ramdisk/list Sun May 23 10:00:41 1999
@@ -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
--- distrib/bebox/floppies/ramdisk/list.orig Sat Nov 28 11:49:45 1998
+++ distrib/bebox/floppies/ramdisk/list Sun May 23 10:03:48 1999
@@ -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
--- distrib/i386/floppies/ramdisk/list.orig Wed Apr 21 07:49:05 1999
+++ distrib/i386/floppies/ramdisk/list Sun May 23 10:06:03 1999
@@ -93,10 +93,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
@@ -109,11 +109,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
--- distrib/mac68k/instkernel/ramdisk/list.orig Fri Mar 26 17:34:37 1999
+++ distrib/mac68k/instkernel/ramdisk/list Sun May 23 10:07:18 1999
@@ -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
--- distrib/macppc/floppies/ramdisk/list.orig Wed Jan 27 22:18:30 1999
+++ distrib/macppc/floppies/ramdisk/list Sun May 23 10:09:10 1999
@@ -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
--- distrib/mvme68k/ramdisk/list.orig Thu Dec 18 07:13:33 1997
+++ distrib/mvme68k/ramdisk/list Sun May 23 10:11:09 1999
@@ -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
--- distrib/pc532/floppies/inst/list.orig Tue Jan 6 13:45:20 1998
+++ distrib/pc532/floppies/inst/list Sun May 23 10:12:57 1999
@@ -4,8 +4,8 @@
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
--- distrib/pc532/floppies/upgr/list.orig Tue Jan 6 13:45:34 1998
+++ distrib/pc532/floppies/upgr/list Sun May 23 10:14:08 1999
@@ -1,8 +1,8 @@
# $NetBSD: list,v 1.3 1998/01/06 04:45:34 perry 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
--- distrib/pmax/ramdisk/list.orig Tue Apr 6 00:07:31 1999
+++ distrib/pmax/ramdisk/list Sun May 23 10:15:48 1999
@@ -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
--- distrib/utils/Makefile.orig Sat Apr 17 20:05:44 1999
+++ distrib/utils/Makefile Sun May 23 10:20:21 1999
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.4.2.1 1999/04/17 11:05:44 simonb 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
--- distrib/vax/inst/list.orig Tue Jan 6 13:45:43 1998
+++ distrib/vax/inst/list Sun May 23 10:21:54 1999
@@ -1,7 +1,7 @@
# $NetBSD: list,v 1.2 1998/01/06 04:45:43 perry 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
--- distrib/vax/ramdisk/list.orig Sat Mar 13 03:36:52 1999
+++ distrib/vax/ramdisk/list Sun May 23 10:23:47 1999
@@ -82,18 +82,18 @@
# and the common installation tools
# COPY dot.commonutils .commonutils
-COPY termcap.vt100 usr/share/misc/termcap
+COPY ${CURDIR}/termcap.vt100 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.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
--- distrib/x68k/floppies/ramdisk/list.orig Fri Apr 16 01:37:11 1999
+++ distrib/x68k/floppies/ramdisk/list Sun May 23 10:25:01 1999
@@ -79,17 +79,17 @@
# and the common installation tools
COPY ${CURDIR}/../../../utils/script-installer/dot.instutils .instutils
COPY ${CURDIR}/../../../utils/script-installer/dot.commonutils .commonutils
-COPY termcap.vt usr/share/misc/termcap
+COPY ${CURDIR}/termcap.vt 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
>Audit-Trail:
>Unformatted: