summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2016-01-23 14:11:20 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2016-01-23 14:11:20 -0800
commitcae778e10ef2485ba5432edf4efc5cfe7dfbe435 (patch)
tree3575b90161f9fd49014e5eef13874b9776d1e1eb
parentkconfig/x86: older x86 can use microcode too. (diff)
downloadgenkernel-cae778e10ef2485ba5432edf4efc5cfe7dfbe435.tar.gz
genkernel-cae778e10ef2485ba5432edf4efc5cfe7dfbe435.tar.bz2
genkernel-cae778e10ef2485ba5432edf4efc5cfe7dfbe435.zip
Some of the arch-config blocks were never populated for minor arches, so the configs are not usable, we should ignore them.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rw-r--r--Makefile2
-rw-r--r--arch/arm/arch-config1
-rw-r--r--arch/ia64/arch-config1
-rw-r--r--arch/mips/arch-config1
-rw-r--r--arch/parisc/arch-config1
-rw-r--r--arch/parisc64/arch-config1
-rw-r--r--arch/sparc/arch-config1
-rw-r--r--arch/sparc64/arch-config1
-rw-r--r--arch/um/arch-config1
9 files changed, 9 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 421a071b..0a339e36 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ distclean: clean
# Generic rules
%/generated-config: %/arch-config $(BASE_KCONF) merge.pl Makefile
- perl merge.pl $^ $(BASE_KCONF) > $@
+ grep -sq THIS_CONFIG_IS_BROKEN $< && cat $< >$@ || grep -sq perl merge.pl $< $(BASE_KCONF) > $@
%.8: doc/%.8.txt doc/asciidoc.conf Makefile genkernel
a2x --conf-file=doc/asciidoc.conf --attribute="genkernelversion=$(PACKAGE_VERSION)" \
diff --git a/arch/arm/arch-config b/arch/arm/arch-config
index e69de29b..1119d0b5 100644
--- a/arch/arm/arch-config
+++ b/arch/arm/arch-config
@@ -0,0 +1 @@
+THIS_CONFIG_IS_BROKEN
diff --git a/arch/ia64/arch-config b/arch/ia64/arch-config
index e69de29b..1119d0b5 100644
--- a/arch/ia64/arch-config
+++ b/arch/ia64/arch-config
@@ -0,0 +1 @@
+THIS_CONFIG_IS_BROKEN
diff --git a/arch/mips/arch-config b/arch/mips/arch-config
index e69de29b..1119d0b5 100644
--- a/arch/mips/arch-config
+++ b/arch/mips/arch-config
@@ -0,0 +1 @@
+THIS_CONFIG_IS_BROKEN
diff --git a/arch/parisc/arch-config b/arch/parisc/arch-config
index e69de29b..1119d0b5 100644
--- a/arch/parisc/arch-config
+++ b/arch/parisc/arch-config
@@ -0,0 +1 @@
+THIS_CONFIG_IS_BROKEN
diff --git a/arch/parisc64/arch-config b/arch/parisc64/arch-config
index e69de29b..1119d0b5 100644
--- a/arch/parisc64/arch-config
+++ b/arch/parisc64/arch-config
@@ -0,0 +1 @@
+THIS_CONFIG_IS_BROKEN
diff --git a/arch/sparc/arch-config b/arch/sparc/arch-config
index e69de29b..1119d0b5 100644
--- a/arch/sparc/arch-config
+++ b/arch/sparc/arch-config
@@ -0,0 +1 @@
+THIS_CONFIG_IS_BROKEN
diff --git a/arch/sparc64/arch-config b/arch/sparc64/arch-config
index e69de29b..1119d0b5 100644
--- a/arch/sparc64/arch-config
+++ b/arch/sparc64/arch-config
@@ -0,0 +1 @@
+THIS_CONFIG_IS_BROKEN
diff --git a/arch/um/arch-config b/arch/um/arch-config
index e69de29b..1119d0b5 100644
--- a/arch/um/arch-config
+++ b/arch/um/arch-config
@@ -0,0 +1 @@
+THIS_CONFIG_IS_BROKEN