Merge branch 'master' into kernel-4.9
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 9 Jul 2017 10:47:16 +0000 (12:47 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 9 Jul 2017 10:47:16 +0000 (12:47 +0200)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
1  2 
config/qos/makeqosscripts.pl
lfs/linux
lfs/postfix
lfs/udev
make.sh

Simple merge
diff --cc lfs/linux
Simple merge
diff --cc lfs/postfix
Simple merge
diff --cc lfs/udev
+++ b/lfs/udev
@@@ -76,10 -76,7 +76,8 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(VER)-1.tar.bz2
  
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208_remove_systemd_log.patch
 +      cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208-fix_uint8_t.patch
  
-       cd $(DIR_APP)/udev-lfs-$(VER)-1 && sed -i "s/HANDLE_AT 1/HANDLE_AT 0/g" cfg.h
        rm -rf /lib/udev/devices
        install -dv /lib/firmware
  
diff --cc make.sh
+++ b/make.sh
@@@ -392,67 -396,68 +396,68 @@@ buildbase() 
  buildipfire() {
    LOGFILE="$BASEDIR/log/_build.ipfire.log"
    export LOGFILE
-   ipfiremake configroot
-   ipfiremake backup
-   ipfiremake pkg-config
-   ipfiremake libusb
-   ipfiremake libusb-compat
-   ipfiremake libpcap
-   ipfiremake ppp
-   ipfiremake pptp
-   ipfiremake unzip
-   ipfiremake which
-   ipfiremake linux-firmware
-   ipfiremake ath10k-firmware
-   ipfiremake dvb-firmwares
-   ipfiremake mt7601u-firmware
-   ipfiremake zd1211-firmware
-   ipfiremake rpi-firmware
-   ipfiremake bc
-   ipfiremake u-boot
-   ipfiremake cpio
-   ipfiremake mdadm
-   ipfiremake dracut
-   ipfiremake lvm2
-   ipfiremake multipath-tools
-   ipfiremake freetype
-   ipfiremake grub
-   ipfiremake libmnl
-   ipfiremake libnfnetlink
-   ipfiremake libnetfilter_queue
-   ipfiremake libnetfilter_conntrack
-   ipfiremake libnetfilter_cthelper
-   ipfiremake libnetfilter_cttimeout
-   ipfiremake iptables
-   case "${TARGET_ARCH}" in
+   lfsmake2 configroot
+   lfsmake2 initscripts
+   lfsmake2 backup
+   lfsmake2 pkg-config
+   lfsmake2 libusb
+   lfsmake2 libusb-compat
+   lfsmake2 libpcap
+   lfsmake2 ppp
+   lfsmake2 pptp
+   lfsmake2 unzip
+   lfsmake2 which
+   lfsmake2 linux-firmware
+   lfsmake2 ath10k-firmware
+   lfsmake2 dvb-firmwares
+   lfsmake2 mt7601u-firmware
+   lfsmake2 zd1211-firmware
+   lfsmake2 rpi-firmware
+   lfsmake2 bc
+   lfsmake2 u-boot
+   lfsmake2 cpio
+   lfsmake2 mdadm
+   lfsmake2 dracut
+   lfsmake2 lvm2
+   lfsmake2 multipath-tools
+   lfsmake2 freetype
+   lfsmake2 grub
+   lfsmake2 libmnl
+   lfsmake2 libnfnetlink
+   lfsmake2 libnetfilter_queue
+   lfsmake2 libnetfilter_conntrack
+   lfsmake2 libnetfilter_cthelper
+   lfsmake2 libnetfilter_cttimeout
+   lfsmake2 iptables
+   case "${BUILD_ARCH}" in
        x86_64)
-               ipfiremake linux                        KCFG=""
- #             ipfiremake backports                    KCFG=""
- #             ipfiremake e1000e                       KCFG=""
- #             ipfiremake igb                          KCFG=""
- #             ipfiremake ixgbe                        KCFG=""
-               ipfiremake xtables-addons               KCFG=""
-               ipfiremake linux-initrd                 KCFG=""
+               lfsmake2 linux                  KCFG=""
 -              lfsmake2 backports                      KCFG=""
 -              lfsmake2 e1000e                 KCFG=""
 -              lfsmake2 igb                            KCFG=""
 -              lfsmake2 ixgbe                  KCFG=""
++#             lfsmake2 backports                      KCFG=""
++#             lfsmake2 e1000e                 KCFG=""
++#             lfsmake2 igb                            KCFG=""
++#             lfsmake2 ixgbe                  KCFG=""
+               lfsmake2 xtables-addons         KCFG=""
+               lfsmake2 linux-initrd                   KCFG=""
                ;;
        i586)
                # x86-pae (Native and new XEN) kernel build
-               ipfiremake linux                        KCFG="-pae"
- #             ipfiremake backports                    KCFG="-pae"
- #             ipfiremake e1000e                       KCFG="-pae"
- #             ipfiremake igb                          KCFG="-pae"
- #             ipfiremake ixgbe                        KCFG="-pae"
-               ipfiremake xtables-addons               KCFG="-pae"
-               ipfiremake linux-initrd                 KCFG="-pae"
+               lfsmake2 linux                  KCFG="-pae"
 -              lfsmake2 backports                      KCFG="-pae"
 -              lfsmake2 e1000e                 KCFG="-pae"
 -              lfsmake2 igb                            KCFG="-pae"
 -              lfsmake2 ixgbe                  KCFG="-pae"
++#             lfsmake2 backports                      KCFG="-pae"
++#             lfsmake2 e1000e                 KCFG="-pae"
++#             lfsmake2 igb                            KCFG="-pae"
++#             lfsmake2 ixgbe                  KCFG="-pae"
+               lfsmake2 xtables-addons         KCFG="-pae"
+               lfsmake2 linux-initrd                   KCFG="-pae"
  
                # x86 kernel build
-               ipfiremake linux                        KCFG=""
- #             ipfiremake backports                    KCFG=""
- #             ipfiremake e1000e                       KCFG=""
- #             ipfiremake igb                          KCFG=""
- #             ipfiremake ixgbe                        KCFG=""
-               ipfiremake xtables-addons               KCFG=""
-               ipfiremake linux-initrd                 KCFG=""
+               lfsmake2 linux                  KCFG=""
 -              lfsmake2 backports                      KCFG=""
 -              lfsmake2 e1000e                 KCFG=""
 -              lfsmake2 igb                            KCFG=""
 -              lfsmake2 ixgbe                  KCFG=""
++#             lfsmake2 backports                      KCFG=""
++#             lfsmake2 e1000e                 KCFG=""
++#             lfsmake2 igb                            KCFG=""
++#             lfsmake2 ixgbe                  KCFG=""
+               lfsmake2 xtables-addons         KCFG=""
+               lfsmake2 linux-initrd                   KCFG=""
                ;;
  
        armv5tel)