From 1c6e776c151eb8d6631f2aa30c5ed22700e9e4a8 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 17 Aug 2011 16:52:47 +0200 Subject: [PATCH] qemu: update to 0.15.0. (need gcc4.1.2) --- config/rootfiles/packages/qemu | 17 +++++--- lfs/qemu | 9 +++-- ...qemu-0.15.0_missing_definitions_hack.patch | 40 +++++++++++++++++++ 3 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 src/patches/qemu-0.15.0_missing_definitions_hack.patch diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index f04fdfbed7..8d9b283023 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -1,6 +1,7 @@ #etc/qemu etc/qemu/target-x86_64.conf usr/bin/qemu +usr/bin/qemu-ga usr/bin/qemu-i386 usr/bin/qemu-img usr/bin/qemu-io @@ -15,7 +16,6 @@ usr/share/qemu usr/share/qemu/bamboo.dtb usr/share/qemu/bios.bin usr/share/qemu/extboot.bin -usr/share/qemu/gpxe-eepro100-80861209.rom usr/share/qemu/keymaps usr/share/qemu/keymaps/ar usr/share/qemu/keymaps/common @@ -53,18 +53,23 @@ usr/share/qemu/keymaps/sv usr/share/qemu/keymaps/th usr/share/qemu/keymaps/tr usr/share/qemu/linuxboot.bin +usr/share/qemu/mpc8544ds.dtb usr/share/qemu/multiboot.bin usr/share/qemu/openbios-ppc usr/share/qemu/openbios-sparc32 usr/share/qemu/openbios-sparc64 +usr/share/qemu/petalogix-ml605.dtb usr/share/qemu/petalogix-s3adsp1800.dtb usr/share/qemu/ppc_rom.bin -usr/share/qemu/pxe-e1000.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/pxe-e1000.rom +usr/share/qemu/pxe-eepro100.rom +usr/share/qemu/pxe-ne2k_pci.rom +usr/share/qemu/pxe-pcnet.rom +usr/share/qemu/pxe-rtl8139.rom +usr/share/qemu/pxe-virtio.rom usr/share/qemu/s390-zipl.rom +usr/share/qemu/slof.bin +usr/share/qemu/spapr-rtas.bin usr/share/qemu/vapic.bin usr/share/qemu/vgabios-cirrus.bin usr/share/qemu/vgabios-qxl.bin diff --git a/lfs/qemu b/lfs/qemu index 2751550356..ce0f33de3a 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -24,7 +24,7 @@ include Config -VER = 0.14.1 +VER = 0.15.0 THISAPP = qemu-kvm-$(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 = 12 +PAK_VER = 13 DEPS = "sdl" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ed37a2c0b1981220b842920140574c63 +$(DL_FILE)_MD5 = b45b0deebba4ce47dcaaab3807f6ed47 install : $(TARGET) @@ -78,7 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch + cd $(DIR_APP) && sed -i -e 's|CFLAGS+="-march=i486"|CFLAGS+=""|g' configure + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.15.0_missing_definitions_hack.patch cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --target-list="i386-linux-user i386-softmmu" diff --git a/src/patches/qemu-0.15.0_missing_definitions_hack.patch b/src/patches/qemu-0.15.0_missing_definitions_hack.patch new file mode 100644 index 0000000000..4ff2c08472 --- /dev/null +++ b/src/patches/qemu-0.15.0_missing_definitions_hack.patch @@ -0,0 +1,40 @@ +diff -Naur qemu-kvm-0.15.0.org/hw/9pfs/virtio-9p-local.c qemu-kvm-0.15.0/hw/9pfs/virtio-9p-local.c +--- qemu-kvm-0.15.0.org/hw/9pfs/virtio-9p-local.c 2011-08-09 14:40:29.000000000 +0200 ++++ qemu-kvm-0.15.0/hw/9pfs/virtio-9p-local.c 2011-08-14 10:31:22.711480316 +0200 +@@ -21,6 +21,16 @@ + #include + #include + ++#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) + { +diff -Naur qemu-kvm-0.15.0.org/linux-user/syscall.c qemu-kvm-0.15.0/linux-user/syscall.c +--- qemu-kvm-0.15.0.org/linux-user/syscall.c 2011-08-09 14:40:29.000000000 +0200 ++++ qemu-kvm-0.15.0/linux-user/syscall.c 2011-08-14 12:43:43.190231600 +0200 +@@ -971,6 +971,16 @@ + return result; + } + ++/* Copied from linux/include/asm/resource.h * because direct include fails */ ++ ++#ifndef RLIMIT_NICE ++#define RLIMIT_NICE 13 /* max nice prio allowed to raise to ++ 0-39 for nice level 19 .. -20 */ ++#endif ++#ifndef RLIMIT_RTPRIO ++#define RLIMIT_RTPRIO 14 /* maximum realtime priority */ ++#endif ++ + static inline int target_to_host_resource(int code) + { + switch (code) { -- 2.39.5