[src/trunk]: src/distrib Make sure to copy the language catalog files for sys...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/distrib Make sure to copy the language catalog files for sys...
From: martin <martin%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 19:25:27 +0000

details:   https://anonhg.NetBSD.org/src/rev/fcf7f404abe3
branches:  trunk
changeset: 338513:fcf7f404abe3
user:      martin <martin%NetBSD.org@localhost>
date:      Thu May 28 09:51:31 2015 +0000

description:
Make sure to copy the language catalog files for sysinst, but do not
copy sysinst itself to / on the CD, and instead use the base version
for installation.

diffstat:

 distrib/amd64/cdroms/Makefile.cdrom         |  6 ++----
 distrib/amd64/cdroms/install.sh             |  4 ++--
 distrib/i386/cdroms/Makefile.cdrom          |  6 ++----
 distrib/i386/cdroms/install.sh              |  4 ++--
 distrib/sparc64/cdroms/installcd/Makefile   |  7 ++-----
 distrib/sparc64/cdroms/installcd/install.sh |  4 ++--
 distrib/vax/cdroms/installcd/Makefile       |  7 ++-----
 distrib/vax/cdroms/installcd/install.sh     |  4 ++--
 8 files changed, 16 insertions(+), 26 deletions(-)

diffs (154 lines):

diff -r 4d5b5afbd25b -r fcf7f404abe3 distrib/amd64/cdroms/Makefile.cdrom
--- a/distrib/amd64/cdroms/Makefile.cdrom       Thu May 28 09:06:36 2015 +0000
+++ b/distrib/amd64/cdroms/Makefile.cdrom       Thu May 28 09:51:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.18 2015/05/27 09:44:40 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.19 2015/05/28 09:51:31 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -19,7 +19,5 @@
        ${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
        ${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
        ${MKDIR} cdrom/mnt2 cdrom/targetroot
-       ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinst cdrom
-       ${CHMOD} ugo+rx cdrom/sysinst
-       ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom
+       ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
        ${MKDIR} cdrom/var
diff -r 4d5b5afbd25b -r fcf7f404abe3 distrib/amd64/cdroms/install.sh
--- a/distrib/amd64/cdroms/install.sh   Thu May 28 09:06:36 2015 +0000
+++ b/distrib/amd64/cdroms/install.sh   Thu May 28 09:51:31 2015 +0000
@@ -1,5 +1,5 @@
 #! /bin/sh -m
-# $NetBSD: install.sh,v 1.3 2012/06/03 21:42:44 joerg Exp $
+# $NetBSD: install.sh,v 1.4 2015/05/28 09:51:31 martin Exp $
 #
 # -
 #  Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -87,7 +87,7 @@
 
 # run the installation or upgrade script.
 cd /
-cmd=./sysinst
+cmd=/usr/sbin/sysinst
 
 while [ -n "${cmd}" ]
 do
diff -r 4d5b5afbd25b -r fcf7f404abe3 distrib/i386/cdroms/Makefile.cdrom
--- a/distrib/i386/cdroms/Makefile.cdrom        Thu May 28 09:06:36 2015 +0000
+++ b/distrib/i386/cdroms/Makefile.cdrom        Thu May 28 09:51:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.38 2015/05/27 09:44:40 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.39 2015/05/28 09:51:31 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -19,7 +19,5 @@
        ${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
        ${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
        ${MKDIR} cdrom/mnt2 cdrom/targetroot
-       ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinst cdrom
-       ${CHMOD} ugo+rx cdrom/sysinst
-       ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom
+       ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
        ${MKDIR} cdrom/var
diff -r 4d5b5afbd25b -r fcf7f404abe3 distrib/i386/cdroms/install.sh
--- a/distrib/i386/cdroms/install.sh    Thu May 28 09:06:36 2015 +0000
+++ b/distrib/i386/cdroms/install.sh    Thu May 28 09:51:31 2015 +0000
@@ -1,5 +1,5 @@
 #! /bin/sh -m
-# $NetBSD: install.sh,v 1.3 2012/06/03 21:42:45 joerg Exp $
+# $NetBSD: install.sh,v 1.4 2015/05/28 09:51:31 martin Exp $
 #
 # -
 #  Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -87,7 +87,7 @@
 
 # run the installation or upgrade script.
 cd /
-cmd=./sysinst
+cmd=/usr/sbin/sysinst
 
 while [ -n "${cmd}" ]
 do
diff -r 4d5b5afbd25b -r fcf7f404abe3 distrib/sparc64/cdroms/installcd/Makefile
--- a/distrib/sparc64/cdroms/installcd/Makefile Thu May 28 09:06:36 2015 +0000
+++ b/distrib/sparc64/cdroms/installcd/Makefile Thu May 28 09:51:31 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.25 2015/05/27 09:44:40 martin Exp $
+#      $NetBSD: Makefile,v 1.26 2015/05/28 09:51:31 martin Exp $
 CDBASE=                sparc64cd               # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 CDKERNELS=     ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz        netbsd
@@ -21,10 +21,7 @@
        ${INSTALL} ${COPY} ${.CURDIR}/etc.rc cdrom/etc/rc
        ${INSTALL} ${COPY} -m 0555 ${.CURDIR}/install.sh cdrom/install.sh
        ${MKDIR} cdrom/mnt2 cdrom/targetroot
-       ${INSTALL} ${COPY} -m 0555 ${SYSINSTDIR}/sysinst cdrom
-       for f in ${SYSINSTDIR}/sysinstmsgs.??; do \
-               ${INSTALL} ${COPY} $$f cdrom; \
-       done
+       ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
 
 image_md_post:
        SUNLABEL=${TOOL_SUNLABEL:Q} \
diff -r 4d5b5afbd25b -r fcf7f404abe3 distrib/sparc64/cdroms/installcd/install.sh
--- a/distrib/sparc64/cdroms/installcd/install.sh       Thu May 28 09:06:36 2015 +0000
+++ b/distrib/sparc64/cdroms/installcd/install.sh       Thu May 28 09:51:31 2015 +0000
@@ -1,5 +1,5 @@
 #! /bin/sh -m
-# $NetBSD: install.sh,v 1.3 2012/06/03 21:42:45 joerg Exp $
+# $NetBSD: install.sh,v 1.4 2015/05/28 09:51:31 martin Exp $
 #
 # -
 #  Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -87,7 +87,7 @@
 
 # run the installation or upgrade script.
 cd /
-cmd=./sysinst
+cmd=/usr/sbin/sysinst
 
 while [ -n "${cmd}" ]
 do
diff -r 4d5b5afbd25b -r fcf7f404abe3 distrib/vax/cdroms/installcd/Makefile
--- a/distrib/vax/cdroms/installcd/Makefile     Thu May 28 09:06:36 2015 +0000
+++ b/distrib/vax/cdroms/installcd/Makefile     Thu May 28 09:51:31 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2015/05/25 15:38:33 martin Exp $
+#      $NetBSD: Makefile,v 1.15 2015/05/28 09:51:31 martin Exp $
 CDBASE=                vaxcd                   # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 CDKERNELS=     ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz        netbsd.gz
@@ -21,10 +21,7 @@
        ${INSTALL} ${COPY} ${.CURDIR}/etc.rc cdrom/etc/rc
        ${INSTALL} ${COPY} -m 0555 ${.CURDIR}/install.sh cdrom/install.sh
        ${MKDIR} cdrom/mnt2 cdrom/targetroot
-       ${INSTALL} ${COPY} -m 0555 ${SYSINSTDIR}/sysinst cdrom
-       for f in ${SYSINSTDIR}/sysinstmsgs.??; do \
-               ${INSTALL} ${COPY} $$f cdrom; \
-       done
+       ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
        ${TOOL_GZIP} -d -f cdrom/netbsd.gz
 
 # make the CD bootable
diff -r 4d5b5afbd25b -r fcf7f404abe3 distrib/vax/cdroms/installcd/install.sh
--- a/distrib/vax/cdroms/installcd/install.sh   Thu May 28 09:06:36 2015 +0000
+++ b/distrib/vax/cdroms/installcd/install.sh   Thu May 28 09:51:31 2015 +0000
@@ -1,5 +1,5 @@
 #! /bin/sh -m
-# $NetBSD: install.sh,v 1.1 2014/05/21 14:21:35 martin Exp $
+# $NetBSD: install.sh,v 1.2 2015/05/28 09:51:31 martin Exp $
 #
 # -
 #  Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -87,7 +87,7 @@
 
 # run the installation or upgrade script.
 cd /
-cmd=./sysinst
+cmd=/usr/sbin/sysinst
 
 while [ -n "${cmd}" ]
 do

Prev by Date: [src/trunk]: src/tests/net/mcast Make the test stable under load or when runn...
Next by Date: [src/trunk]: src Build both xf86-video-radeon drivers for amd64 and i386, jus...
Previous by Thread: [src/trunk]: src/tests/net/mcast Make the test stable under load or when runn...
Next by Thread: [src/trunk]: src Build both xf86-video-radeon drivers for amd64 and i386, jus...
Indexes:

Home | Main Index | Thread Index | Old Index