rpms/kernel-xen/devel Config.mk,1.2,1.3 kernel-xen.spec,1.14,1.15

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Dec 7 17:09:38 UTC 2005


Author: quintela

Update of /cvs/dist/rpms/kernel-xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12062

Modified Files:
	kernel-xen.spec 
Added Files:
	Config.mk 
Log Message:
Undelete Config.mk


Index: Config.mk
===================================================================
RCS file: Config.mk
diff -N Config.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Config.mk	7 Dec 2005 17:09:33 -0000	1.3
@@ -0,0 +1,73 @@
+# -*- mode: Makefile; -*-
+
+# Currently supported architectures: x86_32, x86_64
+XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
+XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
+XEN_TARGET_X86_PAE  ?= n
+
+# Tools to run on system hosting the build
+HOSTCC     = gcc
+HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
+
+AS         = $(CROSS_COMPILE)as
+LD         = $(CROSS_COMPILE)ld
+CC         = $(CROSS_COMPILE)gcc
+CPP        = $(CROSS_COMPILE)gcc -E
+AR         = $(CROSS_COMPILE)ar
+RANLIB     = $(CROSS_COMPILE)ranlib
+NM         = $(CROSS_COMPILE)nm
+STRIP      = $(CROSS_COMPILE)strip
+OBJCOPY    = $(CROSS_COMPILE)objcopy
+OBJDUMP    = $(CROSS_COMPILE)objdump
+
+DISTDIR     ?= $(XEN_ROOT)/dist
+
+INSTALL      = install
+INSTALL_DIR  = $(INSTALL) -d -m0755
+INSTALL_DATA = $(INSTALL) -m0644
+INSTALL_PROG = $(INSTALL) -m0755
+
+ifeq ($(XEN_TARGET_ARCH),x86_64)
+LIBDIR = lib64
+else
+LIBDIR = lib
+endif
+
+ifneq ($(EXTRA_PREFIX),)
+EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
+EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
+endif
+
+test-gcc-flag = $(shell $(CC) -v --help 2>&1 | grep -q " $(1) " && echo $(1))
+
+HOSTCFLAGS += $(call test-gcc-flag,-Wdeclaration-after-statement)
+CFLAGS     += $(call test-gcc-flag,-Wdeclaration-after-statement)
+
+LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i)) 
+CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i))
+
+# Choose the best mirror to download linux kernel
+KERNEL_REPO = http://www.kernel.org
+
+# If ACM_SECURITY = y, then the access control module is compiled
+# into Xen and the policy type can be set by the boot policy file
+#        y - Build the Xen ACM framework
+#        n - Do not build the Xen ACM framework
+ACM_SECURITY ?= n
+
+# If ACM_SECURITY = y and no boot policy file is installed,
+# then the ACM defaults to the security policy set by
+# ACM_DEFAULT_SECURITY_POLICY
+# Supported models are:
+#	ACM_NULL_POLICY
+#	ACM_CHINESE_WALL_POLICY
+#	ACM_SIMPLE_TYPE_ENFORCEMENT_POLICY
+#	ACM_CHINESE_WALL_AND_SIMPLE_TYPE_ENFORCEMENT_POLICY
+ACM_DEFAULT_SECURITY_POLICY ?= ACM_NULL_POLICY
+
+# Optional components
+XENSTAT_XENTOP ?= y
+
+VTPM_TOOLS ?= n
+
+-include $(XEN_ROOT)/.config


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kernel-xen.spec	7 Dec 2005 16:51:44 -0000	1.14
+++ kernel-xen.spec	7 Dec 2005 17:09:33 -0000	1.15
@@ -93,6 +93,7 @@
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
 Source1: xen-20051206.tar.bz2
+Source2: Config.mk
 Source10: COPYING.modules
 
 Source31: kernel-%{kversion}-i686-hypervisor.config
@@ -202,6 +203,7 @@
 # Ok, first time we do a make prep.
 %setup -q -n %{name}-%{version} -c -a1
 rm -f pax_global_header
+cp %{SOURCE2} .
 cd linux-%{kversion}
 
 %patch1 -p1
@@ -527,7 +529,7 @@
 /usr/src/kernels/%{KVERREL}guest-%{_target_cpu}
 
 %changelog
-* Wed Dec  7 2005 Juan Quintela <quintela at trasno.org>
+* Wed Dec  7 2005 Juan Quintela <quintela at redhat.com>
 - patch 2.6.12.6
 - Updated to 3.0.0 (20051206)
 




More information about the fedora-cvs-commits mailing list