Revision: 6983
http://ipcop.svn.sourceforge.net/ipcop/?rev=6983&view=rev
Author: gespinasse
Date: 2013-03-24 23:10:01 +0000 (Sun, 24 Mar 2013)
Log Message:
-----------
Like LFS, use util-linux kill and switch off procps-ng kill
Mostly use LFS instructions for procps-ng compilation.
This will install headers to the correct place.
Update sysvinit rootfile as utmpdump is now supplied by util-linux
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/procps
ipcop/trunk/config/rootfiles/common/sysvinit
ipcop/trunk/config/rootfiles/common/util-linux
ipcop/trunk/lfs/procps
ipcop/trunk/lfs/sysvinit
ipcop/trunk/lfs/util-linux
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
Modified: ipcop/trunk/config/rootfiles/common/procps
===================================================================
--- ipcop/trunk/config/rootfiles/common/procps 2013-03-24 22:39:35 UTC (rev
6982)
+++ ipcop/trunk/config/rootfiles/common/procps 2013-03-24 23:10:01 UTC (rev
6983)
@@ -1,6 +1,4 @@
-bin/kill
bin/ps
-#lib/libprocps.so
lib/libprocps.so.1
lib/libprocps.so.1.1.0
sbin/sysctl
@@ -16,3 +14,37 @@
usr/bin/vmstat
usr/bin/w
#usr/bin/watch
+#usr/include/proc
+#usr/include/proc/alloc.h
+#usr/include/proc/devname.h
+#usr/include/proc/escape.h
+#usr/include/proc/procps.h
+#usr/include/proc/pwcache.h
+#usr/include/proc/readproc.h
+#usr/include/proc/sig.h
+#usr/include/proc/slab.h
+#usr/include/proc/sysinfo.h
+#usr/include/proc/version.h
+#usr/include/proc/wchan.h
+#usr/include/proc/whattime.h
+#usr/lib/libprocps.so
+#usr/lib/pkgconfig/libprocps.pc
+#usr/share/doc/procps-ng
+#usr/share/doc/procps-ng/BUGS
+#usr/share/doc/procps-ng/FAQ
+#usr/share/doc/procps-ng/README.top
+#usr/share/man/man1/free.1
+#usr/share/man/man1/pgrep.1
+#usr/share/man/man1/pkill.1
+#usr/share/man/man1/pmap.1
+#usr/share/man/man1/ps.1
+#usr/share/man/man1/pwdx.1
+#usr/share/man/man1/slabtop.1
+#usr/share/man/man1/tload.1
+#usr/share/man/man1/top.1
+#usr/share/man/man1/uptime.1
+#usr/share/man/man1/w.1
+#usr/share/man/man1/watch.1
+#usr/share/man/man5/sysctl.conf.5
+#usr/share/man/man8/sysctl.8
+#usr/share/man/man8/vmstat.8
Modified: ipcop/trunk/config/rootfiles/common/sysvinit
===================================================================
--- ipcop/trunk/config/rootfiles/common/sysvinit 2013-03-24 22:39:35 UTC
(rev 6982)
+++ ipcop/trunk/config/rootfiles/common/sysvinit 2013-03-24 23:10:01 UTC
(rev 6983)
@@ -13,12 +13,10 @@
usr/bin/last
usr/bin/lastb
usr/bin/mesg
-usr/bin/utmpdump
#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/man1/utmpdump.1
#usr/share/man/man5/initscript.5
#usr/share/man/man5/inittab.5
#usr/share/man/man8/bootlogd.8
Modified: ipcop/trunk/config/rootfiles/common/util-linux
===================================================================
--- ipcop/trunk/config/rootfiles/common/util-linux 2013-03-24 22:39:35 UTC
(rev 6982)
+++ ipcop/trunk/config/rootfiles/common/util-linux 2013-03-24 23:10:01 UTC
(rev 6983)
@@ -1,5 +1,6 @@
bin/dmesg
#bin/findmnt
+bin/kill
#bin/lsblk
bin/more
bin/mount
@@ -75,7 +76,7 @@
#usr/bin/tailf
#usr/bin/ul
#usr/bin/unshare
-#usr/bin/utmpdump
+usr/bin/utmpdump
#usr/bin/uuidgen
#usr/bin/wall
#usr/bin/whereis
@@ -85,11 +86,8 @@
#usr/include/libmount/libmount.h
#usr/include/uuid
#usr/include/uuid/uuid.h
-#usr/lib/libblkid.la
usr/lib/libblkid.so
-#usr/lib/libmount.la
usr/lib/libmount.so
-#usr/lib/libuuid.la
usr/lib/libuuid.so
#usr/lib/pkgconfig/blkid.pc
#usr/lib/pkgconfig/mount.pc
@@ -121,6 +119,7 @@
#usr/share/man/man1/ipcmk.1
#usr/share/man/man1/ipcrm.1
#usr/share/man/man1/ipcs.1
+#usr/share/man/man1/kill.1
#usr/share/man/man1/logger.1
#usr/share/man/man1/look.1
#usr/share/man/man1/lscpu.1
@@ -206,6 +205,4 @@
#usr/share/man/man8/uuidd.8
#usr/share/man/man8/wdctl.8
#usr/share/man/man8/wipefs.8
-#usr/share/man/ru
-#usr/share/man/ru/man1
var/lib/hwclock
Modified: ipcop/trunk/lfs/procps
===================================================================
--- ipcop/trunk/lfs/procps 2013-03-24 22:39:35 UTC (rev 6982)
+++ ipcop/trunk/lfs/procps 2013-03-24 23:10:01 UTC (rev 6983)
@@ -83,20 +83,26 @@
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
# Fix the test suite
- # This is a fast hack, unsure what should be made upstream
- cd $(DIR_APP) && sed -i "s|exec which sleep|exec echo
/$(TOOLS_DIR)/bin/sleep|" testsuite/config/unix.exp
+ # This is a fast hack, unsure what should be made upstream, allow
slabtop to report more objects
+ cd $(DIR_APP) && sed -i -e "s|exec which sleep|exec echo
/$(TOOLS_DIR)/bin/sleep|" -e 's|999999|&9|' testsuite/config/unix.exp
- cd $(DIR_APP) && ./configure --prefix= --disable-static --disable-nls
+ cd $(DIR_APP) && ./configure --prefix=/usr --exec-prefix=
--libdir=/usr/lib --disable-static --disable-nls --disable-kill --disable-skill
cd $(DIR_APP) && make -j $(PARALLELISM)
+
ifeq "$(RUNNING_TEST)" "yes"
# Using directly runtest produce just a much nicer output to read than
make check
# Defining DEJAGNU silent "Couldn't find the global config file" warning
-(cd $(DIR_APP)/testsuite; make site.exp && DEJAGNU=global-conf.exp
runtest) &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
- cd $(DIR_APP) && make install-exec
+ cd $(DIR_APP) && make install
+ # Move shared .so.* to lib because ps is in /bin and recreate .so
symlink
+ mv /usr/lib/libprocps.so.* /lib
+ ln -sf ../../lib/libprocps.so.1.1.0 /usr/lib/libprocps.so
+
# Reinstall our sysctl.conf
cp -f $(DIR_SRC)/config/etc/sysctl.conf /etc
- rm /lib/libprocps.la
+
+ rm /usr/lib/libprocps.la
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/lfs/sysvinit
===================================================================
--- ipcop/trunk/lfs/sysvinit 2013-03-24 22:39:35 UTC (rev 6982)
+++ ipcop/trunk/lfs/sysvinit 2013-03-24 23:10:01 UTC (rev 6983)
@@ -83,8 +83,8 @@
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i 's@Sending processes@& configured via
/etc/inittab@g' src/init.c
- # From LFS: Maintained versions of the wall and mountpoint programs
were installed earlier by Util-linux.
- cd $(DIR_APP) && sed -i -e 's/utmpdump wall/utmpdump/' -e '/=
mountpoint/d' -e 's/mountpoint.1 wall.1//' src/Makefile
+ # 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
Modified: ipcop/trunk/lfs/util-linux
===================================================================
--- ipcop/trunk/lfs/util-linux 2013-03-24 22:39:35 UTC (rev 6982)
+++ ipcop/trunk/lfs/util-linux 2013-03-24 23:10:01 UTC (rev 6983)
@@ -130,7 +130,7 @@
cd $(DIR_APP) && sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' `grep
-rl 'etc/adjtime' .`
cd $(DIR_APP) && mkdir -p /var/lib/hwclock
cd $(DIR_APP) && ./configure --localstatedir=/var/run --disable-static
--disable-nls --disable-cramfs --disable-schedutils \
- --disable-su --disable-sulogin --disable-login
--disable-kill
+ --disable-su --disable-sulogin --disable-login
# CCACHE_CPP2=1 replace the CFLAGS -fPIE hack and workaround a not well
identified gcc-4.4 issue that trigger
# lscpu.c: In function 'read_hypervisor':
# lscpu.c:446: error can't find a register in class 'BREG' while
reloading 'asm'
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-03-24 22:39:35 UTC
(rev 6982)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-03-24 23:10:01 UTC
(rev 6983)
@@ -748,7 +748,6 @@
/usr/sbin/pppstats
##
## procps-3.3.6
-/bin/kill
/bin/ps
/lib/libprocps.so.1
/lib/libprocps.so.1.1.0
@@ -826,6 +825,7 @@
##
## util-linux-2.22.2
/bin/dmesg
+/bin/kill
/bin/more
/bin/mount
/bin/mountpoint
@@ -847,6 +847,7 @@
/usr/bin/pg
/usr/bin/rename
/usr/bin/renice
+/usr/bin/utmpdump
/usr/sbin/fdformat
##
## xz-5.0.4
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
