[arch-commits] Commit in qemu/repos (16 files)
Tobias Powalowski
tpowa at archlinux.org
Fri Sep 7 12:55:20 UTC 2012
Date: Friday, September 7, 2012 @ 08:55:19
Author: tpowa
Revision: 166385
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
qemu/repos/extra-i686/65-kvm.rules
(from rev 166384, qemu/trunk/65-kvm.rules)
qemu/repos/extra-i686/PKGBUILD
(from rev 166384, qemu/trunk/PKGBUILD)
qemu/repos/extra-i686/qemu-glibc-2.16-build.patch
(from rev 166384, qemu/trunk/qemu-glibc-2.16-build.patch)
qemu/repos/extra-i686/qemu.install
(from rev 166384, qemu/trunk/qemu.install)
qemu/repos/extra-x86_64/65-kvm.rules
(from rev 166384, qemu/trunk/65-kvm.rules)
qemu/repos/extra-x86_64/PKGBUILD
(from rev 166384, qemu/trunk/PKGBUILD)
qemu/repos/extra-x86_64/qemu-glibc-2.16-build.patch
(from rev 166384, qemu/trunk/qemu-glibc-2.16-build.patch)
qemu/repos/extra-x86_64/qemu.install
(from rev 166384, qemu/trunk/qemu.install)
Deleted:
qemu/repos/extra-i686/65-kvm.rules
qemu/repos/extra-i686/PKGBUILD
qemu/repos/extra-i686/qemu-glibc-2.16-build.patch
qemu/repos/extra-i686/qemu.install
qemu/repos/extra-x86_64/65-kvm.rules
qemu/repos/extra-x86_64/PKGBUILD
qemu/repos/extra-x86_64/qemu-glibc-2.16-build.patch
qemu/repos/extra-x86_64/qemu.install
------------------------------------------+
extra-i686/65-kvm.rules | 2
extra-i686/PKGBUILD | 100 ++++++++++----------
extra-i686/qemu-glibc-2.16-build.patch | 140 ++++++++++++++---------------
extra-i686/qemu.install | 46 ++++-----
extra-x86_64/65-kvm.rules | 2
extra-x86_64/PKGBUILD | 100 ++++++++++----------
extra-x86_64/qemu-glibc-2.16-build.patch | 140 ++++++++++++++---------------
extra-x86_64/qemu.install | 46 ++++-----
8 files changed, 286 insertions(+), 290 deletions(-)
Deleted: extra-i686/65-kvm.rules
===================================================================
--- extra-i686/65-kvm.rules 2012-09-07 12:54:33 UTC (rev 166384)
+++ extra-i686/65-kvm.rules 2012-09-07 12:55:19 UTC (rev 166385)
@@ -1 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
Copied: qemu/repos/extra-i686/65-kvm.rules (from rev 166384, qemu/trunk/65-kvm.rules)
===================================================================
--- extra-i686/65-kvm.rules (rev 0)
+++ extra-i686/65-kvm.rules 2012-09-07 12:55:19 UTC (rev 166385)
@@ -0,0 +1 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-09-07 12:54:33 UTC (rev 166384)
+++ extra-i686/PKGBUILD 2012-09-07 12:55:19 UTC (rev 166385)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-pkgname=qemu
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url="http://wiki.qemu.org/Index.html"
-makedepends=('texi2html' 'perl' 'python2')
-depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng')
-backup=('etc/qemu/target-x86_64.conf')
-install=qemu.install
-source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
- 65-kvm.rules
- qemu-glibc-2.16-build.patch)
-options=(!strip)
-
-build()
-{
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i -e 's/lib64/lib/g' x86_64.ld
- # patch from fedora git: http://pkgs.fedoraproject.org/gitweb/?p=qemu.git
- # fix changes from glibc-2.16
- patch -Np1 -i ../qemu-glibc-2.16-build.patch
- ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
- --python=/usr/bin/python2 \
- --audio-card-list=ac97,sb16,es1370,hda \
- --enable-docs
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
- rm "${pkgdir}/usr/share/qemu/bios.bin"
-
- install -D -m644 "${srcdir}/65-kvm.rules" \
- "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
- # strip scripts directory
- find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
- case "$(file -bi "$binary")" in
- *application/x-executable*) # Binaries
- /usr/bin/strip $STRIP_BINARIES "$binary";;
- esac
- done
-
-}
-md5sums=('f691baa30e8fb40f37f2797fba892e12'
- 'b316a066d2f1bb57d8f5b7ea1d0d1caf'
- '8687179e77ab954c4a43017d030f7349')
Copied: qemu/repos/extra-i686/PKGBUILD (from rev 166384, qemu/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-09-07 12:55:19 UTC (rev 166385)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=qemu
+pkgver=1.2.0
+pkgrel=1
+pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
+arch=('i686' 'x86_64')
+license=('GPL2' 'LGPL2.1')
+url="http://wiki.qemu.org/Index.html"
+makedepends=('texi2html' 'perl' 'python2')
+depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng')
+backup=('etc/qemu/target-x86_64.conf')
+install=qemu.install
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
+ 65-kvm.rules)
+options=(!strip)
+
+build()
+{
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ sed -i -e 's/lib64/lib/g' x86_64.ld
+ ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
+ --python=/usr/bin/python2 \
+ --audio-card-list=ac97,sb16,es1370,hda \
+ --enable-docs
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
+ rm "${pkgdir}/usr/share/qemu/bios.bin"
+
+ install -D -m644 "${srcdir}/65-kvm.rules" \
+ "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
+ # strip scripts directory
+ find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
+ case "$(file -bi "$binary")" in
+ *application/x-executable*) # Binaries
+ /usr/bin/strip $STRIP_BINARIES "$binary";;
+ esac
+ done
+
+}
+md5sums=('78eb1e984f4532aa9f2bdd3c127b5b61'
+ 'b316a066d2f1bb57d8f5b7ea1d0d1caf'
+ '8687179e77ab954c4a43017d030f7349')
+md5sums=('78eb1e984f4532aa9f2bdd3c127b5b61'
+ 'b316a066d2f1bb57d8f5b7ea1d0d1caf')
Deleted: extra-i686/qemu-glibc-2.16-build.patch
===================================================================
--- extra-i686/qemu-glibc-2.16-build.patch 2012-09-07 12:54:33 UTC (rev 166384)
+++ extra-i686/qemu-glibc-2.16-build.patch 2012-09-07 12:55:19 UTC (rev 166385)
@@ -1,70 +0,0 @@
-From baf954154e7c0acda038c01a5c28aea4db7eec67 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Thu, 5 Jul 2012 14:28:03 +0100
-Subject: [PATCH] Replace 'struct siginfo' with 'siginfo_t'.
-
-glibc 2.16 will remove the undocumented definition of 'struct siginfo'
-from <bits/siginfo.h>.
-
-This change is already present in glibc 2.15.90, so qemu compilation
-of certain targets (eg. cris-user) breaks.
-
-This struct was always typedef'd to be the same as 'siginfo_t' which
-is what POSIX documents, so use that instead.
-
-Signed-off-by: Richard W.M. Jones <rjones at redhat.com>
----
- linux-user/signal.c | 8 ++++----
- user-exec.c | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 43346dc..108dff9 100644
---- a/linux-user/signal.c
-+++ b/linux-user/signal.c
-@@ -2849,7 +2849,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
- * Arguments to signal handler:
- *
- * a0 = signal number
-- * a1 = pointer to struct siginfo
-+ * a1 = pointer to siginfo_t
- * a2 = pointer to struct ucontext
- *
- * $25 and PC point to the signal handler, $29 points to the
-@@ -3255,7 +3255,7 @@ struct target_signal_frame {
- };
-
- struct rt_signal_frame {
-- struct siginfo info;
-+ siginfo_t info;
- struct ucontext uc;
- uint32_t tramp[2];
- };
-@@ -3474,9 +3474,9 @@ struct target_signal_frame {
- };
-
- struct rt_signal_frame {
-- struct siginfo *pinfo;
-+ siginfo_t *pinfo;
- void *puc;
-- struct siginfo info;
-+ siginfo_t info;
- struct ucontext uc;
- uint8_t retcode[8]; /* Trampoline code. */
- };
-diff --git a/user-exec.c b/user-exec.c
-index b2a4261..1a9c276 100644
---- a/user-exec.c
-+++ b/user-exec.c
-@@ -588,7 +588,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
- int cpu_signal_handler(int host_signum, void *pinfo,
- void *puc)
- {
-- struct siginfo *info = pinfo;
-+ siginfo_t *info = pinfo;
- struct ucontext *uc = puc;
- unsigned long pc = uc->uc_mcontext.sc_iaoq[0];
- uint32_t insn = *(uint32_t *)pc;
---
-1.7.10.4
-
Copied: qemu/repos/extra-i686/qemu-glibc-2.16-build.patch (from rev 166384, qemu/trunk/qemu-glibc-2.16-build.patch)
===================================================================
--- extra-i686/qemu-glibc-2.16-build.patch (rev 0)
+++ extra-i686/qemu-glibc-2.16-build.patch 2012-09-07 12:55:19 UTC (rev 166385)
@@ -0,0 +1,70 @@
+From baf954154e7c0acda038c01a5c28aea4db7eec67 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Thu, 5 Jul 2012 14:28:03 +0100
+Subject: [PATCH] Replace 'struct siginfo' with 'siginfo_t'.
+
+glibc 2.16 will remove the undocumented definition of 'struct siginfo'
+from <bits/siginfo.h>.
+
+This change is already present in glibc 2.15.90, so qemu compilation
+of certain targets (eg. cris-user) breaks.
+
+This struct was always typedef'd to be the same as 'siginfo_t' which
+is what POSIX documents, so use that instead.
+
+Signed-off-by: Richard W.M. Jones <rjones at redhat.com>
+---
+ linux-user/signal.c | 8 ++++----
+ user-exec.c | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/linux-user/signal.c b/linux-user/signal.c
+index 43346dc..108dff9 100644
+--- a/linux-user/signal.c
++++ b/linux-user/signal.c
+@@ -2849,7 +2849,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
+ * Arguments to signal handler:
+ *
+ * a0 = signal number
+- * a1 = pointer to struct siginfo
++ * a1 = pointer to siginfo_t
+ * a2 = pointer to struct ucontext
+ *
+ * $25 and PC point to the signal handler, $29 points to the
+@@ -3255,7 +3255,7 @@ struct target_signal_frame {
+ };
+
+ struct rt_signal_frame {
+- struct siginfo info;
++ siginfo_t info;
+ struct ucontext uc;
+ uint32_t tramp[2];
+ };
+@@ -3474,9 +3474,9 @@ struct target_signal_frame {
+ };
+
+ struct rt_signal_frame {
+- struct siginfo *pinfo;
++ siginfo_t *pinfo;
+ void *puc;
+- struct siginfo info;
++ siginfo_t info;
+ struct ucontext uc;
+ uint8_t retcode[8]; /* Trampoline code. */
+ };
+diff --git a/user-exec.c b/user-exec.c
+index b2a4261..1a9c276 100644
+--- a/user-exec.c
++++ b/user-exec.c
+@@ -588,7 +588,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
+ int cpu_signal_handler(int host_signum, void *pinfo,
+ void *puc)
+ {
+- struct siginfo *info = pinfo;
++ siginfo_t *info = pinfo;
+ struct ucontext *uc = puc;
+ unsigned long pc = uc->uc_mcontext.sc_iaoq[0];
+ uint32_t insn = *(uint32_t *)pc;
+--
+1.7.10.4
+
Deleted: extra-i686/qemu.install
===================================================================
--- extra-i686/qemu.install 2012-09-07 12:54:33 UTC (rev 166384)
+++ extra-i686/qemu.install 2012-09-07 12:55:19 UTC (rev 166385)
@@ -1,23 +0,0 @@
-# kvm: the new package version
-post_install() {
- #
- groupadd kvm -f -g 78
- echo ">>> PLEASE READ FOR KVM USAGE!"
- echo ">>> Load the correct KVM module, you will need a KVM capable CPU!"
- echo ">>> Add yourself to the group 'kvm'."
- echo ""
- if [ "$(vercmp $2 0.11)" -lt 0 ]; then
- echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
- echo "is no longer supported and will be removed from the repositories. You"
- echo "can safely uninstall it from your system."
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- #
- groupdel kvm
-}
Copied: qemu/repos/extra-i686/qemu.install (from rev 166384, qemu/trunk/qemu.install)
===================================================================
--- extra-i686/qemu.install (rev 0)
+++ extra-i686/qemu.install 2012-09-07 12:55:19 UTC (rev 166385)
@@ -0,0 +1,23 @@
+# kvm: the new package version
+post_install() {
+ #
+ groupadd kvm -f -g 78
+ echo ">>> PLEASE READ FOR KVM USAGE!"
+ echo ">>> Load the correct KVM module, you will need a KVM capable CPU!"
+ echo ">>> Add yourself to the group 'kvm'."
+ echo ""
+ if [ "$(vercmp $2 0.11)" -lt 0 ]; then
+ echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
+ echo "is no longer supported and will be removed from the repositories. You"
+ echo "can safely uninstall it from your system."
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ #
+ groupdel kvm
+}
Deleted: extra-x86_64/65-kvm.rules
===================================================================
--- extra-x86_64/65-kvm.rules 2012-09-07 12:54:33 UTC (rev 166384)
+++ extra-x86_64/65-kvm.rules 2012-09-07 12:55:19 UTC (rev 166385)
@@ -1 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
Copied: qemu/repos/extra-x86_64/65-kvm.rules (from rev 166384, qemu/trunk/65-kvm.rules)
===================================================================
--- extra-x86_64/65-kvm.rules (rev 0)
+++ extra-x86_64/65-kvm.rules 2012-09-07 12:55:19 UTC (rev 166385)
@@ -0,0 +1 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-09-07 12:54:33 UTC (rev 166384)
+++ extra-x86_64/PKGBUILD 2012-09-07 12:55:19 UTC (rev 166385)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-pkgname=qemu
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url="http://wiki.qemu.org/Index.html"
-makedepends=('texi2html' 'perl' 'python2')
-depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng')
-backup=('etc/qemu/target-x86_64.conf')
-install=qemu.install
-source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
- 65-kvm.rules
- qemu-glibc-2.16-build.patch)
-options=(!strip)
-
-build()
-{
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i -e 's/lib64/lib/g' x86_64.ld
- # patch from fedora git: http://pkgs.fedoraproject.org/gitweb/?p=qemu.git
- # fix changes from glibc-2.16
- patch -Np1 -i ../qemu-glibc-2.16-build.patch
- ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
- --python=/usr/bin/python2 \
- --audio-card-list=ac97,sb16,es1370,hda \
- --enable-docs
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
- rm "${pkgdir}/usr/share/qemu/bios.bin"
-
- install -D -m644 "${srcdir}/65-kvm.rules" \
- "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
- # strip scripts directory
- find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
- case "$(file -bi "$binary")" in
- *application/x-executable*) # Binaries
- /usr/bin/strip $STRIP_BINARIES "$binary";;
- esac
- done
-
-}
-md5sums=('f691baa30e8fb40f37f2797fba892e12'
- 'b316a066d2f1bb57d8f5b7ea1d0d1caf'
- '8687179e77ab954c4a43017d030f7349')
Copied: qemu/repos/extra-x86_64/PKGBUILD (from rev 166384, qemu/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-09-07 12:55:19 UTC (rev 166385)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=qemu
+pkgver=1.2.0
+pkgrel=1
+pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
+arch=('i686' 'x86_64')
+license=('GPL2' 'LGPL2.1')
+url="http://wiki.qemu.org/Index.html"
+makedepends=('texi2html' 'perl' 'python2')
+depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng')
+backup=('etc/qemu/target-x86_64.conf')
+install=qemu.install
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
+ 65-kvm.rules)
+options=(!strip)
+
+build()
+{
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ sed -i -e 's/lib64/lib/g' x86_64.ld
+ ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
+ --python=/usr/bin/python2 \
+ --audio-card-list=ac97,sb16,es1370,hda \
+ --enable-docs
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
+ rm "${pkgdir}/usr/share/qemu/bios.bin"
+
+ install -D -m644 "${srcdir}/65-kvm.rules" \
+ "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
+ # strip scripts directory
+ find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
+ case "$(file -bi "$binary")" in
+ *application/x-executable*) # Binaries
+ /usr/bin/strip $STRIP_BINARIES "$binary";;
+ esac
+ done
+
+}
+md5sums=('78eb1e984f4532aa9f2bdd3c127b5b61'
+ 'b316a066d2f1bb57d8f5b7ea1d0d1caf'
+ '8687179e77ab954c4a43017d030f7349')
+md5sums=('78eb1e984f4532aa9f2bdd3c127b5b61'
+ 'b316a066d2f1bb57d8f5b7ea1d0d1caf')
Deleted: extra-x86_64/qemu-glibc-2.16-build.patch
===================================================================
--- extra-x86_64/qemu-glibc-2.16-build.patch 2012-09-07 12:54:33 UTC (rev 166384)
+++ extra-x86_64/qemu-glibc-2.16-build.patch 2012-09-07 12:55:19 UTC (rev 166385)
@@ -1,70 +0,0 @@
-From baf954154e7c0acda038c01a5c28aea4db7eec67 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Thu, 5 Jul 2012 14:28:03 +0100
-Subject: [PATCH] Replace 'struct siginfo' with 'siginfo_t'.
-
-glibc 2.16 will remove the undocumented definition of 'struct siginfo'
-from <bits/siginfo.h>.
-
-This change is already present in glibc 2.15.90, so qemu compilation
-of certain targets (eg. cris-user) breaks.
-
-This struct was always typedef'd to be the same as 'siginfo_t' which
-is what POSIX documents, so use that instead.
-
-Signed-off-by: Richard W.M. Jones <rjones at redhat.com>
----
- linux-user/signal.c | 8 ++++----
- user-exec.c | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 43346dc..108dff9 100644
---- a/linux-user/signal.c
-+++ b/linux-user/signal.c
-@@ -2849,7 +2849,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
- * Arguments to signal handler:
- *
- * a0 = signal number
-- * a1 = pointer to struct siginfo
-+ * a1 = pointer to siginfo_t
- * a2 = pointer to struct ucontext
- *
- * $25 and PC point to the signal handler, $29 points to the
-@@ -3255,7 +3255,7 @@ struct target_signal_frame {
- };
-
- struct rt_signal_frame {
-- struct siginfo info;
-+ siginfo_t info;
- struct ucontext uc;
- uint32_t tramp[2];
- };
-@@ -3474,9 +3474,9 @@ struct target_signal_frame {
- };
-
- struct rt_signal_frame {
-- struct siginfo *pinfo;
-+ siginfo_t *pinfo;
- void *puc;
-- struct siginfo info;
-+ siginfo_t info;
- struct ucontext uc;
- uint8_t retcode[8]; /* Trampoline code. */
- };
-diff --git a/user-exec.c b/user-exec.c
-index b2a4261..1a9c276 100644
---- a/user-exec.c
-+++ b/user-exec.c
-@@ -588,7 +588,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
- int cpu_signal_handler(int host_signum, void *pinfo,
- void *puc)
- {
-- struct siginfo *info = pinfo;
-+ siginfo_t *info = pinfo;
- struct ucontext *uc = puc;
- unsigned long pc = uc->uc_mcontext.sc_iaoq[0];
- uint32_t insn = *(uint32_t *)pc;
---
-1.7.10.4
-
Copied: qemu/repos/extra-x86_64/qemu-glibc-2.16-build.patch (from rev 166384, qemu/trunk/qemu-glibc-2.16-build.patch)
===================================================================
--- extra-x86_64/qemu-glibc-2.16-build.patch (rev 0)
+++ extra-x86_64/qemu-glibc-2.16-build.patch 2012-09-07 12:55:19 UTC (rev 166385)
@@ -0,0 +1,70 @@
+From baf954154e7c0acda038c01a5c28aea4db7eec67 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Thu, 5 Jul 2012 14:28:03 +0100
+Subject: [PATCH] Replace 'struct siginfo' with 'siginfo_t'.
+
+glibc 2.16 will remove the undocumented definition of 'struct siginfo'
+from <bits/siginfo.h>.
+
+This change is already present in glibc 2.15.90, so qemu compilation
+of certain targets (eg. cris-user) breaks.
+
+This struct was always typedef'd to be the same as 'siginfo_t' which
+is what POSIX documents, so use that instead.
+
+Signed-off-by: Richard W.M. Jones <rjones at redhat.com>
+---
+ linux-user/signal.c | 8 ++++----
+ user-exec.c | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/linux-user/signal.c b/linux-user/signal.c
+index 43346dc..108dff9 100644
+--- a/linux-user/signal.c
++++ b/linux-user/signal.c
+@@ -2849,7 +2849,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
+ * Arguments to signal handler:
+ *
+ * a0 = signal number
+- * a1 = pointer to struct siginfo
++ * a1 = pointer to siginfo_t
+ * a2 = pointer to struct ucontext
+ *
+ * $25 and PC point to the signal handler, $29 points to the
+@@ -3255,7 +3255,7 @@ struct target_signal_frame {
+ };
+
+ struct rt_signal_frame {
+- struct siginfo info;
++ siginfo_t info;
+ struct ucontext uc;
+ uint32_t tramp[2];
+ };
+@@ -3474,9 +3474,9 @@ struct target_signal_frame {
+ };
+
+ struct rt_signal_frame {
+- struct siginfo *pinfo;
++ siginfo_t *pinfo;
+ void *puc;
+- struct siginfo info;
++ siginfo_t info;
+ struct ucontext uc;
+ uint8_t retcode[8]; /* Trampoline code. */
+ };
+diff --git a/user-exec.c b/user-exec.c
+index b2a4261..1a9c276 100644
+--- a/user-exec.c
++++ b/user-exec.c
+@@ -588,7 +588,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
+ int cpu_signal_handler(int host_signum, void *pinfo,
+ void *puc)
+ {
+- struct siginfo *info = pinfo;
++ siginfo_t *info = pinfo;
+ struct ucontext *uc = puc;
+ unsigned long pc = uc->uc_mcontext.sc_iaoq[0];
+ uint32_t insn = *(uint32_t *)pc;
+--
+1.7.10.4
+
Deleted: extra-x86_64/qemu.install
===================================================================
--- extra-x86_64/qemu.install 2012-09-07 12:54:33 UTC (rev 166384)
+++ extra-x86_64/qemu.install 2012-09-07 12:55:19 UTC (rev 166385)
@@ -1,23 +0,0 @@
-# kvm: the new package version
-post_install() {
- #
- groupadd kvm -f -g 78
- echo ">>> PLEASE READ FOR KVM USAGE!"
- echo ">>> Load the correct KVM module, you will need a KVM capable CPU!"
- echo ">>> Add yourself to the group 'kvm'."
- echo ""
- if [ "$(vercmp $2 0.11)" -lt 0 ]; then
- echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
- echo "is no longer supported and will be removed from the repositories. You"
- echo "can safely uninstall it from your system."
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- #
- groupdel kvm
-}
Copied: qemu/repos/extra-x86_64/qemu.install (from rev 166384, qemu/trunk/qemu.install)
===================================================================
--- extra-x86_64/qemu.install (rev 0)
+++ extra-x86_64/qemu.install 2012-09-07 12:55:19 UTC (rev 166385)
@@ -0,0 +1,23 @@
+# kvm: the new package version
+post_install() {
+ #
+ groupadd kvm -f -g 78
+ echo ">>> PLEASE READ FOR KVM USAGE!"
+ echo ">>> Load the correct KVM module, you will need a KVM capable CPU!"
+ echo ">>> Add yourself to the group 'kvm'."
+ echo ""
+ if [ "$(vercmp $2 0.11)" -lt 0 ]; then
+ echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
+ echo "is no longer supported and will be removed from the repositories. You"
+ echo "can safely uninstall it from your system."
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ #
+ groupdel kvm
+}
More information about the arch-commits
mailing list