emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix the upstream default network stack

Browse Source 
The OpenRC upstream default network stack was changed, but there was no
reason to change it. Now since we have the MKNET build switch, it is
easy for the gentoo ebuild to install oldnet by default.

The upstream default is newnet.
This commit is contained in:
William Hubbs 2012-07-10 12:18:06 -05:00
parent 60d6847de5
commit 006fbdce83
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -7,7 +7,7 @@ include Makefile.inc
SUBDIR= conf.d etc init.d local.d man scripts sh src sysctl.d SUBDIR= conf.d etc init.d local.d man scripts sh src sysctl.d
# Build our old net foo or not # Build our old net foo or not
ifeq (${MKNET},) ifeq (${MKNET},oldnet)
SUBDIR+= net doc SUBDIR+= net doc
endif endif

2
README
View File

@ -10,7 +10,7 @@ You may wish to tweak the installation with the below arguments
PROGLDFLAGS=-static PROGLDFLAGS=-static
LIBNAME=lib64 LIBNAME=lib64
DESTDIR=/tmp/openrc-image DESTDIR=/tmp/openrc-image
MKNET=newnet MKNET=oldnet
MKPAM=pam MKPAM=pam
MKPKGCONFIG=no MKPKGCONFIG=no
MKSELINUX=yes MKSELINUX=yes

2
conf.d/Makefile
View File

@ -1,7 +1,7 @@
DIR= ${CONFDIR} DIR= ${CONFDIR}
CONF= bootmisc fsck hostname localmount urandom ${CONF-${OS}} CONF= bootmisc fsck hostname localmount urandom ${CONF-${OS}}
ifeq (${MKNET},newnet) ifeq (${MKNET},)
CONF+= network staticroute CONF+= network staticroute
TARGETS+= network staticroute TARGETS+= network staticroute
CLEANFILES+= network staticroute CLEANFILES+= network staticroute

8
init.d/Makefile
View File

@ -6,12 +6,12 @@ BIN= ${OBJS}
# Build our old net foo or not # Build our old net foo or not
ifeq (${MKNET},) ifeq (${MKNET},)
INSTALLAFTER= _installafter_net.lo SRCS+= network.in staticroute.in
SRCS+= net.lo.in
endif endif
ifeq (${MKNET},newnet) ifeq (${MKNET},oldnet)
SRCS+= network.in staticroute.in INSTALLAFTER= _installafter_net.lo
SRCS+= net.lo.in
endif endif
MK= ../mk MK= ../mk

18
runlevels/Makefile
View File

@ -11,12 +11,6 @@ DEFAULTDIR= ${LEVELDIR}/default
SHUTDOWNDIR= ${LEVELDIR}/shutdown SHUTDOWNDIR= ${LEVELDIR}/shutdown
ifeq (${MKNET},) ifeq (${MKNET},)
BOOT-FreeBSD += net.lo0
BOOT-Linux += net.lo
BOOT-NetBSD += net.lo0
endif
ifeq (${MKNET},newnet)
BOOT+= network staticroute BOOT+= network staticroute
endif endif
@ -31,19 +25,25 @@ BOOT-${OS}=
SHUTDOWN-${OS}= SHUTDOWN-${OS}=
SYSINIT-${OS}= SYSINIT-${OS}=
ifeq (${MKNET},oldnet)
BOOT-FreeBSD+= net.lo0
BOOT-Linux+= net.lo
BOOT-NetBSD+= net.lo0
endif
BOOT-BSD= hostid newsyslog savecore syslogd swap-blk BOOT-BSD= hostid newsyslog savecore syslogd swap-blk
# Generic BSD stuff # Generic BSD stuff
BOOT-FreeBSD= hostid newsyslog savecore syslogd BOOT-FreeBSD+= hostid newsyslog savecore syslogd
# FreeBSD specific stuff # FreeBSD specific stuff
BOOT-FreeBSD+= adjkerntz dumpon syscons BOOT-FreeBSD+= adjkerntz dumpon syscons
BOOT-Linux= hwclock keymaps modules mtab procfs termencoding BOOT-Linux+= hwclock keymaps modules mtab procfs termencoding
SHUTDOWN-Linux= killprocs mount-ro SHUTDOWN-Linux= killprocs mount-ro
SYSINIT-Linux= devfs dmesg SYSINIT-Linux= devfs dmesg
# Generic BSD stuff # Generic BSD stuff
BOOT-NetBSD= hostid newsyslog savecore syslogd BOOT-NetBSD+= hostid newsyslog savecore syslogd
# NetBSD specific stuff # NetBSD specific stuff
BOOT-NetBSD+= devdb swap-blk ttys wscons BOOT-NetBSD+= devdb swap-blk ttys wscons