Revision: 6776
http://ipcop.svn.sourceforge.net/ipcop/?rev=6776&view=rev
Author: gespinasse
Date: 2012-09-01 17:45:33 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Upgrade coreutils to 8.19
This fix some sort -u issues
As su has been removed in coreutils, follow LFS and compile shadow before
coreutils to supply another su needed for coreutils tests
As /etc/mtab is not a symlink and mostly only this configuration is tested, one
df test fail and another is skipped
Change the tests so they work in this configuration. I could have changed
/etc/mtab to a symlink, probably we should in the futur.
(The coreutils test that was failing to umount in the 8.0 era with /etc/mtab as
a symlink has been removed)
Change coreutils tests not to break the build, this mostly only loose time when
pure test issue happen.
Modified Paths:
--------------
ipcop/trunk/lfs/coreutils
ipcop/trunk/make.sh
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Modified: ipcop/trunk/lfs/coreutils
===================================================================
--- ipcop/trunk/lfs/coreutils 2012-08-28 06:34:13 UTC (rev 6775)
+++ ipcop/trunk/lfs/coreutils 2012-09-01 17:45:33 UTC (rev 6776)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = coreutils
-VER = 8.17
+VER = 8.19
HOST_ARCH = all
OTHER_SRC = yes
@@ -50,7 +50,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = bbda656ce8ca2c6903948f9faa204ba3
+$(DL_FILE)_MD5 = 1a01231a2f3ed37c0efc073ccdda9375
install : $(TARGET)
@@ -83,6 +83,10 @@
# Fix a 8.{16,17} test issue
cd $(DIR_APP) && sed -i -e 's/! isatty/isatty/' -e '45i\
|| errno == ENOENT' gnulib-tests/test-getlogin.c
+ # Hack a 8.{18,19} test issues due to /etc/mtab not a symlink, df
parameter should vary
+ # /etc/mtab as symlink is not a panacea as no-mtab-status may fail due
to a mount outside of our chroot
+ cd $(DIR_APP) && sed -i -e "s/ '\.' / /" tests/df/total-unprocessed
+ cd $(DIR_APP) && sed -i -e "s/df ||/df '.' ||/" tests/df/no-mtab-status
ifeq "$(STAGE)" "toolchain"
# hostname is used on base stage by coreutils configure and perl base
tests
@@ -90,8 +94,6 @@
cd $(DIR_APP) && FORCE_UNSAFE_CONFIGURE=1 ./configure
--prefix=/$(TOOLS_DIR) --disable-nls --enable-install-program=hostname
cd $(DIR_APP) && make -j $(PARALLELISM)
cd $(DIR_APP) && make install-exec
- # su is not installed (because suid root)
- cd $(DIR_APP) && cp src/su /$(TOOLS_DIR)/bin
endif
ifeq "$(STAGE)" "base"
@@ -108,13 +110,12 @@
# To be able to run rm/fail-eperm test
touch /tmp/root-owned
- # No test should fail there
- cd $(DIR_APP) && make -j 1 NON_ROOT_USERNAME=nobody check-root &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ -cd $(DIR_APP) && make -j 1 NON_ROOT_USERNAME=nobody check-root &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
# Temporary during tests
echo "dummy:x:1000:nobody" >> /etc/group
# To be able to run non-root tests as nobody
chown -R nobody $(DIR_APP)
- cd $(DIR_APP) && su nobody -s /bin/bash -c "make -j 1 -k
RUN_EXPENSIVE_TESTS=yes check" \
+ -cd $(DIR_APP) && su nobody -s /bin/bash -c "PATH=$(PATH) make -j 1 -k
RUN_EXPENSIVE_TESTS=yes check" \
>>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log 2>&1
endif
# need to be outside ifeq/endif in case a test fail and you recompile
without test
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2012-08-28 06:34:13 UTC (rev 6775)
+++ ipcop/trunk/make.sh 2012-09-01 17:45:33 UTC (rev 6776)
@@ -1693,6 +1693,7 @@
chroot_make util-linux
chroot_make psmisc
chroot_make e2fsprogs
+ chroot_make shadow # provide su for coreutils tests
chroot_make coreutils
chroot_make iana-etc
chroot_make m4
@@ -1730,7 +1731,6 @@
#chroot_make kmod
chroot_make patch
chroot_make rsyslog
- chroot_make shadow
chroot_make strace # compile early for debug purpose
chroot_make sysvinit
chroot_make tar
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-08-28 06:34:13 UTC
(rev 6775)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-09-01 17:45:33 UTC
(rev 6776)
@@ -124,7 +124,7 @@
/usr/sbin/conntrack
/usr/sbin/nfct
##
-## coreutils-8.17
+## coreutils-8.19
/bin/cat
/bin/chgrp
/bin/chmod
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-08-28 06:34:13 UTC (rev
6775)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-09-01 17:45:33 UTC (rev
6776)
@@ -7,7 +7,7 @@
cairo recompiled with -O3, isdn4k-utils with -Os
-fno-strict-aliasing<br />
Add URL filter, xz-5.0.4<br />
Language updates.<br />
- Upgrade acpid to 2.0.16, arping to 2.12, bash to 4.2.36, bind to
9.8.3-P2, conntrack-tools to 1.2.2, coreutils to 8.17,
+ Upgrade acpid to 2.0.16, arping to 2.12, bash to 4.2.36, bind to
9.8.3-P2, conntrack-tools to 1.2.2, coreutils to 8.19,
dhcpcd to 5.5.6, dnsmasq to 2.63,
e2fsprogs to 1.42.5, ethtool to 3.2, expat to 2.1.0, freetype to
2.4.10, fontconfig to 2.9, gawk to 4.0.1, glib to 2.30.3,
gmp to 5.0.5, gnupg to 1.4.12, grep to 2.14, gzip to 1.5,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
