Begin port to GNU/kFreeBSD

This is just a minimal port to get Debian up and running; the rest will be done later.
bootmisc: do not run clean_run on VSERVER systems
2013-10-30 15:00:40 -05:00 · 2013-10-28 15:40:47 -05:00 · 2013-10-28 15:40:16 -05:00 · 2013-10-28 15:39:19 -05:00 · 2013-10-18 15:22:24 -05:00 · 2013-10-18 15:19:52 -05:00
11 changed files with 30 additions and 9 deletions
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.12.2
+VERSION=	0.12.4
 PKG=		${NAME}-${VERSION}
--- a/etc/rc.conf.GNU-kFreeBSD
+++ 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=""
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -117,6 +117,7 @@ migrate_to_run()

 clean_run()
 {
+	[ "$RC_SYS" = VSERVER ] && return 0
 	local dir
 	dir=$(mktemp -d)
 	mount --bind / $dir
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -9,7 +9,7 @@ _IFS="
 depend()
 {
 	use dev clock modules
-	keyword -jail -openvz -prefix -timeout -vserver -lxc
+	keyword -jail -openvz -prefix -timeout -vserver -lxc -uml
 }

 _abort() {
--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -6,7 +6,7 @@ description="Configures the loopback interface."

 depend()
 {
-	return 0
+	keyword -jail -prefix -vserver
 }

 start()
--- a/mk/os-GNU-kFreeBSD.mk
+++ b/mk/os-GNU-kFreeBSD.mk
@@ -0,0 +1,9 @@
+# Copyright (c) 2008 Roy Marples <roy@marples.name>
+# 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
--- 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
--- 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)
 {
--- a/src/rc/mountinfo.c
+++ b/src/rc/mountinfo.c
@@ -39,7 +39,7 @@
 #  include <sys/statvfs.h>
 #  define statfs statvfs
 #  define F_FLAGS f_flag
-#elif defined (__linux__)
+#elif defined (__linux__) || defined (__GLIBC__)
 #  include <mntent.h>
 #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)
 {
--- a/src/rc/rc-logger.c
+++ b/src/rc/rc-logger.c
@@ -44,7 +44,7 @@
 #include <time.h>
 #include <unistd.h>

-#ifdef __linux__
+#if defined(__linux__) || defined(__GLIBC__)
 #  include <pty.h>
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
 #  include <util.h>
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -52,7 +52,7 @@
 #include <time.h>
 #include <unistd.h>

-#ifdef __linux__
+#if defined(__linux__) || defined(__GLIBC__)
 #  include <pty.h>
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
 #  include <util.h>
Author	SHA1	Message	Date
Steven Chamberlain	0853c110e5	Begin port to GNU/kFreeBSD This is just a minimal port to get Debian up and running; the rest will be done later.	2013-10-30 15:00:40 -05:00
William Hubbs	1a43ce11d0	bootmisc: do not run clean_run on VSERVER systems X-Gentoo-Bug: 489370 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=489370	2013-10-28 15:40:47 -05:00
William Hubbs	46e504b403	loopback: do not run in a prefix or vserver X-Gentoo-Bug: 489370 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=489370	2013-10-28 15:40:16 -05:00
William Hubbs	fc1f3d14f4	start 0.12.4	2013-10-28 15:39:19 -05:00
Alexander V Vershilov	b8a016aaba	Add uml keyword to fsck service. Fix relevant an issue mentioned by Toralf Förster. X-Gentoo-Bug: 481096. X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=481096	2013-10-18 15:22:24 -05:00
William Hubbs	63f5256b59	start work on OpenRC-0.12.3	2013-10-18 15:19:52 -05:00