]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 20 Sep 2012 05:45:00 +0000 (07:45 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 20 Sep 2012 05:45:00 +0000 (07:45 +0200)
Conflicts:
config/rootfiles/core/52/meta
config/rootfiles/core/53/filelists/strongswan
config/rootfiles/core/53/meta
config/rootfiles/core/54/filelists/strongswan
config/rootfiles/core/54/meta
config/rootfiles/core/55/exclude
config/rootfiles/core/55/meta
config/rootfiles/core/56/exclude
config/rootfiles/core/56/meta
config/rootfiles/core/57/exclude
config/rootfiles/core/57/filelists/strongswan
config/rootfiles/core/57/meta
config/rootfiles/core/58/exclude
config/rootfiles/core/58/filelists/strongswan
config/rootfiles/core/58/meta
config/rootfiles/core/59/exclude
config/rootfiles/core/59/filelists/strongswan
config/rootfiles/core/59/meta
config/rootfiles/core/strongswan/exclude
config/rootfiles/core/strongswan/filelists/strongswan
config/rootfiles/core/strongswan/meta
config/rootfiles/oldcore/52/meta
config/rootfiles/oldcore/53/filelists/strongswan
config/rootfiles/oldcore/53/meta
config/rootfiles/oldcore/54/filelists/strongswan
config/rootfiles/oldcore/54/meta
config/rootfiles/oldcore/55/exclude
config/rootfiles/oldcore/55/meta
config/rootfiles/oldcore/56/exclude
config/rootfiles/oldcore/56/meta
config/rootfiles/oldcore/57/exclude
config/rootfiles/oldcore/57/filelists/strongswan
config/rootfiles/oldcore/57/meta
config/rootfiles/oldcore/58/exclude
config/rootfiles/oldcore/58/filelists/strongswan
config/rootfiles/oldcore/58/meta
config/rootfiles/oldcore/59/exclude
config/rootfiles/oldcore/59/filelists/strongswan
config/rootfiles/oldcore/59/meta
lfs/dhcp

1  2 
lfs/dhcp
lfs/inetutils
lfs/minidlna
make.sh

diff --combined lfs/dhcp
index 235e825968d98a2b4f0583f78279fc55f3e06b39,fa26b5cfb7143d04f8b0e5d0149d3fdebe8fcc2d..317eef4ed46369db5cf56b65a953fe1ead2720d5
+++ b/lfs/dhcp
@@@ -1,7 -1,7 +1,7 @@@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
 -# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
 +# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@@ -24,7 -24,7 +24,7 @@@
  
  include Config
  
- VER        = 3.1-ESV-R3
+ VER        = 4.2.2
  
  THISAPP    = dhcp-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@@ -40,7 -40,7 +40,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
- $(DL_FILE)_MD5 = af3d8db60f62664f1d5538b81e406459
+ $(DL_FILE)_MD5 = bb0f0434cd796f76aa7cead391d71f31
  
  install : $(TARGET)
  
@@@ -70,11 -70,59 +70,63 @@@ $(subst %,%_MD5,$(objects)) 
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure
++
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-3.1_linux3.patch
 -      # Has to be enabled after glibc update.
 -      #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-CLOEXEC.patch
++
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-remove-bind.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-errwarn-message.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-options.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-release-by-ifup.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-dhclient-decline-backoff.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-unicast-bootp.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-dhclient-usage.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-default-requested-options.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-xen-checksum.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-manpages.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-paths.patch
 -      #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-missing-ipv6-not-fatal.patch
++      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-CLOEXEC.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-inherit-leases.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-garbage-chars.patch
++      # ???
++      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-missing-ipv6-not-fatal.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-add_timeout_when_NULL.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-64_bit_lease_parse.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-capability.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-logpid.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-UseMulticast.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-sendDecline.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-retransmission.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-rfc3442-classless-static-routes.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-honor-expired.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-noprefixavail.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-sharedlib.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-PPP.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-lpf-ib.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-improved-xid.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-gpxe-cid.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.1-invalid-dhclient-conf.patch
+       # Remove bundled BIND stuff.
+       # (requires newer autoconf)
+       #rm -rfv $(DIR_APP)/bind/bind.tar.gz
+       #cd $(DIR_APP) && autoreconf --verbose --force --install
+       cd $(DIR_APP) && \
+               ./configure \
+                       --prefix=/usr \
+                       --sysconfdir=/etc \
+                       --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
+                       --disable-static \
+                       --enable-paranoia \
+                       --enable-early-chroot \
+                       --disable-dhcpv6
++
        cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make LIBDIR=/usr/lib INCDIR=/usr/include install
+       cd $(DIR_APP) && make install
+       mkdir -pv /var/state/dhcp
        touch /var/state/dhcp/dhcpd.leases
        ln -sf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcpd.conf
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --combined lfs/inetutils
index 87a137eb1f3d01dcec144351c349769578df51c5,c1d51cef12859f63e2d4cef6bc8481391fef145d..468c2af32f5cf7600787da6b5c93f76e20cc1137
@@@ -72,11 -72,10 +72,11 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4_fixes-3.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-daemon_fixes-1.patch
 +      cd $(DIR_APP) && sed -i '/#include/a #include <stdlib.h>' libicmp/icmp_timestamp.c
        cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/sbin \
                                --sysconfdir=/etc --localstatedir=/var \
                                --mandir=/usr/share/man --infodir=/usr/share/info \
-                               --disable-logger --disable-syslogd
+                               --disable-logger --disable-syslogd --disable-telnet --disable-telnetd
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        mv -v /usr/bin/ping /bin
diff --combined lfs/minidlna
index 47fe270bd64c07bd2302181a628904b903d6e0ae,e2c1d21926b9645d0cd525af3105f83946b7342d..26ec3dd0087ed71f7601eb3f06adf88363a847f3
@@@ -32,9 -32,9 +32,9 @@@ DL_FROM    = $(URL_IPFIRE
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = minidlna
- PAK_VER    = 1
+ PAK_VER    = 2
  
- DEPS       = "ffmpeg flac libexif libid3tag libogg"
+ DEPS       = "ffmpeg flac libexif libid3tag libogg sqlite"
  
  ###############################################################################
  # Top-level Rules
@@@ -77,7 -77,6 +77,7 @@@ $(subst %,%_MD5,$(objects)) 
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 +      cd $(DIR_APP) && sed -i '/include/a #include <limits.h>/' metadata.c
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
  
diff --combined make.sh
index 1e08be6d34c77aa4478d838dc2e93c326835921f,576e9970fbfe63e2919e35bf61def997bbe064e4..0e0192c80bc0ddc4a8d9f20c4d81b3277584c2a9
+++ b/make.sh
@@@ -24,7 -24,7 +24,7 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.11"                                                        # Version number
 +VERSION="2.13"                                                        # Version number
  CORE="62"                                                     # Core Level (Filename)
  PAKFIRE_CORE="62"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
@@@ -37,11 -37,12 +37,11 @@@ 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=5
  
  BUILDMACHINE=$MACHINE
      if [ "$MACHINE" = "x86_64" ]; then
          BUILDMACHINE="i686";
 -        linux32="linux32";
      fi
  
  
@@@ -213,10 -214,15 +213,10 @@@ prepareenv() 
      mount --bind $BASEDIR/log    $BASEDIR/build/usr/src/log
      mount --bind $BASEDIR/src    $BASEDIR/build/usr/src/src
  
 -    # This is a temporary hack!!!
 -    if [ ! -f /tools/bin/hostname ]; then
 -      cp -f /bin/hostname /tools/bin/hostname 2>/dev/null
 -    fi
 -
      # Run LFS static binary creation scripts one by one
      export CCACHE_DIR=$BASEDIR/ccache
      export CCACHE_COMPRESS=1
 -    export CCACHE_HASHDIR=1
 +    export CCACHE_COMPILERCHECK="none"
  
      # Remove pre-install list of installed files in case user erase some files before rebuild
      rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
@@@ -226,7 -232,7 +226,7 @@@ buildtoolchain() 
      local error=false
      case "${MACHINE}:$(uname -m)" in
          # x86
 -        i586:i586|i586:i686)
 +        i586:i586|i586:i686|i586:x86_64)
              # These are working.
              ;;
          i586:*)
              ;;
  
          # ARM
 -        armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv7l)
 +        armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l)
              # These are working.
              ;;
          armv5tel:*)
      ${error} && \
          exiterror "Cannot build ${MACHINE} toolchain on $(uname -m). Please use the download if any."
  
 -    if [ "$(uname -r | grep ipfire)" ]; then
 -        exiterror "Cannot build toolchain on ipfire. Please use the download."
 +    local gcc=$(type -p gcc)
 +    if [ -z "${gcc}" ]; then
 +        exiterror "Could not find GCC. You will need a working build enviroment in order to build the toolchain."
      fi
  
      LOGFILE="$BASEDIR/log/_build.toolchain.log"
      export LOGFILE
 -    NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
 -    export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1}
 -    ORG_PATH=$PATH
 -    lfsmake1 ccache   PASS=1
 -    lfsmake1 make     PASS=1
 -    lfsmake1 binutils PASS=1
 -    lfsmake1 gcc              PASS=1
 -    export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
 -    if [ "${MACHINE_TYPE}" = "arm" ]; then
 -        lfsmake1 linux TOOLS=1 HEADERS=1
 -    else
 -        lfsmake1 linux-libc-header
 -    fi
 +
 +    local ORG_PATH=$PATH
 +    export PATH="/tools/ccache/bin:/tools/bin:$PATH"
 +    lfsmake1 ccache                   PASS=1
 +    lfsmake1 binutils                 PASS=1
 +    lfsmake1 gcc                      PASS=1
 +    lfsmake1 linux2                   TOOLS=1 HEADERS=1
      lfsmake1 glibc
 -    lfsmake1 cleanup-toolchain PASS=1
 -    lfsmake1 fake-environ
 +    lfsmake1 cleanup-toolchain                PASS=1
 +    lfsmake1 binutils                 PASS=2
 +    lfsmake1 gcc                      PASS=2
 +    lfsmake1 ccache                   PASS=2
      lfsmake1 tcl
      lfsmake1 expect
      lfsmake1 dejagnu
 -    lfsmake1 gcc              PASS=2
 -    lfsmake1 binutils PASS=2
 -    lfsmake1 ccache   PASS=2
      lfsmake1 ncurses
      lfsmake1 bash
      lfsmake1 bzip2
      lfsmake1 grep
      lfsmake1 gzip
      lfsmake1 m4
 -    lfsmake1 make     PASS=2
 +    lfsmake1 make
      lfsmake1 patch
      lfsmake1 perl
      lfsmake1 sed
      lfsmake1 tar
      lfsmake1 texinfo
 -    lfsmake1 util-linux
 -    lfsmake1 strip
 -    lfsmake1 cleanup-toolchain        PASS=2
 +    lfsmake1 xz
 +    lfsmake1 fake-environ
 +    lfsmake1 cleanup-toolchain                PASS=2
      export PATH=$ORG_PATH
  }
  
@@@ -294,19 -306,17 +294,19 @@@ buildbase() 
      LOGFILE="$BASEDIR/log/_build.base.log"
      export LOGFILE
      lfsmake2 stage2
 -    if [ "${MACHINE_TYPE}" = "arm" ]; then
 -        lfsmake2 linux HEADERS=1
 -    else
 -        lfsmake2 linux-libc-header
 -    fi
 +    lfsmake2 linux2                   HEADERS=1
      lfsmake2 man-pages
      lfsmake2 glibc
      lfsmake2 tzdata
 -    lfsmake2 cleanup-toolchain        PASS=3
 +    lfsmake2 cleanup-toolchain                PASS=3
 +    lfsmake2 zlib
      lfsmake2 binutils
 +    lfsmake2 gmp
 +    lfsmake2 gmp-compat
 +    lfsmake2 mpfr
 +    lfsmake2 file
      lfsmake2 gcc
 +    lfsmake2 sed
      lfsmake2 berkeley
      lfsmake2 coreutils
      lfsmake2 iana-etc
      lfsmake2 bison
      lfsmake2 ncurses
      lfsmake2 procps
 -    lfsmake2 sed
      lfsmake2 libtool
      lfsmake2 perl
      lfsmake2 readline
 -    lfsmake2 zlib
 +    lfsmake2 readline-compat
 +    lfsmake2 pcre
 +    lfsmake2 pcre-compat
      lfsmake2 autoconf
      lfsmake2 automake
      lfsmake2 bash
      lfsmake2 diffutils
      lfsmake2 e2fsprogs
      lfsmake2 ed
 -    lfsmake2 file
      lfsmake2 findutils
      lfsmake2 flex
      lfsmake2 gawk
      lfsmake2 iproute2
      lfsmake2 kbd
      lfsmake2 less
 -    lfsmake2 libaal
      lfsmake2 make
      lfsmake2 man
      lfsmake2 mktemp
      lfsmake2 net-tools
      lfsmake2 patch
      lfsmake2 psmisc
 -    lfsmake2 reiser4progs
      lfsmake2 shadow
      lfsmake2 sysklogd
      lfsmake2 sysvinit
      lfsmake2 udev
      lfsmake2 util-linux
      lfsmake2 vim
 +    lfsmake2 xz
      lfsmake2 grub
  }
  
@@@ -362,6 -373,7 +362,7 @@@ buildipfire() 
    export LOGFILE
    ipfiremake configroot
    ipfiremake backup
+   ipfiremake bind
    ipfiremake dhcp
    ipfiremake dhcpcd
    ipfiremake libusb
    ipfiremake pptp
    ipfiremake unzip
    ipfiremake which
 -  ipfiremake xz
    ipfiremake linux-firmware
    ipfiremake zd1211-firmware
 +  ipfiremake rpi-firmware
    ipfiremake fw_ath9k_htc
    ipfiremake u-boot
  
    # The xen and PAE kernels are only available for x86
    if [ "${MACHINE_TYPE}" != "arm" ]; then
 -    ipfiremake linux                  KCFG="-xen"
 -    ipfiremake kqemu                  KCFG="-xen"
 +    ipfiremake linux2                 KCFG="-xen"
      ipfiremake v4l-dvb                        KCFG="-xen"
 -    ipfiremake madwifi                        KCFG="-xen"
 -    ipfiremake mISDN                  KCFG="-xen"
 -    ipfiremake dahdi                  KCFG="-xen" KMOD=1
 +#    ipfiremake mISDN                 KCFG="-xen"
      ipfiremake cryptodev              KCFG="-xen"
      ipfiremake compat-wireless                KCFG="-xen"
 -    ipfiremake r8169                  KCFG="-xen"
 -    ipfiremake r8168                  KCFG="-xen"
 -    ipfiremake r8101                  KCFG="-xen"
 -    ipfiremake e1000                  KCFG="-xen"
 -    ipfiremake e1000e                 KCFG="-xen"
 -    ipfiremake igb                    KCFG="-xen"
 +#    ipfiremake r8169                 KCFG="-xen"
 +#    ipfiremake r8168                 KCFG="-xen"
 +#    ipfiremake r8101                 KCFG="-xen"
 +#    ipfiremake e1000                 KCFG="-xen"
 +#    ipfiremake e1000e                        KCFG="-xen"
 +#    ipfiremake igb                   KCFG="-xen"
 +
      ipfiremake linux                  KCFG="-pae"
 -    ipfiremake kqemu                  KCFG="-pae"
 -    ipfiremake kvm-kmod                       KCFG="-pae"
 +#    ipfiremake kvm-kmod                      KCFG="-pae"
      ipfiremake v4l-dvb                        KCFG="-pae"
 -    ipfiremake madwifi                        KCFG="-pae"
      ipfiremake alsa                   KCFG="-pae" KMOD=1
 -    ipfiremake mISDN                  KCFG="-pae"
 -    ipfiremake dahdi                  KCFG="-pae" KMOD=1
 +#    ipfiremake mISDN                 KCFG="-pae"
      ipfiremake cryptodev              KCFG="-pae"
      ipfiremake compat-wireless                KCFG="-pae"
  #    ipfiremake r8169                 KCFG="-pae"
  #    ipfiremake r8168                 KCFG="-pae"
  #    ipfiremake r8101                 KCFG="-pae"
 -    ipfiremake e1000                  KCFG="-pae"
 -    ipfiremake e1000e                 KCFG="-pae"
 -    ipfiremake igb                    KCFG="-pae"
 +#    ipfiremake e1000                 KCFG="-pae"
 +#    ipfiremake e1000e                        KCFG="-pae"
 +#    ipfiremake igb                   KCFG="-pae"
 +
      ipfiremake linux                  KCFG=""
 +#    ipfiremake kvm-kmod                      KCFG=""
      ipfiremake v4l-dvb                        KCFG=""
 -    ipfiremake kqemu                  KCFG=""
 -    ipfiremake kvm-kmod                       KCFG=""
 -    ipfiremake madwifi                        KCFG=""
      ipfiremake alsa                   KCFG="" KMOD=1
 -    ipfiremake mISDN                  KCFG=""
 -    ipfiremake dahdi                  KCFG="" KMOD=1
 +#    ipfiremake mISDN                 KCFG=""
      ipfiremake cryptodev              KCFG=""
      ipfiremake compat-wireless                KCFG=""
  #    ipfiremake r8169                 KCFG=""
  #    ipfiremake r8168                 KCFG=""
  #    ipfiremake r8101                 KCFG=""
 -    ipfiremake e1000                  KCFG=""
 -    ipfiremake e1000e                 KCFG=""
 -    ipfiremake igb                    KCFG=""
 +#    ipfiremake e1000                 KCFG=""
 +#    ipfiremake e1000e                        KCFG=""
 +#    ipfiremake igb                   KCFG=""
 +
    else
 -    # arm-versatile kernel build
 -    ipfiremake linux                  KCFG="-versatile"
 -    ipfiremake v4l-dvb                        KCFG="-versatile"
 -    ipfiremake kqemu                  KCFG="-versatile"
 -    ipfiremake kvm-kmod                       KCFG="-versatile"
 -    ipfiremake madwifi                        KCFG="-versatile"
 -    ipfiremake mISDN                  KCFG="-versatile"
 -    ipfiremake dahdi                  KCFG="-versatile" KMOD=1
 -    ipfiremake cryptodev              KCFG="-versatile"
 -    ipfiremake compat-wireless                KCFG="-versatile"
 -#  ipfiremake r8169                   KCFG="-versatile"
 -#  ipfiremake r8168                   KCFG="-versatile"
 -#  ipfiremake r8101                   KCFG="-versatile"
 -    ipfiremake e1000                  KCFG="-versatile"
 -    ipfiremake e1000e                 KCFG="-versatile"
 -    ipfiremake igb                    KCFG="-versatile"
 +    # arm-omap kernel build
 +    ipfiremake linux                  KCFG="-rpi"
 +#    ipfiremake v4l-dvb                       KCFG="-rpi"
 +#    ipfiremake kvm-kmod                      KCFG="-rpi"
 +#    ipfiremake mISDN                 KCFG="-rpi"
 +    ipfiremake cryptodev              KCFG="-rpi"
 +    ipfiremake compat-wireless                KCFG="-rpi"
 +#    ipfiremake r8169                 KCFG="-rpi"
 +#    ipfiremake r8168                 KCFG="-rpi"
 +#    ipfiremake r8101                 KCFG="-rpi"
 +#    ipfiremake e1000                 KCFG="-rpi"
 +#    ipfiremake e1000e                        KCFG="-rpi"
 +#    ipfiremake igb                   KCFG="-rpi"
 +
 +    ipfiremake linux                  KCFG="-omap"
 +#    ipfiremake v4l-dvb                       KCFG="-omap"
 +#    ipfiremake kvm-kmod                      KCFG="-omap"
 +#    ipfiremake mISDN                 KCFG="-omap"
 +    ipfiremake cryptodev              KCFG="-omap"
 +    ipfiremake compat-wireless                KCFG="-omap"
 +#    ipfiremake r8169                 KCFG="-omap"
 +#    ipfiremake r8168                 KCFG="-omap"
 +#    ipfiremake r8101                 KCFG="-omap"
 +#    ipfiremake e1000                 KCFG="-omap"
 +#    ipfiremake e1000e                        KCFG="-omap"
 +#    ipfiremake igb                   KCFG="-omap"
 +
      # arm-kirkwood kernel build
      ipfiremake linux                  KCFG="-kirkwood"
 -    ipfiremake v4l-dvb                        KCFG="-kirkwood"
 -    ipfiremake kqemu                  KCFG="-kirkwood"
 -    ipfiremake kvm-kmod                       KCFG="-kirkwood"
 -    ipfiremake madwifi                        KCFG="-kirkwood"
 -    ipfiremake mISDN                  KCFG="-kirkwood"
 -    ipfiremake dahdi                  KCFG="-kirkwood" KMOD=1
 +#    ipfiremake v4l-dvb                       KCFG="-kirkwood"
 +#    ipfiremake kvm-kmod                      KCFG="-kirkwood"
 +#    ipfiremake mISDN                 KCFG="-kirkwood"
      ipfiremake cryptodev              KCFG="-kirkwood"
      ipfiremake compat-wireless                KCFG="-kirkwood"
 -#  ipfiremake r8169                   KCFG="-kirkwood"
 -#  ipfiremake r8168                   KCFG="-kirkwood"
 -#  ipfiremake r8101                   KCFG="-kirkwood"
 -    ipfiremake e1000                  KCFG="-kirkwood"
 -    ipfiremake e1000e                 KCFG="-kirkwood"
 -    ipfiremake igb                    KCFG="-kirkwood"
 +#    ipfiremake r8169                 KCFG="-kirkwood"
 +#    ipfiremake r8168                 KCFG="-kirkwood"
 +#    ipfiremake r8101                 KCFG="-kirkwood"
 +#    ipfiremake e1000                 KCFG="-kirkwood"
 +#    ipfiremake e1000e                        KCFG="-kirkwood"
 +#    ipfiremake igb                   KCFG="-kirkwood"
 +
    fi
    ipfiremake pkg-config
    ipfiremake linux-atm
    ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
 -  ipfiremake gmp
    ipfiremake pam
    ipfiremake openssl
    ipfiremake curl
    ipfiremake apache2                  PASS=C
    ipfiremake arping
    ipfiremake beep
-   ipfiremake bind
    ipfiremake dvdrtools
    ipfiremake dnsmasq
    ipfiremake dosfstools
    ipfiremake iptables
    ipfiremake libupnp
    ipfiremake ipaddr
 -  ipfiremake iptstate
    ipfiremake iputils
    ipfiremake l7-protocols
    ipfiremake mISDNuser
    ipfiremake python-mechanize
    ipfiremake python-feedparser
    ipfiremake python-rssdler
 +  ipfiremake libffi
    ipfiremake glib
    ipfiremake GeoIP
    ipfiremake fwhits
    ipfiremake noip_updater
    ipfiremake ntp
    ipfiremake openssh
 +  ipfiremake fontconfig
 +  ipfiremake dejavu-fonts-ttf
 +  ipfiremake freefont
 +  ipfiremake pixman
 +  ipfiremake cairo
 +  ipfiremake pango
    ipfiremake rrdtool
    ipfiremake setserial
    ipfiremake setup
    ipfiremake traceroute
    ipfiremake vlan
    ipfiremake wireless
 -  ipfiremake libsafe
    ipfiremake pakfire
    ipfiremake spandsp
    ipfiremake lzo
    ipfiremake wget
    ipfiremake bridge-utils
    ipfiremake screen
 -  ipfiremake hddtemp
    ipfiremake smartmontools
    ipfiremake htop
    ipfiremake postfix
    ipfiremake cmake
    ipfiremake gnump3d
    ipfiremake libsigc++
 -  ipfiremake applejuice
    ipfiremake libtorrent
    ipfiremake rtorrent
    ipfiremake ipfireseeder
    ipfiremake vsftpd
    ipfiremake strongswan
    ipfiremake lsof
 -  ipfiremake centerim
    ipfiremake br2684ctl
    ipfiremake pcmciautils
    ipfiremake lm_sensors
    ipfiremake fbset
    ipfiremake sdl
    ipfiremake qemu
 -  ipfiremake qemu-kqemu
    ipfiremake sane
    ipfiremake netpbm
    ipfiremake phpSANE
    ipfiremake nagios
    ipfiremake nagios_nrpe
    ipfiremake ebtables
 -  ipfiremake fontconfig
 -  ipfiremake freefont
    ipfiremake directfb
    ipfiremake dfb++
    ipfiremake faad2
    ipfiremake netcat
    ipfiremake 7zip
    ipfiremake lynis
 -  ipfiremake splix
    ipfiremake streamripper
    ipfiremake sshfs
    ipfiremake taglib
    ipfiremake nut
    ipfiremake watchdog
    ipfiremake libpri
 -  ipfiremake dahdi
    ipfiremake asterisk
    ipfiremake lcr
    ipfiremake usb_modeswitch
    ipfiremake mtr
    ipfiremake tcpick
    ipfiremake minidlna
 +  ipfiremake acpid
    ipfiremake fping
+   ipfiremake telnet
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild
@@@ -784,6 -796,7 +785,6 @@@ buildinstaller() 
    ipfiremake mbr
    ipfiremake memtest
    ipfiremake installer
 -  cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/
    installmake strip
    ipfiremake initrd
  }
@@@ -1025,7 -1038,9 +1026,7 @@@ toolchain
        echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $MACHINE" | 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-$MACHINE.tar.gz \
 -              build/{bin,etc,usr/bin,usr/local} \
 -              build/tools/{bin,etc,*-linux-gnu*,include,lib,libexec,sbin,share,var} \
 -              log >> $LOGFILE
 +              build/tools build/bin/sh log >> $LOGFILE
        md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \
                > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.md5
        stdumount