[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-739-g0d68a5c
git
git at cross-lfs.org
Mon Apr 14 14:18:55 PDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, systemd has been updated
via 0d68a5c26f0a87a97cbe7d0e3fc1338c2bcb31da (commit)
via 3f2219eec7b5fa5525d2a36e06911181f8060fd6 (commit)
from 4b9dcd76bee2285a968a2c144fb771c02f63f4b5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0d68a5c26f0a87a97cbe7d0e3fc1338c2bcb31da
Author: Chris Staub <chris at beaker67.com>
Date: Mon Apr 14 17:18:47 2014 -0400
Actually add sysvnit patch
diff --git a/patches/sysvinit-2.88dsf-tools_updates-1.patch b/patches/sysvinit-2.88dsf-tools_updates-1.patch
new file mode 100644
index 0000000..83ad148
--- /dev/null
+++ b/patches/sysvinit-2.88dsf-tools_updates-1.patch
@@ -0,0 +1,82 @@
+diff -Naur sysvinit-2.88dsf.orig/src/Makefile sysvinit-2.88dsf/src/Makefile
+--- sysvinit-2.88dsf.orig/src/Makefile 2010-04-11 05:30:27.000000000 -0400
++++ sysvinit-2.88dsf/src/Makefile 2014-04-14 17:00:32.000000000 -0400
+@@ -16,27 +16,20 @@
+ # For some known distributions we do not build all programs, otherwise we do.
+ BIN =
+ SBIN = init halt shutdown runlevel killall5 fstab-decode
+-USRBIN = last mesg
+
+-MAN1 = last.1 lastb.1 mesg.1
+ MAN5 = initscript.5 inittab.5
+ MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
+ MAN8 += shutdown.8 telinit.8 fstab-decode.8
+
+ ifeq ($(DISTRO),)
+-BIN += mountpoint
+-SBIN += sulogin bootlogd
+-USRBIN += utmpdump wall
+-MAN1 += utmpdump.1 mountpoint.1 wall.1
+-MAN8 += sulogin.8 bootlogd.8
++SBIN += bootlogd
++MAN8 += bootlogd.8
+ endif
+
+ ifeq ($(DISTRO),Debian)
+ CPPFLAGS+= -DACCTON_OFF
+-BIN += mountpoint
+-SBIN += sulogin bootlogd
+-MAN1 += mountpoint.1
+-MAN8 += sulogin.8 bootlogd.8
++SBIN += bootlogd
++MAN8 += bootlogd.8
+ endif
+
+ ifeq ($(DISTRO),Owl)
+@@ -46,11 +39,8 @@
+
+ ifeq ($(DISTRO),SuSE)
+ CPPFLAGS+= -DUSE_SYSFS -DSANE_TIO -DSIGINT_ONLYONCE -DUSE_ONELINE
+-BIN += mountpoint
+-SBIN += sulogin
+-USRBIN += utmpdump
+-MAN1 += utmpdump.1 mountpoint.1
+-MAN8 += sulogin.8
++SBIN +=
++MAN8 +=
+ endif
+
+ ID = $(shell id -u)
+@@ -78,7 +68,7 @@
+ endif
+
+ # Additional libs for GNU libc.
+-ifneq ($(wildcard /usr/lib*/libcrypt.a),)
++ifneq ($(wildcard /tools/lib*/libcrypt.a),)
+ SULOGINLIBS += -lcrypt
+ endif
+
+@@ -96,11 +86,8 @@
+
+ last: last.o oldutmp.h
+
+-mesg: mesg.o
+
+-mountpoint: mountpoint.o
+
+-utmpdump: utmpdump.o
+
+ runlevel: runlevel.o
+
+diff -Naur sysvinit-2.88dsf.orig/src/paths.h sysvinit-2.88dsf/src/paths.h
+--- sysvinit-2.88dsf.orig/src/paths.h 2010-04-11 05:30:27.000000000 -0400
++++ sysvinit-2.88dsf/src/paths.h 2014-04-14 17:00:36.000000000 -0400
+@@ -26,7 +26,7 @@
+ #define CONSOLE "/dev/console" /* Logical system console */
+ #define SECURETTY "/etc/securetty" /* List of root terminals */
+ #define SDALLOW "/etc/shutdown.allow" /* Users allowed to shutdown */
+-#define INITTAB "/etc/inittab" /* Location of inittab */
++#define INITTAB "/tools/etc/inittab" /* Location of inittab */
+ #define INIT "/sbin/init" /* Location of init itself. */
+ #define NOLOGIN "/etc/nologin" /* Stop user logging in. */
+ #define FASTBOOT "/fastboot" /* Enable fast boot. */
commit 3f2219eec7b5fa5525d2a36e06911181f8060fd6
Author: Chris Staub <chris at beaker67.com>
Date: Mon Apr 14 17:18:31 2014 -0400
Consolidated sysvinit source code changes into a patch
diff --git a/BOOK/boot/common/sysvinit.xml b/BOOK/boot/common/sysvinit.xml
index 7b95129..584029d 100644
--- a/BOOK/boot/common/sysvinit.xml
+++ b/BOOK/boot/common/sysvinit.xml
@@ -26,24 +26,11 @@
<sect2 role="installation">
<title>Installation of Sysvinit</title>
- <para os="s1">Prevent several programs from being built, as better versions
- were already installed by Util-linux:</para>
+ <para os="p1">Apply a patch to prevent installation of unneeded programs,
+ and allow Sysvinit to be installed in
+ <filename class="directory">/tools</filename>:</para>
-<screen os="s2"><userinput>cp -v src/Makefile{,.orig}
-sed -e 's/\ sulogin[^ ]*//' -e '/utmpdump/d' -e '/mountpoint/d' \
- -e '/mesg/d' src/Makefile.orig > src/Makefile</userinput></screen>
-
- <para os="aa">The following modifications help locate files specific to this
- particular build:</para>
-
-<screen os="ab"><userinput>cp -v src/Makefile{,.orig}
-sed -e 's,/usr/lib,/tools/lib,g' \
- src/Makefile.orig > src/Makefile</userinput></screen>
-
- <para os="bc">Change the location of inittab:</para>
-
-<screen os="bd"><userinput>cp -v src/paths.h{,.orig}
-sed 's@/etc/inittab@/tools&@' src/paths.h.orig > src/paths.h</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../sysvinit-&sysvinit-version;-tools_updates-1.patch</userinput></screen>
<para os ="c">Compile the package:</para>
diff --git a/BOOK/boot/multilib/sysvinit.xml b/BOOK/boot/multilib/sysvinit.xml
index 8f5175e..08bac47 100644
--- a/BOOK/boot/multilib/sysvinit.xml
+++ b/BOOK/boot/multilib/sysvinit.xml
@@ -24,27 +24,11 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/sysvinit.xml"
- xpointer="xpointer(//*[@os='s1'])"/>
+ xpointer="xpointer(//*[@os='p1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/sysvinit.xml"
- xpointer="xpointer(//*[@os='s2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/sysvinit.xml"
- xpointer="xpointer(//*[@os='aa'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/sysvinit.xml"
- xpointer="xpointer(//*[@os='ab'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/sysvinit.xml"
- xpointer="xpointer(//*[@os='bc'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/sysvinit.xml"
- xpointer="xpointer(//*[@os='bd'])"/>
+ xpointer="xpointer(//*[@os='p2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/sysvinit.xml"
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/common/sysvinit.xml | 21 +-----
BOOK/boot/multilib/sysvinit.xml | 20 +-----
patches/sysvinit-2.88dsf-tools_updates-1.patch | 82 ++++++++++++++++++++++++
3 files changed, 88 insertions(+), 35 deletions(-)
create mode 100644 patches/sysvinit-2.88dsf-tools_updates-1.patch
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list