| 1 |
commit: e0cb77cc53f95f1694616d5bf8fb202c32c7c548 |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Mar 10 02:23:12 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Mar 10 02:23:12 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e0cb77cc |
| 7 |
|
| 8 |
app-emulation/qemu: version bump to 2.8.0-r7 |
| 9 |
|
| 10 |
app-emulation/qemu/Manifest | 2 +- |
| 11 |
.../{qemu-2.8.0-r6.ebuild => qemu-2.8.0-r7.ebuild} | 111 +++++++++++---------- |
| 12 |
2 files changed, 58 insertions(+), 55 deletions(-) |
| 13 |
|
| 14 |
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest |
| 15 |
index c32d60a..2df64a8 100644 |
| 16 |
--- a/app-emulation/qemu/Manifest |
| 17 |
+++ b/app-emulation/qemu/Manifest |
| 18 |
@@ -29,5 +29,5 @@ AUX qemu-2.8.0-F_SHLCK-and-F_EXLCK.patch 574 SHA256 d02353daa0ecfe161e938a5e54fe |
| 19 |
AUX qemu-binfmt.initd-r1 7966 SHA256 5b4b432aa1e44f387c9eb789de0ec6322741fd36dd241f76520f17c6cd6ac49b SHA512 2ba0bff6eb2b6bac4ed440f793771ce9551cad48e38bddb6cf04f804faac2407e80879f66771910344ddcea45f0014095dcc8bfeb0aad5085ef048fd3612dbd8 WHIRLPOOL a2a1fb830a970757d1e203378c7d382b161b1040f3b8aaf0f22bb3b5e46467eff395474ff40d93c9f133bab307b345a6f75d63eae9f8dd8daf67324db41032f9 |
| 20 |
DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5 |
| 21 |
EBUILD qemu-2.8.0-r3.ebuild 21992 SHA256 a2c7a92d214b05e2c6f58fb0d7263472d6a44259de99afc674df713303b432bb SHA512 80699e92ae269cb6ab33b3ec0be164111b68e25d498d8af3624f04bca799174937f1fd2cf49357e0598f6567873cdc8aac3310a1175e328207de8ca5b97856d1 WHIRLPOOL 2079c97d3aa8589c70288cbcca7e1d8591adb1b40a0846b6a683fc6c72f142892e65b6adfac750931e2e63aa33a9d99f31f9659bd5664e6145059f28ecfced1a |
| 22 |
-EBUILD qemu-2.8.0-r6.ebuild 23200 SHA256 5f27a46c6914629140855bf35eb178b4f1eca69c5410d0215684307420690afb SHA512 f61e39fb20341c8a16df5e80eb14518ec7d7917a714a373818c8332100ffeec55c89923f4e31c82561e83471e979304d034e1d1bdaf8c75dbefcb37f575b4187 WHIRLPOOL 2f7e56c1215b5e68e70feb437eea3b2854d85f23431a14e4977435490134a3d6276e4343434e2120bfe6775b9cac06becdfc93c5f29b26bb2f77de63da839a8e |
| 23 |
+EBUILD qemu-2.8.0-r7.ebuild 23243 SHA256 50297d1c34059239373a804aa2fc61926800a1f1a2ff9bfff486e35209a5d4c4 SHA512 8a16c952ebd7ce097cb061e9f68b528a61c0da0667b303faa276fe8f9c68e874a2f37f46a04cf6b9dae7ead5fd79716941f083f2af2af59aae7c112857da2a15 WHIRLPOOL 1050f6ae755095d731305b263b77cca66671071acde4952981dc40315f9d810c5f9590da31a6eb9a858e67193c092769d3efc8b28093d74691b017cc1429d31a |
| 24 |
MISC metadata.xml 3890 SHA256 50fd5960fa2280175116b5ee5ff4a9625f02e38f560061a00b2640cde4846d69 SHA512 f19e826a9daba7f2676f0459f97e7bdc752652ccf8b9dd009fd569977015b0656fee21c74529e53b6bc51c2f19e746f417c3dc1e1472e3767cdefa0746b0876c WHIRLPOOL 03e0dafcdc13beffb0044ce5227b83aa272a21e9835fce9ad16d5bdf56ee1a4c3a1ae4b10d1cdaf405502532b84991b150de262f12fa72497052c2377046845f |
| 25 |
|
| 26 |
diff --git a/app-emulation/qemu/qemu-2.8.0-r6.ebuild b/app-emulation/qemu/qemu-2.8.0-r7.ebuild |
| 27 |
similarity index 93% |
| 28 |
rename from app-emulation/qemu/qemu-2.8.0-r6.ebuild |
| 29 |
rename to app-emulation/qemu/qemu-2.8.0-r7.ebuild |
| 30 |
index 8014ef7..d9d2ca3 100644 |
| 31 |
--- a/app-emulation/qemu/qemu-2.8.0-r6.ebuild |
| 32 |
+++ b/app-emulation/qemu/qemu-2.8.0-r7.ebuild |
| 33 |
@@ -416,9 +416,9 @@ qemu_src_configure() { |
| 34 |
$(use_enable xattr attr) |
| 35 |
) |
| 36 |
|
| 37 |
- # Disable options not used by user targets as the default configure |
| 38 |
- # options will autoprobe and try to link in a bunch of unused junk. |
| 39 |
- conf_softmmu() { |
| 40 |
+ # Disable options not used by user targets. This simplifies building |
| 41 |
+ # static user targets (USE=static-user) considerably. |
| 42 |
+ conf_notuser() { |
| 43 |
if [[ ${buildtype} == "user" ]] ; then |
| 44 |
echo "--disable-${2:-$1}" |
| 45 |
else |
| 46 |
@@ -426,48 +426,61 @@ qemu_src_configure() { |
| 47 |
fi |
| 48 |
} |
| 49 |
conf_opts+=( |
| 50 |
- $(conf_softmmu accessibility brlapi) |
| 51 |
- $(conf_softmmu aio linux-aio) |
| 52 |
- $(conf_softmmu bzip2) |
| 53 |
- $(conf_softmmu bluetooth bluez) |
| 54 |
- $(conf_softmmu caps cap-ng) |
| 55 |
- $(conf_softmmu curl) |
| 56 |
- $(conf_softmmu fdt) |
| 57 |
- $(conf_softmmu glusterfs) |
| 58 |
- $(conf_softmmu gnutls) |
| 59 |
- $(conf_softmmu gnutls nettle) |
| 60 |
- $(conf_softmmu gtk) |
| 61 |
- $(conf_softmmu infiniband rdma) |
| 62 |
- $(conf_softmmu iscsi libiscsi) |
| 63 |
- $(conf_softmmu jpeg vnc-jpeg) |
| 64 |
- $(conf_softmmu kernel_linux kvm) |
| 65 |
- $(conf_softmmu lzo) |
| 66 |
- $(conf_softmmu ncurses curses) |
| 67 |
- $(conf_softmmu nfs libnfs) |
| 68 |
- $(conf_softmmu numa) |
| 69 |
- $(conf_softmmu opengl) |
| 70 |
- $(conf_softmmu png vnc-png) |
| 71 |
- $(conf_softmmu rbd) |
| 72 |
- $(conf_softmmu sasl vnc-sasl) |
| 73 |
- $(conf_softmmu sdl) |
| 74 |
- $(conf_softmmu seccomp) |
| 75 |
- $(conf_softmmu smartcard) |
| 76 |
- $(conf_softmmu snappy) |
| 77 |
- $(conf_softmmu spice) |
| 78 |
- $(conf_softmmu ssh libssh2) |
| 79 |
- $(conf_softmmu usb libusb) |
| 80 |
- $(conf_softmmu usbredir usb-redir) |
| 81 |
- $(conf_softmmu vde) |
| 82 |
- $(conf_softmmu vhost-net) |
| 83 |
- $(conf_softmmu virgl virglrenderer) |
| 84 |
- $(conf_softmmu virtfs) |
| 85 |
- $(conf_softmmu vnc) |
| 86 |
- $(conf_softmmu vte) |
| 87 |
- $(conf_softmmu xen) |
| 88 |
- $(conf_softmmu xen xen-pci-passthrough) |
| 89 |
- $(conf_softmmu xfs xfsctl) |
| 90 |
+ $(conf_notuser accessibility brlapi) |
| 91 |
+ $(conf_notuser aio linux-aio) |
| 92 |
+ $(conf_notuser bzip2) |
| 93 |
+ $(conf_notuser bluetooth bluez) |
| 94 |
+ $(conf_notuser caps cap-ng) |
| 95 |
+ $(conf_notuser curl) |
| 96 |
+ $(conf_notuser fdt) |
| 97 |
+ $(conf_notuser glusterfs) |
| 98 |
+ $(conf_notuser gnutls) |
| 99 |
+ $(conf_notuser gnutls nettle) |
| 100 |
+ $(conf_notuser gtk) |
| 101 |
+ $(conf_notuser infiniband rdma) |
| 102 |
+ $(conf_notuser iscsi libiscsi) |
| 103 |
+ $(conf_notuser jpeg vnc-jpeg) |
| 104 |
+ $(conf_notuser kernel_linux kvm) |
| 105 |
+ $(conf_notuser lzo) |
| 106 |
+ $(conf_notuser ncurses curses) |
| 107 |
+ $(conf_notuser nfs libnfs) |
| 108 |
+ $(conf_notuser numa) |
| 109 |
+ $(conf_notuser opengl) |
| 110 |
+ $(conf_notuser png vnc-png) |
| 111 |
+ $(conf_notuser rbd) |
| 112 |
+ $(conf_notuser sasl vnc-sasl) |
| 113 |
+ $(conf_notuser sdl) |
| 114 |
+ $(conf_notuser seccomp) |
| 115 |
+ $(conf_notuser smartcard) |
| 116 |
+ $(conf_notuser snappy) |
| 117 |
+ $(conf_notuser spice) |
| 118 |
+ $(conf_notuser ssh libssh2) |
| 119 |
+ $(conf_notuser usb libusb) |
| 120 |
+ $(conf_notuser usbredir usb-redir) |
| 121 |
+ $(conf_notuser vde) |
| 122 |
+ $(conf_notuser vhost-net) |
| 123 |
+ $(conf_notuser virgl virglrenderer) |
| 124 |
+ $(conf_notuser virtfs) |
| 125 |
+ $(conf_notuser vnc) |
| 126 |
+ $(conf_notuser vte) |
| 127 |
+ $(conf_notuser xen) |
| 128 |
+ $(conf_notuser xen xen-pci-passthrough) |
| 129 |
+ $(conf_notuser xfs xfsctl) |
| 130 |
) |
| 131 |
|
| 132 |
+ if [[ ! ${buildtype} == "user" ]] ; then |
| 133 |
+ # audio options |
| 134 |
+ local audio_opts="oss" |
| 135 |
+ use alsa && audio_opts="alsa,${audio_opts}" |
| 136 |
+ use sdl && audio_opts="sdl,${audio_opts}" |
| 137 |
+ use pulseaudio && audio_opts="pa,${audio_opts}" |
| 138 |
+ conf_opts+=( |
| 139 |
+ --audio-drv-list="${audio_opts}" |
| 140 |
+ ) |
| 141 |
+ use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) |
| 142 |
+ use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) |
| 143 |
+ fi |
| 144 |
+ |
| 145 |
case ${buildtype} in |
| 146 |
user) |
| 147 |
conf_opts+=( |
| 148 |
@@ -479,21 +492,12 @@ qemu_src_configure() { |
| 149 |
local static_flag="static-user" |
| 150 |
;; |
| 151 |
softmmu) |
| 152 |
- # audio options |
| 153 |
- local audio_opts="oss" |
| 154 |
- use alsa && audio_opts="alsa,${audio_opts}" |
| 155 |
- use sdl && audio_opts="sdl,${audio_opts}" |
| 156 |
- use pulseaudio && audio_opts="pa,${audio_opts}" |
| 157 |
- |
| 158 |
conf_opts+=( |
| 159 |
--disable-linux-user |
| 160 |
--enable-system |
| 161 |
--disable-tools |
| 162 |
--with-system-pixman |
| 163 |
- --audio-drv-list="${audio_opts}" |
| 164 |
) |
| 165 |
- use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) |
| 166 |
- use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) |
| 167 |
local static_flag="static" |
| 168 |
;; |
| 169 |
tools) |
| 170 |
@@ -502,7 +506,6 @@ qemu_src_configure() { |
| 171 |
--disable-system |
| 172 |
--disable-blobs |
| 173 |
--enable-tools |
| 174 |
- $(use_enable bzip2) |
| 175 |
) |
| 176 |
local static_flag="static" |
| 177 |
;; |
| 178 |
@@ -681,7 +684,7 @@ src_install() { |
| 179 |
|
| 180 |
# Disable mprotect on the qemu binaries as they use JITs to be fast #459348 |
| 181 |
pushd "${ED}"/usr/bin >/dev/null |
| 182 |
- pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}" |
| 183 |
+ pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 |
| 184 |
popd >/dev/null |
| 185 |
|
| 186 |
# Install config file example for qemu-bridge-helper |
Archives