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 58efaf8e1807eda1f4dbf3bc360698b075ef51d1 (commit) via ba837e88425933b863ed2a430a0a53995a57a840 (commit) via ad39b30985d0fe217f355491bbbe9a5515026927 (commit) via 898474e6ffc676ebc71636cde5bdacf370f3d083 (commit) via 5d5f5393fe4a1ef2aa07ee59ab7120112b25fe93 (commit) from 9acda8fa69b22f410b2b3787b7fad5cff899488d (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 58efaf8e1807eda1f4dbf3bc360698b075ef51d1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed May 6 19:28:40 2015 +0200

core90: run user update script at kernel update.

fixes #10767

commit ba837e88425933b863ed2a430a0a53995a57a840 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed May 6 19:21:05 2015 +0200

core90: restart init after glibc update.

commit ad39b30985d0fe217f355491bbbe9a5515026927 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed May 6 19:12:06 2015 +0200

qemu: update to 2.3.0

commit 898474e6ffc676ebc71636cde5bdacf370f3d083 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed May 6 19:10:47 2015 +0200

core90: update kernel version in uEnv.txt

commit 5d5f5393fe4a1ef2aa07ee59ab7120112b25fe93 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed May 6 19:08:09 2015 +0200

core90: add Locale-Country to update

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

Summary of changes: config/qemu/qemu | 10 ++++++ config/rootfiles/core/90/filelists/Locale-Country | 1 + config/rootfiles/core/90/update.sh | 15 ++++++++ config/rootfiles/packages/qemu | 30 +++++++++++++--- lfs/qemu | 22 ++++++++---- .../qemu-0.15.0_missing_definitions_hack.patch | 40 ---------------------- 6 files changed, 67 insertions(+), 51 deletions(-) create mode 100644 config/qemu/qemu create mode 120000 config/rootfiles/core/90/filelists/Locale-Country delete mode 100644 src/patches/qemu-0.15.0_missing_definitions_hack.patch

Difference in files: diff --git a/config/qemu/qemu b/config/qemu/qemu new file mode 100644 index 0000000..64b458a --- /dev/null +++ b/config/qemu/qemu @@ -0,0 +1,10 @@ +#!/bin/bash +# +# QEMU wrapper to enable kvm as default like old qemu-kvm... +# +if [[ $* == *" -no-kvm"* ]]; then + qemu-system-i386 $* +else + qemu-system-i386 -enable-kvm $* +fi +exit ${?} diff --git a/config/rootfiles/core/90/filelists/Locale-Country b/config/rootfiles/core/90/filelists/Locale-Country new file mode 120000 index 0000000..025c278 --- /dev/null +++ b/config/rootfiles/core/90/filelists/Locale-Country @@ -0,0 +1 @@ +../../../common/Locale-Country \ No newline at end of file diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index 1e0a548..7e41f4b 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -139,6 +139,10 @@ rm /srv/web/ipfire/html/images/flags/* #Extract files tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /

+# +# restart init because glibc was updated. +telinit u + # Remove old openssl libraries rm -vf /usr/lib/libcrypto.so.0.9.8 /usr/lib/libssl.so.0.9.8

@@ -231,6 +235,17 @@ case "$(uname -m)" in esac esac

+# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update +fi + + # Force (re)install pae kernel if pae is supported rm -rf /opt/pakfire/db/*/meta-linux-pae if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 5062066..9896139 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -7,19 +7,33 @@ usr/bin/qemu-img usr/bin/qemu-io usr/bin/qemu-nbd usr/bin/qemu-system-arm +usr/bin/qemu-system-i386 +usr/libexec/qemu-bridge-helper #usr/share/doc/qemu #usr/share/doc/qemu/qemu-doc.html #usr/share/doc/qemu/qemu-tech.html +#usr/share/doc/qemu/qmp-commands.txt #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/QEMU,cgthree.bin +usr/share/qemu/QEMU,tcx.bin +usr/share/qemu/acpi-dsdt.aml usr/share/qemu/bamboo.dtb +usr/share/qemu/bios-256k.bin usr/share/qemu/bios.bin -usr/share/qemu/extboot.bin +usr/share/qemu/efi-e1000.rom +usr/share/qemu/efi-eepro100.rom +usr/share/qemu/efi-ne2k_pci.rom +usr/share/qemu/efi-pcnet.rom +usr/share/qemu/efi-rtl8139.rom +usr/share/qemu/efi-virtio.rom usr/share/qemu/keymaps usr/share/qemu/keymaps/ar +usr/share/qemu/keymaps/bepo usr/share/qemu/keymaps/common +usr/share/qemu/keymaps/cz usr/share/qemu/keymaps/da usr/share/qemu/keymaps/de usr/share/qemu/keymaps/de-ch @@ -53,12 +67,13 @@ usr/share/qemu/keymaps/sl usr/share/qemu/keymaps/sv usr/share/qemu/keymaps/th usr/share/qemu/keymaps/tr +usr/share/qemu/kvmvapic.bin 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/palcode-clipper usr/share/qemu/petalogix-ml605.dtb usr/share/qemu/petalogix-s3adsp1800.dtb usr/share/qemu/ppc_rom.bin @@ -68,12 +83,19 @@ 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/q35-acpi-dsdt.aml +usr/share/qemu/qemu-icon.bmp +usr/share/qemu/qemu_logo_no_text.svg +usr/share/qemu/s390-ccw.img usr/share/qemu/s390-zipl.rom +usr/share/qemu/sgabios.bin usr/share/qemu/slof.bin usr/share/qemu/spapr-rtas.bin -usr/share/qemu/vapic.bin +usr/share/qemu/trace-events +usr/share/qemu/u-boot.e500 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/var/run diff --git a/lfs/qemu b/lfs/qemu index 2fc0476..8512568 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -24,16 +24,16 @@

include Config

-VER = 0.15.0 +VER = 2.3.0

-THISAPP = qemu-kvm-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = qemu-$(VER) +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 PROG = qemu -PAK_VER = 14 +PAK_VER = 15

DEPS = "sdl"

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

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

-$(DL_FILE)_MD5 = b45b0deebba4ce47dcaaab3807f6ed47 +$(DL_FILE)_MD5 = 2fab3ea4460de9b57192e5b8b311f221

install : $(TARGET)

@@ -77,12 +77,20 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.15.0_missing_definitions_hack.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-kvm --disable-attr \ --target-list="i386-linux-user i386-softmmu arm-softmmu" \ --extra-cflags="$(CFLAGS)" cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + + # install wrapper for old kvm parameter handling + install -m 755 $(DIR_SRC)/config/qemu/qemu /usr/bin/qemu + + # disable PaX MPROTECT + paxctl -m /usr/bin/qemu-system-arm + paxctl -m /usr/bin/qemu-system-i386 + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/qemu-0.15.0_missing_definitions_hack.patch b/src/patches/qemu-0.15.0_missing_definitions_hack.patch deleted file mode 100644 index 4ff2c08..0000000 --- a/src/patches/qemu-0.15.0_missing_definitions_hack.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 <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) - { -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) {

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