SHARE
TWEET

qemu-pinning-4.2.0.patch

a guest Jan 27th, 2020 35 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/PKGBUILD b/PKGBUILD
  2. index 96abf11..551a367 100644
  3. --- a/PKGBUILD
  4. +++ b/PKGBUILD
  5. @@ -6,25 +6,27 @@ pkgname=(qemu-pinning qemu-pinning-headless qemu-pinning-arch-extra qemu-pinning
  6.           qemu-pinning-block-{iscsi,rbd,gluster} qemu-pinning-guest-agent)
  7.  _pkgname=qemu
  8.  pkgdesc="A generic and open source machine emulator and virtualizer. Patch from saveriomiroddi/qemu-pinning applied"
  9. -pkgver=4.1.0
  10. +pkgver=4.2.0
  11.  pkgrel=1
  12.  arch=(x86_64)
  13.  license=(GPL2 LGPL2.1)
  14.  url="https://wiki.qemu.org/"
  15.  _headlessdeps=(seabios gnutls libpng libaio numactl jemalloc xfsprogs libnfs
  16. -               lzo snappy curl vde2 libcap-ng spice libcacard usbredir)
  17. +               lzo snappy curl vde2 libcap-ng spice libcacard usbredir libslirp libssh)
  18.  provides=(qemu)
  19.  depends=(virglrenderer sdl2 vte3 libpulse "${_headlessdeps[@]}")
  20. -makedepends=(spice-protocol python2 ceph libiscsi glusterfs python-sphinx)
  21. +makedepends=(spice-protocol python ceph libiscsi glusterfs python-sphinx)
  22.  source=(https://download.qemu.org/qemu-$pkgver.tar.xz{,.sig}
  23.          qemu-ga.service
  24.          65-kvm.rules
  25. -        https://github.com/saveriomiroddi/qemu-pinning/commit/3c467032dca13f9a4b4a2316dbf904112dd2b364.diff)
  26. -sha512sums=('82fd51702a7b9b1b00b2f1bd3b4a832b80249018dbba1add0b0a73e7d4bee452afd45574b4d8df7ce4477d8711f3bda4ca072a1a6de25895c93eb21cf78fc4b2'
  27. +        https://github.com/saveriomiroddi/qemu-pinning/commit/4e4fe6402e9e4943cc247a4ccfea21fa5f608b30.diff
  28. +        capstone-include.patch)
  29. +sha512sums=('2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56'
  30.              'SKIP'
  31.              '269c0f0bacbd06a3d817fde02dce26c99d9f55c9e3b74bb710bd7e5cdde7a66b904d2eb794c8a605bf9305e4e3dee261a6e7d4ec9d9134144754914039f176e4'
  32.              'bdf05f99407491e27a03aaf845b7cc8acfa2e0e59968236f10ffc905e5e3d5e8569df496fd71c887da2b5b8d1902494520c7da2d3a8258f7fd93a881dd610c99'
  33. -            'SKIP')
  34. +            'SKIP'
  35. +            '099751aee34d9244b4d73401a39a1717ecaaef37d36c9b5fe58cc7051a61771c686910f58b297a3c5bb92add9ae3f151bc100dde8a3122b3b849b6595ba476aa')
  36.  validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584')
  37.  
  38.  case $CARCH in
  39. @@ -33,14 +35,14 @@ case $CARCH in
  40.  esac
  41.  
  42.  prepare() {
  43. -  mkdir -p build-{full,headless}
  44. +  mkdir build-{full,headless}
  45.    mkdir -p extra-arch-{full,headless}/usr/{bin,share/qemu}
  46.  
  47.    cd ${_pkgname}-${pkgver}
  48.  
  49. -  patch -p1 < ../3c467032dca13f9a4b4a2316dbf904112dd2b364.diff
  50. -
  51. -  #sed -i 's/vte-2\.90/vte-2.91/g' configure
  52. +  patch -p1 < ../4e4fe6402e9e4943cc247a4ccfea21fa5f608b30.diff
  53. +  # Needed until capstone is updated with include fix
  54. +  patch -p1 < ../capstone-include.patch
  55.  }
  56.  
  57.  build() {
  58. @@ -71,11 +73,11 @@ _build() (
  59.      --sysconfdir=/etc \
  60.      --localstatedir=/var \
  61.      --libexecdir=/usr/lib/qemu \
  62. -    --python=/usr/bin/python2 \
  63.      --smbd=/usr/bin/smbd \
  64.      --enable-modules \
  65.      --enable-sdl \
  66.      --enable-jemalloc \
  67. +    --enable-slirp=system \
  68.      "${@:2}"
  69.  
  70.    make
  71. diff --git a/capstone-include.patch b/capstone-include.patch
  72. new file mode 100644
  73. index 0000000..839e264
  74. --- /dev/null
  75. +++ b/capstone-include.patch
  76. @@ -0,0 +1,11 @@
  77. +--- a/include/disas/capstone.h
  78. ++++ b/include/disas/capstone.h
  79. +@@ -3,7 +3,7 @@
  80. +
  81. + #ifdef CONFIG_CAPSTONE
  82. +
  83. +-#include <capstone.h>
  84. ++#include <capstone/capstone.h>
  85. +
  86. + #else
  87. +
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
Top