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 2.x development tree".

The branch, next has been updated via 62b923f9dfbf0c86ac49405c884d0b1167c71b5f (commit) via bc481fef281da3512ae10fd1f8810244c0586c74 (commit) via 6f52b3df16e7cb95d435f65846abb8dde68824e4 (commit) from 2e5cba5c3f7f11019df1380237baddf1759557ea (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 62b923f9dfbf0c86ac49405c884d0b1167c71b5f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 21 15:22:35 2011 +0200

kvm-kmod: update to 2.6.38.6.

commit bc481fef281da3512ae10fd1f8810244c0586c74 Merge: 2e5cba5 6f52b3d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed May 18 22:11:44 2011 +0200

Merge branch 'master' into next

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

Summary of changes: config/rootfiles/packages/qemu | 15 ++++++- lfs/kvm-kmod | 5 +- lfs/qemu | 11 +++-- ...6_remove_pvclock_scale_delta_redifinition.patch | 45 ++++++++++++++++++++ src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch | 28 ++++++++++++ 5 files changed, 96 insertions(+), 8 deletions(-) create mode 100644 src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch create mode 100644 src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch

Difference in files: diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 27d82a3..d061319 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -1,11 +1,20 @@ +#etc/qemu +etc/qemu/target-x86_64.conf usr/bin/qemu usr/bin/qemu-i386 usr/bin/qemu-img usr/bin/qemu-io usr/bin/qemu-nbd +#usr/share/doc/qemu +#usr/share/doc/qemu/qemu-doc.html +#usr/share/doc/qemu/qemu-tech.html +#usr/share/man/man1/qemu-img.1 +#usr/share/man/man1/qemu.1 +#usr/share/man/man8/qemu-nbd.8 usr/share/qemu usr/share/qemu/bamboo.dtb usr/share/qemu/bios.bin +usr/share/qemu/gpxe-eepro100-80861209.rom usr/share/qemu/keymaps usr/share/qemu/keymaps/ar usr/share/qemu/keymaps/common @@ -50,11 +59,13 @@ usr/share/qemu/openbios-sparc64 usr/share/qemu/petalogix-s3adsp1800.dtb usr/share/qemu/ppc_rom.bin usr/share/qemu/pxe-e1000.bin -usr/share/qemu/pxe-i82559er.bin usr/share/qemu/pxe-ne2k_pci.bin usr/share/qemu/pxe-pcnet.bin usr/share/qemu/pxe-rtl8139.bin usr/share/qemu/pxe-virtio.bin +usr/share/qemu/s390-zipl.rom usr/share/qemu/vgabios-cirrus.bin +usr/share/qemu/vgabios-qxl.bin +usr/share/qemu/vgabios-stdvga.bin +usr/share/qemu/vgabios-vmware.bin usr/share/qemu/vgabios.bin -usr/share/qemu/video.x diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod index e443b70..b6418ac 100644 --- a/lfs/kvm-kmod +++ b/lfs/kvm-kmod @@ -34,7 +34,7 @@ else endif endif

-VER = 2.6.34.1 +VER = 2.6.38.6

THISAPP = kvm-kmod-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -50,7 +50,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = c227b58ee33f6035f16abd258bcd92ec +$(DL_FILE)_MD5 = b631ba6ba7b0d3c07de870c6104ffbd5

install : $(TARGET)

@@ -83,6 +83,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_pvclock_scale_delta_redifinition.patch cd $(DIR_APP) && ./configure --kerneldir=/usr/src/linux cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && install -m 644 x86/*.ko \ diff --git a/lfs/qemu b/lfs/qemu index 7925f0d..03c20d5 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -24,7 +24,7 @@

include Config

-VER = 0.12.3 +VER = 0.14.1

THISAPP = qemu-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu -PAK_VER = 10 +PAK_VER = 11

DEPS = "sdl"

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = d215e4568650e8019816397174c090e1 +$(DL_FILE)_MD5 = b6c713a8db638e173af53a62d5178640

install : $(TARGET)

@@ -77,7 +77,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr \ + + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch + + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --target-list="i386-linux-user i386-softmmu" cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch b/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch new file mode 100644 index 0000000..331e8a1 --- /dev/null +++ b/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch @@ -0,0 +1,45 @@ +diff -Naur kvm-kmod-2.6.38.6.org/x86/external-module-compat.h kvm-kmod-2.6.38.6/x86/external-module-compat.h +--- kvm-kmod-2.6.38.6.org/x86/external-module-compat.h 2011-05-15 09:34:48.000000000 +0200 ++++ kvm-kmod-2.6.38.6/x86/external-module-compat.h 2011-05-21 13:30:50.529469540 +0200 +@@ -1064,41 +1064,6 @@ + + #endif /* >= 2.6.36 */ + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) +-static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift) +-{ +- u64 product; +-#ifdef __i386__ +- u32 tmp1, tmp2; +-#endif +- +- if (shift < 0) +- delta >>= -shift; +- else +- delta <<= shift; +- +-#ifdef __i386__ +- __asm__ ( +- "mul %5 ; " +- "mov %4,%%eax ; " +- "mov %%edx,%4 ; " +- "mul %5 ; " +- "xor %5,%5 ; " +- "add %4,%%eax ; " +- "adc %5,%%edx ; " +- : "=A" (product), "=r" (tmp1), "=r" (tmp2) +- : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) ); +-#elif defined(__x86_64__) +- __asm__ ( +- "mul %%rdx ; shrd $32,%%rdx,%%rax" +- : "=a" (product) : "0" (delta), "d" ((u64)mul_frac) ); +-#else +-#error implement me! +-#endif +- +- return product; +-} +-#endif + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) && \ + LINUX_VERSION_CODE != KERNEL_VERSION(2,6,32) && defined(CONFIG_X86_64) diff --git a/src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch b/src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch new file mode 100644 index 0000000..31dde45 --- /dev/null +++ b/src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch @@ -0,0 +1,28 @@ +diff -Naur qemu-0.14.1.org/hw/virtio-9p-local.c qemu-0.14.1/hw/virtio-9p-local.c +--- qemu-0.14.1.org/hw/virtio-9p-local.c 2011-05-06 21:01:43.000000000 +0200 ++++ qemu-0.14.1/hw/virtio-9p-local.c 2011-05-18 14:04:32.432444320 +0200 +@@ -10,6 +10,7 @@ + * the COPYING file in the top-level directory. + * + */ ++ + #include "virtio.h" + #include "virtio-9p.h" + #include "virtio-9p-xattr.h" +@@ -20,6 +21,16 @@ + #include <sys/un.h> + #include <attr/xattr.h> + ++#ifndef AT_FDCWD ++/* Copied from linux/include/linux/fcntl.h * because direct include fails */ ++#define AT_FDCWD -100 /* Special value used to indicate ++ openat should use the current ++ working directory. */ ++#define AT_SYMLINK_NOFOLLOW 0x100 /* Do not follow symbolic links. */ ++#define AT_REMOVEDIR 0x200 /* Remove directory instead of ++ unlinking file. */ ++#define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ ++#endif + + static int local_lstat(FsContext *fs_ctx, const char *path, struct stat *stbuf) + {

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