From cae778e10ef2485ba5432edf4efc5cfe7dfbe435 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 23 Jan 2016 14:11:20 -0800 Subject: 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 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') 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)" \ -- cgit v1.2.3-18-g5258