* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-1.2.2-r4.ebuild ChangeLog qemu-1.4.0.ebuild
@ 2013-02-25 4:08 Doug Goldstein (cardoe)
0 siblings, 0 replies; 2+ messages in thread
From: Doug Goldstein (cardoe) @ 2013-02-25 4:08 UTC (permalink / raw
To: gentoo-commits
cardoe 13/02/25 04:08:48
Modified: ChangeLog qemu-1.4.0.ebuild
Added: qemu-1.2.2-r4.ebuild
Log:
Support file capabilities for helper binaries
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)
Revision Changes Path
1.188 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.188&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.188&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.187&r2=1.188
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- ChangeLog 21 Feb 2013 14:53:45 -0000 1.187
+++ ChangeLog 25 Feb 2013 04:08:48 -0000 1.188
@@ -1,6 +1,12 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.187 2013/02/21 14:53:45 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.188 2013/02/25 04:08:48 cardoe Exp $
+
+*qemu-1.2.2-r4 (25 Feb 2013)
+
+ 25 Feb 2013; Doug Goldstein <cardoe@gentoo.org> +qemu-1.2.2-r4.ebuild,
+ qemu-1.4.0.ebuild:
+ Support file capabilities for helper binaries
21 Feb 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.2.2-r3.ebuild,
+files/bridge.conf:
1.2 app-emulation/qemu/qemu-1.4.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild?r1=1.1&r2=1.2
Index: qemu-1.4.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-1.4.0.ebuild 16 Feb 2013 21:43:26 -0000 1.1
+++ qemu-1.4.0.ebuild 25 Feb 2013 04:08:48 -0000 1.2
@@ -1,11 +1,12 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild,v 1.1 2013/02/16 21:43:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild,v 1.2 2013/02/25 04:08:48 cardoe Exp $
EAPI=5
PYTHON_DEPEND="2:2.4"
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user udev
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python \
+ user udev fcaps
#BACKPORTS=7c9a3a87
if [[ ${PV} = *9999* ]]; then
@@ -395,6 +396,10 @@
use python && dobin "${S}/scripts/kvm/vmxcap"
fi
+ # Install config file example for qemu-bridge-helper
+ insinto "/etc/qemu"
+ doins "${FILESDIR}/bridge.conf"
+
cd "${S}"
dodoc Changelog MAINTAINERS TODO docs/specs/pci-ids.txt
newdoc pc-bios/README README.pc-bios
@@ -454,6 +459,10 @@
elog
fi
+ fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+ use virtfs && fcaps cap_chown cap_dac_override cap_fowner cap_fsetid \
+ cap_setgid cap_mknod cap_setuid /usr/libexec/virtfs-proxy-helper
+
elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
}
1.1 app-emulation/qemu/qemu-1.2.2-r4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r4.ebuild?rev=1.1&content-type=text/plain
Index: qemu-1.2.2-r4.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r4.ebuild,v 1.1 2013/02/25 04:08:48 cardoe Exp $
EAPI=5
MY_PN="qemu-kvm"
MY_P=${MY_PN}-1.2.0
PYTHON_DEPEND="2:2.4"
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python \
user udev fcaps
BACKPORTS=7c9a3a87
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
inherit git-2
SRC_URI=""
KEYWORDS=""
else
SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz
${BACKPORTS:+
http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
HOMEPAGE="http://www.linux-kvm.org"
LICENSE="GPL-2 LGPL-2 BSD-2"
SLOT="0"
IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \
kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp \
sdl selinux smartcard spice static static-softmmu static-user systemtap tci \
+threads tls usbredir +uuid vde +vhost-net virtfs +vnc xattr xen xfs"
COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus"
# Setup the default SoftMMU targets, while using the loops
# below to setup the other targets.
REQUIRED_USE="|| ("
for target in ${IUSE_SOFTMMU_TARGETS}; do
IUSE="${IUSE} qemu_softmmu_targets_${target}"
REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
done
REQUIRED_USE="${REQUIRED_USE} )"
for target in ${IUSE_USER_TARGETS}; do
IUSE="${IUSE} qemu_user_targets_${target}"
done
# Block USE flag configurations known to not work
REQUIRED_USE="${REQUIRED_USE}
static? ( static-softmmu static-user )
static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl )
virtfs? ( xattr )"
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
sys-apps/pciutils[static-libs(+)]
sys-libs/zlib[static-libs(+)]
aio? ( dev-libs/libaio[static-libs(+)] )
caps? ( sys-libs/libcap-ng[static-libs(+)] )
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
jpeg? ( virtual/jpeg[static-libs(+)] )
ncurses? ( sys-libs/ncurses[static-libs(+)] )
png? ( media-libs/libpng[static-libs(+)] )
rbd? ( sys-cluster/ceph[static-libs(+)] )
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] )
spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
tls? ( net-libs/gnutls[static-libs(+)] )
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
vde? ( net-misc/vde[static-libs(+)] )
xattr? ( sys-apps/attr[static-libs(+)] )
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
!app-emulation/kqemu
qemu_softmmu_targets_i386? (
sys-firmware/ipxe
~sys-firmware/seabios-1.7.1
~sys-firmware/sgabios-0.1_pre8
~sys-firmware/vgabios-0.7a
)
qemu_softmmu_targets_x86_64? (
sys-firmware/ipxe
~sys-firmware/seabios-1.7.1
~sys-firmware/sgabios-0.1_pre8
~sys-firmware/vgabios-0.7a
)
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
brltty? ( app-accessibility/brltty )
opengl? ( virtual/opengl )
pulseaudio? ( media-sound/pulseaudio )
python? ( =dev-lang/python-2*[ncurses] )
sdl? ( media-libs/libsdl[X] )
selinux? ( sec-policy/selinux-qemu )
smartcard? ( dev-libs/nss )
spice? ( >=app-emulation/spice-protocol-0.12.2 )
systemtap? ( dev-util/systemtap )
usbredir? ( ~sys-apps/usbredir-0.4.4 )
virtfs? ( sys-libs/libcap )
xen? ( app-emulation/xen-tools )"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-text/texi2html )
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
static-softmmu? ( ${LIB_DEPEND} )"
S="${WORKDIR}/${MY_P}"
STRIP_MASK="/usr/share/qemu/palcode-clipper"
QA_PREBUILT="
usr/share/qemu/openbios-ppc
usr/share/qemu/openbios-sparc64
usr/share/qemu/openbios-sparc32
usr/share/qemu/palcode-clipper"
QA_WX_LOAD="usr/bin/qemu-i386
usr/bin/qemu-x86_64
usr/bin/qemu-alpha
usr/bin/qemu-arm
usr/bin/qemu-cris
usr/bin/qemu-m68k
usr/bin/qemu-microblaze
usr/bin/qemu-microblazeel
usr/bin/qemu-mips
usr/bin/qemu-mipsel
usr/bin/qemu-or32
usr/bin/qemu-ppc
usr/bin/qemu-ppc64
usr/bin/qemu-ppc64abi32
usr/bin/qemu-sh4
usr/bin/qemu-sh4eb
usr/bin/qemu-sparc
usr/bin/qemu-sparc64
usr/bin/qemu-armeb
usr/bin/qemu-sparc32plus
usr/bin/qemu-s390x
usr/bin/qemu-unicore32"
qemu_support_kvm() {
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
use qemu_softmmu_targets_s390x; then
return 0
fi
return 1
}
pkg_pretend() {
if use kernel_linux && kernel_is lt 2 6 25; then
eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
elif use kernel_linux; then
if ! linux_config_exists; then
eerror "Unable to check your kernel for KVM support"
else
CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
ERROR_KVM="You must enable KVM in your kernel to continue"
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
ERROR_KVM_AMD+=" your kernel configuration."
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
ERROR_TUN+=" into your kernel or loaded as a module to use the"
ERROR_TUN+=" virtual network device if using -net tap."
ERROR_BRIDGE="You will also need support for 802.1d"
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
ERROR_VHOST_NET+=" support"
if use amd64 || use x86 || use amd64-linux || use x86-linux; then
CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
fi
use python && CONFIG_CHECK+=" ~DEBUG_FS"
ERROR_DEBUG_FS="debugFS support required for kvm_stat"
# Now do the actual checks setup above
check_extra_config
fi
fi
}
pkg_setup() {
python_set_active_version 2
python_pkg_setup
enewgroup kvm 78
}
src_prepare() {
# Alter target makefiles to accept CFLAGS set via flag-o
sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
Makefile Makefile.target || die
python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
python_convert_shebangs -r 2 "${S}/scripts/kvm/vmxcap"
epatch "${FILESDIR}"/qemu-1.2.0-cflags.patch
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch
# Fix ld and objcopy being called directly
tc-export LD OBJCOPY
# Verbose builds
MAKEOPTS+=" V=1"
epatch_user
}
##
# configures qemu based on the build directory and the build type
# we are using.
#
qemu_src_configure() {
debug-print-function $FUNCNAME "$@"
local buildtype=$1
local builddir=$2
local conf_opts audio_opts
local static_flag="static-${buildtype}"
conf_opts="--prefix=/usr"
conf_opts+=" --sysconfdir=/etc"
conf_opts+=" --docdir=/usr/share/doc/${PF}/html"
conf_opts+=" --disable-bsd-user"
conf_opts+=" --disable-guest-agent"
conf_opts+=" --disable-libiscsi"
conf_opts+=" --disable-strip"
conf_opts+=" --disable-werror"
conf_opts+=" --python=python2"
# audio options
audio_opts="oss"
use alsa && audio_opts="alsa,${audio_opts}"
use sdl && audio_opts="sdl,${audio_opts}"
use pulseaudio && audio_opts="pa,${audio_opts}"
if [[ ${buildtype} == "user" ]]; then
conf_opts+=" --enable-linux-user"
conf_opts+=" --disable-system"
conf_opts+=" --target-list=${user_targets}"
conf_opts+=" --disable-bluez"
conf_opts+=" --disable-sdl"
fi
if [[ ${buildtype} == "softmmu" ]]; then
conf_opts+=" --disable-linux-user"
conf_opts+=" --enable-system"
conf_opts+=" --target-list=${softmmu_targets}"
conf_opts+=" $(use_enable bluetooth bluez)"
conf_opts+=" $(use_enable sdl)"
conf_opts+=" $(use_enable aio linux-aio)"
conf_opts+=" $(use_enable brltty brlapi)"
conf_opts+=" $(use_enable caps cap-ng)"
conf_opts+=" $(use_enable curl)"
conf_opts+=" $(use_enable fdt)"
conf_opts+=" $(use_enable jpeg vnc-jpeg)"
conf_opts+=" $(use_enable kernel_linux kvm)"
conf_opts+=" $(use_enable kernel_linux nptl)"
conf_opts+=" $(use_enable ncurses curses)"
conf_opts+=" $(use_enable opengl)"
conf_opts+=" $(use_enable png vnc-png)"
conf_opts+=" $(use_enable rbd)"
conf_opts+=" $(use_enable sasl vnc-sasl)"
conf_opts+=" $(use_enable seccomp)"
conf_opts+=" $(use_enable smartcard smartcard)"
conf_opts+=" $(use_enable smartcard smartcard-nss)"
conf_opts+=" $(use_enable spice)"
conf_opts+=" $(use_enable tls vnc-tls)"
conf_opts+=" $(use_enable usbredir usb-redir)"
conf_opts+=" $(use_enable uuid)"
conf_opts+=" $(use_enable vde)"
conf_opts+=" $(use_enable vhost-net)"
conf_opts+=" $(use_enable virtfs)"
conf_opts+=" $(use_enable vnc)"
conf_opts+=" $(use_enable xattr attr)"
conf_opts+=" $(use_enable xen)"
conf_opts+=" $(use_enable xen xen-pci-passthrough)"
conf_opts+=" $(use_enable xfs xfsctl)"
use mixemu && conf_opts+=" --enable-mixemu"
conf_opts+=" --audio-drv-list=${audio_opts}"
fi
conf_opts+=" $(use_enable debug debug-info)"
conf_opts+=" $(use_enable debug debug-tcg)"
conf_opts+=" $(use_enable doc docs)"
conf_opts+=" $(use_enable tci tcg-interpreter)"
# Add support for SystemTAP
use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
# Add support for static builds
use ${static_flag} && conf_opts="${conf_opts} --static --disable-pie"
# We always want to attempt to build with PIE support as it results
# in a more secure binary. But it doesn't work with static or if
# the current GCC doesn't have PIE support.
if ! use ${static_flag} && gcc-specs-pie; then
conf_opts="${conf_opts} --enable-pie"
fi
einfo "./configure ${conf_opts}"
cd ${builddir}
../configure \
--cc="$(tc-getCC)" \
--host-cc="$(tc-getBUILD_CC)" \
${conf_opts} \
|| die "configure failed"
# FreeBSD's kernel does not support QEMU assigning/grabbing
# host USB devices yet
use kernel_FreeBSD && \
sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
}
src_configure() {
softmmu_targets=
user_targets=
for target in ${IUSE_SOFTMMU_TARGETS} ; do
use "qemu_softmmu_targets_${target}" && \
softmmu_targets="${softmmu_targets},${target}-softmmu"
done
for target in ${IUSE_USER_TARGETS} ; do
use "qemu_user_targets_${target}" && \
user_targets="${user_targets},${target}-linux-user"
done
[[ -n ${softmmu_targets} ]] && \
einfo "Building the following softmmu targets: ${softmmu_targets}"
[[ -n ${user_targets} ]] && \
einfo "Building the following user targets: ${user_targets}"
if [[ -n ${softmmu_targets} ]]; then
mkdir "${S}/softmmu-build"
qemu_src_configure "softmmu" "${S}/softmmu-build"
fi
if [[ -n ${user_targets} ]]; then
mkdir "${S}/user-build"
qemu_src_configure "user" "${S}/user-build"
fi
}
src_compile() {
if [[ -n ${user_targets} ]]; then
cd "${S}/user-build"
default
fi
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
default
fi
}
src_install() {
if [[ -n ${user_targets} ]]; then
cd "${S}/user-build"
emake DESTDIR="${ED}" install
# Install binfmt handler init script for user targets
newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
fi
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
emake DESTDIR="${ED}" install
if use kernel_linux; then
udev_dorules "${FILESDIR}"/65-kvm.rules
fi
if use qemu_softmmu_targets_x86_64 ; then
dosym /usr/bin/qemu-system-x86_64 /usr/bin/qemu-kvm
ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
ewarn "your libvirt configs or other wrappers for ${PN}"
elif use x86 || use amd64; then
elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
elog "of the /usr/bin/qemu-kvm symlink."
fi
use python && dobin "${S}/scripts/kvm/kvm_stat"
use python && dobin "${S}/scripts/kvm/vmxcap"
fi
# Install config file example for qemu-bridge-helper
insinto "/etc/qemu"
doins "${FILESDIR}/bridge.conf"
cd "${S}"
dodoc Changelog MAINTAINERS TODO pci-ids.txt
newdoc pc-bios/README README.pc-bios
# Avoid collision with app-emulation/libcacard
use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${ED}/usr/share/qemu/bios.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
fi
# Remove vgabios since we're using the vgabios packaged one
rm "${ED}/usr/share/qemu/vgabios.bin"
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
fi
# Remove sgabios since we're using the sgabios packaged one
rm "${ED}/usr/share/qemu/sgabios.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
fi
# Remove iPXE since we're using the iPXE packaged one
rm "${ED}"/usr/share/qemu/pxe-*.rom
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
fi
}
pkg_postinst() {
if qemu_support_kvm; then
elog "If you don't have kvm compiled into the kernel, make sure you have"
elog "the kernel module loaded before running kvm. The easiest way to"
elog "ensure that the kernel module is loaded is to load it on boot."
elog "For AMD CPUs the module is called 'kvm-amd'"
elog "For Intel CPUs the module is called 'kvm-intel'"
elog "Please review /etc/conf.d/modules for how to load these"
elog
elog "Make sure your user is in the 'kvm' group"
elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
elog
fi
fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
use virtfs && fcaps cap_chown cap_dac_override cap_fowner cap_fsetid \
cap_setgid cap_mknod cap_setuid /usr/libexec/virtfs-proxy-helper
elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-1.2.2-r4.ebuild ChangeLog qemu-1.4.0.ebuild
@ 2013-02-26 5:49 Doug Goldstein (cardoe)
0 siblings, 0 replies; 2+ messages in thread
From: Doug Goldstein (cardoe) @ 2013-02-26 5:49 UTC (permalink / raw
To: gentoo-commits
cardoe 13/02/26 05:49:10
Modified: qemu-1.2.2-r4.ebuild ChangeLog qemu-1.4.0.ebuild
Log:
Fix fcaps usage
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)
Revision Changes Path
1.2 app-emulation/qemu/qemu-1.2.2-r4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r4.ebuild?r1=1.1&r2=1.2
Index: qemu-1.2.2-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-1.2.2-r4.ebuild 25 Feb 2013 04:08:48 -0000 1.1
+++ qemu-1.2.2-r4.ebuild 26 Feb 2013 05:49:10 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r4.ebuild,v 1.1 2013/02/25 04:08:48 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r4.ebuild,v 1.2 2013/02/26 05:49:10 cardoe Exp $
EAPI=5
@@ -452,6 +452,8 @@
}
pkg_postinst() {
+ local virtfs_caps=
+
if qemu_support_kvm; then
elog "If you don't have kvm compiled into the kernel, make sure you have"
elog "the kernel module loaded before running kvm. The easiest way to"
@@ -465,9 +467,11 @@
elog
fi
+ virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid"
+ virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
+
fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
- use virtfs && fcaps cap_chown cap_dac_override cap_fowner cap_fsetid \
- cap_setgid cap_mknod cap_setuid /usr/libexec/virtfs-proxy-helper
+ use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
1.194 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.194&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.194&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.193&r2=1.194
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- ChangeLog 25 Feb 2013 15:07:35 -0000 1.193
+++ ChangeLog 26 Feb 2013 05:49:10 -0000 1.194
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.193 2013/02/25 15:07:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.194 2013/02/26 05:49:10 cardoe Exp $
+
+ 26 Feb 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.2.2-r4.ebuild,
+ qemu-1.4.0.ebuild:
+ Fix fcaps usage
25 Feb 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.4.0.ebuild:
Fix patch to virtfs-proxy-helper
1.6 app-emulation/qemu/qemu-1.4.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild?r1=1.5&r2=1.6
Index: qemu-1.4.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qemu-1.4.0.ebuild 25 Feb 2013 15:07:35 -0000 1.5
+++ qemu-1.4.0.ebuild 26 Feb 2013 05:49:10 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild,v 1.5 2013/02/25 15:07:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild,v 1.6 2013/02/26 05:49:10 cardoe Exp $
EAPI=5
@@ -451,6 +451,8 @@
}
pkg_postinst() {
+ local virtfs_caps=
+
if qemu_support_kvm; then
elog "If you don't have kvm compiled into the kernel, make sure you have"
elog "the kernel module loaded before running kvm. The easiest way to"
@@ -464,9 +466,11 @@
elog
fi
+ virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid"
+ virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
+
fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
- use virtfs && fcaps cap_chown cap_dac_override cap_fowner cap_fsetid \
- cap_setgid cap_mknod cap_setuid /usr/bin/virtfs-proxy-helper
+ use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-26 5:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-25 4:08 [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-1.2.2-r4.ebuild ChangeLog qemu-1.4.0.ebuild Doug Goldstein (cardoe)
-- strict thread matches above, loose matches on Subject: below --
2013-02-26 5:49 Doug Goldstein (cardoe)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox