Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into...

diff --combined lfs/Config
index 9a8c3cdd2b56effca06958bebf65b720238b6363,db4891b21a29965724c51aed31f0acb44d8d1127..b91f2ee63d06705c06d2c1fe13e4a243f93f007a
--- 1/lfs/Config
--- 2/lfs/Config
+++ b/lfs/Config
@@@ -37,12 -37,6 +37,6 @@@ URL_IPFIRE  = http://source.ipfire.org/
  URL_TOOLCHAIN = http://source.ipfire.org/toolchains
  URL_SOURCE = source.ipfire.org:/pub/source/source-2.x
  
- # Default compiler optimizations.
- #
- FLAGS_OPT   = -O2
- FLAGS_CPU   = -mcpu=$(MACHINE)
- FLAGS_ARCH  = -march=$(MACHINE)
- 
  # Don't change this; it will be overridden by other makefiles where necessary.
  #
  ROOT =
@@@ -191,12 -185,7 +185,12 @@@ define PA
                cp -f /usr/src/src/paks/default/{,un}install.sh /usr/src/src/paks/default/update.sh \
                /install/packages/package; \
        fi
 -      cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
 +      for i in $(DIR_SRC)/config/rootfiles/packages/{$(MACHINE),}/$(PROG); do \
 +              if [ -e "$${i}" ]; then \
 +                      cp -v $${i} /install/packages/package/ROOTFILES; \
 +                      break; \
 +              fi; \
 +      done
        sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE/$(MACHINE)/g' -i /install/packages/package/ROOTFILES
        sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
        chmod 755 /install/packages/package/{{,un}install,update}.sh

diff --combined make.sh
index 34c2a05607cb8006a0c9a9d1b93dc0f4fa769047,7ecc812e785aabc2520f4b5b54ab1b6e891862c8..15ab38b72cfe76736ac72196cd7457c9ff34b4d5
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -38,7 -38,6 +38,6 @@@ 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=1
- IPFVER="full"                         # Which versions should be compiled? (full|devel)
  
  BUILDMACHINE=$MACHINE
      if [ "$MACHINE" = "x86_64" ]; then
@@@ -414,7 -413,7 +413,7 @@@ buildipfire() 
    ipfiremake kqemu
    ipfiremake kvm-kmod
    ipfiremake madwifi
 -  if [ "${MACHINE_TYPE}" = "arm" ]; then
 +  if [ "${MACHINE_TYPE}" != "arm" ]; then
      #todo enable alsa driver in kernel config
      ipfiremake alsa                   KMOD=1
    fi
@@@ -605,6 -604,7 +604,7 @@@
    ipfiremake rsync
    ipfiremake tcpwrapper
    ipfiremake libevent
+   ipfiremake libevent2
    ipfiremake portmap
    ipfiremake nfs
    ipfiremake nmap
@@@ -720,6 -720,7 +720,7 @@@
    ipfiremake python-xattr
    ipfiremake intltool
    ipfiremake pakfire3-deps
+   ipfiremake transmission
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild
@@@ -775,14 -776,14 +776,14 @@@ buildpackages() 
    $0 git log
  
    # Create images for install
-   ipfiremake cdrom ED=$IPFVER
+   ipfiremake cdrom
  
    # 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 ED=$IPFVER
+               ipfiremake usb-stick
        fi
-       ipfiremake flash-images ED=$IPFVER
+       ipfiremake flash-images
    fi
  
    mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
@@@ -790,10 -791,10 +791,10 @@@
    ipfirepackages
  
    # 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 [ $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/
-       ipfiremake xen-image ED=$IPFVER
+       ipfiremake xen-image
        rm -rf $LFS/install/packages/linux-xen-*.ipfire
        rm -rf $LFS/install/packages/meta-linux-xen
    fi
@@@ -827,10 -828,7 +828,10 @@@
  
  ipfirepackages() {
        ipfiremake core-updates
 -      for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
 +
 +      local i
 +      for i in $(find $BASEDIR/config/rootfiles/packages{${machine},} -maxdepth 1 -type f); do
 +              i=$(basename ${i})
                if [ -e $BASEDIR/lfs/$i ]; then
                        ipfiredist $i
                else
@@@ -1028,54 -1026,6 +1029,6 @@@ othersrc
        fi
        stdumount
        ;;
- git)
-       case "$2" in
-         update|up)
-                       ## REMOVES ALL UNCOMMITTED CHANGES!
-                       [ "$3" == "--force" ] && git checkout -f
-                       git pull
-               ;;
-         commit|ci)
-               shift 2
-                       git commit $*
-                       
-                       [ "$?" -eq "0" ] || exiterror "git commit $* failed."
-                       
-                       echo -e "${BOLD}Do you want to push, too? [y/N]${NORMAL}"
-                       read
-                       [ -z $REPLY ] && exit 0
-                       for i in y Y j J; do
-                               if [ "$i" == "$REPLY" ]; then
-                                       $0 git push
-                                       exit $?
-                               fi
-                       done
-                       exiterror "\"$REPLY\" is not a valid answer."
-               ;;
-         dist)
-                       git archive HEAD | gzip -9 > ${SNAME}-${VERSION}.tar.gz
-                 ;;
-         diff|di)
-                       echo -ne "Make a local diff to last revision"
-                       git diff HEAD > ipfire-diff-$(date +'%Y-%m-%d-%H:%M').diff
-                       evaluate 1
-                       echo "Diff was successfully saved to ipfire-diff-$(date +'%Y-%m-%d-%H:%M').diff"
-                       git diff --stat
-               ;;
-         push)
-               [ -z $GIT_USER ] && exiterror "You have to setup GIT_USER first."
-                       GIT_URL="ssh://${GIT_USER}@git.ipfire.org/pub/git/ipfire-2.x"
-                       
-               git push ${GIT_URL} $3
-               ;;
-         log)
-               [ -z $GIT_TAG ]  || LAST_TAG=$GIT_TAG
-               [ -z $LAST_TAG ] || EXT="$LAST_TAG..HEAD"
- 
-               git log -n 500 --no-merges --pretty=medium --shortstat $EXT > $BASEDIR/doc/ChangeLog
-       ;;
-       esac
-       ;;
  uploadsrc)
        PWD=`pwd`
        if [ -z $IPFIRE_USER ]; then
@@@ -1097,83 -1047,9 +1050,9 @@@
        cd $PWD
        exit 0
        ;;
- batch)
-       if [ "$2" = "--background" ]; then
-               batch_script
-               exit $?
-       fi
-       if [ `screen -ls | grep -q ipfire` ]; then
-               echo "Build is already running, sorry!"
-               exit 1
-       else
-               if [ "$2" = "--rebuild" ]; then
-                       export IPFIRE_REBUILD=1
-                       echo "REBUILD!"
-               else
-                       export IPFIRE_REBUILD=0
-               fi
-               echo -en "${BOLD}***IPFire-Batch-Build is starting...${NORMAL}"
-               screen -dmS ipfire $0 batch --background
-               evaluate 1
-               exit 0
-       fi
-       ;;
- watch)
-       watch_screen
-       ;;
- pxe)
-       case "$2" in
-         start)
-               start_tftpd
-               ;;
-         stop)
-               stop_tftpd
-               ;;
-         reload|restart)
-               reload_tftpd
-               ;;              
-       esac
-       exit 0
-       ;;
  lang)
        update_langs
        ;;
- "")
-       clear
-       select name in "Exit" "IPFIRE: Downloadsrc" "IPFIRE: Build (silent)" "IPFIRE: Watch Build" "IPFIRE: Batch" "IPFIRE: Clean" "LOG: Tail" "Help"
-       do
-       case $name in
-       "IPFIRE: Downloadsrc")
-               $0 downloadsrc
-               ;;
-       "IPFIRE: Build (silent)")
-               $0 build-silent
-               ;;
-       "IPFIRE: Watch Build")
-               $0 watch
-               ;;
-       "IPFIRE: Batch")
-               $0 batch
-               ;;
-       "IPFIRE: Clean")
-               $0 clean
-               ;;
-       "Help")
-               echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain}"
-               cat doc/make.sh-usage
-               ;;
-       "LOG: Tail")
-               tail -f log/_*
-               ;;
-       "Exit")
-               break
-               ;;
-       esac
-       done
-       ;;
- config)
-       make_config
-       ;;
  *)
        echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain}"
        cat doc/make.sh-usage