]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'origin/next' into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Dec 2013 09:05:39 +0000 (10:05 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Dec 2013 09:05:39 +0000 (10:05 +0100)
1  2 
config/rootfiles/common/configroot
lfs/configroot
lfs/strongswan
make.sh

index 087443aab70c1c734b8e1a9000e129bbdfbd32a2,5a169d8d826e89c2185abca6e97027185683790c..b1097cd8956e2af376ba1b8081263308de3f5873
@@@ -1,8 -1,3 +1,8 @@@
 +usr/sbin/convert-dmz
 +usr/sbin/convert-outgoingfw
 +usr/sbin/convert-portfw
 +usr/sbin/convert-xtaccess
 +usr/sbin/firewall-policy
  #var/ipfire
  var/ipfire/addon-lang
  var/ipfire/auth
@@@ -31,6 -26,8 +31,6 @@@ var/ipfire/dhc
  #var/ipfire/dhcp/fixleases
  #var/ipfire/dhcp/settings
  var/ipfire/dhcpc
 -var/ipfire/dmzholes
 -#var/ipfire/dmzholes/config
  var/ipfire/dns
  #var/ipfire/dns/settings
  var/ipfire/dnsforward
@@@ -42,31 -39,13 +42,31 @@@ var/ipfire/etherne
  #var/ipfire/ethernet/settings
  #var/ipfire/ethernet/vlans
  #var/ipfire/ethernet/wireless
 -#var/ipfire/extrahd
 +var/ipfire/extrahd
  #var/ipfire/extrahd/bin
 -var/ipfire/extrahd/bin/extrahd.pl
 -var/ipfire/extrahd/devices
 -var/ipfire/extrahd/partitions
 -var/ipfire/extrahd/scan
 -var/ipfire/extrahd/settings
 +#var/ipfire/extrahd/bin/extrahd.pl
 +#var/ipfire/extrahd/devices
 +#var/ipfire/extrahd/partitions
 +#var/ipfire/extrahd/scan
 +#var/ipfire/extrahd/settings
 +var/ipfire/firewall
 +#var/ipfire/firewall/bin
 +#var/ipfire/firewall/bin/firewall-lib.pl
 +#var/ipfire/firewall/bin/rules.pl
 +#var/ipfire/firewall/config
 +#var/ipfire/firewall/dmz
 +#var/ipfire/firewall/input
 +#var/ipfire/firewall/nat
 +#var/ipfire/firewall/outgoing
 +#var/ipfire/firewall/p2protocols
 +#var/ipfire/firewall/settings
 +var/ipfire/fwhosts
 +#var/ipfire/fwhosts/customgroups
 +#var/ipfire/fwhosts/customhosts
 +#var/ipfire/fwhosts/customnetworks
 +#var/ipfire/fwhosts/customservicegrp
 +#var/ipfire/fwhosts/customservices
 +#var/ipfire/fwhosts/icmp-types
  var/ipfire/fwlogs
  #var/ipfire/fwlogs/ipsettings
  #var/ipfire/fwlogs/portsettings
@@@ -127,14 -106,24 +127,14 @@@ var/ipfire/net-traffi
  #var/ipfire/nfs/nfs-server
  var/ipfire/optionsfw
  #var/ipfire/optionsfw/settings
 -var/ipfire/outgoing
 -#var/ipfire/outgoing/bin
 -#var/ipfire/outgoing/bin/outgoingfw.pl
 -var/ipfire/outgoing/defaultservices
 -#var/ipfire/outgoing/groups
 -#var/ipfire/outgoing/groups/ipgroups
 -#var/ipfire/outgoing/groups/macgroups
 -#var/ipfire/outgoing/p2protocols
 -#var/ipfire/outgoing/rules
 -#var/ipfire/outgoing/settings
  var/ipfire/ovpn
 -var/ipfire/ovpn/ccd.conf
 -var/ipfire/ovpn/ccdroute
 -var/ipfire/ovpn/ccdroute2
 +#var/ipfire/ovpn/ccd.conf
 +#var/ipfire/ovpn/ccdroute
 +#var/ipfire/ovpn/ccdroute2
  var/ipfire/pakfire
  #var/ipfire/pakfire/settings
  #var/ipfire/patches
 -var/ipfire/portfw
 +#var/ipfire/portfw
  #var/ipfire/portfw/config
  var/ipfire/ppp
  #var/ipfire/ppp/fake-resolv.conf
@@@ -155,6 -144,7 +155,7 @@@ var/ipfire/prox
  #var/ipfire/proxy/calamaris
  #var/ipfire/proxy/calamaris/bin
  #var/ipfire/proxy/settings
+ #var/ipfire/proxy/squid.conf
  var/ipfire/qos
  #var/ipfire/qos/bin
  #var/ipfire/qos/bin/RRD-func.pl
@@@ -199,3 -189,7 +200,3 @@@ var/ipfire/wakeonla
  var/ipfire/wireless
  #var/ipfire/wireless/config
  #var/ipfire/wireless/settings
 -var/ipfire/xtaccess
 -#var/ipfire/xtaccess/config
 -var/ipfire/firebuild
 -etc/system-release
diff --combined lfs/configroot
index f73453d91c391e5bf3bc4e7f1b1f1ab9069ca309,1260ceb61b5ed244a5bf75897b4a1c0be14b0db2..98e7af320a30380eda721a7c1478ec08b29708f3
@@@ -50,65 -50,59 +50,65 @@@ $(TARGET) 
        @$(PREBUILD)
  
        # Create all directories
 -      for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes dns dnsforward \
 -                      ethernet extrahd/bin fwlogs isdn key langs logging mac main  menu.d modem net-traffic \
 -                      net-traffic/templates nfs optionsfw outgoing/bin outgoing/groups outgoing/groups/ipgroups \
 -                      outgoing/groups/macgroups ovpn patches pakfire portfw ppp private proxy/advanced/cre \
 +      for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dns dnsforward \
 +                      ethernet extrahd/bin fwlogs fwhosts firewall firewall/bin isdn key langs logging mac main \
 +                      menu.d modem net-traffic net-traffic/templates nfs optionsfw \
 +                      ovpn patches pakfire portfw ppp private proxy/advanced/cre \
                        proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report \
                        updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \
 -                      wakeonlan wireless xtaccess ; do \
 +                      wakeonlan wireless ; do \
                mkdir -p $(CONFIG_ROOT)/$$i; \
        done
  
        # Touch empty files
        for i in auth/users backup/include.user backup/exclude.user \
            certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
 -          dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
 -          ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \
 -          isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \
 +          dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
 +          ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/input firewall/outgoing \
 +          fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwlogs/ipsettings fwlogs/portsettings \
 +          isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \
            ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
-           ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
+           ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
            qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \
            vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
 -              touch $(CONFIG_ROOT)/$$i; \
 +          touch $(CONFIG_ROOT)/$$i; \
        done
  
        # Copy initial configfiles
        cp $(DIR_SRC)/config/cfgroot/header.pl                  $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/general-functions.pl       $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/lang.pl                    $(CONFIG_ROOT)/
 -      cp $(DIR_SRC)/config/cfgroot/countries.pl                       $(CONFIG_ROOT)/
 +      cp $(DIR_SRC)/config/cfgroot/countries.pl               $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/graphs.pl                  $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/advoptions-list            $(CONFIG_ROOT)/dhcp/advoptions-list
        cp $(DIR_SRC)/config/cfgroot/connscheduler-lib.pl       $(CONFIG_ROOT)/connscheduler/lib.pl
        cp $(DIR_SRC)/config/cfgroot/connscheduler.conf         $(CONFIG_ROOT)/connscheduler
        cp $(DIR_SRC)/config/extrahd/*                          $(CONFIG_ROOT)/extrahd/bin/
        cp $(DIR_SRC)/config/cfgroot/sensors-settings           $(CONFIG_ROOT)/sensors/settings
 -      cp $(DIR_SRC)/config/menu/*                                     $(CONFIG_ROOT)/menu.d/
 +      cp $(DIR_SRC)/config/menu/*                             $(CONFIG_ROOT)/menu.d/
        cp $(DIR_SRC)/config/cfgroot/modem-defaults             $(CONFIG_ROOT)/modem/defaults
        cp $(DIR_SRC)/config/cfgroot/modem-settings             $(CONFIG_ROOT)/modem/settings
        cp $(DIR_SRC)/config/cfgroot/net-traffic-lib.pl         $(CONFIG_ROOT)/net-traffic/net-traffic-lib.pl
 -      cp $(DIR_SRC)/config/cfgroot/net-traffic-admin.pl               $(CONFIG_ROOT)/net-traffic/net-traffic-admin.pl
 +      cp $(DIR_SRC)/config/cfgroot/net-traffic-admin.pl       $(CONFIG_ROOT)/net-traffic/net-traffic-admin.pl
        cp $(DIR_SRC)/config/cfgroot/nfs-server                 $(CONFIG_ROOT)/nfs/nfs-server
 -      cp $(DIR_SRC)/config/cfgroot/p2protocols                        $(CONFIG_ROOT)/outgoing/p2protocols
 -      cp $(DIR_SRC)/config/outgoingfw/outgoingfw.pl           $(CONFIG_ROOT)/outgoing/bin/
 -      cp $(DIR_SRC)/config/outgoingfw/defaultservices         $(CONFIG_ROOT)/outgoing/
        cp $(DIR_SRC)/config/cfgroot/proxy-acl                  $(CONFIG_ROOT)/proxy/acl-1.4
 -      cp $(DIR_SRC)/config/qos/*                                      $(CONFIG_ROOT)/qos/bin/
 -      cp $(DIR_SRC)/config/cfgroot/ssh-settings                       $(CONFIG_ROOT)/remote/settings
 -      cp $(DIR_SRC)/config/cfgroot/xtaccess-config            $(CONFIG_ROOT)/xtaccess/config
 +      cp $(DIR_SRC)/config/qos/*                                              $(CONFIG_ROOT)/qos/bin/
 +      cp $(DIR_SRC)/config/cfgroot/ssh-settings               $(CONFIG_ROOT)/remote/settings
        cp $(DIR_SRC)/config/cfgroot/time-settings              $(CONFIG_ROOT)/time/settings
 -      cp $(DIR_SRC)/config/cfgroot/logging-settings           $(CONFIG_ROOT)/logging/settings
 +      cp $(DIR_SRC)/config/cfgroot/logging-settings   $(CONFIG_ROOT)/logging/settings
        cp $(DIR_SRC)/config/cfgroot/useragents                 $(CONFIG_ROOT)/proxy/advanced
        cp $(DIR_SRC)/config/cfgroot/ethernet-vlans             $(CONFIG_ROOT)/ethernet/vlans
 -      cp $(DIR_SRC)/langs/list                                        $(CONFIG_ROOT)/langs/
 -
 +      cp $(DIR_SRC)/langs/list                                                $(CONFIG_ROOT)/langs/
 +      cp $(DIR_SRC)/config/firewall/rules.pl                  $(CONFIG_ROOT)/firewall/bin/rules.pl
 +      cp $(DIR_SRC)/config/firewall/convert-xtaccess  /usr/sbin/convert-xtaccess
 +      cp $(DIR_SRC)/config/firewall/convert-outgoingfw        /usr/sbin/convert-outgoingfw
 +      cp $(DIR_SRC)/config/firewall/convert-dmz       /usr/sbin/convert-dmz
 +      cp $(DIR_SRC)/config/firewall/convert-portfw    /usr/sbin/convert-portfw
 +      cp $(DIR_SRC)/config/firewall/p2protocols               $(CONFIG_ROOT)/firewall/p2protocols
 +      cp $(DIR_SRC)/config/firewall/firewall-lib.pl   $(CONFIG_ROOT)/firewall/bin/firewall-lib.pl
 +      cp $(DIR_SRC)/config/firewall/firewall-policy   /usr/sbin/firewall-policy
 +      cp $(DIR_SRC)/config/fwhosts/icmp-types                 $(CONFIG_ROOT)/fwhosts/icmp-types
 +      cp $(DIR_SRC)/config/fwhosts/customservices             $(CONFIG_ROOT)/fwhosts/customservices
        # Oneliner configfiles
        echo  "ENABLED=off"             > $(CONFIG_ROOT)/vpn/settings
        echo  "VPN_DELAYED_START=0"     >>$(CONFIG_ROOT)/vpn/settings
        echo  "nameserver    1.2.3.4"   > $(CONFIG_ROOT)/ppp/fake-resolv.conf
        echo  "DROPNEWNOTSYN=on"                >> $(CONFIG_ROOT)/optionsfw/settings
        echo  "DROPINPUT=on"            >> $(CONFIG_ROOT)/optionsfw/settings
 -      echo  "DROPOUTPUT=on"           >> $(CONFIG_ROOT)/optionsfw/settings
 -      echo  "DROPINPUT=on"            >> $(CONFIG_ROOT)/optionsfw/settings
 -      echo  "DROPOUTPUT=on"           >> $(CONFIG_ROOT)/optionsfw/settings
 +      echo  "DROPFORWARD=on"          >> $(CONFIG_ROOT)/optionsfw/settings
 +      echo  "FWPOLICY=DROP"           >> $(CONFIG_ROOT)/optionsfw/settings
 +      echo  "FWPOLICY1=DROP"          >> $(CONFIG_ROOT)/optionsfw/settings
 +      echo  "FWPOLICY2=DROP"          >> $(CONFIG_ROOT)/optionsfw/settings
        echo  "DROPPORTSCAN=on"         >> $(CONFIG_ROOT)/optionsfw/settings
 -
 +      echo  "DROPOUTGOING=on"         >> $(CONFIG_ROOT)/optionsfw/settings
 +      echo  "DROPSAMBA=off"           >> $(CONFIG_ROOT)/optionsfw/settings
 +      echo  "DROPPROXY=off"           >> $(CONFIG_ROOT)/optionsfw/settings
 +      echo  "SHOWREMARK=on"           >> $(CONFIG_ROOT)/optionsfw/settings
 +      echo  "SHOWCOLORS=on"           >> $(CONFIG_ROOT)/optionsfw/settings
 +      echo  "SHOWTABLES=off"          >> $(CONFIG_ROOT)/optionsfw/settings
 +      echo  "SHOWDROPDOWN=off"        >> $(CONFIG_ROOT)/optionsfw/settings
 +      echo  "DROPWIRELESSINPUT=on"    >> $(CONFIG_ROOT)/optionsfw/settings
 +      echo  "DROPWIRELESSFORWARD=on"  >> $(CONFIG_ROOT)/optionsfw/settings
 +      echo  "POLICY=MODE2"            >> $(CONFIG_ROOT)/firewall/settings
 +      echo  "POLICY1=MODE2"           >> $(CONFIG_ROOT)/firewall/settings
 +      
 +      # set rules.pl executable
 +      chmod 755 $(CONFIG_ROOT)/firewall/bin/rules.pl
 +              
 +      # set converters executable
 +      chmod 755 /usr/sbin/convert-*
 +      
        # Modify variables in header.pl
        sed -i -e "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" \
            -e "s+VERSION+$(VERSION)+g" \
  
        # Language files
        cp $(DIR_SRC)/langs/*/cgi-bin/*.pl $(CONFIG_ROOT)/langs/
 -      
 +
        # Configroot permissions
        chown -R nobody:nobody $(CONFIG_ROOT)
        chown      root:root   $(CONFIG_ROOT)
 -      for i in backup/ header.pl general-functions.pl lang.pl addon-lang/ langs/ red/ ; do \
 +      for i in backup/ header.pl general-functions.pl graphs.pl lang.pl addon-lang/ langs/ red/ ; do \
              chown -R root:root $(CONFIG_ROOT)/$$i; \
        done
 +      chown -Rv root:root $(CONFIG_ROOT)/*/bin
        chown root:nobody $(CONFIG_ROOT)/dhcpc
  
 -      # Set outgoingfw.pl executable
 -      chmod 755 $(CONFIG_ROOT)/outgoing/bin/outgoingfw.pl
 -
        @$(POSTBUILD)
diff --combined lfs/strongswan
index 948db5b1dfee681a5caa5bf9e28d6e9dd9729ae0,495d0359918bbc9d65543ce2b08eb7483b94f53a..5c411a3337ae4279c604fd2e1eaea6fe0631b425
@@@ -34,12 -34,10 +34,10 @@@ TARGET     = $(DIR_INFO)/$(THISAPP
  
  ifeq "$(MACHINE)" "i586"
        CONFIGURE_OPTIONS = \
-               --enable-padlock \
-               --enable-rdrand
+               --enable-padlock
  else
        CONFIGURE_OPTIONS = \
-               --disable-padlock \
-               --disable-rdrand
+               --disable-padlock
  endif
  
  ###############################################################################
@@@ -80,7 -78,8 +78,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) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch
 +      cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.0.2_ipfire.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.1.1-delay-dpd.patch
  
        cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh
diff --combined make.sh
index 8de509725cff68c9b89734d26921179d6d3bc5c3,37fa1c80574f6e85f2a1eff62f145b9d361b50b1..8e7252fbc44471f25261a555a456becfc6a952af
+++ b/make.sh
@@@ -26,18 -26,18 +26,18 @@@ NAME="IPFire"                                                      # Software nam
  SNAME="ipfire"                                                        # Short name
  VERSION="2.13"                                                        # Version number
  CORE="74"                                                     # Core Level (Filename)
- PAKFIRE_CORE="73"                                             # Core Level (PAKFIRE)
+ PAKFIRE_CORE="74"                                             # 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
  NICE=10                                                               # Nice level
  MAX_RETRIES=1                                                 # prefetch/check loop
 -BUILD_IMAGES=1                                                        # Build USB, Flash and Xen Images
 +BUILD_IMAGES=1                                                        # Flash and Xen Downloader
  KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
  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=6
 +TOOLCHAINVER=7
  
  BUILDMACHINE=$MACHINE
      if [ "$MACHINE" = "x86_64" ]; then
@@@ -83,22 -83,6 +83,22 @@@ if [ -z $EDITOR ]; the
        [ -z $EDITOR ] && exiterror "You should have installed an editor."
  fi
  
 +# Prepare string for /etc/system-release.
 +SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})"
 +if [ "$(git status -s | wc -l)" == "0" ]; then
 +      GIT_STATUS=""
 +else
 +      GIT_STATUS="-dirty"
 +fi
 +case "$GIT_BRANCH" in
 +      core*|beta?|rc?)
 +              SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS"
 +              ;;
 +      *)
 +              SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS"
 +              ;;
 +esac
 +
  prepareenv() {
      ############################################################################
      #                                                                          #
@@@ -360,7 -344,7 +360,7 @@@ buildbase() 
      lfsmake2 make
      lfsmake2 man
      lfsmake2 mktemp
 -    lfsmake2 module-init-tools
 +    lfsmake2 kmod
      lfsmake2 net-tools
      lfsmake2 patch
      lfsmake2 psmisc
      lfsmake2 sysvinit
      lfsmake2 tar
      lfsmake2 texinfo
 -    lfsmake2 udev
      lfsmake2 util-linux
 +    lfsmake2 udev
      lfsmake2 vim
      lfsmake2 xz
 +    lfsmake2 paxctl
      lfsmake2 grub
  }
  
@@@ -386,7 -369,6 +386,7 @@@ buildipfire() 
    ipfiremake dhcp
    ipfiremake dhcpcd
    ipfiremake libusb
 +  ipfiremake libusbx
    ipfiremake libpcap
    ipfiremake ppp
    ipfiremake pptp
    ipfiremake dvb-firmwares
    ipfiremake zd1211-firmware
    ipfiremake rpi-firmware
 +  ipfiremake bc
    ipfiremake u-boot
  
    if [ "${MACHINE_TYPE}" != "arm" ]; then
  
 -    # x86-xen (Legacy XEN) kernel build
 -    ipfiremake linux2                 KCFG="-xen"
 -    ipfiremake v4l-dvb                        KCFG="-xen"
 -    ipfiremake mISDN                  KCFG="-xen"
 -    ipfiremake cryptodev              KCFG="-xen"
 -    ipfiremake compat-drivers         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"
 -
      # x86-pae (Native and new XEN) kernel build
      ipfiremake linux                  KCFG="-pae"
 -    ipfiremake kvm-kmod                       KCFG="-pae"
 -    ipfiremake v4l-dvb                        KCFG="-pae"
 -    ipfiremake mISDN                  KCFG="-pae"
 +#    ipfiremake kvm-kmod                      KCFG="-pae"
 +#    ipfiremake v4l-dvb                       KCFG="-pae"
 +#    ipfiremake mISDN                 KCFG="-pae"
      ipfiremake cryptodev              KCFG="-pae"
 -    ipfiremake compat-drivers         KCFG="-pae"
 -    ipfiremake r8169                  KCFG="-pae"
 -    ipfiremake r8168                  KCFG="-pae"
 -    ipfiremake r8101                  KCFG="-pae"
 -    ipfiremake e1000e                 KCFG="-pae"
 -    ipfiremake igb                    KCFG="-pae"
 +#    ipfiremake compat-drivers                KCFG="-pae"
 +#    ipfiremake r8169                 KCFG="-pae"
 +#    ipfiremake r8168                 KCFG="-pae"
 +#    ipfiremake r8101                 KCFG="-pae"
 +#    ipfiremake e1000e                        KCFG="-pae"
 +#    ipfiremake igb                   KCFG="-pae"
  
      # x86 kernel build
      ipfiremake linux                  KCFG=""
 -    ipfiremake kvm-kmod                       KCFG=""
 -    ipfiremake v4l-dvb                        KCFG=""
 -    ipfiremake mISDN                  KCFG=""
 +#    ipfiremake kvm-kmod                      KCFG=""
 +#    ipfiremake v4l-dvb                       KCFG=""
 +#    ipfiremake mISDN                 KCFG=""
      ipfiremake cryptodev              KCFG=""
 -    ipfiremake compat-drivers         KCFG=""
 -    ipfiremake r8169                  KCFG=""
 -    ipfiremake r8168                  KCFG=""
 -    ipfiremake r8101                  KCFG=""
 -    ipfiremake e1000e                 KCFG=""
 -    ipfiremake igb                    KCFG=""
 +#    ipfiremake compat-drivers                KCFG=""
 +#    ipfiremake r8169                 KCFG=""
 +#    ipfiremake r8168                 KCFG=""
 +#    ipfiremake r8101                 KCFG=""
 +#    ipfiremake e1000e                        KCFG=""
 +#    ipfiremake igb                   KCFG=""
  
    else
      # arm-rpi (Raspberry Pi) kernel build
      ipfiremake linux                  KCFG="-rpi"
 -    ipfiremake v4l-dvb                        KCFG="-rpi"
 -    ipfiremake mISDN                  KCFG="-rpi" NOPCI=1
 +#    ipfiremake v4l-dvb                       KCFG="-rpi"
 +#    ipfiremake mISDN                 KCFG="-rpi" NOPCI=1
      ipfiremake cryptodev              KCFG="-rpi"
 -    ipfiremake compat-drivers         KCFG="-rpi"
 +#    ipfiremake compat-drivers                KCFG="-rpi"
  
 -    # arm-omap (Panda Board) kernel build
 -    ipfiremake linux                  KCFG="-omap"
 -    ipfiremake v4l-dvb                        KCFG="-omap"
 -    ipfiremake mISDN                  KCFG="-omap" NOPCI=1
 -    ipfiremake cryptodev              KCFG="-omap"
 -    ipfiremake compat-drivers         KCFG="-omap"
 +    # arm multi platform (Panda, Wandboard ...) kernel build
 +    ipfiremake linux                  KCFG="-multi"
 +    ipfiremake cryptodev              KCFG="-multi"
  
      # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
      ipfiremake linux                  KCFG="-kirkwood"
 -    ipfiremake v4l-dvb                        KCFG="-kirkwood"
 -    ipfiremake mISDN                  KCFG="-kirkwood"
 +#    ipfiremake v4l-dvb                       KCFG="-kirkwood"
 +#    ipfiremake mISDN                 KCFG="-kirkwood"
      ipfiremake cryptodev              KCFG="-kirkwood"
 -    ipfiremake compat-drivers         KCFG="-kirkwood"
 -    ipfiremake r8169                  KCFG="-kirkwood"
 -    ipfiremake r8168                  KCFG="-kirkwood"
 -    ipfiremake r8101                  KCFG="-kirkwood"
 -#    ipfiremake e1000e                        KCFG="-kirkwood"
 -    ipfiremake igb                    KCFG="-kirkwood"
 +#    ipfiremake compat-drivers                KCFG="-kirkwood"
 +#    ipfiremake r8169                 KCFG="-kirkwood"
 +#    ipfiremake r8168                 KCFG="-kirkwood"
 +#    ipfiremake r8101                 KCFG="-kirkwood"
 +#   ipfiremake e1000e                 KCFG="-kirkwood"
 +#    ipfiremake igb                   KCFG="-kirkwood"
  
    fi
    ipfiremake pkg-config
    ipfiremake apache2
    ipfiremake php
    ipfiremake apache2                  PASS=C
 +  ipfiremake jquery
    ipfiremake arping
    ipfiremake beep
    ipfiremake dvdrtools
    ipfiremake lzo
    ipfiremake openvpn
    ipfiremake pammysql
 +  ipfiremake mpage
 +  ipfiremake dbus
    ipfiremake cups
    ipfiremake ghostscript
    ipfiremake foomatic
    ipfiremake mpc
    ipfiremake git
    ipfiremake squidclamav
 -  ipfiremake bc
    ipfiremake vnstat
    ipfiremake vnstati
    ipfiremake iw
    ipfiremake syslinux
    ipfiremake tftpd
    ipfiremake cpufrequtils
 -  ipfiremake dbus
    ipfiremake bluetooth
    ipfiremake gutenprint
    ipfiremake apcupsd
    ipfiremake arm
    ipfiremake wavemon
    ipfiremake iptraf-ng
 -  echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
 -  cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
 -  echo >> $BASEDIR/build/var/ipfire/firebuild
 -  git log -1 >> $BASEDIR/build/var/ipfire/firebuild
 -  echo >> $BASEDIR/build/var/ipfire/firebuild
 -  git status >> $BASEDIR/build/var/ipfire/firebuild
 -  echo >> $BASEDIR/build/var/ipfire/firebuild
 -  cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
 -  echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
 -  if [ "$(git status -s | wc -l)" == "0" ]; then
 -      GIT_STATUS=""
 -  else
 -      GIT_STATUS="-dirty"
 -  fi
 -  case "$GIT_BRANCH" in
 -      core*|beta?|rc?)
 -          echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH$GIT_STATUS" > $BASEDIR/build/etc/system-release
 -          ;;
 -      *)
 -          echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" > $BASEDIR/build/etc/system-release
 -          ;;
 -  esac
 +  ipfiremake iotop
  }
  
  buildinstaller() {
    # Run installer scripts one by one
    LOGFILE="$BASEDIR/log/_build.installer.log"
    export LOGFILE
 -  ipfiremake as86
 -  ipfiremake mbr
    ipfiremake memtest
    ipfiremake installer
    installmake strip
@@@ -836,6 -855,9 +836,6 @@@ buildpackages() 
  
    # Check if there is a loop device for building in virtual environments
    if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
 -      if [ "${MACHINE_TYPE}" != "arm" ]; then
 -              ipfiremake usb-stick
 -      fi
        ipfiremake flash-images
    fi
  
  
    ipfirepackages
  
 -  # Check if there is a loop device for building in virtual environments
 -  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]) && [ "${MACHINE_TYPE}" != "arm" ]; then
 -        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
 -        cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
 -        cp -f $BASEDIR/packages/linux-pae-*.ipfire $LFS/install/packages/
 -        cp -f $BASEDIR/packages/meta-linux-pae $LFS/install/packages/
 -      ipfiremake xen-image
 -      rm -rf $LFS/install/packages/linux-xen-*.ipfire
 -      rm -rf $LFS/install/packages/meta-linux-xen
 -  fi
 +  ipfiremake xen-image
    mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
  
    cd $BASEDIR