From: Arne Fitzenreiter Date: Fri, 3 Dec 2010 17:56:37 +0000 (+0100) Subject: Merge commit 'origin/core43' X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=51cac9a1ce8b4baa0a214f7674d8a915a8030560;hp=-c Merge commit 'origin/core43' Conflicts: lfs/openssl make.sh --- 51cac9a1ce8b4baa0a214f7674d8a915a8030560 diff --combined config/rootfiles/oldcore/42/exclude index e69de29bb,01b7a7f2a..01b7a7f2a --- a/config/rootfiles/oldcore/42/exclude +++ b/config/rootfiles/oldcore/42/exclude @@@ -1,0 -1,3 +1,3 @@@ + etc/ssh/ssh_config + etc/ssh/sshd_config + etc/ssl/openssl.cnf diff --combined make.sh index 4d49eaaf3,42a188ac2..979215cfd --- a/make.sh +++ b/make.sh @@@ -24,9 -24,9 +24,9 @@@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.7" # Version number -CORE="43" # Core Level (Filename) +VERSION="2.8test" # Version number - CORE="43" # Core Level (Filename) - PAKFIRE_CORE="42" # Core Level (PAKFIRE) ++CORE="44" # Core Level (Filename) + PAKFIRE_CORE="43" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@@ -37,16 -37,9 +37,16 @@@ KVER=`grep --max-count=1 VER lfs/linux MACHINE=`uname -m` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit -TOOLCHAINVER=3 +TOOLCHAINVER=1 IPFVER="full" # Which versions should be compiled? (full|devel) +BUILDMACHINE=$MACHINE + if [ "$MACHINE" = "x86_64" ]; then + BUILDMACHINE="i686"; + linux32="linux32"; + fi + + # Debian specific settings if [ ! -e /etc/debian_version ]; then FULLPATH=`which $0` @@@ -234,13 -227,6 +234,13 @@@ prepareenv() } buildtoolchain() { + if [ "$(uname -m)" = "x86_64" ]; then + exiterror "Cannot build toolchain on x86_64. Please use the download." + fi + if [ "$(uname -r | grep ipfire)" ]; then + exiterror "Cannot build toolchain on ipfire. Please use the download." + fi + LOGFILE="$BASEDIR/log/_build.toolchain.log" export LOGFILE ORG_PATH=$PATH @@@ -327,6 -313,7 +327,6 @@@ buildbase() lfsmake2 man lfsmake2 mktemp lfsmake2 module-init-tools - lfsmake2 mtd lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc @@@ -365,28 -352,12 +365,28 @@@ buildipfire() ipfiremake dahdi XEN=1 KMOD=1 ipfiremake cryptodev XEN=1 ipfiremake compat-wireless XEN=1 - ipfiremake r8169 XEN=1 - ipfiremake r8168 XEN=1 - ipfiremake r8101 XEN=1 +# ipfiremake r8169 XEN=1 +# ipfiremake r8168 XEN=1 +# ipfiremake r8101 XEN=1 ipfiremake e1000 XEN=1 ipfiremake e1000e XEN=1 ipfiremake igb XEN=1 + ipfiremake linux PAE=1 + ipfiremake kqemu PAE=1 + ipfiremake kvm-kmod PAE=1 + ipfiremake v4l-dvb PAE=1 + ipfiremake madwifi PAE=1 + ipfiremake alsa PAE=1 KMOD=1 + ipfiremake mISDN PAE=1 + ipfiremake dahdi PAE=1 KMOD=1 + ipfiremake cryptodev PAE=1 + ipfiremake compat-wireless PAE=1 +# ipfiremake r8169 PAE=1 +# ipfiremake r8168 PAE=1 +# ipfiremake r8101 PAE=1 + ipfiremake e1000 PAE=1 + ipfiremake e1000e PAE=1 + ipfiremake igb PAE=1 ipfiremake linux ipfiremake kqemu ipfiremake kvm-kmod @@@ -397,19 -368,18 +397,19 @@@ ipfiremake dahdi KMOD=1 ipfiremake cryptodev ipfiremake compat-wireless - ipfiremake r8169 - ipfiremake r8168 - ipfiremake r8101 +# ipfiremake r8169 +# ipfiremake r8168 +# ipfiremake r8101 ipfiremake e1000 ipfiremake e1000e ipfiremake igb ipfiremake pkg-config ipfiremake linux-atm ipfiremake cpio - ipfiremake klibc - ipfiremake mkinitcpio - ipfiremake udev KLIBC=1 + + installmake strip + + ipfiremake dracut ipfiremake expat ipfiremake gdbm ipfiremake gmp @@@ -417,7 -387,6 +417,7 @@@ ipfiremake openssl ipfiremake curl ipfiremake python + ipfiremake fireinfo ipfiremake libnet ipfiremake libnl ipfiremake libidn @@@ -431,8 -400,6 +431,8 @@@ ipfiremake pcre ipfiremake slang ipfiremake newt + ipfiremake attr + ipfiremake acl ipfiremake libcap ipfiremake pciutils ipfiremake usbutils @@@ -451,6 -418,7 +451,6 @@@ ipfiremake cdrtools ipfiremake dnsmasq ipfiremake dosfstools - ipfiremake squashfstools ipfiremake reiserfsprogs ipfiremake xfsprogs ipfiremake sysfsutils @@@ -673,17 -641,13 +673,17 @@@ ipfiremake asterisk ipfiremake lcr ipfiremake usb_modeswitch + ipfiremake usb_modeswitch_data ipfiremake zerofree ipfiremake mdadm ipfiremake eject ipfiremake pound ipfiremake minicom ipfiremake ddrescue + ipfiremake tcl ipfiremake imspector + ipfiremake miniupnpd + ipfiremake client175 echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@@ -707,10 -671,34 +707,10 @@@ buildinstaller() ipfiremake as86 ipfiremake mbr ipfiremake memtest - installmake linux-libc-header - installmake binutils - ipfiremake uClibc PASS=1 - ipfiremake gcc INST=1 - installmake uClibc PASS=2 - installmake gcc INST=2 - installmake uClibc PASS=3 - installmake busybox - installmake udev - installmake slang - installmake newt - installmake gettext - installmake kbd - installmake popt - installmake sysvinit - installmake misc-progs - installmake reiserfsprogs - installmake sysfsutils - installmake util-linux - installmake pciutils - installmake zlib - installmake mtd - installmake wget - installmake hwdata - installmake kudzu - installmake pcmciautils - installmake installer - installmake initrd + ipfiremake installer + cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/ + installmake strip + ipfiremake initrd } buildpackages() { @@@ -718,6 -706,7 +718,6 @@@ export LOGFILE echo "... see detailed log in _build.*.log files" >> $LOGFILE - installmake strip # Generating list of packages used echo -n "Generating packages list from logs" | tee -a $LOGFILE @@@ -800,6 -789,7 +800,6 @@@ ipfirepackages() case "$1" in build) clear - BUILDMACHINE=`uname -m` PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1` #only restore on a clean disk if [ ! -f log/cleanup-toolchain-2-tools ]; then @@@ -927,6 -917,7 +927,6 @@@ toolchain prepareenv beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`" buildtoolchain - BUILDMACHINE=`uname -m` echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \ @@@ -938,6 -929,7 +938,6 @@@ stdumount ;; gettoolchain) - BUILDMACHINE=`uname -m` # arbitrary name to be updated in case of new toolchain package upload PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then