From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Tue, 15 Nov 2011 22:18:55 +0000 (-0800)
Subject: Revert "generate -paravirt configs more accurate"
X-Git-Tag: v2.6.39-400.9.0~848
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=26c9809f334e586633e830a1a15bc7cf273bd6ab;p=users%2Fjedix%2Flinux-maple.git

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 48561be7ff79..62b4de326adf 100644
--- 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 48561be7ff79..62b4de326adf 100644
--- 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 > $@