packages: kernel-xenU/kernel-xenU-x86.config, kernel-xenU/kernel-xenU.spec ...

caleb caleb at pld-linux.org
Sat Oct 2 17:54:04 CEST 2010 

Author: caleb                        Date: Sat Oct  2 15:54:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Cleaned up differences between x86 and x86_64 configs
- Removed vserver options from config. These get added by builder if requested
- Added EC2 specific kernel patch
- TODO: setup with_ec2 option to set the proper cpu type and cpu_hotplug options so they don't have to be hard coded in the config file

---- Files affected:
packages/kernel-xenU:
   kernel-xenU-x86.config (1.3 -> 1.4) , kernel-xenU.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: packages/kernel-xenU/kernel-xenU-x86.config
diff -u packages/kernel-xenU/kernel-xenU-x86.config:1.3 packages/kernel-xenU/kernel-xenU-x86.config:1.4
--- packages/kernel-xenU/kernel-xenU-x86.config:1.3	Fri Oct  1 14:24:01 2010
+++ packages/kernel-xenU/kernel-xenU-x86.config	Sat Oct  2 17:53:58 2010
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.35.7
-# Fri Oct  1 05:25:10 2010
+# Sat Oct  2 09:39:10 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -58,6 +58,7 @@
 CONFIG_X86_32_LAZY_GS=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_KTIME_SCALAR=y
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_CONSTRUCTORS=y
 
@@ -289,14 +290,14 @@
 # CONFIG_M586 is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M586MMX is not set
-CONFIG_M686=y
+# CONFIG_M686 is not set
 # CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
 # CONFIG_MPENTIUM4 is not set
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
+CONFIG_MK8=y
 # CONFIG_MCRUSOE is not set
 # CONFIG_MEFFICEON is not set
 # CONFIG_MWINCHIPC6 is not set
@@ -310,17 +311,17 @@
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
 # CONFIG_GENERIC_CPU is not set
-# CONFIG_X86_GENERIC is not set
+CONFIG_X86_GENERIC=y
 CONFIG_X86_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=5
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
-# CONFIG_X86_PPRO_FENCE is not set
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
+CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_TSC=y
 CONFIG_X86_CMPXCHG64=y
@@ -400,7 +401,7 @@
 CONFIG_PHYSICAL_START=0x1000000
 # CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x1000000
-# CONFIG_HOTPLUG_CPU is not set
+CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CMDLINE_BOOL is not set
 
@@ -1488,6 +1489,7 @@
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_LKDTM=m
+# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1558,31 +1560,6 @@
 # CONFIG_CPA_DEBUG is not set
 CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-
-#
-# Linux VServer
-#
-CONFIG_VSERVER_AUTO_LBACK=y
-CONFIG_VSERVER_AUTO_SINGLE=y
-CONFIG_VSERVER_COWBL=y
-# CONFIG_VSERVER_VTIME is not set
-# CONFIG_VSERVER_DEVICE is not set
-CONFIG_VSERVER_PROC_SECURE=y
-CONFIG_VSERVER_HARDCPU=y
-CONFIG_VSERVER_IDLETIME=y
-# CONFIG_VSERVER_IDLELIMIT is not set
-# CONFIG_TAGGING_NONE is not set
-# CONFIG_TAGGING_UID16 is not set
-# CONFIG_TAGGING_GID16 is not set
-CONFIG_TAGGING_ID24=y
-# CONFIG_TAGGING_INTERN is not set
-# CONFIG_TAG_NFSD is not set
-# CONFIG_VSERVER_PRIVACY is not set
-CONFIG_VSERVER_CONTEXTS=256
-CONFIG_VSERVER_WARN=y
-# CONFIG_VSERVER_DEBUG is not set
-# CONFIG_VSERVER_LEGACY_MEM is not set
-CONFIG_VSERVER=y
 
 #
 # Security options

================================================================
Index: packages/kernel-xenU/kernel-xenU.spec
diff -u packages/kernel-xenU/kernel-xenU.spec:1.50 packages/kernel-xenU/kernel-xenU.spec:1.51
--- packages/kernel-xenU/kernel-xenU.spec:1.50	Sat Oct  2 13:35:02 2010
+++ packages/kernel-xenU/kernel-xenU.spec	Sat Oct  2 17:53:58 2010
@@ -4,11 +4,13 @@
 # - ostrzezenie: Znaleziono zainstalowane (ale niespakietowane) pliki:
 #   /usr/src/linux-2.6.31-xenU/tools/perf/*
 # - update vserver patch. It does not applies since 2.6.32.11
+# - Fix with_ec2 option to specify processor type and hotplug_cpu in kernel config
 #
 # Conditional build:
 %bcond_without	source		# don't build kernel-xenU-source package
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_without	vserver		# enable vserver
+%bcond_with	ec2				# build with patches necessary for use on EC2
 
 %{?debug:%define with_verbose 1}
 
@@ -18,7 +20,7 @@
 
 %define		_enable_debug_packages			0
 
-%define		alt_kernel	xenU%{!?with_vserver:novserver}
+%define		alt_kernel	xenU%{!?with_vserver:novserver}%{?with_ec2:ec2}
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -52,6 +54,7 @@
 Source11:	kernel-xenU-x86.config
 
 Patch1:		linux-2.6-vs2.3.patch
+Patch2:		linux-2.6-ec2.patch
 
 URL:		http://www.kernel.org/
 BuildRequires:	/sbin/depmod
@@ -274,6 +277,9 @@
 %if %{with vserver}
 %patch1 -p1
 %endif
+%if %{with ec2}
+%patch2 -p1
+%endif
 
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile
@@ -685,6 +691,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2010/10/02 15:53:58  caleb
+- Cleaned up differences between x86 and x86_64 configs
+- Removed vserver options from config. These get added by builder if requested
+- Added EC2 specific kernel patch
+- TODO: setup with_ec2 option to set the proper cpu type and cpu_hotplug options so they don't have to be hard coded in the config file
+
 Revision 1.50  2010/10/02 11:35:02  pawelz
 - updated en and pl description. Please, update other languages (de and fr).
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-xenU/kernel-xenU-x86.config?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-xenU/kernel-xenU.spec?r1=1.50&r2=1.51&f=u

More information about the pld-cvs-commit mailing list