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

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[4884] ipcop/trunk/make.sh
From:       gespinasse () users ! sourceforge ! net
Date:       2010-08-27 17:37:46
Message-ID: E1Op2s6-00058B-Sx () sfp-svn-2 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 4884
          http://ipcop.svn.sourceforge.net/ipcop/?rev=4884&view=rev
Author:   gespinasse
Date:     2010-08-27 17:37:46 +0000 (Fri, 27 Aug 2010)

Log Message:
-----------
Mount/umount /dev/shm like LFS do.
I haven't seen a difference in the tests results.

Fix patch 2.6.1 detection as GNU was added at the left

Fix glibc.a detection on x86_64 host that use /usr/lib64

Modified Paths:
--------------
    ipcop/trunk/make.sh

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh	2010-08-27 16:29:07 UTC (rev 4883)
+++ ipcop/trunk/make.sh	2010-08-27 17:37:46 UTC (rev 4884)
@@ -727,8 +727,9 @@
 		${SUDO} ${LOSETUP} -d ${DEVICE} > /dev/null 2>&1
 	done
 
-	# Umount /dev/pts before /dev
+	# Umount /dev/pts and /dev/shm before /dev
 	${MOUNT} | grep -q ${LFS}/dev/pts && ${SUDO} ${UMOUNT} ${LFS}/dev/pts
+	${MOUNT} | grep -q ${LFS}/dev/shm && ${SUDO} ${UMOUNT} ${LFS}/dev/shm
 
 	# Now find and unmount any of the bound filesystems we need for the build
 	for i in `${MOUNT} | grep ${BASEDIR} | sed 's/^.* on \(.[^ ]*\).*$/\1/'`
@@ -1020,6 +1021,7 @@
 	${SUDO} ${MKDIR} ${BASEDIR}/build_${MACHINE}/${INSTALLER_DIR}
 	${SUDO} ${MKDIR} ${LFS}/${TOOLS_DIR}
 	${SUDO} ${MKDIR} ${LFS}/dev/pts
+	${SUDO} ${MKDIR} ${LFS}/dev/shm
 	${SUDO} ${MKDIR} ${LFS}/proc
 	${SUDO} ${MKDIR} ${LFS}/sys
 	${SUDO} ${MKDIR} ${LFS}/usr/src/{cache,ccache,config,doc,files_${MACHINE},html,langs,lfs,log_${MACHINE},src,test_${MACHINE},updates}
 @@ -1041,8 +1043,7 @@
 	#################################################################################
 	${SUDO} ${BIND} /dev							${LFS}/dev
 	${SUDO} ${BIND} /dev/pts						${LFS}/dev/pts
-	# contrary to LFS, dev/shm is not mounted, should we?
-	# but we can't mount --bind if not mounted on the host
+	${SUDO} ${BIND} /dev/shm						${LFS}/dev/shm
 	${SUDO} ${BIND} /proc							${LFS}/proc
 	${SUDO} ${BIND} /sys							${LFS}/sys
 	${SUDO} ${BIND} ${BASEDIR}/cache					${LFS}/usr/src/cache
@@ -1205,7 +1206,7 @@
 	SUCCESS=$[ ${SUCCESS} - ${RESULT} ]
 	report_result ${RESULT}
 	echo -n "Checking static /usr/lib/glibc.a"
-	if [ -f /usr/lib/libc.a ]; then
+	if [ -f /usr/lib/libc.a -o -f /usr/lib64/libc.a ]; then
 		beautify message DONE
 	else
 		beautify message FAIL
@@ -1250,7 +1251,7 @@
 	fi
 
 	if bash +h -c "type patch" > /dev/null 2>&1; then
-		check_version "GNU patch" ${REQUIRED_PATCH} `patch --version | head -n1 | cut -d" \
" -f2` +		check_version "GNU patch" ${REQUIRED_PATCH} `patch --version | head -n1 | \
sed "s,.* \([0-9]*\.[0-9][^ ]*\).*$,\1,g"`  RESULT=${?}
 		SUCCESS=$[ ${SUCCESS} - ${RESULT} ]
 		report_result ${RESULT}


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

------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users 
worldwide. Take advantage of special opportunities to increase revenue and 
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d
_______________________________________________
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]