Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove and obsolete rumpkern_time as a separate component.

Browse Source
This commit is contained in:
pooka 2014-08-25 18:44:02 +00:00
parent f2e3a5e0ac
commit 67433f3a0f
10 changed files with 16 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
distrib/sets/lists/base/shl.mi
View File

@ -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

6
distrib/sets/lists/comp/mi
View File

@ -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

4
distrib/sets/lists/comp/shl.mi
View File

@ -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

4
distrib/sets/lists/debug/mi
View File

@ -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

4
distrib/sets/lists/debug/shl.mi
View File

@ -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

5
sys/rump/kern/lib/Makefile
View File

@ -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>

13
sys/rump/kern/lib/libtime/Makefile
View File

@ -1,13 +0,0 @@
# $NetBSD: Makefile,v 1.2 2014/04/02 19:37:17 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../kern
LIB= rumpkern_time
SRCS+= time_component.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
.include <bsd.lib.mk>
.include <bsd.klinks.mk>

4
sys/rump/kern/lib/libtime/shlib_version
View File

@ -1,4 +0,0 @@
# $NetBSD: shlib_version,v 1.1 2014/03/14 01:02:34 pooka Exp $
#
major=0
minor=0

42
sys/rump/kern/lib/libtime/time_component.c
View File

@ -1,42 +0,0 @@
/* $NetBSD: time_component.c,v 1.2 2014/04/02 19:37:17 pooka Exp $ */
/*
* Copyright (c) 2014 Antti Kantee. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: time_component.c,v 1.2 2014/04/02 19:37:17 pooka Exp $");
#include <sys/param.h>
#include <sys/timevar.h>
#include "rump_private.h"
void rumpkern_time_is_obsolete(void);
RUMP_COMPONENT(RUMP_COMPONENT_KERN)
{
rumpkern_time_is_obsolete();
}

17
sys/rump/librump/rumpkern/rump.c
View File

@ -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_etfs *eb)
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);
}