summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--distrib/sets/lists/base/rescue.mi3
-rw-r--r--distrib/sets/lists/etc/mi4
-rw-r--r--etc/Makefile4
-rw-r--r--etc/root/Makefile11
-rw-r--r--rescue/Makefile10
-rw-r--r--rescue/list3
-rwxr-xr-xrescue/mkterminfo (renamed from etc/root/mkterminfo)4
-rw-r--r--rescue/terminfo (renamed from etc/root/dot.terminfo)2
8 files changed, 18 insertions, 23 deletions
diff --git a/distrib/sets/lists/base/rescue.mi b/distrib/sets/lists/base/rescue.mi
index c1762db1b79..7369af88c14 100644
--- a/distrib/sets/lists/base/rescue.mi
+++ b/distrib/sets/lists/base/rescue.mi
@@ -1,4 +1,4 @@
-# $NetBSD: rescue.mi,v 1.30 2010/01/14 10:04:19 wiz Exp $
+# $NetBSD: rescue.mi,v 1.31 2010/02/05 09:44:23 roy Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -143,6 +143,7 @@
./rescue/sysctl base-rescue-root
./rescue/systrace base-obsolete obsolete
./rescue/tar base-rescue-root
+./rescue/terminfo.db base-rescue-root
./rescue/test base-rescue-root
./rescue/tetris base-rescue-root
./rescue/ttyflags base-rescue-root
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index 3614e2e11d2..d740ae6addd 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.215 2010/02/04 21:01:45 roy Exp $
+# $NetBSD: mi,v 1.216 2010/02/05 09:44:23 roy Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked "obsolete"; they should just be removed from
@@ -322,8 +322,6 @@
./root/.login etc-root-root
./root/.profile etc-root-root
./root/.shrc etc-root-root
-./root/.terminfo etc-root-root
-./root/.terminfo.db etc-root-root
./var/at/at.deny etc-cron-root
./var/crash/minfree etc-sys-root
./var/cron/tabs/root etc-cron-root
diff --git a/etc/Makefile b/etc/Makefile
index c15a05df694..e9c6503a30d 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.379 2010/02/04 21:01:16 roy Exp $
+# $NetBSD: Makefile,v 1.380 2010/02/05 09:44:23 roy Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -620,7 +620,7 @@ snap_md_post: .PHONY check_DESTDIR check_RELEASEDIR snap_post
clean:
-rm -rf ${CDROM.dir} ${CDROM.pathlist} ${OBSOLETE.dir}
-SUBDIR= rc.d mtree root
+SUBDIR= rc.d mtree
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
diff --git a/etc/root/Makefile b/etc/root/Makefile
index 53304e5d8cb..228137d4015 100644
--- a/etc/root/Makefile
+++ b/etc/root/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2010/02/04 21:01:16 roy Exp $
+# $NetBSD: Makefile,v 1.3 2010/02/05 09:44:23 roy Exp $
CONFIGFILES= dot.cshrc dot.klogin dot.login dot.profile dot.shrc
-CONFIGFILES+= dot.terminfo.db dot.terminfo
-CLEANFILES= dot.terminfo.db
FILESDIR= /root
FILESMODE= 644
@@ -14,11 +12,4 @@ FILESNAME_${F}= ${F:S/dot//}
CONFIGLINKS= /root/.cshrc /.cshrc \
/root/.profile /.profile
-realall: dot.terminfo.db
-
-dot.terminfo.db: dot.terminfo
- ${_MKTARGET_CREATE}
- ${TOOL_TIC} -x -o "${.OBJDIR}/dot.terminfo" "${.CURDIR}/dot.terminfo"
-
-
.include <bsd.prog.mk>
diff --git a/rescue/Makefile b/rescue/Makefile
index 07ad8ed6887..337df7770cc 100644
--- a/rescue/Makefile
+++ b/rescue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/08/22 06:52:15 mrg Exp $
+# $NetBSD: Makefile,v 1.25 2010/02/05 09:44:23 roy Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -53,7 +53,7 @@ ${LIBOVERRIDE}: ${OVERRIDEOBJS}
${_MKTARGET_LINK}
${LD} -r -o $@ ${OVERRIDEOBJS}
-CLEANFILES+= ${OVERRIDEOBJS} ${LIBOVERRIDE}
+CLEANFILES+= ${OVERRIDEOBJS} ${LIBOVERRIDE} terminfo.db
${CRUNCHBIN}: ${LIBOVERRIDE}
@@ -65,7 +65,11 @@ CLEANFILES+= rescue.unstripped
.include "${DISTRIBDIR}/common/Makefile.crunch"
-realall: ${CRUNCHBIN}
+realall: ${CRUNCHBIN} terminfo.db
+
+terminfo.db: terminfo
+ ${_MKTARGET_CREATE}
+ ${TOOL_TIC} -x -o "${.OBJDIR}/terminfo" "${.CURDIR}/terminfo"
install: ${CRUNCHBIN}
# XXX this MKMSG doesn't line up
diff --git a/rescue/list b/rescue/list
index 0ad0e4230ee..72d52bf0bbc 100644
--- a/rescue/list
+++ b/rescue/list
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.37 2010/02/03 15:34:44 roy Exp $
+# $NetBSD: list,v 1.38 2010/02/05 09:44:23 roy Exp $
SRCDIRS bin
@@ -147,6 +147,7 @@ SRCDIRS libexec
PROG lfs_cleanerd
+COPY terminfo.db terminfo.db
LIBS liboverride.o
LIBS -lbz2 -lcrypt -ledit -lipsec -lkvm -ll -lm -lrmt -lcurses -lterminfo -lutil -lz -levent -lprop
diff --git a/etc/root/mkterminfo b/rescue/mkterminfo
index 9d651b67cf6..474d3d4caf4 100755
--- a/etc/root/mkterminfo
+++ b/rescue/mkterminfo
@@ -1,9 +1,9 @@
#!/bin/sh
-# $NetBSD: mkterminfo,v 1.1 2010/02/04 21:01:16 roy Exp $
+# $NetBSD: mkterminfo,v 1.1 2010/02/05 09:44:23 roy Exp $
# Build a minimal set of terminfo definitons from our ttys
-TARGET=dot.terminfo
+TARGET=terminfo
echo "# \$NetBSD\$" > ${TARGET}
echo >> ${TARGET}
diff --git a/etc/root/dot.terminfo b/rescue/terminfo
index 12da4e16a73..2f2573232b7 100644
--- a/etc/root/dot.terminfo
+++ b/rescue/terminfo
@@ -1,4 +1,4 @@
-# $NetBSD: dot.terminfo,v 1.1 2010/02/04 21:01:16 roy Exp $
+# $NetBSD: terminfo,v 1.1 2010/02/05 09:44:23 roy Exp $
pc3|BSD/OS on the PC Console,
am, bs, eo, km, xon,