Revision: 6093
http://ipcop.svn.sourceforge.net/ipcop/?rev=6093&view=rev
Author: gespinasse
Date: 2011-11-16 23:11:22 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
Clean up fix-up from some test lines
Add IPv6 localhost configuration.
That solve some krb5 ipv6 'Temporary failure in name resolution' (not reported
as error)
Add fix-up run on shell exit. That mostly only help testing fixup logic as no
iso is build there.
Simplify shell exit by removing the exiterror when last command had an error.
I find no interest to see an error already know when that happen.
Modified Paths:
--------------
ipcop/trunk/lfs/fix-up
ipcop/trunk/make.sh
Modified: ipcop/trunk/lfs/fix-up
===================================================================
--- ipcop/trunk/lfs/fix-up 2011-11-16 18:40:03 UTC (rev 6092)
+++ ipcop/trunk/lfs/fix-up 2011-11-16 23:11:22 UTC (rev 6093)
@@ -55,13 +55,17 @@
install :
# Reset settings made just for build (at every stage as easier to add
later from a know content)
- # Remove fqdn localhost alias entire line
- sed -i -e 's/localhost.*/localhost/' -e '/^127.0.1.1.*$$/d' /etc/hosts
- #sed -i -e '/^127.0.1.1.*$$/d' /etc/hosts
+ # Remove fqdn localhost alias entire line and full IPv6 localhost
+ sed -i -e 's/localhost.*/localhost/' -e '/^127.0.1.1.*$$/d' -e
'/^::1.*\|fe00::0.*\|ff00::0.*\|ff02::.*/d' /etc/hosts
ifeq "$(STAGE)" "base"
# Initialize settings needed during build, but not include in .iso
- # set hostname for perl, libwww-perl and add hostname fqdn for
localhost (krb5)
- #sed -i "s/localhost.*/localhost
$$(hostname)\n127.0.1.1\t$$(hostname).maison $$(hostname)/" /etc/hosts
+ # Set hostname for perl, libwww-perl. Add hostname fqdn for localhost
and IPv6 localhost (krb5)
sed -i "s/localhost/localhost\n127.0.1.1\t$$(hostname).dummydomain
$$(hostname)/" /etc/hosts
+ echo '::1 localhost ipv6-localhost ipv6-loopback'
>>/etc/hosts
+ echo 'fe00::0 ipv6-localnet' >>/etc/hosts
+ echo 'ff00::0 ipv6-mcastprefix' >>/etc/hosts
+ echo 'ff02::1 ipv6-allnodes' >>/etc/hosts
+ echo 'ff02::2 ipv6-allrouters' >>/etc/hosts
+ echo 'ff02::3 ipv6-allhostsf' >>/etc/hosts
endif
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2011-11-16 18:40:03 UTC (rev 6092)
+++ ipcop/trunk/make.sh 2011-11-16 23:11:22 UTC (rev 6093)
@@ -1334,10 +1334,9 @@
echo -ne "Entering ${BOLD}${MACHINE_REAL}${NORMAL} LFS chroot, type
exit to return to host environment\n"
- # By default
- STAGE_ORDER=02
- STAGE=base
-
+ # By default, needed to log stage2 and fix-up
+ STAGE_ORDER=02; STAGE=base
+
# Set CCACHE_COMPILERCHECK
for GCC_AVAILABLE in ${BASEDIR}/build_${MACHINE}/ipcop/usr/bin/gcc
/${TOOLS_DIR}/bin/${TARGET_2}-gcc; do
[ -f ${GCC_AVAILABLE} ] && update-gcc-hash "$GCC_AVAILABLE" &&
break
@@ -1375,11 +1374,9 @@
LOGFILE=`echo ${PREPLOGFILE} | sed "s,${BASEDIR},/usr/src,g"` \
${WRAPPER_32BIT} bash
- if [ ${?} -ne 0 ]; then
- exiterror "chroot error"
- else
- stdumount
- fi
+ STAGE_ORDER=05; STAGE=packages
+ chroot_make fix-up
+ stdumount
} # End of entershell()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
