mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +02:00
qemu: update to 0.14.1.
This commit is contained in:
@@ -1,11 +1,20 @@
|
|||||||
|
#etc/qemu
|
||||||
|
etc/qemu/target-x86_64.conf
|
||||||
usr/bin/qemu
|
usr/bin/qemu
|
||||||
usr/bin/qemu-i386
|
usr/bin/qemu-i386
|
||||||
usr/bin/qemu-img
|
usr/bin/qemu-img
|
||||||
usr/bin/qemu-io
|
usr/bin/qemu-io
|
||||||
usr/bin/qemu-nbd
|
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
|
||||||
usr/share/qemu/bamboo.dtb
|
usr/share/qemu/bamboo.dtb
|
||||||
usr/share/qemu/bios.bin
|
usr/share/qemu/bios.bin
|
||||||
|
usr/share/qemu/gpxe-eepro100-80861209.rom
|
||||||
usr/share/qemu/keymaps
|
usr/share/qemu/keymaps
|
||||||
usr/share/qemu/keymaps/ar
|
usr/share/qemu/keymaps/ar
|
||||||
usr/share/qemu/keymaps/common
|
usr/share/qemu/keymaps/common
|
||||||
@@ -50,11 +59,13 @@ usr/share/qemu/openbios-sparc64
|
|||||||
usr/share/qemu/petalogix-s3adsp1800.dtb
|
usr/share/qemu/petalogix-s3adsp1800.dtb
|
||||||
usr/share/qemu/ppc_rom.bin
|
usr/share/qemu/ppc_rom.bin
|
||||||
usr/share/qemu/pxe-e1000.bin
|
usr/share/qemu/pxe-e1000.bin
|
||||||
usr/share/qemu/pxe-i82559er.bin
|
|
||||||
usr/share/qemu/pxe-ne2k_pci.bin
|
usr/share/qemu/pxe-ne2k_pci.bin
|
||||||
usr/share/qemu/pxe-pcnet.bin
|
usr/share/qemu/pxe-pcnet.bin
|
||||||
usr/share/qemu/pxe-rtl8139.bin
|
usr/share/qemu/pxe-rtl8139.bin
|
||||||
usr/share/qemu/pxe-virtio.bin
|
usr/share/qemu/pxe-virtio.bin
|
||||||
|
usr/share/qemu/s390-zipl.rom
|
||||||
usr/share/qemu/vgabios-cirrus.bin
|
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/vgabios.bin
|
||||||
usr/share/qemu/video.x
|
|
||||||
|
|||||||
11
lfs/qemu
11
lfs/qemu
@@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
include Config
|
include Config
|
||||||
|
|
||||||
VER = 0.12.3
|
VER = 0.14.1
|
||||||
|
|
||||||
THISAPP = qemu-$(VER)
|
THISAPP = qemu-$(VER)
|
||||||
DL_FILE = $(THISAPP).tar.gz
|
DL_FILE = $(THISAPP).tar.gz
|
||||||
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
|
|||||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||||
PROG = qemu
|
PROG = qemu
|
||||||
PAK_VER = 10
|
PAK_VER = 11
|
||||||
|
|
||||||
DEPS = "sdl"
|
DEPS = "sdl"
|
||||||
|
|
||||||
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
|
|||||||
|
|
||||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||||
|
|
||||||
$(DL_FILE)_MD5 = d215e4568650e8019816397174c090e1
|
$(DL_FILE)_MD5 = b6c713a8db638e173af53a62d5178640
|
||||||
|
|
||||||
install : $(TARGET)
|
install : $(TARGET)
|
||||||
|
|
||||||
@@ -77,7 +77,10 @@ $(subst %,%_MD5,$(objects)) :
|
|||||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||||
@$(PREBUILD)
|
@$(PREBUILD)
|
||||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
@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"
|
--target-list="i386-linux-user i386-softmmu"
|
||||||
cd $(DIR_APP) && make $(MAKETUNING)
|
cd $(DIR_APP) && make $(MAKETUNING)
|
||||||
cd $(DIR_APP) && make install
|
cd $(DIR_APP) && make install
|
||||||
|
|||||||
28
src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch
Normal file
28
src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch
Normal file
@@ -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)
|
||||||
|
{
|
||||||
Reference in New Issue
Block a user