Revision: 6853
http://ipcop.svn.sourceforge.net/ipcop/?rev=6853&view=rev
Author: gespinasse
Date: 2012-11-18 14:03:03 +0000 (Sun, 18 Nov 2012)
Log Message:
-----------
Upgrade util-linux to 2.22.1
Ajust toolchain configure to build mostly only the code needed at that stage
On base configure, exclude the new su, sulogin, login due to PAM
Queep kill from sysvinit for now, so disable this one.
Configure for /var/run
Running the non-root tests is easy, so do that when requested
Running root tests is much harder as modprobe is not build yet, so let that
part commented for now.
Tests are not ready too to run on every machine, like mdadm.
Hide a minor libtool issue that create many warnings when the .la is not
present BEFORE the lib is installed.
Real fix would have to wait a fixed libtool version released.
The issue with lscpu.c disappear, I let the comment for now as I am unsure how
that happen.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/util-linux
ipcop/trunk/lfs/util-linux
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Modified: ipcop/trunk/config/rootfiles/common/util-linux
===================================================================
--- ipcop/trunk/config/rootfiles/common/util-linux 2012-11-18 13:33:35 UTC
(rev 6852)
+++ ipcop/trunk/config/rootfiles/common/util-linux 2012-11-18 14:03:03 UTC
(rev 6853)
@@ -5,6 +5,7 @@
bin/mount
bin/mountpoint
bin/umount
+#bin/wdctl
lib/libblkid.so.1
lib/libblkid.so.1.1.0
lib/libmount.so.1
@@ -38,12 +39,12 @@
#sbin/switch_root
#sbin/wipefs
#usr/bin/cal
-#usr/bin/chkdupexe
#usr/bin/col
#usr/bin/colcrt
#usr/bin/colrm
#usr/bin/column
#usr/bin/cytune
+#usr/bin/eject
#usr/bin/fallocate
#usr/bin/flock
usr/bin/getopt
@@ -58,6 +59,7 @@
usr/bin/logger
#usr/bin/look
#usr/bin/lscpu
+#usr/bin/lslocks
#usr/bin/mcookie
#usr/bin/namei
usr/bin/pg
@@ -73,6 +75,7 @@
#usr/bin/tailf
#usr/bin/ul
#usr/bin/unshare
+#usr/bin/utmpdump
#usr/bin/uuidgen
#usr/bin/wall
#usr/bin/whereis
@@ -97,6 +100,7 @@
#usr/sbin/ldattach
#usr/sbin/partx
#usr/sbin/readprofile
+#usr/sbin/resizepart
#usr/sbin/rtcwake
#usr/sbin/tunelp
#usr/sbin/uuidd
@@ -104,12 +108,12 @@
#usr/share/getopt/getopt-parse.bash
#usr/share/getopt/getopt-parse.tcsh
#usr/share/man/man1/cal.1
-#usr/share/man/man1/chkdupexe.1
#usr/share/man/man1/col.1
#usr/share/man/man1/colcrt.1
#usr/share/man/man1/colrm.1
#usr/share/man/man1/column.1
#usr/share/man/man1/dmesg.1
+#usr/share/man/man1/eject.1
#usr/share/man/man1/fallocate.1
#usr/share/man/man1/flock.1
#usr/share/man/man1/getopt.1
@@ -136,6 +140,7 @@
#usr/share/man/man1/tailf.1
#usr/share/man/man1/ul.1
#usr/share/man/man1/unshare.1
+#usr/share/man/man1/utmpdump.1
#usr/share/man/man1/uuidgen.1
#usr/share/man/man1/wall.1
#usr/share/man/man1/whereis.1
@@ -178,6 +183,7 @@
#usr/share/man/man8/linux64.8
#usr/share/man/man8/losetup.8
#usr/share/man/man8/lsblk.8
+#usr/share/man/man8/lslocks.8
#usr/share/man/man8/mkfs.8
#usr/share/man/man8/mkfs.bfs.8
#usr/share/man/man8/mkfs.minix.8
@@ -187,6 +193,7 @@
#usr/share/man/man8/pivot_root.8
#usr/share/man/man8/raw.8
#usr/share/man/man8/readprofile.8
+#usr/share/man/man8/resizepart.8
#usr/share/man/man8/rtcwake.8
#usr/share/man/man8/setarch.8
#usr/share/man/man8/sfdisk.8
@@ -197,6 +204,7 @@
#usr/share/man/man8/tunelp.8
#usr/share/man/man8/umount.8
#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
Modified: ipcop/trunk/lfs/util-linux
===================================================================
--- ipcop/trunk/lfs/util-linux 2012-11-18 13:33:35 UTC (rev 6852)
+++ ipcop/trunk/lfs/util-linux 2012-11-18 14:03:03 UTC (rev 6853)
@@ -33,13 +33,13 @@
include Config
PKG_NAME = util-linux
-VER = 2.21.2
+VER = 2.22.1
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
DL_FILE = $(THISAPP).tar.xz
-DL_FROM = $(URL_KERNEL)/linux/utils/util-linux/v2.21
+DL_FROM = $(URL_KERNEL)/linux/utils/util-linux/v2.22
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 54ba880f1d66782c2287ee2c898520e9
+$(DL_FILE)_MD5 = 730cf9932531ed09b53a04ca30fcb4c9
install : $(TARGET)
@@ -81,46 +81,75 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
+ # Fix to skip tests using bc, accepted upstream, remove after 2.22.1
+ cd $(DIR_APP) && sed -i 's/\. \$$TS_SELF/type bc \&>\/dev\/null ||
ts_skip "cannot find bc command"\n&/' tests/ts/ipcs/limits{,2}
ifeq "$(STAGE)" "toolchain"
- # Just try to build only what is required here : mount, arch (for
linux32), libblkid, libuuid
+ # Just try to build only what is required here : mount, setarch (for
linux32), libblkid, libuuid
+ # --with-systemdsystemunitdir=no avoid pkg-config not found
cd $(DIR_APP) && ./configure --prefix=/$(TOOLS_DIR) \
+ --localstatedir=/var/run \
--disable-static \
--disable-nls \
--enable-mount \
--disable-agetty \
--disable-cramfs \
+ --disable-eject \
--disable-fallocate \
--disable-fsck \
--disable-kill \
--disable-last \
- --disable-login-utils \
+ --disable-login \
+ --disable-losetup \
--disable-mesg \
+ --disable-mountpoint \
--disable-partx \
+ --disable-pivot_root \
--disable-raw \
--disable-rename \
--disable-reset \
--disable-schedutils \
+ --disable-su \
+ --disable-sulogin \
+ --disable-switch_root \
--disable-unshare \
+ --disable-utmpdump \
+ --disable-uuidd \
--disable-wall \
--disable-write \
--disable-makeinstall-chown \
+ --with-systemdsystemunitdir=no
cd $(DIR_APP) && make -j $(PARALLELISM)
cd $(DIR_APP) && make -j $(PARALLELISM) install
endif
ifeq "$(STAGE)" "base"
- cd $(DIR_APP) && sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g'
hwclock/hwclock.c
- cd $(DIR_APP) && mkdir -pv /var/lib/hwclock
- cd $(DIR_APP) && ./configure --disable-static --disable-nls
--disable-cramfs --disable-schedutils
+ 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
+ # This issue disappear on 2.22
# 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'
# lscpu.c:446: error 'asm' operand has impossible constraints
- # Testing is prone to error, CCACHE_RECACHE= is required to avoid
ancient cache hit
- cd $(DIR_APP) && make -j $(PARALLELISM) V=1 CCACHE_CPP2=1
+ # Testing compilation with ccache is prone to error, CCACHE_RECACHE= is
required to avoid ancient cache hit
+ cd $(DIR_APP) && make -j $(PARALLELISM) V=1
+
+ifeq "$(RUNNING_TEST)" "yes"
+ # Run non-root tests first as make check will build the tests programs
+ # To be able to run non-root tests as nobody
+ chown -R nobody $(DIR_APP)
+ -cd $(DIR_APP) && su nobody -s /bin/bash -c "PATH=$(PATH) make -j 1
check" &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ # For as-root tests, not yet ready, modprobe is not yet build, some
tests use hardcode loop number
+ # To run the tests for one component (ipcs here), use ./tests/run.sh
ipcs
+ #-cd $(DIR_APP) && ./tests/run.sh >>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log 2>&1
+endif
+ # Hide 46 of 48 libtool warnings
+ touch /usr/lib/{libblkid,libmount,libuuid}.la
cd $(DIR_APP) && make -j $(PARALLELISM) install
+ rm /usr/lib/{libblkid,libmount,libuuid}.la
ifeq "$(MACHINE)" "sparc"
# cfdisk and sfdisk don't exist on sparc
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-11-18 13:33:35 UTC
(rev 6852)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-11-18 14:03:03 UTC
(rev 6853)
@@ -749,7 +749,7 @@
/usr/bin/lsusb
/usr/share/usb.ids.gz
##
-## util-linux-2.21.2
+## util-linux-2.22.1
/bin/dmesg
/bin/more
/bin/mount
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-11-18 13:33:35 UTC (rev
6852)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-11-18 14:03:03 UTC (rev
6853)
@@ -20,7 +20,7 @@
parted to 3.1, pciutils to 3.1.10, pcre to 8.30, pixman to 0.24.4,
procps to 3.3.4, psmisc to 22.20,
rsyslog to 5.8.12, shadow to 4.1.5.1, sqlite to 3.7.13,
tcpdump to 4.3.0, traceroute to 2.0.18,
- usb-modeswitch to 1.2.4, usb-modeswitch-data to 20120815, usbutils
to 006, util-linux to 2.21.2,
+ usb-modeswitch to 1.2.4, usb-modeswitch-data to 20120815, usbutils
to 006, util-linux to 2.22.1,
zlib to 1.2.7, several Perl CPAN modules.
</description>
<previousversion>2.0.6</previousversion>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
