Revision: 7291
http://sourceforge.net/p/ipcop/svn/7291
Author: owes
Date: 2014-03-06 13:12:09 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
Use a patch to remove several programs that are also available in procps and
util-linux
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/sysvinit
ipcop/trunk/lfs/sysvinit
Added Paths:
-----------
ipcop/trunk/src/patches/sysvinit-2.88dsf_remove-programs.patch
Modified: ipcop/trunk/config/rootfiles/common/sysvinit
===================================================================
--- ipcop/trunk/config/rootfiles/common/sysvinit 2014-03-06 06:44:41 UTC
(rev 7290)
+++ ipcop/trunk/config/rootfiles/common/sysvinit 2014-03-06 13:12:09 UTC
(rev 7291)
@@ -1,4 +1,3 @@
-bin/pidof
#sbin/bootlogd
#sbin/fstab-decode
sbin/halt
@@ -8,15 +7,8 @@
sbin/reboot
sbin/runlevel
sbin/shutdown
-sbin/sulogin
sbin/telinit
-usr/bin/last
-usr/bin/lastb
-usr/bin/mesg
#usr/include/initreq.h
-#usr/share/man/man1/last.1
-#usr/share/man/man1/lastb.1
-#usr/share/man/man1/mesg.1
#usr/share/man/man5/initscript.5
#usr/share/man/man5/inittab.5
#usr/share/man/man8/bootlogd.8
@@ -24,10 +16,8 @@
#usr/share/man/man8/halt.8
#usr/share/man/man8/init.8
#usr/share/man/man8/killall5.8
-#usr/share/man/man8/pidof.8
#usr/share/man/man8/poweroff.8
#usr/share/man/man8/reboot.8
#usr/share/man/man8/runlevel.8
#usr/share/man/man8/shutdown.8
-#usr/share/man/man8/sulogin.8
#usr/share/man/man8/telinit.8
Modified: ipcop/trunk/lfs/sysvinit
===================================================================
--- ipcop/trunk/lfs/sysvinit 2014-03-06 06:44:41 UTC (rev 7290)
+++ ipcop/trunk/lfs/sysvinit 2014-03-06 13:12:09 UTC (rev 7291)
@@ -47,11 +47,11 @@
# Top-level Rules
###############################################################################
-objects = $(DL_FILE)
+objects = $(DL_FILE)
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6eda8a97b86e0a6f59dabbf25202aa6f
+$(DL_FILE)_MD5 = 6eda8a97b86e0a6f59dabbf25202aa6f
install : $(TARGET)
@@ -81,10 +81,11 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ # based on LFS: remove programs superceeded elsewhere
+ cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_remove-programs.patch
+ # update messages sent when terminating
+ cd $(DIR_APP) && sed -i 's@Sending processes@& configured via
/etc/inittab@g' src/init.c
- cd $(DIR_APP) && sed -i 's@Sending processes@& configured via
/etc/inittab@g' src/init.c
- # From LFS: wall, mountpoint and utmpdump programs were installed
earlier by util-linux.
- cd $(DIR_APP) && sed -i -e '/utmpdump/d' -e '/mountpoint/d' src/Makefile
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
Added: ipcop/trunk/src/patches/sysvinit-2.88dsf_remove-programs.patch
===================================================================
--- ipcop/trunk/src/patches/sysvinit-2.88dsf_remove-programs.patch
(rev 0)
+++ ipcop/trunk/src/patches/sysvinit-2.88dsf_remove-programs.patch
2014-03-06 13:12:09 UTC (rev 7291)
@@ -0,0 +1,90 @@
+Patch from LSF to remove programs superceeded in other packages.
+Programs removed: last, lastb, mesg, mountpoint, pidof, sulogin, utmpdump, wall
+
+
+diff -Naur sysvinit-2.88dsf.orig/src/Makefile sysvinit-2.88dsf/src/Makefile
+--- sysvinit-2.88dsf.orig/src/Makefile 2010-04-11 04:30:27.000000000 -0500
++++ sysvinit-2.88dsf/src/Makefile 2013-12-12 16:17:43.930749763 -0600
+@@ -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 = halt.8 init.8 killall5.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)
+@@ -96,11 +86,8 @@
+
+ last: last.o oldutmp.h
+
+-mesg: mesg.o
+
+-mountpoint: mountpoint.o
+
+-utmpdump: utmpdump.o
+
+ runlevel: runlevel.o
+
+@@ -138,8 +125,7 @@
+ distclean: clobber
+
+ install:
+- $(INSTALL_DIR) $(ROOT)/bin/ $(ROOT)/sbin/
+- $(INSTALL_DIR) $(ROOT)/usr/bin/
++ $(INSTALL_DIR) $(ROOT)/sbin/
+ for i in $(BIN); do \
+ $(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
+ done
+@@ -154,13 +140,8 @@
+ ln -sf halt $(ROOT)/sbin/reboot
+ ln -sf halt $(ROOT)/sbin/poweroff
+ ln -sf init $(ROOT)/sbin/telinit
+- ln -sf /sbin/killall5 $(ROOT)/bin/pidof
+- if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
+- ln -sf last $(ROOT)/usr/bin/lastb; \
+- fi
+ $(INSTALL_DIR) $(ROOT)/usr/include/
+ $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
+- $(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
+ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/
+ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/
+ for i in $(MAN1); do \
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
