]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 19 Oct 2013 13:05:42 +0000 (15:05 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 19 Oct 2013 13:05:42 +0000 (15:05 +0200)
1  2 
lfs/linux

diff --combined lfs/linux
index bb838c1e69db48205831cc608bc3f07439321518,d6a8b1d112db85cf13bb6b913c7f3181b25bd2bc..0c8ac9fca1efe4b6d37231772d5587d4523fd6eb
+++ b/lfs/linux
  
  include Config
  
 -VER        = 3.10.16
 +VER        = 3.10.17
  
  RPI_PATCHES = linux-3.10.10-c1af7c6
 -GRS_PATCHES = grsecurity-2.9.1-3.10.16-ipfire1.patch.xz
 +GRS_PATCHES = grsecurity-2.9.1-3.10.17-ipfire1.patch.xz
  
  THISAPP    = linux-$(VER)
  DL_FILE    = linux-$(VER).tar.xz
@@@ -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                                = 5e232365cbc0797b716b605a165703e1
 +$(DL_FILE)_MD5                                = 0c52d1266fe1087bcfa6517646188ecc
  rpi-patches-$(RPI_PATCHES).patch.xz_MD5       = ef9274b3ff5d05daaaa4bdbe86ad00fc
 -$(GRS_PATCHES)_MD5                    = 826d8a90e7cdfc84ac871512c773d712
 +$(GRS_PATCHES)_MD5                    = 2c005d8f5e55da2f23cb92af3baa7108
  
  install : $(TARGET)
  
@@@ -191,21 -191,21 +191,21 @@@ els
        cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile
  
  ifeq "$(KCFG)" "-kirkwood"
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage
+       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage modules
        cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX)
  else
  ifeq "$(KCFG)" "-multi"
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage
+       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage modules
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/zImage-$(VERSUFIX)
  else
  ifeq "$(KCFG)" "-rpi"
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage
+       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage modules
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/kernel.img
  else
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
+       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage modules
        cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
        ln -sf vmlinuz-$(VER)-$(VERSUFIX) /boot/vmlinuz-$(VERSUFIX)
  endif
@@@ -214,7 -214,6 +214,6 @@@ endi
        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 CC="$(KGCC)" $(MAKETUNING) modules
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install