]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'origin/next' into kernel-4.14
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 1 Dec 2017 16:51:46 +0000 (17:51 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 1 Dec 2017 16:51:46 +0000 (17:51 +0100)
1  2 
make.sh

diff --combined make.sh
index ca4b8477a71550ea4df8a00b8e40e0873481d007,bb80f3c052420f0f4cb106adf373b1f61d139601..e3f32b73741f40927c0d6b8599bb090586093dbe
+++ b/make.sh
@@@ -947,6 -947,7 +947,7 @@@ buildtoolchain() 
        lfsmake1 texinfo
        lfsmake1 xz
        lfsmake1 fake-environ
+       lfsmake1 strip
        lfsmake1 cleanup-toolchain
  }
  
@@@ -1060,29 -1061,29 +1061,29 @@@ buildipfire() 
    case "${BUILD_ARCH}" in
        x86_64)
                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
                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
                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=""
                ;;