From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2D85613860F for ; Wed, 30 Oct 2013 19:58:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E721E09D5; Wed, 30 Oct 2013 19:58:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D924E09D5 for ; Wed, 30 Oct 2013 19:58:37 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CDE1833EFC4 for ; Wed, 30 Oct 2013 19:58:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3CB13E546E for ; Wed, 30 Oct 2013 19:58:34 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1383115203.766d71c2d32d2c57969d161f4d96f15706b8ed3a.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/librc/, mk/, etc/, src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: etc/rc.conf.GNU-kFreeBSD mk/os-GNU-kFreeBSD.mk mk/os.mk src/librc/librc-daemon.c src/rc/mountinfo.c src/rc/rc-logger.c src/rc/runscript.c X-VCS-Directories: src/librc/ mk/ etc/ src/rc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 766d71c2d32d2c57969d161f4d96f15706b8ed3a X-VCS-Branch: master Date: Wed, 30 Oct 2013 19:58:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e901a404-9a56-4e1e-8a8c-2758662682af X-Archives-Hash: 0e362cccac7d320ae3dd8a27ded14b2c commit: 766d71c2d32d2c57969d161f4d96f15706b8ed3a Author: Steven Chamberlain pyro eu org> AuthorDate: Tue Oct 29 18:35:33 2013 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Oct 30 06:40:03 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=766d71c2 Begin port to GNU/kFreeBSD This is just a minimal port to get Debian up and running; the rest will be done later. --- etc/rc.conf.GNU-kFreeBSD | 11 +++++++++++ mk/os-GNU-kFreeBSD.mk | 9 +++++++++ mk/os.mk | 2 +- src/librc/librc-daemon.c | 2 +- src/rc/mountinfo.c | 4 ++-- src/rc/rc-logger.c | 2 +- src/rc/runscript.c | 2 +- 7 files changed, 26 insertions(+), 6 deletions(-) diff --git a/etc/rc.conf.GNU-kFreeBSD b/etc/rc.conf.GNU-kFreeBSD new file mode 100644 index 0000000..67fe2ae --- /dev/null +++ b/etc/rc.conf.GNU-kFreeBSD @@ -0,0 +1,11 @@ +############################################################################## +# GNU/kFreeBSD SPECIFIC OPTIONS + +# This is the subsystem type. Valid options on GNU/kFreeBSD: +# "" - nothing special +# "jail" - FreeBSD jails (not yet implemented) +# If this is commented out, automatic detection will be used. +# +# This should be set to the value representing the environment this file is +# PRESENTLY in, not the virtualization the environment is capable of. +#rc_sys="" diff --git a/mk/os-GNU-kFreeBSD.mk b/mk/os-GNU-kFreeBSD.mk new file mode 100644 index 0000000..72fea3e --- /dev/null +++ b/mk/os-GNU-kFreeBSD.mk @@ -0,0 +1,9 @@ +# Copyright (c) 2008 Roy Marples +# Released under the 2-clause BSD license. + +# Generic definitions + +CPPFLAGS+= -D_BSD_SOURCE -D_XOPEN_SOURCE=700 +LIBDL= -Wl,-Bdynamic -ldl +LIBKVM?= +include ${MK}/os-BSD.mk diff --git a/mk/os.mk b/mk/os.mk index 3e18962..6b2d428 100644 --- a/mk/os.mk +++ b/mk/os.mk @@ -3,7 +3,7 @@ # Generic definitions -_OS_SH= uname -s +_OS_SH= uname -s | tr '/' '-' _OS:= $(shell ${_OS_SH}) OS?= ${_OS} include ${MK}/os-${OS}.mk diff --git a/src/librc/librc-daemon.c b/src/librc/librc-daemon.c index 6e7d57f..e98b02c 100644 --- a/src/librc/librc-daemon.c +++ b/src/librc/librc-daemon.c @@ -30,7 +30,7 @@ #include "librc.h" -#if defined(__linux__) +#if defined(__linux__) || defined (__GLIBC__) static bool pid_is_exec(pid_t pid, const char *exec) { diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c index 43d9c83..ce3f27d 100644 --- a/src/rc/mountinfo.c +++ b/src/rc/mountinfo.c @@ -39,7 +39,7 @@ # include # define statfs statvfs # define F_FLAGS f_flag -#elif defined (__linux__) +#elif defined (__linux__) || defined (__GLIBC__) # include #endif @@ -265,7 +265,7 @@ find_mounts(struct args *args) return list; } -#elif defined (__linux__) +#elif defined (__linux__) || defined (__GLIBC__) static struct mntent * getmntfile(const char *file) { diff --git a/src/rc/rc-logger.c b/src/rc/rc-logger.c index 468225f..e8fb0ff 100644 --- a/src/rc/rc-logger.c +++ b/src/rc/rc-logger.c @@ -44,7 +44,7 @@ #include #include -#ifdef __linux__ +#if defined(__linux__) || defined(__GLIBC__) # include #elif defined(__NetBSD__) || defined(__OpenBSD__) # include diff --git a/src/rc/runscript.c b/src/rc/runscript.c index 3ecb6b5..7dc7593 100644 --- a/src/rc/runscript.c +++ b/src/rc/runscript.c @@ -52,7 +52,7 @@ #include #include -#ifdef __linux__ +#if defined(__linux__) || defined(__GLIBC__) # include #elif defined(__NetBSD__) || defined(__OpenBSD__) # include