Commit 460cc8bf authored by Mike Hibler's avatar Mike Hibler

FreeBSD 11 (aka current) support.

Mostly I just wanted to test "the latest" FBSD kernel on Apt
so see if anything done recently would help with the hanging
console problem on the R320s (newer kernels actually only hang
for about 10 seconds and drop around 500 chars when they probe
the ethernet interfaces--this is better than it was).

While in there, I just went ahead and did the client side,
mostly ifdefs in the makefiles.
parent ac81d7b6
......@@ -4525,6 +4525,7 @@ outfiles="Makeconf GNUmakefile setversion \
tmcc/freebsd/init/8/GNUmakefile \
tmcc/freebsd/init/9/GNUmakefile \
tmcc/freebsd/init/10/GNUmakefile \
tmcc/freebsd/init/11/GNUmakefile \
tmcc/freebsd/supfile tmcc/freebsd/sethostname \
tmcc/linux/GNUmakefile tmcc/linux/supfile \
tmcc/linux/sethostname.dhclient \
......
......@@ -262,6 +262,7 @@ outfiles="Makeconf GNUmakefile setversion \
tmcc/freebsd/init/8/GNUmakefile \
tmcc/freebsd/init/9/GNUmakefile \
tmcc/freebsd/init/10/GNUmakefile \
tmcc/freebsd/init/11/GNUmakefile \
tmcc/freebsd/supfile tmcc/freebsd/sethostname \
tmcc/linux/GNUmakefile tmcc/linux/supfile \
tmcc/linux/sethostname.dhclient \
......
......@@ -63,6 +63,7 @@ ifneq ($(FBSDMAJ),7)
ifneq ($(FBSDMAJ),8)
ifneq ($(FBSDMAJ),9)
ifneq ($(FBSDMAJ),10)
ifneq ($(FBSDMAJ),11)
WITH_LTHREADS = 1
endif
endif
......@@ -70,6 +71,7 @@ endif
endif
endif
endif
endif
#ifndef WITH_MSERVER_NULL
WITH_MSERVER_NULL = 1
......
......@@ -75,6 +75,7 @@ ifneq ($(FBSDMAJ),7)
ifneq ($(FBSDMAJ),8)
ifneq ($(FBSDMAJ),9)
ifneq ($(FBSDMAJ),10)
ifneq ($(FBSDMAJ),11)
WITH_LTHREADS = 1
endif
endif
......@@ -82,6 +83,7 @@ endif
endif
endif
endif
endif
# Linux specific goop
ifeq ($(SYSTEM),Linux)
......
#
# Insert Copyright Here.
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = @top_builddir@
SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
include $(OBJDIR)/Makeconf
all:
client: init
include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT -DTESTBED
init: init.c pathnames.h
$(CC) $(CFLAGS) -static -o init $< -lutil -lcrypt
install:
client-install: client
install -s -o root -g wheel -m 555 -b -B.bak -fschg -S init $(DESTDIR)/sbin/init
clean:
rm -f *.o core init
This diff is collapsed.
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Donn Seeley at Berkeley Software Design, Inc.
*
* 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.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS 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.
*
* @(#)pathnames.h 8.1 (Berkeley) 6/5/93
* $FreeBSD: head/sbin/init/pathnames.h 232977 2012-03-14 16:22:09Z ed $
*/
#include <paths.h>
#define _PATH_INITLOG "/var/log/init.log"
#define _PATH_SLOGGER "/sbin/session_logger"
#define _PATH_RUNCOM "/etc/rc"
#define _PATH_RUNDOWN "/etc/rc.shutdown"
#
# Copyright (c) 2006-2013 University of Utah and the Flux Group.
# Copyright (c) 2006-2015 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -51,6 +51,9 @@ endif
ifeq ($(FBSDVERSION),FreeBSD10)
FSUBDIR = 10
endif
ifeq ($(FBSDVERSION),FreeBSD11)
FSUBDIR = 11
endif
SUBDIRS = $(FSUBDIR)
all:
......
#
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
# Copyright (c) 2000-2015 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -41,12 +41,14 @@ ifneq ($(FBSDMAJ),7)
ifneq ($(FBSDMAJ),8)
ifneq ($(FBSDMAJ),9)
ifneq ($(FBSDMAJ),10)
ifneq ($(FBSDMAJ),11)
WITH_LTHREADS = 1
endif
endif
endif
endif
endif
endif
ifeq ($(WITH_LTHREADS),1)
PTHREADCFLAGS += -D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads
......
......@@ -7075,6 +7075,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/tmcc/freebsd/init/8/GNUmakefile \
clientside/tmcc/freebsd/init/9/GNUmakefile \
clientside/tmcc/freebsd/init/10/GNUmakefile \
clientside/tmcc/freebsd/init/11/GNUmakefile \
clientside/tmcc/freebsd/supfile clientside/tmcc/freebsd/sethostname \
clientside/tmcc/linux/GNUmakefile clientside/tmcc/linux/supfile \
clientside/tmcc/linux/sethostname.dhclient \
......
......@@ -1445,6 +1445,7 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/tmcc/freebsd/init/8/GNUmakefile \
clientside/tmcc/freebsd/init/9/GNUmakefile \
clientside/tmcc/freebsd/init/10/GNUmakefile \
clientside/tmcc/freebsd/init/11/GNUmakefile \
clientside/tmcc/freebsd/supfile clientside/tmcc/freebsd/sethostname \
clientside/tmcc/linux/GNUmakefile clientside/tmcc/linux/supfile \
clientside/tmcc/linux/sethostname.dhclient \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment