pcr/qemu-riscv-* superseded by qemu-git et al.

17 files changed, 123 insertions, 85 deletions

diff --git a/pcr/qemu-riscv-git/65-kvm.rules b/pcr/qemu-git/65-kvm.rules
index 569ded9f9..569ded9f9 100644
--- a/pcr/qemu-riscv-git/65-kvm.rules
+++ b/pcr/qemu-git/65-kvm.rules
diff --git a/pcr/qemu-riscv-git/PKGBUILD b/pcr/qemu-git/PKGBUILD
index db62ff60d..c42869a37 100644
--- a/pcr/qemu-riscv-git/PKGBUILD
+++ b/pcr/qemu-git/PKGBUILD
@@ -1,32 +1,28 @@
-# Maintainer (AUR): Frederic Bezies <fredbezies@gmail.com>
-# Contributor (AUR): ajs124 < aur at ajs124 dot de>
-# Contributor (AUR): Devin Cofer <ranguvar{AT]archlinux[DOT}us>
-# Contributor (AUR): Tobias Powalowski <tpowa@archlinux.org>
-# Contributor (AUR): Sébastien "Seblu" Luttringer <seblu@seblu.net>
-
-# parabola changes and rationale:
-#  - apdapted from qemu-git on the AUR
-#  - changed to build riscv/riscv-qemu on github
-#  - checking out submodules in prepare
-
-pkgbase=qemu-riscv-git
-_gitname=riscv-qemu
-pkgname=(qemu-riscv-git qemu-riscv-headless-git qemu-riscv-arch-extra-git qemu-riscv-headless-arch-extra-git qemu-riscv-block-{iscsi-git,rbd-git,gluster-git} qemu-riscv-guest-agent-git)
-pkgdesc="A generic and open source machine emulator and virtualizer. Git version with riscv support."
-pkgver=2.11.50.r59354.b6e0a38a92
+# Maintainer: Frederic Bezies <fredbezies@gmail.com>
+# Contributor: ajs124 < aur at ajs124 dot de>
+# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Sébastien "Seblu" Luttringer <seblu@seblu.net>
+
+pkgbase=qemu-git
+_gitname=qemu
+pkgname=(qemu-git qemu-headless-git qemu-arch-extra-git qemu-headless-arch-extra-git qemu-block-{iscsi-git,rbd-git,gluster-git} qemu-guest-agent-git)
+pkgdesc="A generic and open source machine emulator and virtualizer. Git version."
+pkgver=v2.11.0.r2282.gfb5fff1588
 pkgrel=1
+epoch=3
 arch=(x86_64)
 license=(GPL2 LGPL2.1)
-url="https://github.com/riscv/riscv-qemu"
+url="http://wiki.qemu.org/"
 _headlessdeps=(seabios gnutls libpng libaio numactl jemalloc xfsprogs libnfs lzo snappy curl vde2 libcap-ng spice libcacard usbredir)
 depends=(dtc virglrenderer sdl2 vte3 libpulse "${_headlessdeps[@]}")
 makedepends=(spice-protocol python2 ceph libiscsi glusterfs git)
-source=(git+https://github.com/riscv/riscv-qemu.git#tag=riscv-qemu-upstream-v8
+source=(git://git.qemu.org/qemu.git
         qemu-ga.service
         65-kvm.rules)
 sha256sums=('SKIP'
             '0b4f3283973bb3bc876735f051d8eaab68f0065502a3a5012141fad193538ea1'
-            '60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7')
+           '60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7')
 
 case $CARCH in
   i?86) _corearch=i386 ;;
@@ -35,8 +31,7 @@ esac
 
 pkgver() {
   cd "${srcdir}/${_gitname}"
-
-  printf "%s.r%s.%s" "$(cat VERSION)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
@@ -44,11 +39,10 @@ prepare() {
   mkdir build-{full,headless}
   mkdir -p extra-arch-{full,headless}/usr/{bin,share/qemu}
 
+  scripts/git-submodule.sh update  ui/keycodemapdb capstone
+
   #cd "${srcdir}/${_gitname}"
   sed -i 's/vte-2\.90/vte-2.91/g' configure
-
-  # update git submodules
-  scripts/git-submodule.sh update ui/keycodemapdb
 }
 
 build() {
@@ -62,7 +56,7 @@ build() {
     --disable-gtk \
     --disable-vte \
     --disable-opengl \
-    --disable-virglrenderer
+    --disable-virglrenderer 
 }
 
 _build() (
@@ -86,13 +80,12 @@ _build() (
     --enable-modules \
     --enable-jemalloc \
     --disable-werror \
-    --disable-git-update \
     "${@:2}"
 
   make
 )
 
-package_qemu-riscv-git() {
+package_qemu-git() {
   optdepends=('qemu-arch-extra-git: extra architectures support')
   conflicts=('qemu-headless' 'qemu' 'kvm' 'kvm-git' 'qemu-spice')
   provides=('qemu-headless' 'qemu' 'qemu-kvm' 'qemu-spice')
@@ -101,7 +94,7 @@ package_qemu-riscv-git() {
   _package full
 }
 
-package_qemu-riscv-headless-git() {
+package_qemu-headless-git() {
   pkgdesc="QEMU without GUI. Git version."
   depends=("${_headlessdeps[@]}")
   optdepends=('qemu-headless-arch-extra-git: extra architectures support')
@@ -136,7 +129,7 @@ _package() {
   chmod u+s qemu/qemu-bridge-helper
 
   # remove split block modules
-  rm qemu/block-{iscsi,rbd,gluster}.so
+  rm -f qemu/block-{iscsi,rbd,gluster}.so
 
   cd ../bin
   tidy_strip
@@ -186,7 +179,7 @@ _package() {
   done
 }
 
-package_qemu-riscv-arch-extra-git() {
+package_qemu-arch-extra-git() {
   pkgdesc="QEMU for foreign architectures. Git version."
   depends=(qemu)
   provides=(qemu-arch-extra)
@@ -196,7 +189,7 @@ package_qemu-riscv-arch-extra-git() {
   mv $srcdir/$_gitname/extra-arch-full/usr "$pkgdir"
 }
 
-package_qemu-riscv-headless-arch-extra-git() {
+package_qemu-headless-arch-extra-git() {
   pkgdesc="QEMU without GUI, for foreign architectures. Git version."
   depends=(qemu-headless)
   options=(!strip)
@@ -206,7 +199,7 @@ package_qemu-riscv-headless-arch-extra-git() {
   mv $srcdir/$_gitname/extra-arch-headless/usr "$pkgdir"
 }
 
-package_qemu-riscv-block-iscsi-git() {
+package_qemu-block-iscsi-git() {
   pkgdesc="QEMU iSCSI block module. Git version."
   depends=(glib2 libiscsi jemalloc)
   conflicts=(qemu-block-iscsi)
@@ -215,7 +208,7 @@ package_qemu-riscv-block-iscsi-git() {
   install -D $srcdir/$_gitname/build-full/block-iscsi.so "$pkgdir/usr/lib/qemu/block-iscsi.so"
 }
 
-package_qemu-riscv-block-rbd-git() {
+package_qemu-block-rbd-git() {
   pkgdesc="QEMU RBD block module. Git version."
   depends=(glib2 ceph)
   conflicts=(qemu-block-rbd)
@@ -224,7 +217,7 @@ package_qemu-riscv-block-rbd-git() {
   install -D $srcdir/$_gitname/build-full/block-rbd.so "$pkgdir/usr/lib/qemu/block-rbd.so"
 }
 
-package_qemu-riscv-block-gluster-git() {
+package_qemu-block-gluster-git() {
   pkgdesc="QEMU GlusterFS block module. Git version."
   depends=(glib2 glusterfs)
   conflicts=(qemu-block-gluster)
@@ -233,7 +226,7 @@ package_qemu-riscv-block-gluster-git() {
   install -D $srcdir/$_gitname/build-full/block-gluster.so "$pkgdir/usr/lib/qemu/block-gluster.so"
 }
 
-package_qemu-riscv-guest-agent-git() {
+package_qemu-guest-agent-git() {
   pkgdesc="QEMU Guest Agent. Git version."
   depends=(gcc-libs glib2)
   conflicts=(qemu-guest-agent)
diff --git a/pcr/qemu-riscv-git/qemu-ga.service b/pcr/qemu-git/qemu-ga.service
index e5eb469f9..e5eb469f9 100644
--- a/pcr/qemu-riscv-git/qemu-ga.service
+++ b/pcr/qemu-git/qemu-ga.service
diff --git a/pcr/qemu-riscv-git/qemu.install b/pcr/qemu-git/qemu.install
index 9fe850d4e..9fe850d4e 100644
--- a/pcr/qemu-riscv-git/qemu.install
+++ b/pcr/qemu-git/qemu.install
diff --git a/pcr/qemu-user-static-riscv-git/0001-linux-user-Use-if-to-only-call-validate_guest_space-.patch b/pcr/qemu-user-static-git/0001-linux-user-Use-if-to-only-call-validate_guest_space-.patch
index bbc3840fe..bbc3840fe 100644
--- a/pcr/qemu-user-static-riscv-git/0001-linux-user-Use-if-to-only-call-validate_guest_space-.patch
+++ b/pcr/qemu-user-static-git/0001-linux-user-Use-if-to-only-call-validate_guest_space-.patch
diff --git a/pcr/qemu-user-static-riscv-git/0002-linux-user-Rename-validate_guest_space-init_guest_co.patch b/pcr/qemu-user-static-git/0002-linux-user-Rename-validate_guest_space-init_guest_co.patch
index 06e508219..06e508219 100644
--- a/pcr/qemu-user-static-riscv-git/0002-linux-user-Rename-validate_guest_space-init_guest_co.patch
+++ b/pcr/qemu-user-static-git/0002-linux-user-Rename-validate_guest_space-init_guest_co.patch
diff --git a/pcr/qemu-user-static-riscv-git/0003-linux-user-init_guest_space-Clean-up-if-we-can-t-ini.patch b/pcr/qemu-user-static-git/0003-linux-user-init_guest_space-Clean-up-if-we-can-t-ini.patch
index ea9eff138..ea9eff138 100644
--- a/pcr/qemu-user-static-riscv-git/0003-linux-user-init_guest_space-Clean-up-if-we-can-t-ini.patch
+++ b/pcr/qemu-user-static-git/0003-linux-user-init_guest_space-Clean-up-if-we-can-t-ini.patch
diff --git a/pcr/qemu-user-static-riscv-git/0004-linux-user-init_guest_space-Correctly-handle-guest_s.patch b/pcr/qemu-user-static-git/0004-linux-user-init_guest_space-Correctly-handle-guest_s.patch
index 7f9cfc7a8..7f9cfc7a8 100644
--- a/pcr/qemu-user-static-riscv-git/0004-linux-user-init_guest_space-Correctly-handle-guest_s.patch
+++ b/pcr/qemu-user-static-git/0004-linux-user-init_guest_space-Correctly-handle-guest_s.patch
diff --git a/pcr/qemu-user-static-riscv-git/0005-linux-user-init_guest_space-Clarify-page-alignment-l.patch b/pcr/qemu-user-static-git/0005-linux-user-init_guest_space-Clarify-page-alignment-l.patch
index 1570774ee..1570774ee 100644
--- a/pcr/qemu-user-static-riscv-git/0005-linux-user-init_guest_space-Clarify-page-alignment-l.patch
+++ b/pcr/qemu-user-static-git/0005-linux-user-init_guest_space-Clarify-page-alignment-l.patch
diff --git a/pcr/qemu-user-static-riscv-git/0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch b/pcr/qemu-user-static-git/0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch
index 4436b7817..4436b7817 100644
--- a/pcr/qemu-user-static-riscv-git/0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch
+++ b/pcr/qemu-user-static-git/0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch
diff --git a/pcr/qemu-user-static-riscv-git/0007-linux-user-init_guest_space-Clean-up-control-flow-a-.patch b/pcr/qemu-user-static-git/0007-linux-user-init_guest_space-Clean-up-control-flow-a-.patch
index 59be04cf9..59be04cf9 100644
--- a/pcr/qemu-user-static-riscv-git/0007-linux-user-init_guest_space-Clean-up-control-flow-a-.patch
+++ b/pcr/qemu-user-static-git/0007-linux-user-init_guest_space-Clean-up-control-flow-a-.patch
diff --git a/pcr/qemu-user-static-riscv-git/0008-linux-user-init_guest_space-Don-t-try-to-align-if-we.patch b/pcr/qemu-user-static-git/0008-linux-user-init_guest_space-Don-t-try-to-align-if-we.patch
index 9f434e116..9f434e116 100644
--- a/pcr/qemu-user-static-riscv-git/0008-linux-user-init_guest_space-Don-t-try-to-align-if-we.patch
+++ b/pcr/qemu-user-static-git/0008-linux-user-init_guest_space-Don-t-try-to-align-if-we.patch
diff --git a/pcr/qemu-user-static-riscv-git/0009-linux-user-init_guest_space-Add-a-comment-about-sear.patch b/pcr/qemu-user-static-git/0009-linux-user-init_guest_space-Add-a-comment-about-sear.patch
index e91fdefd8..e91fdefd8 100644
--- a/pcr/qemu-user-static-riscv-git/0009-linux-user-init_guest_space-Add-a-comment-about-sear.patch
+++ b/pcr/qemu-user-static-git/0009-linux-user-init_guest_space-Add-a-comment-about-sear.patch
diff --git a/pcr/qemu-user-static-riscv-git/0010-linux-user-init_guest_space-Try-to-make-ARM-space-co.patch b/pcr/qemu-user-static-git/0010-linux-user-init_guest_space-Try-to-make-ARM-space-co.patch
index 587293564..587293564 100644
--- a/pcr/qemu-user-static-riscv-git/0010-linux-user-init_guest_space-Try-to-make-ARM-space-co.patch
+++ b/pcr/qemu-user-static-git/0010-linux-user-init_guest_space-Try-to-make-ARM-space-co.patch
diff --git a/pcr/qemu-user-static-riscv-git/PKGBUILD b/pcr/qemu-user-static-git/PKGBUILD
index 89b83a008..a16fa8ebc 100644
--- a/pcr/qemu-user-static-riscv-git/PKGBUILD
+++ b/pcr/qemu-user-static-git/PKGBUILD
@@ -3,22 +3,17 @@
 # Maintainer: Luke Shumaker <lukeshu@parabola.nu>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 
-# parabola changes and rationale:
-#  - apdapted from ribre/qemu-user-static
-#  - changed to build riscv/riscv-qemu on github
-#  - checking out submodules in prepare
-
-_pkgbase=qemu
-_gitname=riscv-qemu
-pkgname=(qemu-user-static-riscv-git qemu-user-static-binfmt-riscv-git)
-pkgdesc="A generic and open source machine emulator and virtualizer. Git version with riscv support."
-pkgver=2.11.50.r59354.b6e0a38a92
+_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=2.11.50.r59752.fb5fff1588
 pkgrel=1
 arch=(x86_64)
 license=(GPL2 LGPL2.1)
-url="https://github.com/riscv/riscv-qemu"
+url="http://wiki.qemu.org/"
 makedepends=(git pixman-static glib2-static pcre-static python2)
-source=("git+https://github.com/riscv/riscv-qemu.git#tag=riscv-qemu-upstream-v8"
+source=(git://git.qemu.org/qemu.git
         0001-linux-user-Use-if-to-only-call-validate_guest_space-.patch
         0002-linux-user-Rename-validate_guest_space-init_guest_co.patch
         0003-linux-user-init_guest_space-Clean-up-if-we-can-t-ini.patch
@@ -28,8 +23,7 @@ source=("git+https://github.com/riscv/riscv-qemu.git#tag=riscv-qemu-upstream-v8"
         0007-linux-user-init_guest_space-Clean-up-control-flow-a-.patch
         0008-linux-user-init_guest_space-Don-t-try-to-align-if-we.patch
         0009-linux-user-init_guest_space-Add-a-comment-about-sear.patch
-        0010-linux-user-init_guest_space-Try-to-make-ARM-space-co.patch
-        allow_elf64.patch)
+        0010-linux-user-init_guest_space-Try-to-make-ARM-space-co.patch)
 sha256sums=('SKIP'
             '9953a8debd9456adb4f5968817fa89da4d4542e44980a5533ccf86371d819845'
             'a977e9295daa14a9c73258cf16399eb5af66382217f8a4e69951ec044131a7ce'
@@ -40,8 +34,7 @@ sha256sums=('SKIP'
             '76f88850b0f52450eecb80029ffe16db6f418cec3b58231aca354cc20bbfb16a'
             '76944d84990cc76e47c381849c683a346c5234bcebbe4c24334d0fd8368482db'
             '7845867348fd380def28c7fe023e54cee8ff88cd6754aae3ab3472149cfbde51'
-            '1953e7cac58c23526d007d8559410e0042d4a7c1b8cbd5f4c0543f7f876436dd'
-            '13a6d9e678bdc9e1f051006cfd0555f5a80582368f54c8a1bb5a78ece3832ac4')
+            '1953e7cac58c23526d007d8559410e0042d4a7c1b8cbd5f4c0543f7f876436dd')
 validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584')
 
 case $CARCH in
@@ -69,8 +62,6 @@ prepare() {
     patch -p1 < "$patchfile"
   done
 
-  patch -p1 < ../allow_elf64.patch
-
   # update git submodules
   scripts/git-submodule.sh update ui/keycodemapdb dtc
 }
@@ -131,8 +122,8 @@ _build() (
   make
 )
 
-package_qemu-user-static-riscv-git() {
-  pkgdesc="QEMU user-mode emulation (static binaries) - Git version with riscv support."
+package_qemu-user-static-git() {
+  pkgdesc="QEMU user-mode emulation (static binaries) - Git version."
 
   provides=("qemu-static=$pkgver")
   conflicts=(qemu-static qemu-user-static)
@@ -158,9 +149,9 @@ _package() {
   tidy_strip
 }
 
-package_qemu-user-static-binfmt-riscv-git() {
-  pkgdesc="binfmt registration for QEMU user-mode emulation - Git version with riscv support."
-  depends=("qemu-user-static-riscv-git=$pkgver")
+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')
diff --git a/pcr/qemu-user-static-git/out b/pcr/qemu-user-static-git/out
new file mode 100644
index 000000000..b53c479cc
--- /dev/null
+++ b/pcr/qemu-user-static-git/out
@@ -0,0 +1,81 @@
+ID   State      Output               E-Level  Times(r/u/s)   Command [run=0/1]
+114  finished   /tmp/ts-out.jKXd3b   0        0.00/0.00/0.00 echo /home/andi/parabola/tree/abslibre/libre/qtcreator
+115  finished   /tmp/ts-out.bLshXK   0        2.07/0.50/0.14 [114]&& script --return --quiet --command sudo /usr/bin/librechroot -A x86_64 -n default-x86_64 update  /dev/null
+116  finished   /tmp/ts-out.4clmJN   0        3477.55/6939.77/472.28 [115]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-x86_64  /dev/null
+117  finished   /tmp/ts-out.LesP6K   0        46.29/19.98/4.79 [116]&& script --return --quiet --command sudo /usr/bin/librechroot -A i686 -n default-i686 update  /dev/null
+118  finished   /tmp/ts-out.FsJBTB   0        3549.12/7215.64/361.63 [117]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-i686  /dev/null
+119  finished   /tmp/ts-out.1966dR   0        92.37/60.61/6.76 [118]&& script --return --quiet --command sudo /usr/bin/librechroot -A armv7h -n default-armv7h update  /dev/null
+120  finished   /tmp/ts-out.xSySZl   1        121.93/16.85/2.16 [119]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-armv7h  /dev/null
+121  skipped    (no output)                                  [120]&& librestage
+122  finished   /tmp/ts-out.KQQ5SR   0        0.01/0.00/0.00 echo /home/andi/parabola/tree/abslibre/libre/khotkeys
+123  finished   /tmp/ts-out.nS62vV   0        2.23/0.34/0.09 [122]&& script --return --quiet --command sudo /usr/bin/librechroot -A x86_64 -n default-x86_64 update  /dev/null
+124  finished   /tmp/ts-out.iUm6cj   0        128.67/166.64/22.83 [123]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-x86_64  /dev/null
+125  finished   /tmp/ts-out.RnwqqV   0        3.43/0.44/0.17 [124]&& script --return --quiet --command sudo /usr/bin/librechroot -A i686 -n default-i686 update  /dev/null
+126  finished   /tmp/ts-out.fRfmqC   1        145.69/3.35/1.28 [125]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-i686  /dev/null
+127  skipped    (no output)                                  [126]&& script --return --quiet --command sudo /usr/bin/librechroot -A armv7h -n default-armv7h update  /dev/null
+128  skipped    (no output)                                  [127]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-armv7h  /dev/null
+129  skipped    (no output)                                  [128]&& librestage
+130  finished   /tmp/ts-out.qRKrxc   0        0.00/0.00/0.00 echo /home/andi/parabola/tree/abslibre/libre/kinfocenter
+131  finished   /tmp/ts-out.cYMQmc   0        2.05/0.48/0.08 [130]&& script --return --quiet --command sudo /usr/bin/librechroot -A x86_64 -n default-x86_64 update  /dev/null
+132  finished   /tmp/ts-out.62n1qk   0        89.65/136.29/18.21 [131]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-x86_64  /dev/null
+133  finished   /tmp/ts-out.CtuGTQ   0        1.92/0.36/0.08 [132]&& script --return --quiet --command sudo /usr/bin/librechroot -A i686 -n default-i686 update  /dev/null
+134  finished   /tmp/ts-out.SERXL1   1        26.15/4.06/0.65 [133]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-i686  /dev/null
+135  skipped    (no output)                                  [134]&& script --return --quiet --command sudo /usr/bin/librechroot -A armv7h -n default-armv7h update  /dev/null
+136  skipped    (no output)                                  [135]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-armv7h  /dev/null
+137  skipped    (no output)                                  [136]&& librestage
+138  finished   /tmp/ts-out.ZnBjor   0        0.00/0.00/0.00 echo /home/andi/parabola/tree/abslibre/libre/kio-extras
+139  finished   /tmp/ts-out.8E8wer   0        2.03/0.44/0.11 [138]&& script --return --quiet --command sudo /usr/bin/librechroot -A x86_64 -n default-x86_64 update  /dev/null
+140  finished   /tmp/ts-out.uBqekA   0        149.69/239.85/30.41 [139]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-x86_64  /dev/null
+141  finished   /tmp/ts-out.YWHWJx   0        1.99/0.36/0.09 [140]&& script --return --quiet --command sudo /usr/bin/librechroot -A i686 -n default-i686 update  /dev/null
+142  finished   /tmp/ts-out.RNe9ZD   1        68.01/6.23/0.77 [141]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-i686  /dev/null
+143  skipped    (no output)                                  [142]&& script --return --quiet --command sudo /usr/bin/librechroot -A armv7h -n default-armv7h update  /dev/null
+144  skipped    (no output)                                  [143]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-armv7h  /dev/null
+145  skipped    (no output)                                  [144]&& librestage
+146  finished   /tmp/ts-out.Qzqk7l   0        0.00/0.00/0.00 echo /home/andi/parabola/tree/abslibre/libre/kio
+147  finished   /tmp/ts-out.zcsBam   0        2.05/0.46/0.09 [146]&& script --return --quiet --command sudo /usr/bin/librechroot -A x86_64 -n default-x86_64 update  /dev/null
+148  finished   /tmp/ts-out.WqzjOy   2        11.73/9.36/1.55 [147]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-x86_64  /dev/null
+149  skipped    (no output)                                  [148]&& script --return --quiet --command sudo /usr/bin/librechroot -A i686 -n default-i686 update  /dev/null
+150  skipped    (no output)                                  [149]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-i686  /dev/null
+151  skipped    (no output)                                  [150]&& script --return --quiet --command sudo /usr/bin/librechroot -A armv7h -n default-armv7h update  /dev/null
+152  skipped    (no output)                                  [151]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-armv7h  /dev/null
+153  skipped    (no output)                                  [152]&& librestage
+154  finished   /tmp/ts-out.qPBy1S   0        0.00/0.00/0.00 echo /home/andi/parabola/tree/abslibre/libre/ark
+155  finished   /tmp/ts-out.hq0gZS   0        2.01/0.46/0.10 [154]&& script --return --quiet --command sudo /usr/bin/librechroot -A x86_64 -n default-x86_64 update  /dev/null
+156  finished   /tmp/ts-out.QWdn0Y   0        85.41/168.05/18.15 [155]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-x86_64  /dev/null
+157  finished   /tmp/ts-out.R2kOmY   0        1.93/0.35/0.10 [156]&& script --return --quiet --command sudo /usr/bin/librechroot -A i686 -n default-i686 update  /dev/null
+158  finished   /tmp/ts-out.ByXyGZ   1        11.01/7.78/1.82 [157]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-i686  /dev/null
+159  skipped    (no output)                                  [158]&& script --return --quiet --command sudo /usr/bin/librechroot -A armv7h -n default-armv7h update  /dev/null
+160  skipped    (no output)                                  [159]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-armv7h  /dev/null
+161  skipped    (no output)                                  [160]&& librestage
+162  finished   /tmp/ts-out.ZAcxSz   0        0.00/0.00/0.00 echo /home/andi/parabola/tree/abslibre/libre/konqueror
+163  finished   /tmp/ts-out.24ch0z   0        2.01/0.44/0.11 [162]&& script --return --quiet --command sudo /usr/bin/librechroot -A x86_64 -n default-x86_64 update  /dev/null
+164  finished   /tmp/ts-out.nY510G   2        19.05/15.45/3.71 [163]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-x86_64  /dev/null
+165  skipped    (no output)                                  [164]&& script --return --quiet --command sudo /usr/bin/librechroot -A i686 -n default-i686 update  /dev/null
+166  skipped    (no output)                                  [165]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-i686  /dev/null
+167  skipped    (no output)                                  [166]&& script --return --quiet --command sudo /usr/bin/librechroot -A armv7h -n default-armv7h update  /dev/null
+168  skipped    (no output)                                  [167]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-armv7h  /dev/null
+169  skipped    (no output)                                  [168]&& librestage
+170  finished   /tmp/ts-out.DFQFUN   0        0.00/0.00/0.00 echo /home/andi/parabola/tree/abslibre/libre/okular
+171  finished   /tmp/ts-out.GYxJIN   0        2.02/0.45/0.11 [170]&& script --return --quiet --command sudo /usr/bin/librechroot -A x86_64 -n default-x86_64 update  /dev/null
+172  finished   /tmp/ts-out.fRbbXX   0        217.58/461.79/47.29 [171]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-x86_64  /dev/null
+173  finished   /tmp/ts-out.xV2Q2q   0        1.92/0.36/0.09 [172]&& script --return --quiet --command sudo /usr/bin/librechroot -A i686 -n default-i686 update  /dev/null
+174  finished   /tmp/ts-out.rFR91u   1        105.93/8.18/1.11 [173]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-i686  /dev/null
+175  skipped    (no output)                                  [174]&& script --return --quiet --command sudo /usr/bin/librechroot -A armv7h -n default-armv7h update  /dev/null
+176  skipped    (no output)                                  [175]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-armv7h  /dev/null
+177  skipped    (no output)                                  [176]&& librestage
+178  finished   /tmp/ts-out.vvrtXa   0        0.00/0.00/0.00 echo /home/andi/parabola/tree/abslibre/libre/linux-libre-armv7
+179  finished   /tmp/ts-out.weaBTb   0        2.74/1.20/0.12 [178]&& script --return --quiet --command sudo /usr/bin/librechroot -A armv7h -n default-armv7h update  /dev/null
+180  finished   /tmp/ts-out.8A2Bm1   1        41.80/31.36/3.75 [179]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-armv7h  /dev/null
+181  skipped    (no output)                                  [180]&& librestage
+182  finished   /tmp/ts-out.pnAfO4   0        0.00/0.00/0.00 echo /home/andi/parabola/tree/abslibre/pcr/qemu-git
+183  finished   /tmp/ts-out.MO6WN4   0        2.29/0.45/0.09 [182]&& script --return --quiet --command sudo /usr/bin/librechroot -A x86_64 -n default-x86_64 update  /dev/null
+184  finished   /tmp/ts-out.TJcZHx   0        2323.03/6351.91/490.83 [183]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-x86_64  /dev/null
+185  finished   /tmp/ts-out.jbHsL1   0        3.66/0.45/0.18 [184]&& script --return --quiet --command sudo /usr/bin/librechroot -A i686 -n default-i686 update  /dev/null
+186  finished   /tmp/ts-out.E56QbQ   1        58.06/16.16/3.95 [185]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-i686  /dev/null
+187  skipped    (no output)                                  [186]&& librestage
+188  finished   /tmp/ts-out.yj25w6   0        0.02/0.00/0.00 echo /home/andi/parabola/tree/abslibre/pcr/qemu-user-static-git
+189  finished   /tmp/ts-out.O6yyo5   0        2.44/0.50/0.16 [188]&& script --return --quiet --command sudo /usr/bin/librechroot -A x86_64 -n default-x86_64 update  /dev/null
+190  finished   /tmp/ts-out.DbDqGL   2        14.80/5.27/3.26 [189]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-x86_64  /dev/null
+191  skipped    (no output)                                  [190]&& script --return --quiet --command sudo /usr/bin/librechroot -A i686 -n default-i686 update  /dev/null
+192  skipped    (no output)                                  [191]&& script --return --quiet --command sudo /usr/bin/libremakepkg -n default-i686  /dev/null
+193  skipped    (no output)                                  [192]&& librestage
diff --git a/pcr/qemu-user-static-riscv-git/allow_elf64.patch b/pcr/qemu-user-static-riscv-git/allow_elf64.patch
deleted file mode 100644
index 07f27a038..000000000
--- a/pcr/qemu-user-static-riscv-git/allow_elf64.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 3c72765ec760a51f0e879dc792be82c93141e318
-Author: Anatol Pomozov <anatol.pomozov@gmail.com>
-Date:   Tue Jun 6 20:07:03 2017 -0700
-
-    Remove restriction that prevents bootimg elf64 images
-    
-    It is possible to create a 64 bit elf image that has valid multiboot header.
-    qemu should be able to boot such images.
-    
-    Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
-
-diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
-index 663f35a658..cf1b4f5fb3 100644
---- a/hw/i386/multiboot.c
-+++ b/hw/i386/multiboot.c
-@@ -192,11 +192,6 @@ int load_multiboot(FWCfgState *fw_cfg,
-         int kernel_size;
-         fclose(f);
- 
--        if (((struct elf64_hdr*)header)->e_machine == EM_X86_64) {
--            fprintf(stderr, "Cannot load x86-64 image, give a 32bit one.\n");
--            exit(1);
--        }
--
-         kernel_size = load_elf(kernel_filename, NULL, NULL, &elf_entry,
-                                &elf_low, &elf_high, 0, I386_ELF_MACHINE,
-                                0, 0);