'[Ipcop-svn] SF.net SVN: ipcop:[4187] ipcop/trunk'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[4187] ipcop/trunk
From:       gespinasse () users ! sourceforge ! net
Date:       2010-01-30 8:21:43
Message-ID: E1Nb8aN-0000Hq-D1 () 74yxhf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 4187
          http://ipcop.svn.sourceforge.net/ipcop/?rev=4187&view=rev
Author:   gespinasse
Date:     2010-01-30 08:21:40 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Upgrade to coreutils-8.4
No test should fail

Once a new toolchain is published, we should remove hostname compilation on base \
stage. That's more cleaner to have only hostname compiled once (in net-tools) in the \
final stage

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/coreutils
    ipcop/trunk/lfs/coreutils

Modified: ipcop/trunk/config/rootfiles/common/coreutils
===================================================================
--- ipcop/trunk/config/rootfiles/common/coreutils	2010-01-30 08:02:11 UTC (rev 4186)
+++ ipcop/trunk/config/rootfiles/common/coreutils	2010-01-30 08:21:40 UTC (rev 4187)
@@ -56,6 +56,7 @@
 usr/bin/mktemp
 #usr/bin/nl
 usr/bin/nohup
+#usr/bin/nproc
 #usr/bin/od
 usr/bin/paste
 #usr/bin/pathchk
@@ -126,14 +127,17 @@
 #usr/share/locale/el/LC_MESSAGES/coreutils.mo
 #usr/share/locale/el/LC_TIME
 #usr/share/locale/el/LC_TIME/coreutils.mo
+#usr/share/locale/en
+#usr/share/locale/en/LC_MESSAGES
+#usr/share/locale/en/LC_MESSAGES/coreutils.mo
+#usr/share/locale/en/LC_TIME
+#usr/share/locale/en/LC_TIME/coreutils.mo
 #usr/share/locale/es/LC_MESSAGES/coreutils.mo
 #usr/share/locale/es/LC_TIME
 #usr/share/locale/es/LC_TIME/coreutils.mo
 #usr/share/locale/et/LC_MESSAGES/coreutils.mo
 #usr/share/locale/et/LC_TIME
 #usr/share/locale/et/LC_TIME/coreutils.mo
-#usr/share/locale/eu
-#usr/share/locale/eu/LC_MESSAGES
 #usr/share/locale/eu/LC_MESSAGES/coreutils.mo
 #usr/share/locale/eu/LC_TIME
 #usr/share/locale/eu/LC_TIME/coreutils.mo
@@ -164,6 +168,11 @@
 #usr/share/locale/ko/LC_MESSAGES/coreutils.mo
 #usr/share/locale/ko/LC_TIME
 #usr/share/locale/ko/LC_TIME/coreutils.mo
+#usr/share/locale/lg
+#usr/share/locale/lg/LC_MESSAGES
+#usr/share/locale/lg/LC_MESSAGES/coreutils.mo
+#usr/share/locale/lg/LC_TIME
+#usr/share/locale/lg/LC_TIME/coreutils.mo
 #usr/share/locale/lt
 #usr/share/locale/lt/LC_MESSAGES
 #usr/share/locale/lt/LC_MESSAGES/coreutils.mo
@@ -183,8 +192,6 @@
 #usr/share/locale/pl/LC_MESSAGES/coreutils.mo
 #usr/share/locale/pl/LC_TIME
 #usr/share/locale/pl/LC_TIME/coreutils.mo
-#usr/share/locale/pt
-#usr/share/locale/pt/LC_MESSAGES
 #usr/share/locale/pt/LC_MESSAGES/coreutils.mo
 #usr/share/locale/pt/LC_TIME
 #usr/share/locale/pt/LC_TIME/coreutils.mo
@@ -266,6 +273,7 @@
 #usr/share/man/man1/nice.1
 #usr/share/man/man1/nl.1
 #usr/share/man/man1/nohup.1
+#usr/share/man/man1/nproc.1
 #usr/share/man/man1/od.1
 #usr/share/man/man1/paste.1
 #usr/share/man/man1/pathchk.1
@@ -310,7 +318,6 @@
 #usr/share/man/man1/unexpand.1
 #usr/share/man/man1/uniq.1
 #usr/share/man/man1/unlink.1
-#usr/share/man/man1/uptime.1
 #usr/share/man/man1/users.1
 #usr/share/man/man1/vdir.1
 #usr/share/man/man1/wc.1

Modified: ipcop/trunk/lfs/coreutils
===================================================================
--- ipcop/trunk/lfs/coreutils	2010-01-30 08:02:11 UTC (rev 4186)
+++ ipcop/trunk/lfs/coreutils	2010-01-30 08:21:40 UTC (rev 4187)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = coreutils
-VER        = 7.6
+VER        = 8.4
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -43,7 +43,7 @@
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
-PATCH1     = $(THISAPP)-uname-1.patch
+PATCH1     = $(PKG_NAME)-7.6-uname-1.patch
 
 ###############################################################################
 # Top-level Rules
@@ -55,7 +55,7 @@
 # LFS uname patch does not support more than x86, so use CLFS patch
 $(PATCH1)			= http://svn.cross-lfs.org/svn/repos/patches/$(PKG_NAME)/$(PATCH1)
 
-$(DL_FILE)_MD5			= 3d82f979229365f880da750642e67cf3
+$(DL_FILE)_MD5			= 56f549854d723d9dcebb77919019df55
 $(PATCH1)_MD5			= 56ad75fedac896082d96ab0bd5e6b32c
 
 install : $(TARGET)
@@ -88,7 +88,9 @@
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
 ifeq "$(STAGE)" "toolchain"
-	cd $(DIR_APP) && ./configure --prefix=/$(TOOLS_DIR)
+	# hostname is used on base stage by coreutils configure and perl base tests
+	cd $(DIR_APP) && ./configure --prefix=/$(TOOLS_DIR) \
+				--enable-install-program=hostname
 	cd $(DIR_APP) && make -j $(PARALLELISM)
 	cd $(DIR_APP) && make install
 	# su is not installed (because suid root)
@@ -98,30 +100,28 @@
 
 ifeq "$(STAGE)" "base"
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(PATCH1)
-	# hostname is used by perl tests a bit later
+	# remove hostname requirement once a toolchain newer than 1.9.8 is published
+	# that's much cleaner to have hostname compiled only once in net-tools
 	cd $(DIR_APP) && ./configure	--prefix=/usr \
 					--enable-install-program=hostname \
 					--enable-no-install-program=kill,uptime
-
 	cd $(DIR_APP) && make -j $(PARALLELISM)
-
 ifeq "$(RUNNING_TEST)" "yes"
-	-cd $(DIR_APP) && make NON_ROOT_USERNAME=nobody check-root &> \
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log +	# no test should fail there
+	cd $(DIR_APP) && make NON_ROOT_USERNAME=nobody check-root &> \
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log  # temporary during tests
 	echo "dummy:x:1000:nobody" >> /etc/group
-	cd $(DIR_APP) && chown -Rv nobody config.log {gnulib-tests,lib,src}/.deps  \
                >>/dev/null
-	-cd $(DIR_APP) && su-tools nobody -s /bin/bash -c "make RUN_EXPENSIVE_TESTS=yes \
check" \ +	# to be able to run non-root tests as nobody
+	chown -Rv nobody $(DIR_APP)
+	cd $(DIR_APP) && su-tools nobody -s /bin/bash -c "make RUN_EXPENSIVE_TESTS=yes \
check" \  >> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log 2>&1
-	sed -i '/dummy/d' /etc/group
-	# umount from test script fail because /etc/mtab is symlinked to /proc/mount
-	# test does that
-	# mount --bind /tmp/tmp22319 a/b
-	# and it fail on umount /tmp/tmp22319 because our chroot 'think' a/b is mounted, \
                not /tmp/tmp22319
-	umount $(DIR_APP)/tests/cu-one-file-system.*/a/b
 endif
+	# need to be outside ifeq/endif in case a test fail and you recompile without test
+	-sed -i '/dummy/d' /etc/group
 
 	cd $(DIR_APP) && make install
 	mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin
+	# remove hostname once compilation is shifted to toolchain stage
 	mv -v /usr/bin/{false,hostname,ln,ls,mkdir,mknod,mv,pwd,readlink,rm} /bin
 	mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin
 	mv -v /usr/bin/chroot /usr/sbin
@@ -129,5 +129,6 @@
 endif
 
 	# ensure hostname come from net-tools even if coreutils is recompiled
+	# remove when toolchain is updated to include hostname
 	@rm -rf $(DIR_APP) $(DIR_INFO)/03_ipcop/net-tools-*
 	@$(POSTBUILD)


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic