Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 516454 | Differences between
and this patch

Collapse All | Expand All

(-)qemu-2.0.0-r1.ebuild (-2 / +38 lines)
Lines 33-39 Link Here
33
gtk iscsi +jpeg \
33
gtk iscsi +jpeg \
34
kernel_linux kernel_FreeBSD ncurses opengl +png pulseaudio python \
34
kernel_linux kernel_FreeBSD ncurses opengl +png pulseaudio python \
35
rbd sasl +seccomp sdl selinux smartcard spice ssh static static-softmmu \
35
rbd sasl +seccomp sdl selinux smartcard spice ssh static static-softmmu \
36
static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
36
static-user binfmt-wrapper systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
37
virtfs +vnc xattr xen xfs"
37
virtfs +vnc xattr xen xfs"
38
38
39
COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
39
COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
Lines 58-63 Link Here
58
	qemu_softmmu_targets_ppc64? ( fdt )
58
	qemu_softmmu_targets_ppc64? ( fdt )
59
	static? ( static-softmmu static-user )
59
	static? ( static-softmmu static-user )
60
	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
60
	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
61
        binfmt-wrapper? ( static-user )
61
	virtfs? ( xattr )"
62
	virtfs? ( xattr )"
62
63
63
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
64
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
Lines 142-168 Link Here
142
	usr/share/qemu/s390-ccw.img"
143
	usr/share/qemu/s390-ccw.img"
143
144
144
QA_WX_LOAD="usr/bin/qemu-i386
145
QA_WX_LOAD="usr/bin/qemu-i386
146
        usr/bin/qemu-i386-binfmt-wrapper
145
	usr/bin/qemu-x86_64
147
	usr/bin/qemu-x86_64
148
        usr/bin/qemu-x86_64-binfmt-wrapper
146
	usr/bin/qemu-alpha
149
	usr/bin/qemu-alpha
150
        usr/bin/qemu-alpha-binfmt-wrapper
147
	usr/bin/qemu-arm
151
	usr/bin/qemu-arm
152
        usr/bin/qemu-arm-binfmt-wrapper
148
	usr/bin/qemu-cris
153
	usr/bin/qemu-cris
154
        usr/bin/qemu-cris-binfmt-wrapper
149
	usr/bin/qemu-m68k
155
	usr/bin/qemu-m68k
156
        usr/bin/qemu-m68k-binfmt-wrapper
150
	usr/bin/qemu-microblaze
157
	usr/bin/qemu-microblaze
158
        usr/bin/qemu-microblaze-binfmt-wrapper
151
	usr/bin/qemu-microblazeel
159
	usr/bin/qemu-microblazeel
160
        usr/bin/qemu-microblazeel-binfmt-wrapper
152
	usr/bin/qemu-mips
161
	usr/bin/qemu-mips
162
        usr/bin/qemu-mips-binfmt-wrapper
153
	usr/bin/qemu-mipsel
163
	usr/bin/qemu-mipsel
164
        usr/bin/qemu-mipsel-binfmt-wrapper
154
	usr/bin/qemu-or32
165
	usr/bin/qemu-or32
166
        usr/bin/qemu-or32-binfmt-wrapper
155
	usr/bin/qemu-ppc
167
	usr/bin/qemu-ppc
168
        usr/bin/qemu-ppc-binfmt-wrapper
156
	usr/bin/qemu-ppc64
169
	usr/bin/qemu-ppc64
170
        usr/bin/qemu-ppc64-binfmt-wrapper
157
	usr/bin/qemu-ppc64abi32
171
	usr/bin/qemu-ppc64abi32
172
        usr/bin/qemu-ppc64abi32-binfmt-wrapper
158
	usr/bin/qemu-sh4
173
	usr/bin/qemu-sh4
174
        usr/bin/qemu-sh4-binfmt-wrapper
159
	usr/bin/qemu-sh4eb
175
	usr/bin/qemu-sh4eb
176
        usr/bin/qemu-sh4eb-binfmt-wrapper
160
	usr/bin/qemu-sparc
177
	usr/bin/qemu-sparc
178
        usr/bin/qemu-sparc-binfmt-wrapper
161
	usr/bin/qemu-sparc64
179
	usr/bin/qemu-sparc64
180
        usr/bin/qemu-sparc64-binfmt-wrapper
162
	usr/bin/qemu-armeb
181
	usr/bin/qemu-armeb
182
        usr/bin/qemu-armeb-binfmt-wrapper
163
	usr/bin/qemu-sparc32plus
183
	usr/bin/qemu-sparc32plus
184
        usr/bin/qemu-sparc32plus-binfmt-wrapper
164
	usr/bin/qemu-s390x
185
	usr/bin/qemu-s390x
165
	usr/bin/qemu-unicore32"
186
        usr/bin/qemu-s390x-binfmt-wrapper
187
	usr/bin/qemu-unicore32
188
        usr/bin/qemu-unicore32-binfmt-wrapper"
166
189
167
DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
190
DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
168
you have the kernel module loaded before running kvm. The easiest way to
191
you have the kernel module loaded before running kvm. The easiest way to
Lines 243-248 Link Here
243
	epatch "${FILESDIR}"/${P}-qcow-check-max-sizes.patch #510234
266
	epatch "${FILESDIR}"/${P}-qcow-check-max-sizes.patch #510234
244
	epatch "${FILESDIR}"/${P}-CVE-2014-0222.patch #510234
267
	epatch "${FILESDIR}"/${P}-CVE-2014-0222.patch #510234
245
	epatch "${FILESDIR}"/${P}-CVE-2014-0223.patch #510234
268
	epatch "${FILESDIR}"/${P}-CVE-2014-0223.patch #510234
269
        
270
        if use binfmt-wrapper; then
271
                epatch "${FILESDIR}"/${PN}-9999-binfmt-wrapper.patch
272
        fi
273
246
	[[ -n ${BACKPORTS} ]] && \
274
	[[ -n ${BACKPORTS} ]] && \
247
		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
275
		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
248
			epatch
276
			epatch
Lines 400-405 Link Here
400
		if use "qemu_user_targets_${target}"; then
428
		if use "qemu_user_targets_${target}"; then
401
			user_targets+=",${target}-linux-user"
429
			user_targets+=",${target}-linux-user"
402
			user_bins+=( "qemu-${target}" )
430
			user_bins+=( "qemu-${target}" )
431
432
                        if use binfmt-wrapper; then
433
                                user_bins+=( "qemu-${target}-binfmt-wrapper" )
434
                        fi
403
		fi
435
		fi
404
	done
436
	done
405
437
Lines 456-461 Link Here
456
488
457
		# Install binfmt handler init script for user targets
489
		# Install binfmt handler init script for user targets
458
		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
490
		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
491
492
                if use binfmt-wrapper; then
493
                        newinitd "${FILESDIR}/qemu-binfmt-wrapper.initd-r1" qemu-binfmt-wrapper
494
                fi
459
	fi
495
	fi
460
496
461
	if [[ -n ${softmmu_targets} ]]; then
497
	if [[ -n ${softmmu_targets} ]]; then

Return to bug 516454