diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
commit | eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch) | |
tree | ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /app-emulation/qemu | |
parent | b7ebc951da8800f711142f69d9d958bde67a112d (diff) |
gentoo resync : 04.05.2019
Diffstat (limited to 'app-emulation/qemu')
-rw-r--r-- | app-emulation/qemu/Manifest | 8 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-3.1.0-CVE-2018-20123.patch | 35 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-3.1.0-CVE-2019-3812.patch | 33 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-4.0.0-sanitize-interp_info.patch | 32 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-4.0.0.ebuild (renamed from app-emulation/qemu/qemu-3.1.0-r1.ebuild) | 67 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 25 |
6 files changed, 83 insertions, 117 deletions
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 15328278420a..a4b407d8075f 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -3,13 +3,13 @@ AUX bridge.conf 454 BLAKE2B 2f3e828a001ac77de96c8a11e3fc462149e1c16972c28b836765 AUX qemu-2.11.1-capstone_include_path.patch 264 BLAKE2B 955b498c0ea2657ee4c9d0054a32693ac2096232ae8358848fa8518bcb87c1cce5d9145ccf560320ba53d60ae8ed85f6be801b72707a964b247e8f1f1844f9cd SHA512 ebf1d6450b7c499a8e490b19f87a3b4f8bbc50ea44edaac8c12b0993947513a8b616af2d4cf6240c8e265824a44463f917333ffa510e6ffedf379921e28fc3ab AUX qemu-2.5.0-cflags.patch 410 BLAKE2B 1d072b5dd00369bb565b30c2aa7047de92b441bf103faadb5dd42daf36ad1c5e39c5bdfdc2b5f2bb0bfec2ea1255b4182caeb467614a487f5cfcb341109a4884 SHA512 0194d28de08b4e51c5bd1c9a2cc7965ba7f66dfddb8fd91de3da93677e6cf2d38ad3270f69aaea8a20cf2533c2980018d6e0fed711be2806fe2053fba7c081f3 AUX qemu-2.5.0-sysmacros.patch 333 BLAKE2B 8c38410c6ea789f669d89c7321cdc9e5c734bb3db332272657302977241f157b04fb07e27bda4f67ee560e39a7494344ad79616835e6ff483927f2b72ed9c597 SHA512 329632c5bff846ca3ffcdb4bc94ae62f17c6bdbb566f9bec0784357c943523e8ca7773790b83a9617734cab3b003baa3d636cbd08f7385810a63b0fa0383c4f0 -AUX qemu-3.1.0-CVE-2018-20123.patch 1001 BLAKE2B 0556cd85cc88173ccb7add0eef87dbc1311c80e66513137056776b6955ea5f04d3f1b87bbf88bb43a55149b9fe45490c3c061efdd37bfb06fb31bd20946594a2 SHA512 68ff91a7af012ffc2cc7e67b525eaaf2ce2ed991debf9c73c1157424b13e74cbc82327f6e2596455c9ed6915cb35798e39075fd0a9ad1edd7f14d1ab1e8758da -AUX qemu-3.1.0-CVE-2019-3812.patch 997 BLAKE2B 042dd4d18a71a6d23b168afa0447372b1929d436678fda6aa8a6e8d99fecc8bc57decc99bdc82b28523374df06ef7483a6d44c81cf269b7bd0dbc3527fa6d5c3 SHA512 61feb1285d312481e74e6b2cffb5bb5ad00f0c5906d69afc23d2ac218706c024402e2dc538815aef02e79606681fde89ca9ddf2bcd278cc2011bd51df5abd028 +AUX qemu-4.0.0-sanitize-interp_info.patch 930 BLAKE2B d555dedc493cfa1cf888cfa7ce2a4a7811f3fd12615fa5177f82c421ddd82c2d7ffcf2e5c28ca383aac1fff35d03cae6b4b6c5129c694d9b3986819aa1e12962 SHA512 7783acf1172c4fd935c2b8f5bd76e97cea6bbb3ee33a21b23a17f23933f6053b3a933f378c6eae184c2362cb090b6b2c1966f79f1f130cf7344205ef3df0178d AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737 DIST qemu-3.1.0-patches-r1.tar.xz 2292 BLAKE2B 0861dcf2eebd7f1f6dd495035fc39a14e44eb8e437127b22105ea2374e5068613c4c3f41227e97e0093062f9448ded2d956dc6c40ae6c64c7258c3dcf87c59c3 SHA512 6eca3f4ec6e62c7a24af15405147d266f8fb77462eb8797da8d7f9e40805160d9431478428baece5b5744fc1edecff988b44c512ae1fbf8f2cc3632ea14962cc DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe -EBUILD qemu-3.1.0-r1.ebuild 23848 BLAKE2B 5cce371236042a1c0dff289d7fad5287a672f00d292c2580b0da8a558b64514eb66748df184f15b4956fe3fe5df99c62c6d12caecadc2c002fe56022fc3942b9 SHA512 6c38e393fb482b4e330b10f11070a670d3971ba17e1e3bdb3eeb7225e451cb191912ca617c20f33bc393094b3f036e9328a494b32a33f594b3f44bdda98f1e35 +DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13 EBUILD qemu-3.1.0-r4.ebuild 23873 BLAKE2B a16ea397f5da2d3e36edaee9d584fe99366e2b85afe21d83eb906aac58c946ba85789c3430fab4913b8fd9008e2e13fcd13822bf643932988ac999e527311442 SHA512 158917bb98ac88f9d635e928b6397409051ea00269749751d5b0c5aa9d0bb539e7bb50573131e2eba0b6748ddee34a6ffd366c7aa180b2094553bb7b01193223 -EBUILD qemu-9999.ebuild 23666 BLAKE2B 231fa7f12b79c01caa6f49d2a05d8eecd752e23a56fd86747ac2f7185e0155d09b73614a540048e8c9caeb457a92122c8521ced1a028cb2867d933f553d09d95 SHA512 fecd3c094393f73192ab51dea730e3de0e63f4d46e4b51358a855df73ee26dd6a9f00698f3145ec05045344b7c36b7125622fc9fdf60c143097947436941434c +EBUILD qemu-4.0.0.ebuild 23707 BLAKE2B b88519c5d0d2cf5e5e7875815ac837fe662a87bb3ad91848305df6e360d9e1b24d944105b857d5272d7d34edb9d94f7b7d24f410c2db57d8dc97e47c438fa525 SHA512 1d1b9772d83af975d79fc1a7f4b7316701883cd9bbeddcf1366f2ff7b82f90c007d0a4c11270242887d7a1aa2e21f801f62ee57b571a3b5ecc5b0c5259f3fb03 +EBUILD qemu-9999.ebuild 23660 BLAKE2B 861d8c176f233dad287abd6624fa50654f7cbbcc6da4803bbc5a23f5af876b843d6570ae857adefc25b603b8c48aed6a45eeafcf873fa7afb4d75a17d033b2d5 SHA512 34c5c6ddb4caef28f0613b3fe7ec4decfb98b54cc519f1cdf3d238dd2307b2005317a3bbd0304c39c894c3f35f0b6bb124aa2670e29b38b482de3df3c601ef44 MISC metadata.xml 3903 BLAKE2B 47538d32d79321c208037c95184ab68dbbcaa2331a561142bbadc01fbc2b7973cc5ae76ac6dfa7faf1c3aa31d1d0b5dfd6a46211e94c17c5a8939b0ae99b227b SHA512 d501ede1f3182e635db02c8bac4381906ac47b8d6db4bb6b0fdeb91b35b440a2a59a5dd23b06462f1d49a6b64ae2f2bcf1f81fd0a898c8f4b67a40ccf2c58341 diff --git a/app-emulation/qemu/files/qemu-3.1.0-CVE-2018-20123.patch b/app-emulation/qemu/files/qemu-3.1.0-CVE-2018-20123.patch deleted file mode 100644 index a021a6a970d2..000000000000 --- a/app-emulation/qemu/files/qemu-3.1.0-CVE-2018-20123.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Prasad J Pandit <address@hidden> - -If during pvrdma device initialisation an error occurs, -pvrdma_realize() does not release memory resources, leading -to memory leakage. - -Reported-by: Li Qiang <address@hidden> -Signed-off-by: Prasad J Pandit <address@hidden> ---- - hw/rdma/vmw/pvrdma_main.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c -index 8a03ab4669..b65f8662df 100644 ---- a/hw/rdma/vmw/pvrdma_main.c -+++ b/hw/rdma/vmw/pvrdma_main.c -@@ -579,7 +579,7 @@ static void pvrdma_shutdown_notifier(Notifier *n, void *opaque) - - static void pvrdma_realize(PCIDevice *pdev, Error **errp) - { -- int rc; -+ int rc = 0; - PVRDMADev *dev = PVRDMA_DEV(pdev); - Object *memdev_root; - bool ram_shared = false; -@@ -655,6 +655,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp) - - out: - if (rc) { -+ pvrdma_fini(pdev); - error_append_hint(errp, "Device fail to load\n"); - } - } --- -2.19.2 diff --git a/app-emulation/qemu/files/qemu-3.1.0-CVE-2019-3812.patch b/app-emulation/qemu/files/qemu-3.1.0-CVE-2019-3812.patch deleted file mode 100644 index 03db9e0a1f2d..000000000000 --- a/app-emulation/qemu/files/qemu-3.1.0-CVE-2019-3812.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b05b267840515730dbf6753495d5b7bd8b04ad1c Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann <kraxel@redhat.com> -Date: Tue, 8 Jan 2019 11:23:01 +0100 -Subject: [PATCH] i2c-ddc: fix oob read -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Suggested-by: Michael Hanselmann <public@hansmi.ch> -Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> -Reviewed-by: Michael Hanselmann <public@hansmi.ch> -Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> -Message-id: 20190108102301.1957-1-kraxel@redhat.com ---- - hw/i2c/i2c-ddc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/i2c/i2c-ddc.c b/hw/i2c/i2c-ddc.c -index be34fe072c..0a0367ff38 100644 ---- a/hw/i2c/i2c-ddc.c -+++ b/hw/i2c/i2c-ddc.c -@@ -56,7 +56,7 @@ static int i2c_ddc_rx(I2CSlave *i2c) - I2CDDCState *s = I2CDDC(i2c); - - int value; -- value = s->edid_blob[s->reg]; -+ value = s->edid_blob[s->reg % sizeof(s->edid_blob)]; - s->reg++; - return value; - } --- -2.19.2 - diff --git a/app-emulation/qemu/files/qemu-4.0.0-sanitize-interp_info.patch b/app-emulation/qemu/files/qemu-4.0.0-sanitize-interp_info.patch new file mode 100644 index 000000000000..58ff0c788288 --- /dev/null +++ b/app-emulation/qemu/files/qemu-4.0.0-sanitize-interp_info.patch @@ -0,0 +1,32 @@ +linux-user: Sanitize interp_info and, for mips + +Sanitize interp_info structure in load_elf_binary() and, for mips only, +init its field fp_abi. This fixes appearances of "Unexpected FPU mode" +message in some MIPS use cases. + +Signed-off-by: Daniel Santos <address@hidden> +Signed-off-by: Aleksandar Markovic <address@hidden> +--- + linux-user/elfload.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/linux-user/elfload.c b/linux-user/elfload.c +index c1a2602..7f09d57 100644 +--- a/linux-user/elfload.c ++++ b/linux-user/elfload.c +@@ -2698,6 +2698,11 @@ int load_elf_binary(struct linux_binprm *bprm, struct image_info *info) + char *elf_interpreter = NULL; + char *scratch; + ++ memset(&interp_info, 0, sizeof(interp_info)); ++#ifdef TARGET_MIPS ++ interp_info.fp_abi = MIPS_ABI_FP_UNKNOWN; ++#endif ++ + info->start_mmap = (abi_ulong)ELF_START_MMAP; + + load_elf_image(bprm->filename, bprm->fd, info, +-- +2.7.4 + + diff --git a/app-emulation/qemu/qemu-3.1.0-r1.ebuild b/app-emulation/qemu/qemu-4.0.0.ebuild index 560ab04a5c36..1880553a9742 100644 --- a/app-emulation/qemu/qemu-3.1.0-r1.ebuild +++ b/app-emulation/qemu/qemu-4.0.0.ebuild @@ -10,8 +10,8 @@ PLOCALES="bg de_DE fr_FR hu it tr zh_CN" FIRMWARE_ABI_VERSION="2.11.1-r50" -inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \ - user udev fcaps readme.gentoo-r1 pax-utils l10n +inherit eutils linux-info toolchain-funcs multilib python-r1 \ + user udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="git://git.qemu.org/qemu.git" @@ -19,10 +19,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" else SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd" - - # Gentoo specific patchsets: - #SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" @@ -37,8 +34,6 @@ IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs" -RESTRICT=strip - COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb" @@ -97,7 +92,7 @@ SOFTMMU_TOOLS_DEPEND=" capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) - fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) + fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] @@ -173,6 +168,18 @@ PPC64_FIRMWARE_DEPEND=" ) " +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + dev-python/sphinx + sys-apps/texinfo + virtual/pkgconfig + gtk? ( nls? ( sys-devel/gettext ) ) + test? ( + dev-libs/glib[utils] + sys-devel/bc + ) +" CDEPEND=" !static? ( ${ALL_DEPEND//\[static-libs(+)]} @@ -184,20 +191,12 @@ CDEPEND=" " DEPEND="${CDEPEND} ${PYTHON_DEPS} - dev-lang/perl - sys-apps/texinfo - virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - gtk? ( nls? ( sys-devel/gettext ) ) static? ( ${ALL_DEPEND} ${SOFTMMU_TOOLS_DEPEND} ) - static-user? ( ${ALL_DEPEND} ) - test? ( - dev-libs/glib[utils] - sys-devel/bc - )" + static-user? ( ${ALL_DEPEND} )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-qemu )" @@ -205,9 +204,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.5.0-cflags.patch "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch - "${FILESDIR}"/${PN}-3.1.0-CVE-2018-20123.patch - "${FILESDIR}"/${PN}-3.1.0-CVE-2019-3812.patch - #"${WORKDIR}"/patches + "${FILESDIR}"/${P}-sanitize-interp_info.patch ) QA_PREBUILT=" @@ -362,11 +359,6 @@ src_prepare() { check_targets IUSE_SOFTMMU_TARGETS softmmu check_targets IUSE_USER_TARGETS linux-user - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i -r \ - -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target || die - default # Fix ld and objcopy being called directly @@ -487,7 +479,6 @@ qemu_src_configure() { conf_opts+=( --audio-drv-list="${audio_opts}" ) - use sdl && conf_opts+=( --with-sdlabi=2.0 ) fi case ${buildtype} in @@ -599,7 +590,7 @@ src_test() { } qemu_python_install() { - python_domodule "${S}/scripts/qmp/qmp.py" + python_domodule "${S}/python/qemu/qmp.py" python_doscript "${S}/scripts/kvm/vmxcap" python_doscript "${S}/scripts/qmp/qmp-shell" @@ -645,9 +636,11 @@ generate_initd() { sparc*) qcpu="sparc";; esac + # we use 'printf' here to be portable across 'sh' + # implementations: #679168 cat <<EOF >>"${out}" if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then - echo ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register + printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register fi EOF @@ -676,10 +669,7 @@ src_install() { emake DESTDIR="${ED}" install # This might not exist if the test failed. #512010 - if [[ -e check-report.html ]]; then - docinto html - dodoc check-report.html - fi + [[ -e check-report.html ]] && dohtml check-report.html if use kernel_linux; then udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules @@ -706,6 +696,9 @@ src_install() { dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt newdoc pc-bios/README README.pc-bios + # Disallow stripping of prebuilt firmware files. + dostrip -x ${QA_PREBUILT} + if [[ -n ${softmmu_targets} ]]; then # Remove SeaBIOS since we're using the SeaBIOS packaged one rm "${ED}/usr/share/qemu/bios.bin" @@ -769,7 +762,9 @@ pkg_postinst() { udev_reload fi - [[ -f ${D}/usr/libexec/qemu-bridge-helper ]] && \ + xdg_icon_cache_update + + [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ fcaps cap_net_admin /usr/libexec/qemu-bridge-helper DISABLE_AUTOFORMATTING=true @@ -808,3 +803,7 @@ pkg_info() { fi echo " $(best_version sys-firmware/sgabios)" } + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index a1dcb27ce6d6..e765af785c68 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -10,8 +10,8 @@ PLOCALES="bg de_DE fr_FR hu it tr zh_CN" FIRMWARE_ABI_VERSION="2.11.1-r50" -inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \ - user udev fcaps readme.gentoo-r1 pax-utils l10n +inherit eutils linux-info toolchain-funcs multilib python-r1 \ + user udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="git://git.qemu.org/qemu.git" @@ -34,8 +34,6 @@ IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs" -RESTRICT=strip - COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb" @@ -94,7 +92,7 @@ SOFTMMU_TOOLS_DEPEND=" capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) - fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) + fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] @@ -173,6 +171,7 @@ PPC64_FIRMWARE_DEPEND=" BDEPEND=" ${PYTHON_DEPS} dev-lang/perl + dev-python/sphinx sys-apps/texinfo virtual/pkgconfig gtk? ( nls? ( sys-devel/gettext ) ) @@ -359,11 +358,6 @@ src_prepare() { check_targets IUSE_SOFTMMU_TARGETS softmmu check_targets IUSE_USER_TARGETS linux-user - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i -r \ - -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target || die - default # Fix ld and objcopy being called directly @@ -701,6 +695,9 @@ src_install() { dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt newdoc pc-bios/README README.pc-bios + # Disallow stripping of prebuilt firmware files. + dostrip -x ${QA_PREBUILT} + if [[ -n ${softmmu_targets} ]]; then # Remove SeaBIOS since we're using the SeaBIOS packaged one rm "${ED}/usr/share/qemu/bios.bin" @@ -764,7 +761,9 @@ pkg_postinst() { udev_reload fi - [[ -f ${D}/usr/libexec/qemu-bridge-helper ]] && \ + xdg_icon_cache_update + + [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ fcaps cap_net_admin /usr/libexec/qemu-bridge-helper DISABLE_AUTOFORMATTING=true @@ -803,3 +802,7 @@ pkg_info() { fi echo " $(best_version sys-firmware/sgabios)" } + +pkg_postrm() { + xdg_icon_cache_update +} |