Revert "generate -paravirt configs more accurate"

This reverts commit c2c81e6d5e8c5c7893db8e7805849a24578c3cd7.

diff --git a/uek-rpm/ol5/Makefile.config b/uek-rpm/ol5/Makefile.config
index 48561be7ff792f7a52f26d4968fef5b7ff93c748..62b4de326adf2ed56fe239d32ec9bb3b436d6655 100644 (file)
--- a/uek-rpm/ol5/Makefile.config
+++ b/uek-rpm/ol5/Makefile.config
@@ -53,15 +53,15 @@ kernel-$(VERSION)-x86_64.config: /dev/null temp-x86_64-generic
 kernel-$(VERSION)-x86_64-debug.config: /dev/null temp-x86_64-debug-generic
        perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-i686-paravirt.config: config-generic-paravirt kernel-$(VERSION)-i686.config 
+kernel-$(VERSION)-i686-paravirt.config: config-generic-paravirt temp-x86-generic 
        perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i686-paravirt_debug.config: kernel-$(VERSION)-i686-paravirt.config kernel-$(VERSION)-i686-debug.config
+kernel-$(VERSION)-i686-paravirt_debug.config: kernel-$(VERSION)-i686-paravirt.config temp-debug-generic 
        perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-x86_64-paravirt.config: config-generic-paravirt kernel-$(VERSION)-x86_64.config 
+kernel-$(VERSION)-x86_64-paravirt.config: config-generic-paravirt temp-x86_64-generic
        perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-x86_64-paravirt_debug.config: kernel-$(VERSION)-x86_64-paravirt.config kernel-$(VERSION)-x86_64-debug.config
+kernel-$(VERSION)-x86_64-paravirt_debug.config: kernel-$(VERSION)-x86_64-paravirt.config temp-debug-generic 
        perl merge.pl $^ x86_64 > $@
 

diff --git a/uek-rpm/ol6/Makefile.config b/uek-rpm/ol6/Makefile.config
index 48561be7ff792f7a52f26d4968fef5b7ff93c748..62b4de326adf2ed56fe239d32ec9bb3b436d6655 100644 (file)
--- a/uek-rpm/ol6/Makefile.config
+++ b/uek-rpm/ol6/Makefile.config
@@ -53,15 +53,15 @@ kernel-$(VERSION)-x86_64.config: /dev/null temp-x86_64-generic
 kernel-$(VERSION)-x86_64-debug.config: /dev/null temp-x86_64-debug-generic
        perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-i686-paravirt.config: config-generic-paravirt kernel-$(VERSION)-i686.config 
+kernel-$(VERSION)-i686-paravirt.config: config-generic-paravirt temp-x86-generic 
        perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i686-paravirt_debug.config: kernel-$(VERSION)-i686-paravirt.config kernel-$(VERSION)-i686-debug.config
+kernel-$(VERSION)-i686-paravirt_debug.config: kernel-$(VERSION)-i686-paravirt.config temp-debug-generic 
        perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-x86_64-paravirt.config: config-generic-paravirt kernel-$(VERSION)-x86_64.config 
+kernel-$(VERSION)-x86_64-paravirt.config: config-generic-paravirt temp-x86_64-generic
        perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-x86_64-paravirt_debug.config: kernel-$(VERSION)-x86_64-paravirt.config kernel-$(VERSION)-x86_64-debug.config
+kernel-$(VERSION)-x86_64-paravirt_debug.config: kernel-$(VERSION)-x86_64-paravirt.config temp-debug-generic 
        perl merge.pl $^ x86_64 > $@