summaryrefslogtreecommitdiff
path: root/pcr/qemu-user-static-git
diff options
context:
space:
mode:
authorAndreas Grapentin <andreas@grapentin.org>2018-06-04 10:28:21 +0200
committerAndreas Grapentin <andreas@grapentin.org>2018-06-04 10:28:21 +0200
commit2924d3e0db2b21315ae3464ed97b13cdb91a66d3 (patch)
tree793c8d644c5cfd40afe3a759e2392a9a57503406 /pcr/qemu-user-static-git
parent7085141c5cbf9891a5ad0b7560a193cbc6675b6b (diff)
downloadabslibre-2924d3e0db2b21315ae3464ed97b13cdb91a66d3.tar.gz
abslibre-2924d3e0db2b21315ae3464ed97b13cdb91a66d3.tar.bz2
abslibre-2924d3e0db2b21315ae3464ed97b13cdb91a66d3.zip
pcr/qemu{,-user-static}-git: obsolete. removed.
Diffstat (limited to 'pcr/qemu-user-static-git')
-rw-r--r--pcr/qemu-user-static-git/0001-add-binfmt-wrapper.patch146
-rw-r--r--pcr/qemu-user-static-git/PKGBUILD148
2 files changed, 0 insertions, 294 deletions
diff --git a/pcr/qemu-user-static-git/0001-add-binfmt-wrapper.patch b/pcr/qemu-user-static-git/0001-add-binfmt-wrapper.patch
deleted file mode 100644
index 5ba90937d..000000000
--- a/pcr/qemu-user-static-git/0001-add-binfmt-wrapper.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 29fa1af29768c3d069a4b96dc5719a0214a9ed03 Mon Sep 17 00:00:00 2001
-From: Andreas Grapentin <andreas@grapentin.org>
-Date: Tue, 20 Mar 2018 20:54:00 +0100
-Subject: [PATCH] add binfmt wrapper
-
----
- Makefile.target | 9 ++++++++
- binfmt.c | 55 +++++++++++++++++++++++++++++++++++++++++++++
- scripts/qemu-binfmt-conf.sh | 10 ++++-----
- 3 files changed, 68 insertions(+), 6 deletions(-)
- create mode 100644 binfmt.c
-
-diff --git a/Makefile.target b/Makefile.target
-index 6549481096..3edb4cc832 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -36,6 +36,10 @@ endif
- PROGS=$(QEMU_PROG) $(QEMU_PROGW)
- STPFILES=
-
-+ifdef CONFIG_LINUX_USER
-+PROGS+=$(QEMU_PROG)-binfmt
-+endif
-+
- config-target.h: config-target.h-timestamp
- config-target.h-timestamp: config-target.mak
-
-@@ -114,6 +118,8 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \
- obj-y += linux-user/
- obj-y += gdbstub.o thunk.o
-
-+obj-binfmt-y += binfmt.o
-+
- endif #CONFIG_LINUX_USER
-
- #########################################################
-@@ -196,6 +202,9 @@ ifdef CONFIG_DARWIN
- $(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@")
- endif
-
-+$(QEMU_PROG)-binfmt: $(obj-binfmt-y)
-+ $(call LINK,$^)
-+
- gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
- $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES),"GEN","$(TARGET_DIR)$@")
-
-diff --git a/binfmt.c b/binfmt.c
-new file mode 100644
-index 0000000000..9b19436ee5
---- /dev/null
-+++ b/binfmt.c
-@@ -0,0 +1,55 @@
-+
-+#include <stdio.h>
-+#include <stdarg.h>
-+#include <unistd.h>
-+#include <libgen.h>
-+#include <string.h>
-+#include <stdlib.h>
-+
-+int
-+main (int argc, char **argv)
-+{
-+ if (argc < 3) {
-+ fprintf(stderr, "%s: please use me through binfmt\n", argv[0]);
-+ return 1;
-+ }
-+
-+ char **nargv = malloc(sizeof(*argv) * (argc + 2));
-+ if (NULL == nargv)
-+ {
-+ perror("malloc");
-+ return 1;
-+ }
-+
-+ nargv[0] = strdup(argv[0]);
-+ if (NULL == nargv[0])
-+ {
-+ perror("strdup");
-+ return 1;
-+ }
-+
-+ // argv0 is qemu-$cpu-binfmt, and we want to change that to qemu-$cpu-static
-+ char *dest = strstr(nargv[0], "-binfmt");
-+ if (NULL == dest)
-+ {
-+ fprintf(stderr, "%s: -binfmt not found in invocation name\n", argv[0]);
-+ return 1;
-+ }
-+ strncpy(dest, "-static", 7);
-+
-+ nargv[1] = strdup("-0");
-+ if (NULL == nargv[1])
-+ {
-+ perror("strdup");
-+ return 1;
-+ }
-+
-+ nargv[2] = argv[2];
-+ nargv[3] = argv[1];
-+
-+ memcpy(&nargv[4], &argv[3], (argc - 3 + 1) * sizeof(*argv));
-+
-+ int ret = execv(nargv[0], nargv);
-+ perror("exec");
-+ return ret;
-+}
-diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
-index f39ad344fc..c36b1abd43 100755
---- a/scripts/qemu-binfmt-conf.sh
-+++ b/scripts/qemu-binfmt-conf.sh
-@@ -274,9 +274,9 @@ qemu_set_binfmts() {
- continue
- fi
-
-- qemu="$QEMU_PATH/qemu-$cpu"
-+ qemu="$QEMU_PATH/qemu-$cpu-binfmt"
- if [ "$cpu" = "i486" ] ; then
-- qemu="$QEMU_PATH/qemu-i386"
-+ qemu="$QEMU_PATH/qemu-i386-binfmt"
- fi
-
- if [ "$host_family" != "$family" ] ; then
-@@ -292,7 +292,7 @@ SYSTEMDDIR="/etc/binfmt.d"
- DEBIANDIR="/usr/share/binfmts"
-
- QEMU_PATH=/usr/local/bin
--FLAGS=""
-+FLAGS="P"
-
- options=$(getopt -o ds:Q:e:hc: -l debian,systemd:,qemu-path:,exportdir:,help,credential: -- "$@")
- eval set -- "$options"
-@@ -341,9 +341,7 @@ while true ; do
- -c|--credential)
- shift
- if [ "$1" = "yes" ] ; then
-- FLAGS="OC"
-- else
-- FLAGS=""
-+ FLAGS+="OC"
- fi
- ;;
- *)
---
-2.16.2
-
diff --git a/pcr/qemu-user-static-git/PKGBUILD b/pcr/qemu-user-static-git/PKGBUILD
deleted file mode 100644
index 53d71a05f..000000000
--- a/pcr/qemu-user-static-git/PKGBUILD
+++ /dev/null
@@ -1,148 +0,0 @@
-# Maintainer (Arch:qemu): Tobias Powalowski <tpowa@archlinux.org>
-# Contributor (Arch:qemu): Sébastien "Seblu" Luttringer <seblu@seblu.net>
-# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
-# Contributor: Márcio Silva <coadde@hyperbola.info>
-
-_pkgbase=qemu-git
-_gitname=qemu
-pkgname=(qemu-user-static-git qemu-user-static-binfmt-git)
-pkgdesc="A generic and open source machine emulator and virtualizer. Git version."
-pkgver=v2.12.0.rc0.r0.gf1a63fcfcd
-pkgrel=1
-arch=(x86_64)
-license=(GPL2 LGPL2.1)
-url="http://wiki.qemu.org/"
-makedepends=(git pixman-static glib2-static pcre-static python2)
-source=(git://git.qemu.org/qemu.git
- 0001-add-binfmt-wrapper.patch)
-sha256sums=('SKIP'
- '3fc4f49a43adc22e91c485fa13f3690ed2cfc847751032e4215e6da8ec124a27')
-validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584')
-
-case $CARCH in
- i?86) _corearch=i386 ;;
- x86_64) _corearch=x86_64 ;;
-esac
-
-pkgver() {
- cd "${srcdir}/${_gitname}"
- git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
- mkdir build-static
- mkdir -p extra-arch-static/usr/{bin,share/qemu}
-
- cd "${srcdir}/${_gitname}"
- sed -i 's/vte-2\.90/vte-2.91/g' configure
-
- patch -Np1 -i "$srcdir"/0001-add-binfmt-wrapper.patch
-
- # update git submodules
- scripts/git-submodule.sh update ui/keycodemapdb dtc
-}
-
-build() {
- local flags=(
- --static
- --disable-system # disable building qemu-system-$CPU, we only want qemu-$CPU
- --disable-guest-agent # disable building qemu-ga
- --disable-tools # disable building the qemu-{io,nbd,img} tools
- --disable-blobs # disable installing firmware files used by system
- --disable-docs
- --disable-modules # modules imply dynamic linking
-
- # jemalloc-static isn't packaged
- --disable-jemalloc
-
- # These libraries are only used for system or tools, but even
- # though that's disabled, libqemuutil.a still tries to link
- # against them unless we specifically tell it not to (the linkage
- # would be removed at the final linker's tree-shaking).
- --disable-gcrypt
- --disable-nettle
- )
- _build static "${flags[@]}" \
- --audio-drv-list= \
- --disable-bluez \
- --disable-sdl \
- --disable-gtk \
- --disable-vte \
- --disable-opengl \
- --disable-virglrenderer
-}
-
-_build() (
- cd build-$1
-
- # qemu vs. make 4 == bad
- export ARFLAGS=rv
-
- # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
- export CFLAGS+=" -fPIC"
-
- ../${_gitname}/configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/qemu \
- --python=/usr/bin/python2 \
- --smbd=/usr/bin/smbd \
- --with-gtkabi=3.0 \
- --with-sdlabi=2.0 \
- --enable-modules \
- --enable-jemalloc \
- --disable-git-update \
- "${@:2}"
-
- make
-)
-
-package_qemu-user-static-git() {
- pkgdesc="QEMU user-mode emulation (static binaries) - Git version."
-
- provides=("qemu-static=$pkgver")
- conflicts=(qemu-static qemu-user-static)
-
- _package static
-
- rm -vr -- \
- "$pkgdir"/usr/lib/ \
- "$pkgdir"/usr/share/
-
- local prog
- for prog in "$pkgdir"/usr/bin/*; do
- if [[ $prog != *-binfmt ]]; then
- mv -nT -- "$prog" "${prog%-static}-static"
- fi
- done
-}
-
-_package() {
- options=(!strip)
-
- make -C build-$1 DESTDIR="$pkgdir" install "${@:2}"
-
- cd "$pkgdir"/usr/bin
- tidy_strip
-}
-
-package_qemu-user-static-binfmt-git() {
- pkgdesc="binfmt registration for QEMU user-mode emulation - Git version."
- depends=("qemu-user-static-git=$pkgver")
-
- provides=("binfmt-qemu-static=$pkgver")
- conflicts=('binfmt-qemu-static' 'qemu-user-static-binfmt')
-
- cd ${_gitname}
-
- install -d "$pkgdir"/usr/lib/binfmt.d
-
- < scripts/qemu-binfmt-conf.sh \
- sed -e 's/^CHECK=.*/CHECK=qemu_check_systemd/' \
- -e 's/^BINFMT_SET=.*/BINFMT_SET=qemu_generate_systemd/' \
- | sh /dev/stdin \
- --qemu-path /usr/bin \
- --exportdir "$pkgdir"/usr/lib/binfmt.d \
- --credential yes
-}