This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 94cb2bea6b9be686c5bde80fddafbafe26101aa7 (commit) via c09f52dbd5f40bca32da483b069fe56a098f9463 (commit) via a2591f98a10d0c024dac80ba31a8b4dacc953e03 (commit) via a0475003604830c270910f1a08d39a444c667232 (commit) from 437e6719d37230cb0e0b714c32a42057caa2332e (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 94cb2bea6b9be686c5bde80fddafbafe26101aa7 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 17 13:16:28 2011 +0200

xen: Update release number.

Don't forget to increment this number if you want to rebuild a package.

commit c09f52dbd5f40bca32da483b069fe56a098f9463 Merge: 437e671 a2591f9 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 17 13:15:33 2011 +0200

Merge remote-tracking branch 'trikolon/xen2'

commit a2591f98a10d0c024dac80ba31a8b4dacc953e03 Author: Ben Schweikert trikolon@ipfire.org Date: Fri Jun 17 09:22:26 2011 +0200

Xen: Fixed a bug, the regs[] array in xen.detect was one element too short.

commit a0475003604830c270910f1a08d39a444c667232 Author: Ben Schweikert trikolon@ipfire.org Date: Fri Jun 17 09:00:15 2011 +0200

Xen: Updated Xen to Version 4.1.1 and fixed some PIC errors. Xen now builds wir PIC/PIE and stack protection.

-----------------------------------------------------------------------

Summary of changes: pkgs/xen/patches/00-xen-detect.patch | 67 ++++++++++++++++++++++++++++++++++ pkgs/xen/patches/xen-gcc-4.6.0.patch | 23 ++++++++++++ pkgs/xen/xen.nm | 12 ++++--- 3 files changed, 97 insertions(+), 5 deletions(-) create mode 100644 pkgs/xen/patches/00-xen-detect.patch create mode 100644 pkgs/xen/patches/xen-gcc-4.6.0.patch

Difference in files: diff --git a/pkgs/xen/patches/00-xen-detect.patch b/pkgs/xen/patches/00-xen-detect.patch new file mode 100644 index 0000000..0b485f7 --- /dev/null +++ b/pkgs/xen/patches/00-xen-detect.patch @@ -0,0 +1,67 @@ +diff -r 23c068b10923 tools/misc/xen-detect.c +--- a/tools/misc/xen-detect.c Wed Jun 15 16:16:41 2011 +0100 ++++ b/tools/misc/xen-detect.c Wed Jun 15 20:14:30 2011 +0100 +@@ -33,43 +33,46 @@ + #include <unistd.h> + #include <getopt.h> + +-static void cpuid(uint32_t idx, +- uint32_t *eax, +- uint32_t *ebx, +- uint32_t *ecx, +- uint32_t *edx, +- int pv_context) ++static void cpuid(uint32_t idx, uint32_t *regs, int pv_context) + { + asm volatile ( +- "test %1,%1 ; jz 1f ; ud2a ; .ascii "xen" ; 1: cpuid" +- : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx) +- : "0" (idx), "1" (pv_context) ); ++#ifdef __i386__ ++#define R(x) "%%e"#x"x" ++#else ++#define R(x) "%%r"#x"x" ++#endif ++ "push "R(a)"; push "R(b)"; push "R(c)"; push "R(d)"\n\t" ++ "test %1,%1 ; jz 1f ; ud2a ; .ascii "xen" ; 1: cpuid\n\t" ++ "mov %%eax,(%2); mov %%ebx,4(%2)\n\t" ++ "mov %%ecx,8(%2); mov %%edx,12(%2)\n\t" ++ "pop "R(d)"; pop "R(c)"; pop "R(b)"; pop "R(a)"\n\t" ++ : : "a" (idx), "c" (pv_context), "S" (regs) : "memory" ); + } + + static int check_for_xen(int pv_context) + { +- uint32_t eax, ebx, ecx, edx; ++ uint32_t regs[4]; + char signature[13]; + uint32_t base; + + for ( base = 0x40000000; base < 0x40010000; base += 0x100 ) + { +- cpuid(base, &eax, &ebx, &ecx, &edx, pv_context); ++ cpuid(base, regs, pv_context); + +- *(uint32_t *)(signature + 0) = ebx; +- *(uint32_t *)(signature + 4) = ecx; +- *(uint32_t *)(signature + 8) = edx; ++ *(uint32_t *)(signature + 0) = regs[1]; ++ *(uint32_t *)(signature + 4) = regs[2]; ++ *(uint32_t *)(signature + 8) = regs[3]; + signature[12] = '\0'; + +- if ( !strcmp("XenVMMXenVMM", signature) && (eax >= (base + 2)) ) ++ if ( !strcmp("XenVMMXenVMM", signature) && (regs[0] >= (base + 2)) ) + goto found; + } + + return 0; + + found: +- cpuid(base + 1, &eax, &ebx, &ecx, &edx, pv_context); +- return eax; ++ cpuid(base + 1, regs, pv_context); ++ return regs[0]; + } + + static jmp_buf sigill_jmp; diff --git a/pkgs/xen/patches/xen-gcc-4.6.0.patch b/pkgs/xen/patches/xen-gcc-4.6.0.patch new file mode 100644 index 0000000..2ed8c26 --- /dev/null +++ b/pkgs/xen/patches/xen-gcc-4.6.0.patch @@ -0,0 +1,23 @@ +--- xen-4.1.0.orig/Config.mk 2010-08-25 12:22:44.000000000 +0200 ++++ xen-4.1.0/Config.mk 2010-11-02 23:38:11.575000000 +0100 +@@ -187,4 +187,4 @@ + CONFIG_MINITERM ?= n + CONFIG_LOMOUNT ?= n + +--include $(XEN_ROOT)/.config ++#-include $(XEN_ROOT)/.config + +--- xen-4.1.0/Config.mk.orig 2010-08-25 11:22:44.000000000 +0100 ++++ xen-4.1.0/Config.mk 2011-01-29 17:40:43.000000000 +0000 +@@ -135,6 +135,8 @@ + + LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i)) + CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i)) ++# temporary compile fix for rawhide ++CFLAGS += -Wunused-but-set-variable -Wno-error=unused-but-set-variable -Wuninitialized -Wno-error=uninitialized + + EMBEDDED_EXTRA_CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all + EMBEDDED_EXTRA_CFLAGS += -fno-exceptions + + # Enable XSM security module. Enabling XSM requires selection of an + diff --git a/pkgs/xen/xen.nm b/pkgs/xen/xen.nm index 2753b97..77f8cff 100644 --- a/pkgs/xen/xen.nm +++ b/pkgs/xen/xen.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include

PKG_NAME = xen -PKG_VER = 4.1.0 -PKG_REL = 1 +PKG_VER = 4.1.1 +PKG_REL = 2

PKG_MAINTAINER = Ben Schweikert ben.schweikert@ipfire.org PKG_GROUPS = Applications/Virtualization @@ -74,15 +74,17 @@ endef

define STAGE_BUILD # Following two lines are disabling HVM. HVM does not work because \ - # of soem PIE errors we get when we try to build the firmware part \ + # of some PIE errors we get when we try to build the firmware part \ # needed for different architektures. cd $(DIR_APP) && sed -i -e '/^CONFIG_IOEMU := y$$/d' config/*.mk cd $(DIR_APP) && sed -i -e '/SUBDIRS-$$(CONFIG_X86) += firmware/d' tools/Makefile

- cd $(DIR_APP) && make tools xen $(PARALLELISMFLAGS) + cd $(DIR_APP) && rm -f Config.mk~ + + cd $(DIR_APP) && make xen tools $(PARALLELISMFLAGS) endef

define STAGE_INSTALL - cd $(DIR_APP) && make install-tools install-xen DESTDIR=$(BUILDROOT) + cd $(DIR_APP) && make xen install-tools DESTDIR=$(BUILDROOT) rm -R $(BUILDROOT)/etc/init.d endef

hooks/post-receive -- IPFire 3.x development tree