Build paravirt and paravirt-debug kernels

diff --git a/uek-rpm/ol5/Makefile.config b/uek-rpm/ol5/Makefile.config
index a8a9b8c9376455affc3157c2e8dbff8d0bf0e5b6..62b4de326adf2ed56fe239d32ec9bb3b436d6655 100644 (file)
--- a/uek-rpm/ol5/Makefile.config
+++ b/uek-rpm/ol5/Makefile.config
@@ -7,13 +7,11 @@ CFG           = kernel-$(VERSION)
 CONFIGFILES    = \
        $(CFG)-i686.config $(CFG)-i686-debug.config \
        $(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
-       $(CFG)-s390x.config $(CFG)-arm.config \
-       $(CFG)-ppc.config $(CFG)-ppc-smp.config \
-       $(CFG)-sparc64.config  \
-       $(CFG)-ppc64.config $(CFG)-ppc64-debug.config \
-       $(CFG)-ia64.config
+       $(CFG)-i686-paravirt.config $(CFG)-x86_64-paravirt.config \
+       $(CFG)-i686-paravirt_debug.config $(CFG)-x86_64-paravirt_debug.config 
+       
 
-PLATFORMS      = x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64
+PLATFORMS      = x86 x86_64 
 TEMPFILES      = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
 
 configs: $(CONFIGFILES)
@@ -43,24 +41,6 @@ temp-x86_64-generic: config-x86_64-generic temp-generic
 temp-x86_64-debug-generic: config-x86_64-generic temp-debug-generic
        perl merge.pl $^  > $@
 
-temp-sparc64-generic: config-sparc64-generic temp-generic
-       perl merge.pl $^  > $@
-
-temp-powerpc-generic: config-powerpc-generic temp-generic
-       perl merge.pl $^  > $@
-
-temp-powerpc-debug-generic: config-powerpc-generic temp-debug-generic
-       perl merge.pl $^  > $@
-
-temp-powerpc32-generic: config-powerpc32-generic temp-powerpc-generic
-       perl merge.pl $^  > $@
-
-temp-s390-generic: config-s390x temp-generic
-       perl merge.pl $^ > $@
-
-temp-ia64-generic: config-ia64-generic temp-generic
-       perl merge.pl $^ > $@
-
 kernel-$(VERSION)-i686.config: config-i686 temp-x86-generic
        perl merge.pl $^ i386 > $@
 
@@ -73,26 +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)-sparc64.config: /dev/null temp-sparc64-generic
-       perl merge.pl $^ sparc64 > $@
-
-kernel-$(VERSION)-ppc64.config: config-powerpc64 temp-powerpc-generic
-       perl merge.pl $^ powerpc > $@
-
-kernel-$(VERSION)-ppc64-debug.config: config-powerpc64 temp-powerpc-debug-generic
-       perl merge.pl $^ powerpc > $@
-
-kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
-       perl merge.pl $^ s390 > $@
+kernel-$(VERSION)-i686-paravirt.config: config-generic-paravirt temp-x86-generic 
+       perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-arm.config: config-arm temp-generic
-       perl merge.pl $^ arm > $@
+kernel-$(VERSION)-i686-paravirt_debug.config: kernel-$(VERSION)-i686-paravirt.config temp-debug-generic 
+       perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic
-       perl merge.pl $^ powerpc > $@
+kernel-$(VERSION)-x86_64-paravirt.config: config-generic-paravirt temp-x86_64-generic
+       perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-ppc-smp.config: config-powerpc32-smp temp-powerpc32-generic
-       perl merge.pl $^ powerpc > $@
+kernel-$(VERSION)-x86_64-paravirt_debug.config: kernel-$(VERSION)-x86_64-paravirt.config temp-debug-generic 
+       perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-ia64.config: /dev/null temp-ia64-generic
-       perl merge.pl $^ ia64 > $@

diff --git a/uek-rpm/ol5/config-generic-paravirt b/uek-rpm/ol5/config-generic-paravirt
new file mode 100644 (file)
index 0000000..14b4c8d
--- /dev/null
+++ b/uek-rpm/ol5/config-generic-paravirt
@@ -0,0 +1 @@
+CONFIG_PARAVIRT_SPINLOCKS=y

diff --git a/uek-rpm/ol5/kernel-uek.spec b/uek-rpm/ol5/kernel-uek.spec
index cd715fe9593bec28efd6299d4eec602cb74828f6..24d9db453feb6ea3381dca704dfb4cefa1e0a47b 100644 (file)
--- a/uek-rpm/ol5/kernel-uek.spec
+++ b/uek-rpm/ol5/kernel-uek.spec
@@ -91,6 +91,8 @@ Summary: The Linux kernel
 %define with_kdump     0
 # kernel-debug
 %define with_debug     1
+%define with_paravirt  1
+%define with_paravirt_debug  1
 # kernel-doc
 %define with_doc       1
 # kernel-headers
@@ -382,6 +384,8 @@ Summary: The Linux kernel
 %define with_up 0
 %define with_smp 0
 %define with_pae 0
+%define with_paravirt 0
+%define with_paravirt_debug 0
 %define with_kdump 0
 %define with_debuginfo 0
 %define _enable_debug_packages 0
@@ -521,6 +525,7 @@ Source23: config-generic
 Source24: config-rhel-generic
 Source25: Module.kabi_i686
 Source28: Module.kabi_x86_64
+Source29: config-generic-paravirt
 
 Source30: config-x86-generic
 ##Source31: config-i586
@@ -807,6 +812,18 @@ This package includes a kdump version of the Linux kernel. It is
 required only on machines which will use the kexec-based kernel crash dump
 mechanism.
 
+%define variant_summary Paravitrualized kernel
+%kernel_variant_package paravirt
+%description paravirt
+This package includes a paravirt version of the Linux kernel.
+CONFIG_PARAVIRT_SPINLOCKS=y
+
+%define variant_summary Paravitrualized debug kernel
+%kernel_variant_package paravirt_debug
+%description paravirt_debug
+This package includes a paravirt version of the Linux kernel with debug info.
+CONFIG_PARAVIRT_SPINLOCKS=y
+
 
 %prep
 # do a few sanity-checks for --with *only builds
@@ -1505,6 +1522,14 @@ mkdir -p $RPM_BUILD_ROOT/boot
 
 cd linux-%{kversion}.%{_target_cpu}
 
+%if %{with_paravirt}
+BuildKernel %make_target %kernel_image paravirt 
+%endif
+
+%if %{with_paravirt_debug}
+BuildKernel %make_target %kernel_image paravirt_debug 
+%endif
+
 %if %{with_debug}
 %if %{with_up}
 BuildKernel %make_target %kernel_image debug
@@ -1779,6 +1804,15 @@ fi\
 %kernel_variant_preun PAEdebug
 %kernel_variant_pre PAEdebug
 
+%kernel_variant_post -v paravirt -r (kernel-smp|kernel-xen|kernel-uek)
+%kernel_variant_preun paravirt
+%kernel_variant_pre paravirt
+
+%kernel_variant_post -v paravirt_debug -r (kernel-smp|kernel-xen|kernel-uek)
+%kernel_variant_preun paravirt_debug
+%kernel_variant_pre paravirt_debug
+
+
 if [ -x /sbin/ldconfig ]
 then
     /sbin/ldconfig -X || exit $?
@@ -1868,6 +1902,8 @@ fi
 %{nil}
 
 
+%kernel_variant_files %{with_paravirt} paravirt
+%kernel_variant_files %{with_paravirt_debug} paravirt_debug
 %kernel_variant_files %{with_up}
 %kernel_variant_files %{with_smp} smp
 %if %{with_up}

diff --git a/uek-rpm/ol6/Makefile.config b/uek-rpm/ol6/Makefile.config
index a8a9b8c9376455affc3157c2e8dbff8d0bf0e5b6..62b4de326adf2ed56fe239d32ec9bb3b436d6655 100644 (file)
--- a/uek-rpm/ol6/Makefile.config
+++ b/uek-rpm/ol6/Makefile.config
@@ -7,13 +7,11 @@ CFG           = kernel-$(VERSION)
 CONFIGFILES    = \
        $(CFG)-i686.config $(CFG)-i686-debug.config \
        $(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
-       $(CFG)-s390x.config $(CFG)-arm.config \
-       $(CFG)-ppc.config $(CFG)-ppc-smp.config \
-       $(CFG)-sparc64.config  \
-       $(CFG)-ppc64.config $(CFG)-ppc64-debug.config \
-       $(CFG)-ia64.config
+       $(CFG)-i686-paravirt.config $(CFG)-x86_64-paravirt.config \
+       $(CFG)-i686-paravirt_debug.config $(CFG)-x86_64-paravirt_debug.config 
+       
 
-PLATFORMS      = x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64
+PLATFORMS      = x86 x86_64 
 TEMPFILES      = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
 
 configs: $(CONFIGFILES)
@@ -43,24 +41,6 @@ temp-x86_64-generic: config-x86_64-generic temp-generic
 temp-x86_64-debug-generic: config-x86_64-generic temp-debug-generic
        perl merge.pl $^  > $@
 
-temp-sparc64-generic: config-sparc64-generic temp-generic
-       perl merge.pl $^  > $@
-
-temp-powerpc-generic: config-powerpc-generic temp-generic
-       perl merge.pl $^  > $@
-
-temp-powerpc-debug-generic: config-powerpc-generic temp-debug-generic
-       perl merge.pl $^  > $@
-
-temp-powerpc32-generic: config-powerpc32-generic temp-powerpc-generic
-       perl merge.pl $^  > $@
-
-temp-s390-generic: config-s390x temp-generic
-       perl merge.pl $^ > $@
-
-temp-ia64-generic: config-ia64-generic temp-generic
-       perl merge.pl $^ > $@
-
 kernel-$(VERSION)-i686.config: config-i686 temp-x86-generic
        perl merge.pl $^ i386 > $@
 
@@ -73,26 +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)-sparc64.config: /dev/null temp-sparc64-generic
-       perl merge.pl $^ sparc64 > $@
-
-kernel-$(VERSION)-ppc64.config: config-powerpc64 temp-powerpc-generic
-       perl merge.pl $^ powerpc > $@
-
-kernel-$(VERSION)-ppc64-debug.config: config-powerpc64 temp-powerpc-debug-generic
-       perl merge.pl $^ powerpc > $@
-
-kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
-       perl merge.pl $^ s390 > $@
+kernel-$(VERSION)-i686-paravirt.config: config-generic-paravirt temp-x86-generic 
+       perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-arm.config: config-arm temp-generic
-       perl merge.pl $^ arm > $@
+kernel-$(VERSION)-i686-paravirt_debug.config: kernel-$(VERSION)-i686-paravirt.config temp-debug-generic 
+       perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic
-       perl merge.pl $^ powerpc > $@
+kernel-$(VERSION)-x86_64-paravirt.config: config-generic-paravirt temp-x86_64-generic
+       perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-ppc-smp.config: config-powerpc32-smp temp-powerpc32-generic
-       perl merge.pl $^ powerpc > $@
+kernel-$(VERSION)-x86_64-paravirt_debug.config: kernel-$(VERSION)-x86_64-paravirt.config temp-debug-generic 
+       perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-ia64.config: /dev/null temp-ia64-generic
-       perl merge.pl $^ ia64 > $@

diff --git a/uek-rpm/ol6/config-generic-paravirt b/uek-rpm/ol6/config-generic-paravirt
new file mode 100644 (file)
index 0000000..14b4c8d
--- /dev/null
+++ b/uek-rpm/ol6/config-generic-paravirt
@@ -0,0 +1 @@
+CONFIG_PARAVIRT_SPINLOCKS=y

diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index 5d3556d6c05486a1c005dbead7977b725addc3b7..9d4577547e9b187e7f32a5cb558d52d12cedd680 100644 (file)
--- a/uek-rpm/ol6/kernel-uek.spec
+++ b/uek-rpm/ol6/kernel-uek.spec
@@ -98,6 +98,8 @@ Summary: The Linux kernel
 %define with_kdump     0
 # kernel-debug
 %define with_debug     1
+%define with_paravirt  1
+%define with_paravirt_debug  1
 # kernel-doc
 %define with_doc       1
 # kernel-headers
@@ -384,6 +386,8 @@ Summary: The Linux kernel
 %define with_up 0
 %define with_smp 0
 %define with_pae 0
+%define with_paravirt 0
+%define with_paravirt_debug 0
 %define with_kdump 0
 %define with_debuginfo 0
 %define _enable_debug_packages 0
@@ -528,6 +532,7 @@ Source23: config-generic
 Source24: config-rhel-generic
 Source25: Module.kabi_i686
 Source26: Module.kabi_x86_64
+Source27: config-generic-paravirt
 
 Source30: config-x86-generic
 ##Source31: config-i586
@@ -815,6 +820,18 @@ This package includes a kdump version of the Linux kernel. It is
 required only on machines which will use the kexec-based kernel crash dump
 mechanism.
 
+%define variant_summary Paravitrualized kernel
+%kernel_variant_package paravirt
+%description paravirt
+This package includes a paravirt version of the Linux kernel.
+CONFIG_PARAVIRT_SPINLOCKS=y
+
+%define variant_summary Paravitrualized debug kernel
+%kernel_variant_package paravirt_debug
+%description paravirt_debug
+This package includes a paravirt version of the Linux kernel with debug info.
+CONFIG_PARAVIRT_SPINLOCKS=y
+
 
 %prep
 # do a few sanity-checks for --with *only builds
@@ -1483,6 +1500,14 @@ mkdir -p $RPM_BUILD_ROOT/boot
 
 cd linux-%{kversion}.%{_target_cpu}
 
+%if %{with_paravirt}
+BuildKernel %make_target %kernel_image paravirt 
+%endif
+
+%if %{with_paravirt_debug}
+BuildKernel %make_target %kernel_image paravirt_debug 
+%endif
+
 %if %{with_debug}
 %if %{with_up}
 BuildKernel %make_target %kernel_image debug
@@ -1758,6 +1783,15 @@ fi\
 %kernel_variant_preun PAEdebug
 %kernel_variant_pre PAEdebug
 
+%kernel_variant_post -v paravirt -r (kernel-smp|kernel-xen|kernel-uek)
+%kernel_variant_preun paravirt
+%kernel_variant_pre paravirt
+
+%kernel_variant_post -v paravirt_debug -r (kernel-smp|kernel-xen|kernel-uek)
+%kernel_variant_preun paravirt_debug
+%kernel_variant_pre paravirt_debug
+
+
 if [ -x /sbin/ldconfig ]
 then
     /sbin/ldconfig -X || exit $?
@@ -1847,6 +1881,8 @@ fi
 %{nil}
 
 
+%kernel_variant_files %{with_paravirt} paravirt
+%kernel_variant_files %{with_paravirt_debug} paravirt_debug
 %kernel_variant_files %{with_up}
 %kernel_variant_files %{with_smp} smp
 %if %{with_up}