| 1 |
Author: vapier |
| 2 |
Date: 2008-03-23 00:35:59 +0000 (Sun, 23 Mar 2008) |
| 3 |
New Revision: 3110 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/Makefile |
| 7 |
trunk/default.mk |
| 8 |
trunk/etc.BSD/Makefile |
| 9 |
trunk/etc.Linux/Makefile |
| 10 |
trunk/etc/Makefile |
| 11 |
trunk/share.Linux/passwd |
| 12 |
Log: |
| 13 |
finish merging openrc changes |
| 14 |
|
| 15 |
Modified: trunk/Makefile |
| 16 |
=================================================================== |
| 17 |
--- trunk/Makefile 2008-03-23 00:28:02 UTC (rev 3109) |
| 18 |
+++ trunk/Makefile 2008-03-23 00:35:59 UTC (rev 3110) |
| 19 |
@@ -7,10 +7,10 @@ |
| 20 |
# It also has the added bonus of being easier to install on systems |
| 21 |
# without an ebuild style package manager. |
| 22 |
|
| 23 |
-SUBDIRS = conf.d etc init.d man net sh share src |
| 24 |
+SUBDIRS = etc share |
| 25 |
|
| 26 |
NAME = baselayout |
| 27 |
-VERSION = 2.0.0_rc6 |
| 28 |
+VERSION = 2.0.0 |
| 29 |
|
| 30 |
PKG = $(NAME)-$(VERSION) |
| 31 |
|
| 32 |
@@ -21,18 +21,13 @@ |
| 33 |
endif |
| 34 |
endif |
| 35 |
|
| 36 |
-BASE_DIRS = $(RC_LIB)/init.d $(RC_LIB)/tmp |
| 37 |
KEEP_DIRS = /boot /home /mnt /root \ |
| 38 |
/usr/local/bin /usr/local/sbin /usr/local/share/doc /usr/local/share/man \ |
| 39 |
/var/lock /var/run |
| 40 |
|
| 41 |
ifeq ($(OS),Linux) |
| 42 |
KEEP_DIRS += /dev /sys |
| 43 |
- NET_LO = net.lo |
| 44 |
endif |
| 45 |
-ifneq ($(OS),Linux) |
| 46 |
- NET_LO = net.lo0 |
| 47 |
-endif |
| 48 |
|
| 49 |
TOPDIR = . |
| 50 |
include $(TOPDIR)/default.mk |
| 51 |
@@ -43,22 +38,6 @@ |
| 52 |
$(INSTALL_DIR) $(DESTDIR)$$x || exit $$? ; \ |
| 53 |
touch $(DESTDIR)$$x/.keep || exit $$? ; \ |
| 54 |
done |
| 55 |
- # Don't install runlevels if they already exist |
| 56 |
- if ! test -d $(DESTDIR)/etc/runlevels ; then \ |
| 57 |
- (cd runlevels; $(MAKE) install) ; \ |
| 58 |
- test -d runlevels.$(OS) && (cd runlevels.$(OS); $(MAKE) install) ; \ |
| 59 |
- $(INSTALL_DIR) $(DESTDIR)/etc/runlevels/single || exit $$? ; \ |
| 60 |
- $(INSTALL_DIR) $(DESTDIR)/etc/runlevels/nonetwork || exit $$? ; \ |
| 61 |
- fi |
| 62 |
- ln -snf ../../$(RC_LIB)/sh/net.sh $(DESTDIR)/etc/init.d/$(NET_LO) || exit $$? |
| 63 |
- ln -snf ../../$(RC_LIB)/sh/functions.sh $(DESTDIR)/etc/init.d || exit $$? |
| 64 |
- # Handle lib correctly |
| 65 |
- if test $(LIB) != "lib" ; then \ |
| 66 |
- sed -i'.bak' -e 's,/lib/,/$(LIB)/,g' $(DESTDIR)/$(RC_LIB)/sh/functions.sh || exit $$? ; \ |
| 67 |
- rm -f $(DESTDIR)/$(RC_LIB)/sh/functions.sh.bak ; \ |
| 68 |
- sed -i'.bak' -e 's,/lib/,/$(LIB)/,g' $(DESTDIR)/$(RC_LIB)/sh/rc-functions.sh || exit $$? ; \ |
| 69 |
- rm -f $(DESTDIR)/$(RC_LIB)/sh/rc-functions.sh.bak ; \ |
| 70 |
- fi |
| 71 |
|
| 72 |
layout: |
| 73 |
# Create base filesytem layout |
| 74 |
|
| 75 |
Modified: trunk/default.mk |
| 76 |
=================================================================== |
| 77 |
--- trunk/default.mk 2008-03-23 00:28:02 UTC (rev 3109) |
| 78 |
+++ trunk/default.mk 2008-03-23 00:35:59 UTC (rev 3110) |
| 79 |
@@ -4,12 +4,10 @@ |
| 80 |
DESTDIR = / |
| 81 |
ROOT = / |
| 82 |
LIB = lib |
| 83 |
-RC_LIB = /$(LIB)/rc |
| 84 |
|
| 85 |
# |
| 86 |
# Recursive rules |
| 87 |
# |
| 88 |
- |
| 89 |
SUBDIRS_ALL = $(patsubst %,%_all,$(SUBDIRS)) |
| 90 |
SUBDIRS_CLEAN = $(patsubst %,%_clean,$(SUBDIRS)) |
| 91 |
SUBDIRS_INSTALL = $(patsubst %,%_install,$(SUBDIRS)) |
| 92 |
@@ -33,7 +31,6 @@ |
| 93 |
# |
| 94 |
# Install rules |
| 95 |
# |
| 96 |
- |
| 97 |
INSTALL_DIR = install -m 0755 -d |
| 98 |
INSTALL_EXE = install -m 0755 |
| 99 |
INSTALL_FILE = install -m 0644 |
| 100 |
|
| 101 |
Modified: trunk/etc/Makefile |
| 102 |
=================================================================== |
| 103 |
--- trunk/etc/Makefile 2008-03-23 00:28:02 UTC (rev 3109) |
| 104 |
+++ trunk/etc/Makefile 2008-03-23 00:35:59 UTC (rev 3110) |
| 105 |
@@ -1,7 +1,7 @@ |
| 106 |
SUBDIRS = env.d profile.d |
| 107 |
|
| 108 |
DIR = /etc |
| 109 |
-FILES = hosts networks profile protocols rc.conf services shells |
| 110 |
+FILES = hosts networks profile protocols services shells |
| 111 |
|
| 112 |
TOPDIR = .. |
| 113 |
include $(TOPDIR)/default.mk |
| 114 |
|
| 115 |
Modified: trunk/etc.BSD/Makefile |
| 116 |
=================================================================== |
| 117 |
--- trunk/etc.BSD/Makefile 2008-03-23 00:28:02 UTC (rev 3109) |
| 118 |
+++ trunk/etc.BSD/Makefile 2008-03-23 00:35:59 UTC (rev 3110) |
| 119 |
@@ -1,5 +1,5 @@ |
| 120 |
DIR = /etc |
| 121 |
-FILES = COPYRIGHT issue issue.logo login.conf rc rc.shutdown |
| 122 |
+FILES = COPYRIGHT issue issue.logo login.conf |
| 123 |
|
| 124 |
TOPDIR = .. |
| 125 |
include $(TOPDIR)/default.mk |
| 126 |
|
| 127 |
Modified: trunk/etc.Linux/Makefile |
| 128 |
=================================================================== |
| 129 |
--- trunk/etc.Linux/Makefile 2008-03-23 00:28:02 UTC (rev 3109) |
| 130 |
+++ trunk/etc.Linux/Makefile 2008-03-23 00:35:59 UTC (rev 3110) |
| 131 |
@@ -1,4 +1,4 @@ |
| 132 |
-SUBDIRS = modules.d modules.autoload.d |
| 133 |
+SUBDIRS = modules.d |
| 134 |
DIR = /etc |
| 135 |
FILES = filesystems inputrc issue issue.logo |
| 136 |
FILES_NOEXIST = sysctl.conf |
| 137 |
|
| 138 |
Modified: trunk/share.Linux/passwd |
| 139 |
=================================================================== |
| 140 |
--- trunk/share.Linux/passwd 2008-03-23 00:28:02 UTC (rev 3109) |
| 141 |
+++ trunk/share.Linux/passwd 2008-03-23 00:35:59 UTC (rev 3110) |
| 142 |
@@ -10,4 +10,4 @@ |
| 143 |
uucp:x:10:14:uucp:/var/spool/uucp:/bin/false |
| 144 |
operator:x:11:0:operator:/root:/bin/bash |
| 145 |
portage:x:250:250:portage:/var/tmp/portage:/bin/false |
| 146 |
-nobody:x:65534:65534:nobody:/:/bin/false |
| 147 |
+nobody:x:65534:65534:nobody:/var/empty:/bin/false |
| 148 |
|
| 149 |
-- |
| 150 |
gentoo-commits@l.g.o mailing list |
Archives