[gentoo-commits] proj/genkernel:master commit in: /, arch/parisc64/, arch/parisc/, arch/um/, arch/ia64/, arch/mips/, arch/sparc64/, ...

[gentoo-commits] proj/genkernel:master commit in: /, arch/parisc64/, arch/parisc/, arch/um/, arch/ia64/, arch/mips/, arch/sparc64/, ...

[Robin H. Johnson]

commit:     cae778e10ef2485ba5432edf4efc5cfe7dfbe435
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 22:11:20 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 22:11:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cae778e1

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 <AT> gentoo.org>

 Makefile                  | 2 +-
 arch/arm/arch-config      | 1 +
 arch/ia64/arch-config     | 1 +
 arch/mips/arch-config     | 1 +
 arch/parisc/arch-config   | 1 +
 arch/parisc64/arch-config | 1 +
 arch/sparc/arch-config    | 1 +
 arch/sparc64/arch-config  | 1 +
 arch/um/arch-config       | 1 +
 9 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 421a071..0a339e3 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 e69de29..1119d0b 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 e69de29..1119d0b 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 e69de29..1119d0b 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 e69de29..1119d0b 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 e69de29..1119d0b 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 e69de29..1119d0b 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 e69de29..1119d0b 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 e69de29..1119d0b 100644
--- a/arch/um/arch-config
+++ b/arch/um/arch-config
@@ -0,0 +1 @@
+THIS_CONFIG_IS_BROKEN