Module Name: src
Committed By: pooka
Date: Mon Aug 25 18:44:03 UTC 2014
Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/sys/rump/kern/lib: Makefile
src/sys/rump/librump/rumpkern: rump.c
Removed Files:
src/sys/rump/kern/lib/libtime: Makefile shlib_version time_component.c
Log Message:
Remove and obsolete rumpkern_time as a separate component.
To generate a diff of this commit:
cvs rdiff -u -r1.713 -r1.714 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1910 -r1.1911 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.266 -r1.267 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/kern/lib/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/rump/kern/lib/libtime/Makefile \
src/sys/rump/kern/lib/libtime/time_component.c
cvs rdiff -u -r1.1 -r0 src/sys/rump/kern/lib/libtime/shlib_version
cvs rdiff -u -r1.311 -r1.312 src/sys/rump/librump/rumpkern/rump.c
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/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.713 src/distrib/sets/lists/base/shl.mi:1.714
--- src/distrib/sets/lists/base/shl.mi:1.713 Fri Aug 22 10:51:38 2014
+++ src/distrib/sets/lists/base/shl.mi Mon Aug 25 18:44:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.713 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: shl.mi,v 1.714 2014/08/25 18:44:02 pooka Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -653,9 +653,9 @@
./usr/lib/librumpkern_solaris.so base-rump-shlib zfs,rump
./usr/lib/librumpkern_solaris.so.0 base-rump-shlib zfs,rump
./usr/lib/librumpkern_solaris.so.0.0 base-rump-shlib zfs,rump
-./usr/lib/librumpkern_time.so base-rump-shlib rump
-./usr/lib/librumpkern_time.so.0 base-rump-shlib rump
-./usr/lib/librumpkern_time.so.0.0 base-rump-shlib rump
+./usr/lib/librumpkern_time.so base-obsolete obsolete
+./usr/lib/librumpkern_time.so.0 base-obsolete obsolete
+./usr/lib/librumpkern_time.so.0.0 base-obsolete obsolete
./usr/lib/librumpkern_tty.so base-rump-shlib rump
./usr/lib/librumpkern_tty.so.0 base-rump-shlib rump
./usr/lib/librumpkern_tty.so.0.0 base-rump-shlib rump
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1910 src/distrib/sets/lists/comp/mi:1.1911
--- src/distrib/sets/lists/comp/mi:1.1910 Mon Aug 25 10:52:10 2014
+++ src/distrib/sets/lists/comp/mi Mon Aug 25 18:44:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1910 2014/08/25 10:52:10 christos Exp $
+# $NetBSD: mi,v 1.1911 2014/08/25 18:44:03 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3860,8 +3860,8 @@
./usr/lib/librumpkern_sljit_p.a comp-c-proflib profile,sljit,rump
./usr/lib/librumpkern_solaris.a comp-c-lib zfs,rump
./usr/lib/librumpkern_solaris_p.a comp-c-proflib profile,zfs,rump
-./usr/lib/librumpkern_time.a comp-c-lib rump
-./usr/lib/librumpkern_time_p.a comp-c-proflib profile,rump
+./usr/lib/librumpkern_time.a comp-obsolete obsolete
+./usr/lib/librumpkern_time_p.a comp-obsolete obsolete
./usr/lib/librumpkern_tty.a comp-c-lib rump
./usr/lib/librumpkern_tty_p.a comp-c-proflib profile,rump
./usr/lib/librumpkern_z.a comp-c-lib rump
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.266 src/distrib/sets/lists/comp/shl.mi:1.267
--- src/distrib/sets/lists/comp/shl.mi:1.266 Thu Jul 17 12:04:05 2014
+++ src/distrib/sets/lists/comp/shl.mi Mon Aug 25 18:44:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.266 2014/07/17 12:04:05 prlw1 Exp $
+# $NetBSD: shl.mi,v 1.267 2014/08/25 18:44:03 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -208,7 +208,7 @@
./usr/lib/librumpkern_ksem_pic.a comp-obsolete obsolete
./usr/lib/librumpkern_sljit_pic.a comp-c-piclib sljit,rump,picinstall
./usr/lib/librumpkern_solaris_pic.a comp-c-piclib zfs,rump,picinstall
-./usr/lib/librumpkern_time_pic.a comp-c-piclib rump,picinstall
+./usr/lib/librumpkern_time_pic.a comp-obsolete obsolete
./usr/lib/librumpkern_tty_pic.a comp-c-piclib rump,picinstall
./usr/lib/librumpkern_z_pic.a comp-c-piclib rump,picinstall
./usr/lib/librumpnet_agr_pic.a comp-c-piclib rump,picinstall
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.83 src/distrib/sets/lists/debug/mi:1.84
--- src/distrib/sets/lists/debug/mi:1.83 Fri Aug 22 10:51:38 2014
+++ src/distrib/sets/lists/debug/mi Mon Aug 25 18:44:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.83 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: mi,v 1.84 2014/08/25 18:44:03 pooka Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib
@@ -196,7 +196,7 @@
./usr/lib/librumpkern_ksem_g.a comp-obsolete obsolete
./usr/lib/librumpkern_sljit_g.a comp-c-debuglib debuglib,sljit,rump
./usr/lib/librumpkern_solaris_g.a comp-c-debuglib debuglib,zfs,rump
-./usr/lib/librumpkern_time_g.a comp-c-debuglib debuglib,rump
+./usr/lib/librumpkern_time_g.a comp-obsolete obsolete
./usr/lib/librumpkern_tty_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpkern_z_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_agr_g.a comp-c-debuglib debuglib,rump
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.71 src/distrib/sets/lists/debug/shl.mi:1.72
--- src/distrib/sets/lists/debug/shl.mi:1.71 Sun Aug 10 08:07:50 2014
+++ src/distrib/sets/lists/debug/shl.mi Mon Aug 25 18:44:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.71 2014/08/10 08:07:50 spz Exp $
+# $NetBSD: shl.mi,v 1.72 2014/08/25 18:44:03 pooka Exp $
./usr/libdata/debug/lib/libc.so.12.193.debug comp-sys-debug debug
./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug
./usr/libdata/debug/lib/libcrypto.so.8.3.debug comp-sys-debug debug
@@ -220,7 +220,7 @@
./usr/libdata/debug/usr/lib/librumpkern_ksem.so.0.0.debug comp-obsolete obsolete,rump
./usr/libdata/debug/usr/lib/librumpkern_sljit.so.0.0.debug comp-rump-debug debug,sljit,rump
./usr/libdata/debug/usr/lib/librumpkern_solaris.so.0.0.debug comp-rump-debug debug,zfs,rump
-./usr/libdata/debug/usr/lib/librumpkern_time.so.0.0.debug comp-rump-debug debug,rump
+./usr/libdata/debug/usr/lib/librumpkern_time.so.0.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/lib/librumpkern_tty.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpkern_z.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet.so.0.0.debug comp-rump-debug debug,rump
Index: src/sys/rump/kern/lib/Makefile
diff -u src/sys/rump/kern/lib/Makefile:1.5 src/sys/rump/kern/lib/Makefile:1.6
--- src/sys/rump/kern/lib/Makefile:1.5 Wed Apr 2 19:37:17 2014
+++ src/sys/rump/kern/lib/Makefile Mon Aug 25 18:44:02 2014
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2014/04/02 19:37:17 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2014/08/25 18:44:02 pooka Exp $
#
.include "${.CURDIR}/../Makefile.rumpkerncomp"
SUBDIR+= ${RUMPKERNLIBS}
-# obsolete and going away soon
-SUBDIR+= libtime
-
.include <bsd.subdir.mk>
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.311 src/sys/rump/librump/rumpkern/rump.c:1.312
--- src/sys/rump/librump/rumpkern/rump.c:1.311 Mon Aug 25 14:58:48 2014
+++ src/sys/rump/librump/rumpkern/rump.c Mon Aug 25 18:44:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.311 2014/08/25 14:58:48 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.312 2014/08/25 18:44:02 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.311 2014/08/25 14:58:48 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.312 2014/08/25 18:44:02 pooka Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -925,16 +925,3 @@ rump_boot_etfs_register(struct rump_boot
eb->eb_status = -1;
ebstart = eb;
}
-
-/*
- * Temporary notification that rumpkern_time is obsolete. This is to
- * be removed along with obsoleting rumpkern_time in a few months.
- */
-#define RUMPKERN_TIME_WARN "rumpkern_time is obsolete, functionality in librump"
-__warn_references(rumpkern_time_is_obsolete,RUMPKERN_TIME_WARN)
-void rumpkern_time_is_obsolete(void);
-void
-rumpkern_time_is_obsolete(void)
-{
- printf("WARNING: %s\n", RUMPKERN_TIME_WARN);
-}
