157 lines
5.1 KiB
Diff
157 lines
5.1 KiB
Diff
diff -uNr linux-3.2.33-go.orig/arch/alpha/Kconfig linux-3.2.33-go/arch/alpha/Kconfig
|
|
--- linux-3.2.33-go.orig/arch/alpha/Kconfig 2012-11-15 22:08:02.768806792 +0100
|
|
+++ linux-3.2.33-go/arch/alpha/Kconfig 2012-11-15 22:08:29.937483632 +0100
|
|
@@ -673,3 +673,4 @@
|
|
|
|
source "lib/Kconfig"
|
|
|
|
+source "3rdparty/Kconfig"
|
|
diff -uNr linux-3.2.33-go.orig/arch/arm/Kconfig linux-3.2.33-go/arch/arm/Kconfig
|
|
--- linux-3.2.33-go.orig/arch/arm/Kconfig 2012-11-15 22:07:59.952839378 +0100
|
|
+++ linux-3.2.33-go/arch/arm/Kconfig 2012-11-15 22:14:01.950566716 +0100
|
|
@@ -2259,3 +2259,5 @@
|
|
source "crypto/Kconfig"
|
|
|
|
source "lib/Kconfig"
|
|
+
|
|
+source "3rdparty/Kconfig"
|
|
diff -uNr linux-3.2.33-go.orig/arch/ia64/Kconfig linux-3.2.33-go/arch/ia64/Kconfig
|
|
--- linux-3.2.33-go.orig/arch/ia64/Kconfig 2012-11-15 22:08:00.893828523 +0100
|
|
+++ linux-3.2.33-go/arch/ia64/Kconfig 2012-11-15 22:08:29.938483621 +0100
|
|
@@ -669,3 +669,5 @@
|
|
|
|
config IOMMU_HELPER
|
|
def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
|
|
+
|
|
+source "3rdparty/Kconfig"
|
|
diff -uNr linux-3.2.33-go.orig/arch/mips/Kconfig linux-3.2.33-go/arch/mips/Kconfig
|
|
--- linux-3.2.33-go.orig/arch/mips/Kconfig 2012-11-15 22:08:02.698807597 +0100
|
|
+++ linux-3.2.33-go/arch/mips/Kconfig 2012-11-15 22:08:29.939483610 +0100
|
|
@@ -2485,3 +2485,5 @@
|
|
source "crypto/Kconfig"
|
|
|
|
source "lib/Kconfig"
|
|
+
|
|
+source "3rdparty/Kconfig"
|
|
diff -uNr linux-3.2.33-go.orig/arch/powerpc/Kconfig linux-3.2.33-go/arch/powerpc/Kconfig
|
|
--- linux-3.2.33-go.orig/arch/powerpc/Kconfig 2012-11-15 22:08:01.893816938 +0100
|
|
+++ linux-3.2.33-go/arch/powerpc/Kconfig 2012-11-15 22:08:29.940483598 +0100
|
|
@@ -980,3 +980,5 @@
|
|
bool
|
|
|
|
source "arch/powerpc/kvm/Kconfig"
|
|
+
|
|
+source "3rdparty/Kconfig"
|
|
diff -uNr linux-3.2.33-go.orig/arch/sparc/Kconfig linux-3.2.33-go/arch/sparc/Kconfig
|
|
--- linux-3.2.33-go.orig/arch/sparc/Kconfig 2012-11-15 22:08:00.130837331 +0100
|
|
+++ linux-3.2.33-go/arch/sparc/Kconfig 2012-11-15 22:08:29.941483586 +0100
|
|
@@ -605,3 +605,5 @@
|
|
source "crypto/Kconfig"
|
|
|
|
source "lib/Kconfig"
|
|
+
|
|
+source "3rdparty/Kconfig"
|
|
diff -uNr linux-3.2.33-go.orig/arch/x86/Kconfig linux-3.2.33-go/arch/x86/Kconfig
|
|
--- linux-3.2.33-go.orig/arch/x86/Kconfig 2012-11-15 22:08:00.435833823 +0100
|
|
+++ linux-3.2.33-go/arch/x86/Kconfig 2012-11-15 22:08:29.945483540 +0100
|
|
@@ -2179,3 +2179,5 @@
|
|
source "arch/x86/kvm/Kconfig"
|
|
|
|
source "lib/Kconfig"
|
|
+
|
|
+source "3rdparty/Kconfig"
|
|
diff -uNr linux-3.2.33-go.orig/Makefile linux-3.2.33-go/Makefile
|
|
--- linux-3.2.33-go.orig/Makefile 2012-11-15 22:08:03.435799123 +0100
|
|
+++ linux-3.2.33-go/Makefile 2012-11-15 22:08:29.946483529 +0100
|
|
@@ -507,7 +507,7 @@
|
|
|
|
# Objects we will link into vmlinux / subdirs we need to visit
|
|
init-y := init/
|
|
-drivers-y := drivers/ sound/ firmware/
|
|
+drivers-y := drivers/ sound/ firmware/ 3rdparty/
|
|
net-y := net/
|
|
libs-y := lib/
|
|
core-y := usr/
|
|
diff -uNr linux-3.2.33-go.orig/scripts/kconfig/Makefile linux-3.2.33-go/scripts/kconfig/Makefile
|
|
--- linux-3.2.33-go.orig/scripts/kconfig/Makefile 2012-11-15 22:07:58.064861094 +0100
|
|
+++ linux-3.2.33-go/scripts/kconfig/Makefile 2012-11-15 22:08:55.603180188 +0100
|
|
@@ -11,29 +11,29 @@
|
|
Kconfig := Kconfig
|
|
endif
|
|
|
|
-xconfig: $(obj)/qconf
|
|
+xconfig: $(obj)/qconf 3rdparty/Makefile
|
|
$< $(Kconfig)
|
|
|
|
-gconfig: $(obj)/gconf
|
|
+gconfig: $(obj)/gconf 3rdparty/Makefile
|
|
$< $(Kconfig)
|
|
|
|
-menuconfig: $(obj)/mconf
|
|
+menuconfig: $(obj)/mconf 3rdparty/Makefile
|
|
$< $(Kconfig)
|
|
|
|
-config: $(obj)/conf
|
|
+config: $(obj)/conf 3rdparty/Makefile
|
|
$< --oldaskconfig $(Kconfig)
|
|
|
|
-nconfig: $(obj)/nconf
|
|
+nconfig: $(obj)/nconf 3rdparty/Makefile
|
|
$< $(Kconfig)
|
|
|
|
-oldconfig: $(obj)/conf
|
|
+oldconfig: $(obj)/conf 3rdparty/Makefile
|
|
$< --$@ $(Kconfig)
|
|
|
|
-silentoldconfig: $(obj)/conf
|
|
+silentoldconfig: $(obj)/conf 3rdparty/Makefile
|
|
$(Q)mkdir -p include/generated
|
|
$< --$@ $(Kconfig)
|
|
|
|
-localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
|
|
+localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile
|
|
$(Q)mkdir -p include/generated
|
|
$(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
|
|
$(Q)if [ -f .config ]; then \
|
|
@@ -90,18 +90,18 @@
|
|
*) cat $(CLONECONFIG) > .config.running ;; \
|
|
esac && \
|
|
echo -e "Cloning configuration file $(CLONECONFIG)\n"
|
|
- $(Q)$< --defconfig=.config.running arch/$(SRCARCH)/Kconfig
|
|
+ $(Q)$< --defconfig=.config.running arch/$(SRCARCH)/Kconfig 3rdparty/Makefile
|
|
|
|
|
|
PHONY += listnewconfig oldnoconfig savedefconfig defconfig
|
|
|
|
-listnewconfig oldnoconfig: $(obj)/conf
|
|
+listnewconfig oldnoconfig: $(obj)/conf 3rdparty/Makefile
|
|
$< --$@ $(Kconfig)
|
|
|
|
-savedefconfig: $(obj)/conf
|
|
+savedefconfig: $(obj)/conf 3rdparty/Makefile
|
|
$< --$@=defconfig $(Kconfig)
|
|
|
|
-defconfig: $(obj)/conf
|
|
+defconfig: $(obj)/conf 3rdparty/Makefile
|
|
ifeq ($(KBUILD_DEFCONFIG),)
|
|
$< --defconfig $(Kconfig)
|
|
else
|
|
@@ -109,7 +109,7 @@
|
|
$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
|
|
endif
|
|
|
|
-%_defconfig: $(obj)/conf
|
|
+%_defconfig: $(obj)/conf 3rdparty/Makefile
|
|
$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
|
|
|
|
# Help text used by make help
|
|
@@ -186,6 +186,8 @@
|
|
gconf-target := 1
|
|
endif
|
|
|
|
+3rdparty/Makefile:
|
|
+ pushd $(srctree)/3rdparty ; $(PERL) ./mkbuild.pl ; popd
|
|
|
|
ifeq ($(qconf-target),1)
|
|
hostprogs-y += qconf
|