Revision: 6038
http://ipcop.svn.sourceforge.net/ipcop/?rev=6038&view=rev
Author: gespinasse
Date: 2011-11-06 19:48:24 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Fix krb5 test suite by setting a proper hosts configuration (with FQDN first)
This is made by a script that run at each build to add the value to hosts and
remove them before creating the iso.
Once that is made, we have to remove the hack on hostname made on perl and
libwww-perl
Add -fno-strict-aliasing to CFLAGS to fix the strict-aliasing warnings
Remove --enable-dynamic configure option.
Option has been changed to more standard --enable-shared and as selected by
default, is no more needed.
Some krb5 tests may left files on /var/tmp (maybe only when they were failing),
remove them.
krb5 tests, if failing will not break the build.
I am unsure this is the right policy to break the entire build when a test
fail, some tests suite have random errors that make loose time for mostly
nothing (perl, make).
Modified Paths:
--------------
ipcop/trunk/lfs/krb5
ipcop/trunk/lfs/libwww-perl
ipcop/trunk/lfs/perl
ipcop/trunk/make.sh
Added Paths:
-----------
ipcop/trunk/lfs/fix-up
Added: ipcop/trunk/lfs/fix-up
===================================================================
--- ipcop/trunk/lfs/fix-up (rev 0)
+++ ipcop/trunk/lfs/fix-up 2011-11-06 19:48:24 UTC (rev 6038)
@@ -0,0 +1,67 @@
+###############################################################################
+# This file is part of the IPCop Firewall. #
+# #
+# IPCop is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPCop is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPCop; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Makefiles are based on LFSMake, which is #
+# Copyright (C) 2002 Rod Roard <r...@sunsetsystems.com>
#
+# #
+# Modifications by: #
+# ??-12-2003 Mark Wormgoor < m...@wormgoor.com> #
+# - Modified Makefile for IPCop build #
+# #
+# $Id$
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+PKG_NAME = fix-up
+HOST_ARCH = all
+OTHER_SRC = no
+
+THISAPP = $(PKG_NAME)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+check :
+
+download :
+
+md5 :
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+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
+
+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
+ sed -i "s/localhost/localhost\n127.0.1.1\t$$(hostname).dummydomain
$$(hostname)/" /etc/hosts
+endif
Property changes on: ipcop/trunk/lfs/fix-up
___________________________________________________________________
Added: svn:keywords
+ Id Revision
Modified: ipcop/trunk/lfs/krb5
===================================================================
--- ipcop/trunk/lfs/krb5 2011-11-06 19:25:14 UTC (rev 6037)
+++ ipcop/trunk/lfs/krb5 2011-11-06 19:48:24 UTC (rev 6038)
@@ -43,6 +43,8 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+CFLAGS += -fno-strict-aliasing
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -83,12 +85,12 @@
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC) && tar zxf $(THISAPP).tar.gz && rm $(THISAPP).tar.gz*
+ # -no-fatal-warnings is at least for the various warning: no previous
prototype for ...
cd $(DIR_APP)/src && ./configure \
CPPFLAGS="-I/usr/include/et -I/usr/include/ss" \
LDFLAGS="-no-fatal-warnings" \
--prefix=/usr \
--localstatedir=/var/lib \
- --enable-dynamic \
--with-tcl=/$(TOOLS_DIR) \
--with-system-et \
--with-system-ss
@@ -96,13 +98,13 @@
cd $(DIR_APP)/src && make -j $(PARALLELISM)
ifeq "$(RUNNING_TEST)" "yes"
- # FIXME krb5 need a better hostname configuration on /etc/hosts with
same FQDN as outside chroot like this
- # 127.0.0.1 localhost
- # 127.0.1.1 myshostname.mydomain myhostname
-cd $(DIR_APP)/src && make -k check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
cd $(DIR_APP)/src && make install
+ # Some files may remain after tests
+ @rm -rf /var/tmp/*
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/lfs/libwww-perl
===================================================================
--- ipcop/trunk/lfs/libwww-perl 2011-11-06 19:25:14 UTC (rev 6037)
+++ ipcop/trunk/lfs/libwww-perl 2011-11-06 19:48:24 UTC (rev 6038)
@@ -82,12 +82,9 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- # this sed silent this build message "Can't connect: IO::Socket::INET:
Bad hostname"
- sed -i "s/localhost/localhost $$(hostname)/" /etc/hosts
cd $(DIR_APP) && perl Makefile.PL -n
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
- sed -i "s/localhost.*/localhost/" /etc/hosts # no more needed
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/lfs/perl
===================================================================
--- ipcop/trunk/lfs/perl 2011-11-06 19:25:14 UTC (rev 6037)
+++ ipcop/trunk/lfs/perl 2011-11-06 19:48:24 UTC (rev 6038)
@@ -147,11 +147,9 @@
cd $(DIR_APP) && make install
ifeq "$(RUNNING_TEST)" "yes"
- # needed to pass lib/Net/t/hostname test
- sed -i "s/localhost/localhost $$(hostname)/" /etc/hosts
+ # hostname configuration needed to pass lib/Net/t/hostname test is made
on lfs/fix-up
# op/rand.t may fail 0.1 % of the time : sorry, restart
cd $(DIR_APP) && make -j 1 test &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
- sed -i "s/localhost.*/localhost/" /etc/hosts # no more needed after the
tests
endif
endif
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2011-11-06 19:25:14 UTC (rev 6037)
+++ ipcop/trunk/make.sh 2011-11-06 19:48:24 UTC (rev 6038)
@@ -1660,6 +1660,7 @@
update-gcc-hash "/${TOOLS_DIR}/bin/${TARGET_2}-gcc"
chroot_make stage2
+ chroot_make fix-up
chroot_make linux-headers
chroot_make glibc
chroot_make tzdata
@@ -1918,6 +1919,7 @@
${MKDIR} ${BASEDIR}/log_${MACHINE}/05_packages
chroot_make stage5
+ chroot_make fix-up
chroot_make installer
chroot_make initramfs
if [ x"${SKIP_FLOPPY_IMAGES}" != x"yes" ]; then
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
