diff --git a/base/linux/12-conf-hacks.patch b/base/linux/12-conf-hacks.patch index 302fd10a6..1839eb0a3 100644 --- a/base/linux/12-conf-hacks.patch +++ b/base/linux/12-conf-hacks.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../linux/12-conf-hacks.patch -# Copyright (C) 2008 - 2012 The OpenSDE Project +# Copyright (C) 2008 - 2016 The OpenSDE Project # Copyright (C) 2004 - 2008 The T2 SDE Project # Copyright (C) 1998 - 2003 ROCK Linux Project # @@ -89,42 +89,33 @@ diff -up linux-2.6.36/scripts/kconfig/lkc.h.conf_hack linux-2.6.36/scripts/kconf def_no, def_random }; -diff -up linux-2.6.36/scripts/kconfig/Makefile.conf_hack linux-2.6.36/scripts/kconfig/Makefile ---- linux-2.6.36/scripts/kconfig/Makefile.conf_hack 2010-10-20 22:30:22.000000000 +0200 -+++ linux-2.6.36/scripts/kconfig/Makefile 2010-12-10 11:23:35.187362246 +0100 +diff -up linux-4.1/scripts/kconfig/Makefile.conf_hack linux-4.1/scripts/kconfig/Makefile +--- linux-4.1/scripts/kconfig/Makefile.conf_hack 2016-02-24 22:30:22.000000000 +0200 ++++ linux-4.1/scripts/kconfig/Makefile 2016-02-24 11:23:35.187362246 +0100 @@ -3,7 +3,7 @@ # These targets are used from top-level makefile - PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \ + PHONY += xconfig gconfig menuconfig config silentoldconfig update-po-config \ - localmodconfig localyesconfig + localmodconfig localyesconfig no2modconfig ifdef KBUILD_KCONFIG Kconfig := $(KBUILD_KCONFIG) -@@ -95,7 +95,7 @@ update-po-config: $(obj)/kxgettext $(obj - $(Q)rm -f arch/um/Kconfig.arch - $(Q)rm -f $(obj)/config.pot - --PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig -+PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig no2modconfig - - allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf - $< --$@ $(Kconfig) -@@ -108,6 +108,9 @@ listnewconfig oldnoconfig: $(obj)/conf +@@ -93,6 +93,9 @@ savedefconfig: $(obj)/conf - $< --$@=defconfig $(Kconfig) + $< $(silent) --$@=defconfig $(Kconfig) -+no2modconfig: $(obj)/conf -+ $< --$@ $(Kconfig) ++no2modconfig: scripts/kconfig/conf ++ $< --no2modconfig $(Kconfig) + defconfig: $(obj)/conf ifeq ($(KBUILD_DEFCONFIG),) - $< --defconfig $(Kconfig) -@@ -135,6 +138,7 @@ help: + $< $(silent) --defconfig $(Kconfig) +@@ -132,6 +135,7 @@ + @echo ' silentoldconfig - Same as oldconfig, but quietly, additionally update deps' + @echo ' defconfig - New config with default from ARCH supplied defconfig' + @echo ' savedefconfig - Save current config as ./defconfig (minimal config)' ++ @echo ' no2modconfig - New config selecting modules for disabled options' @echo ' allnoconfig - New config where all options are answered with no' @echo ' allyesconfig - New config where all options are accepted with yes' @echo ' allmodconfig - New config selecting modules when possible' -+ @echo ' no2modconfig - New config selecting modules for disabled options' - @echo ' alldefconfig - New config with all symbols set to default' - @echo ' randconfig - New config with random answer to all options' - @echo ' listnewconfig - List new options' diff --git a/base/linux/linux.conf b/base/linux/linux.conf index e92dc1b8b..946e0742b 100644 --- a/base/linux/linux.conf +++ b/base/linux/linux.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../linux/linux.conf -# Copyright (C) 2007 - 2013 The OpenSDE Project +# Copyright (C) 2007 - 2016 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -130,8 +130,8 @@ main_lx() { abort "At least one of the 3rd party kernel modules failed!" fi - echo "Running 'depmod -ae -b ${root:-/} -q -F /boot/System.map ${lx_kernelrelease}' ..." - depmod -ae -b ${root:-/} -q -F $root/boot/System.map_${lx_kernelrelease} ${lx_kernelrelease} + echo "Running 'depmod -ae -b ${root:-/} -F /boot/System.map ${lx_kernelrelease}' ..." + depmod -ae -b ${root:-/} -F $root/boot/System.map_${lx_kernelrelease} ${lx_kernelrelease} # due static depmod :-( for x in $moduledir/modules.*