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

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[3746] ipcop/trunk
From:       gespinasse () users ! sourceforge ! net
Date:       2009-10-26 23:31:17
Message-ID: E1N2Z1x-00015p-K0 () c3vjzd1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 3746
          http://ipcop.svn.sourceforge.net/ipcop/?rev=3746&view=rev
Author:   gespinasse
Date:     2009-10-26 23:31:12 +0000 (Mon, 26 Oct 2009)

Log Message:
-----------
Revert the hostname change on httpscert
The error was caused by me recompiling coreutils for some tests
So ensure net-tools is recompiled after coreutils to include always the same hostname \
program.

Modified Paths:
--------------
    ipcop/trunk/lfs/coreutils
    ipcop/trunk/src/scripts/httpscert

Modified: ipcop/trunk/lfs/coreutils
===================================================================
--- ipcop/trunk/lfs/coreutils	2009-10-26 15:12:13 UTC (rev 3745)
+++ ipcop/trunk/lfs/coreutils	2009-10-26 23:31:12 UTC (rev 3746)
@@ -111,9 +111,9 @@
 	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" \
-					 2>&1 >> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+					>> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log 2>&1
 	sed -i '/dummy/d' /etc/group
-	# umount from test script fail for a reason not yet identified
+	# 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 @@ -128,5 +128,6 @@
 	mv -v /usr/bin/{head,sleep,nice} /bin
 endif
 
-	@rm -rf $(DIR_APP)
+	# ensure hostname come from net-tools even if coreutils is recompiled
+	@rm -rf $(DIR_APP) $(DIR_INFO)/03_ipcop/net-tools-*
 	@$(POSTBUILD)

Modified: ipcop/trunk/src/scripts/httpscert
===================================================================
--- ipcop/trunk/src/scripts/httpscert	2009-10-26 15:12:13 UTC (rev 3745)
+++ ipcop/trunk/src/scripts/httpscert	2009-10-26 23:31:12 UTC (rev 3746)
@@ -4,7 +4,7 @@
 # new : generate new certificate
 # read: read issuer in certificate and verify if it is the same as hostname
 
-HOSTNAME=`/bin/hostname`
+HOSTNAME=`/bin/hostname -f`
 
 # See how we were called.
 case "$1" in


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

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
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]