Merge branch 'kernel-test' into seventeen
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 24 Oct 2014 10:00:34 +0000 (12:00 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 24 Oct 2014 10:00:34 +0000 (12:00 +0200)
1  2 
config/rootfiles/common/i586/linux
config/rootfiles/packages/linux-pae
lfs/linux
make.sh

@@@ -1,7 -1,8 +1,7 @@@
  boot/System.map-KVER-ipfire
 -boot/System.map-ipfire
  boot/config-KVER-ipfire
 +boot/initramfs-KVER-ipfire.img
  boot/vmlinuz-KVER-ipfire
 -boot/vmlinuz-ipfire
  etc/modprobe.d/framebuffer.conf
  etc/modprobe.d/ipv6.conf
  etc/modprobe.d/isdn.conf
@@@ -181,6 -182,8 +181,8 @@@ lib/modules/KVER-ipfir
  #lib/modules/KVER-ipfire/kernel/drivers/base
  #lib/modules/KVER-ipfire/kernel/drivers/base/regmap
  #lib/modules/KVER-ipfire/kernel/drivers/base/regmap/regmap-i2c.ko
+ #lib/modules/KVER-ipfire/kernel/drivers/bcma
+ #lib/modules/KVER-ipfire/kernel/drivers/bcma/bcma.ko
  #lib/modules/KVER-ipfire/kernel/drivers/block
  #lib/modules/KVER-ipfire/kernel/drivers/block/DAC960.ko
  #lib/modules/KVER-ipfire/kernel/drivers/block/cciss.ko
  #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/brcm80211
  #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/brcm80211/brcmfmac
  #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/brcm80211/brcmfmac/brcmfmac.ko
+ #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/brcm80211/brcmsmac
+ #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/brcm80211/brcmsmac/brcmsmac.ko
  #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/brcm80211/brcmutil
  #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/brcm80211/brcmutil/brcmutil.ko
  #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/hostap
  #lib/modules/KVER-ipfire/kernel/drivers/usb/dwc3/dwc3-pci.ko
  #lib/modules/KVER-ipfire/kernel/drivers/usb/dwc3/dwc3.ko
  #lib/modules/KVER-ipfire/kernel/drivers/usb/host
+ #lib/modules/KVER-ipfire/kernel/drivers/usb/host/bcma-hcd.ko
  #lib/modules/KVER-ipfire/kernel/drivers/usb/host/hwa-hc.ko
  #lib/modules/KVER-ipfire/kernel/drivers/usb/host/isp1362-hcd.ko
  #lib/modules/KVER-ipfire/kernel/drivers/usb/host/sl811-hcd.ko
  #lib/modules/KVER-ipfire/modules.symbols.bin
  #lib/modules/KVER-ipfire/source
  sbin/gen_init_cpio
 -boot/ipfirerd-KVER.img
 +boot/initramfs-KVER-ipfire.img
@@@ -1,7 -1,8 +1,7 @@@
  boot/System.map-KVER-ipfire-pae
 -boot/System.map-ipfire-pae
  boot/config-KVER-ipfire-pae
 +#boot/initramfs-KVER-ipfire-pae.img
  boot/vmlinuz-KVER-ipfire-pae
 -boot/vmlinuz-ipfire-pae
  #lib/modules
  lib/modules/KVER-ipfire-pae
  #lib/modules/KVER-ipfire-pae/build
  #lib/modules/KVER-ipfire-pae/kernel/drivers/base
  #lib/modules/KVER-ipfire-pae/kernel/drivers/base/regmap
  #lib/modules/KVER-ipfire-pae/kernel/drivers/base/regmap/regmap-i2c.ko
+ #lib/modules/KVER-ipfire-pae/kernel/drivers/bcma
+ #lib/modules/KVER-ipfire-pae/kernel/drivers/bcma/bcma.ko
  #lib/modules/KVER-ipfire-pae/kernel/drivers/block
  #lib/modules/KVER-ipfire-pae/kernel/drivers/block/DAC960.ko
  #lib/modules/KVER-ipfire-pae/kernel/drivers/block/cciss.ko
  #lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/brcm80211
  #lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/brcm80211/brcmfmac
  #lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/brcm80211/brcmfmac/brcmfmac.ko
+ #lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/brcm80211/brcmsmac
+ #lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/brcm80211/brcmsmac/brcmsmac.ko
  #lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/brcm80211/brcmutil
  #lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/brcm80211/brcmutil/brcmutil.ko
  #lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/hostap
  #lib/modules/KVER-ipfire-pae/kernel/drivers/usb/dwc3/dwc3-pci.ko
  #lib/modules/KVER-ipfire-pae/kernel/drivers/usb/dwc3/dwc3.ko
  #lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host
+ #lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/bcma-hcd.ko
  #lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/hwa-hc.ko
  #lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/isp1362-hcd.ko
  #lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/sl811-hcd.ko
diff --combined lfs/linux
+++ b/lfs/linux
  
  include Config
  
- VER        = 3.10.44
+ VER        = 3.10.58
  
  RPI_PATCHES = linux-3.10.38-grsec-1b49b45
- GRS_PATCHES = grsecurity-2.9.1-3.10.44-ipfire1.patch.xz
+ GRS_PATCHES = grsecurity-2.9.1-3.10.58-ipfire1.patch.xz
  
  THISAPP    = linux-$(VER)
  DL_FILE    = linux-$(VER).tar.xz
@@@ -36,7 -36,7 +36,7 @@@ DIR_APP    = $(DIR_SRC)/$(THISAPP
  CFLAGS     =
  CXXFLAGS   =
  
- PAK_VER    = 51
+ PAK_VER    = 52
  DEPS     = ""
  
  VERSUFIX=ipfire$(KCFG)
@@@ -74,9 -74,9 +74,9 @@@ $(DL_FILE)                            = $(URL_IPFIRE)/$(DL_FILE
  rpi-patches-$(RPI_PATCHES).patch.xz   = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
  $(GRS_PATCHES)                                = $(URL_IPFIRE)/$(GRS_PATCHES)
  
- $(DL_FILE)_MD5                                = 8a4006eff3bbd8aff58fe4b443223e7a
+ $(DL_FILE)_MD5                                = 3ff3478b6351143cef22d4b81cf48b01
  rpi-patches-$(RPI_PATCHES).patch.xz_MD5       = a7408e8bad57b4b2cb677dd5a0bfb7ff
- $(GRS_PATCHES)_MD5                    = 07e5d812146063ed5b2ce49d0d24099b
+ $(GRS_PATCHES)_MD5                    = c96901bf2eae568cce6257546182215d
  
  install : $(TARGET)
  
@@@ -141,8 -141,15 +141,15 @@@ endi
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.55-rt2800usb-change_queue_warn_to_debug.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.39-add_libertas_uap.patch
  
+       # mmc
+ ifneq "$(KCFG)" "-rpi"
+       # this patch is also in the rpi patchset.
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.57-mmc_add_eMMC_5.x.patch
+ endif
        # mISDN Patches
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
@@@ -277,11 -284,13 +284,11 @@@ ifeq "$(KCFG)" "-rpi
  else
        cd $(DIR_APP) && make $(MAKETUNING) bzImage modules
        cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
 -      ln -sf vmlinuz-$(VER)-$(VERSUFIX) /boot/vmlinuz-$(VERSUFIX)
  endif
  endif
  endif
        cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX)
 -      ln -sf System.map-$(VER)-$(VERSUFIX) /boot/System.map-$(VERSUFIX)
        cd $(DIR_APP) && make $(MAKETUNING) modules_install
        cd $(DIR_APP) && make $(MAKETUNING) firmware_install
  
@@@ -293,17 -302,6 +300,17 @@@ ifeq "$(MACHINE_TYPE)" "arm
                        done
  endif
  
 +      # Create initramfs images
 +      dracut --force --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
 +
 +ifeq "$(KCFG)" "-kirkwood"
 +      cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)
 +endif
 +
 +ifeq "$(KCFG)" "-multi"
 +      cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)
 +endif
 +
  ifeq "$(LASTKERNEL)" "1"
        # Only do this once
        cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
diff --combined make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.15"                                                        # Version number
 -CORE="84"                                                     # Core Level (Filename)
 -PAKFIRE_CORE="84"                                             # Core Level (PAKFIRE)
 +VERSION="2.17"                                                        # Version number
 +CORE="86"                                                     # Core Level (Filename)
 +PAKFIRE_CORE="85"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -36,7 -36,7 +36,7 @@@ BUILD_IMAGES=1                                                        # Flash and Xen Do
  KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
  GIT_TAG=$(git tag | tail -1)                                  # Git Tag
  GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)        # Last commit
 -TOOLCHAINVER=7
 +TOOLCHAINVER=8
  
  # New architecture variables
  BUILD_ARCH="$(uname -m)"
@@@ -362,6 -362,7 +362,6 @@@ buildbase() 
      lfsmake2 less
      lfsmake2 make
      lfsmake2 man
 -    lfsmake2 mktemp
      lfsmake2 kmod
      lfsmake2 net-tools
      lfsmake2 patch
      lfsmake2 vim
      lfsmake2 xz
      lfsmake2 paxctl
 -    lfsmake2 grub
  }
  
  buildipfire() {
    ipfiremake rpi-firmware
    ipfiremake bc
    ipfiremake u-boot
 +  ipfiremake cpio
 +  ipfiremake mdadm
 +  ipfiremake dracut
 +  ipfiremake lvm2
 +  ipfiremake multipath-tools
 +  ipfiremake freetype
 +  ipfiremake grub
  
    case "${TARGET_ARCH}" in
        i586)
  #             ipfiremake r8101                        KCFG="-pae"
                ipfiremake e1000e                       KCFG="-pae"
                ipfiremake igb                          KCFG="-pae"
+               ipfiremake ixgbe                        KCFG="-pae"
  
                # x86 kernel build
                ipfiremake linux                        KCFG=""
  #             ipfiremake r8101                        KCFG=""
                ipfiremake e1000e                       KCFG=""
                ipfiremake igb                          KCFG=""
+               ipfiremake ixgbe                        KCFG=""
                ;;
  
        armv5tel)
                ipfiremake cryptodev                    KCFG="-multi"
                ipfiremake e1000e                       KCFG="-multi"
                ipfiremake igb                          KCFG="-multi"
+               ipfiremake ixgbe                        KCFG="-multi"
  
                # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
                ipfiremake linux                        KCFG="-kirkwood"
  #             ipfiremake r8169                        KCFG="-kirkwood"
  #             ipfiremake r8168                        KCFG="-kirkwood"
  #             ipfiremake r8101                        KCFG="-kirkwood"
#             ipfiremake e1000e                       KCFG="-kirkwood"
              ipfiremake e1000e                       KCFG="-kirkwood"
                ipfiremake igb                          KCFG="-kirkwood"
+               ipfiremake ixgbe                        KCFG="-kirkwood"
                ;;
    esac
    ipfiremake pkg-config
    ipfiremake dhcpcd
    ipfiremake boost
    ipfiremake linux-atm
 -  ipfiremake cpio
 -  ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
    ipfiremake pam
    ipfiremake libpng
    ipfiremake libtiff
    ipfiremake libart
 -  ipfiremake freetype
    ipfiremake gd
    ipfiremake popt
    ipfiremake pcre
    ipfiremake slang
    ipfiremake newt
 +  ipfiremake libsmooth
    ipfiremake attr
    ipfiremake acl
    ipfiremake libcap
    ipfiremake usb_modeswitch
    ipfiremake usb_modeswitch_data
    ipfiremake zerofree
 -  ipfiremake mdadm
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
    ipfiremake batctl
    ipfiremake perl-PDF-API2
    ipfiremake squid-accounting
 +  ipfiremake pigz
  }
  
  buildinstaller() {
    ipfiremake memtest
    ipfiremake installer
    installmake strip
 -  ipfiremake initrd
  }
  
  buildpackages() {
    modprobe loop 2>/dev/null
    if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
        ipfiremake flash-images
 +      ipfiremake flash-images SCON=1
    fi
  
    mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1