Module Name: src
Committed By: maya
Date: Wed Oct 2 09:45:10 UTC 2019
Modified Files:
src/distrib/sets/lists/base: rescue.mi
src/rescue: Makefile
Removed Files:
src/distrib/sets/lists/base: rescue.ad.arm rescue.ad.m68k.shl
rescue.i386 rescue.shark rescue.sparc rescue.vax
src/rescue: list.ldconfig
Log Message:
Remove ldconfig from /rescue, and mark it MI obsolete.
- ldconfig in netbsd refers to a.out binaries only. We've been ELF-only
since NetBSD 2.0 or so, and having it in /rescue served little purpose
even before that, as /rescue is standalone.
- Using MI obsolete to avoid the need for MD set lists where ldconfig
is the sole entry
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r0 src/distrib/sets/lists/base/rescue.ad.arm \
src/distrib/sets/lists/base/rescue.ad.m68k.shl \
src/distrib/sets/lists/base/rescue.shark \
src/distrib/sets/lists/base/rescue.vax
cvs rdiff -u -r1.4 -r0 src/distrib/sets/lists/base/rescue.i386
cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/base/rescue.mi
cvs rdiff -u -r1.5 -r0 src/distrib/sets/lists/base/rescue.sparc
cvs rdiff -u -r1.37 -r1.38 src/rescue/Makefile
cvs rdiff -u -r1.1 -r0 src/rescue/list.ldconfig
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/base/rescue.mi
diff -u src/distrib/sets/lists/base/rescue.mi:1.44 src/distrib/sets/lists/base/rescue.mi:1.45
--- src/distrib/sets/lists/base/rescue.mi:1.44 Wed Dec 12 07:04:05 2018
+++ src/distrib/sets/lists/base/rescue.mi Wed Oct 2 09:45:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: rescue.mi,v 1.44 2018/12/12 07:04:05 maxv Exp $
+# $NetBSD: rescue.mi,v 1.45 2019/10/02 09:45:10 maya Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -64,6 +64,7 @@
./rescue/ksh base-rescue-root
./rescue/ktrace base-rescue-root
./rescue/ktruss base-rescue-root
+./rescue/ldconfig base-obsolete obsolete
./rescue/ldd base-rescue-root
./rescue/less base-rescue-root
./rescue/lfs_cleanerd base-rescue-root
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.37 src/rescue/Makefile:1.38
--- src/rescue/Makefile:1.37 Sun Jan 27 04:42:46 2019
+++ src/rescue/Makefile Wed Oct 2 09:45:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2019/01/27 04:42:46 dholland Exp $
+# $NetBSD: Makefile,v 1.38 2019/10/02 09:45:10 maya Exp $
NOLIBCSANITIZER= # defined
NOSANITIZER= # defined
@@ -27,13 +27,6 @@ LISTS= ${.CURDIR}/list
TARGETDIR= ${DESTDIR}/rescue
PARSELISTENV+= TARGETDIR=${TARGETDIR:Q}
-.for f in ldconfig
-PROG_${f}!= cd ${NETBSDSRCDIR}/sbin/${f} && ${MAKE} -V PROG
-.if (${PROG_${f}} != "")
-LISTS+= ${.CURDIR}/list.${f}
-.endif
-.endfor
-
.for f in pdisk
PROG_${f}!= cd ${NETBSDSRCDIR}/external/bsd/${f}/bin && ${MAKE} -V PROG
.if (${PROG_${f}} != "")
