1 |
lu_zero 12/06/22 13:52:59 |
2 |
|
3 |
Modified: ChangeLog qemu-user-9999.ebuild |
4 |
Added: qemu-user-1.1.0-r1.ebuild |
5 |
Log: |
6 |
Update patchset to include binfmt wrapper |
7 |
|
8 |
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.45 app-emulation/qemu-user/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/ChangeLog?rev=1.45&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/ChangeLog?rev=1.45&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/ChangeLog?r1=1.44&r2=1.45 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/ChangeLog,v |
20 |
retrieving revision 1.44 |
21 |
retrieving revision 1.45 |
22 |
diff -u -r1.44 -r1.45 |
23 |
--- ChangeLog 20 Jun 2012 10:58:19 -0000 1.44 |
24 |
+++ ChangeLog 22 Jun 2012 13:52:59 -0000 1.45 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for app-emulation/qemu-user |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/ChangeLog,v 1.44 2012/06/20 10:58:19 lu_zero Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/ChangeLog,v 1.45 2012/06/22 13:52:59 lu_zero Exp $ |
30 |
+ |
31 |
+*qemu-user-1.1.0-r1 (22 Jun 2012) |
32 |
+ |
33 |
+ 22 Jun 2012; Luca Barbato <lu_zero@g.o> +qemu-user-1.1.0-r1.ebuild, |
34 |
+ qemu-user-9999.ebuild: |
35 |
+ Update patchset to include binfmt wrapper |
36 |
|
37 |
*qemu-user-9999 (20 Jun 2012) |
38 |
*qemu-user-1.1.0 (20 Jun 2012) |
39 |
|
40 |
|
41 |
|
42 |
1.3 app-emulation/qemu-user/qemu-user-9999.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/qemu-user-9999.ebuild?rev=1.3&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/qemu-user-9999.ebuild?rev=1.3&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/qemu-user-9999.ebuild?r1=1.2&r2=1.3 |
47 |
|
48 |
Index: qemu-user-9999.ebuild |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-9999.ebuild,v |
51 |
retrieving revision 1.2 |
52 |
retrieving revision 1.3 |
53 |
diff -u -r1.2 -r1.3 |
54 |
--- qemu-user-9999.ebuild 20 Jun 2012 19:48:44 -0000 1.2 |
55 |
+++ qemu-user-9999.ebuild 22 Jun 2012 13:52:59 -0000 1.3 |
56 |
@@ -1,6 +1,6 @@ |
57 |
# Copyright 1999-2012 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-9999.ebuild,v 1.2 2012/06/20 19:48:44 mr_bones_ Exp $ |
60 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-9999.ebuild,v 1.3 2012/06/22 13:52:59 lu_zero Exp $ |
61 |
|
62 |
EAPI=4 |
63 |
|
64 |
@@ -16,7 +16,7 @@ |
65 |
|
66 |
if [[ ${PV} != *9999 ]]; then |
67 |
SRC_URI="http://wiki.qemu.org/download/${MY_P}-1.tar.bz2 |
68 |
- http://dev.gentoo.org/~lu_zero/distfiles/qemu-1.1.0-patches.tar.xz" |
69 |
+ http://dev.gentoo.org/~lu_zero/distfiles/qemu-1.1.0-r1-patches.tar.xz" |
70 |
KEYWORDS="~amd64 ~ppc ~x86 ~ppc64" |
71 |
S="${WORKDIR}/${MY_P}" |
72 |
fi |
73 |
|
74 |
|
75 |
|
76 |
1.1 app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild |
77 |
|
78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild?rev=1.1&view=markup |
79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild?rev=1.1&content-type=text/plain |
80 |
|
81 |
Index: qemu-user-1.1.0-r1.ebuild |
82 |
=================================================================== |
83 |
# Copyright 1999-2012 Gentoo Foundation |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-1.1.0-r1.ebuild,v 1.1 2012/06/22 13:52:59 lu_zero Exp $ |
86 |
|
87 |
EAPI=4 |
88 |
|
89 |
|
90 |
if [[ ${PV} == *9999 ]]; then |
91 |
EGIT_REPO_URI="git://git.qemu.org/qemu.git |
92 |
http://git.qemu.org/git/qemu.git" |
93 |
GIT_ECLASS="git-2" |
94 |
fi |
95 |
|
96 |
inherit eutils base flag-o-matic pax-utils toolchain-funcs ${GIT_ECLASS} |
97 |
|
98 |
MY_P=${P/-user/} |
99 |
|
100 |
if [[ ${PV} != *9999 ]]; then |
101 |
SRC_URI="http://wiki.qemu.org/download/${MY_P}-1.tar.bz2 |
102 |
http://dev.gentoo.org/~lu_zero/distfiles/qemu-${PVR}-patches.tar.xz" |
103 |
KEYWORDS="~amd64 ~ppc ~x86 ~ppc64" |
104 |
S="${WORKDIR}/${MY_P}" |
105 |
fi |
106 |
|
107 |
DESCRIPTION="Open source dynamic CPU translator" |
108 |
HOMEPAGE="http://www.qemu.org" |
109 |
|
110 |
LICENSE="GPL-2 LGPL-2.1" |
111 |
SLOT="0" |
112 |
IUSE="" |
113 |
RESTRICT="test" |
114 |
|
115 |
COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x" |
116 |
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32" |
117 |
|
118 |
for target in ${IUSE_USER_TARGETS}; do |
119 |
IUSE="${IUSE} +qemu_user_targets_${target}" |
120 |
done |
121 |
|
122 |
DEPEND="app-text/texi2html |
123 |
virtual/pkgconfig |
124 |
sys-libs/zlib[static-libs] |
125 |
dev-libs/glib[static-libs]" |
126 |
RDEPEND="" |
127 |
|
128 |
QA_WX_LOAD=" |
129 |
usr/bin/qemu-static-ppc64abi32-binfmt |
130 |
usr/bin/qemu-static-ppc64 |
131 |
usr/bin/qemu-static-x86_64-binfmt |
132 |
usr/bin/qemu-static-x86_64 |
133 |
usr/bin/qemu-static-unicore32-binfmt |
134 |
usr/bin/qemu-static-m68k-binfmt |
135 |
usr/bin/qemu-static-ppc-binfmt |
136 |
usr/bin/qemu-static-alpha-binfmt |
137 |
usr/bin/qemu-static-microblazeel-binfmt |
138 |
usr/bin/qemu-static-sparc-binfmt |
139 |
usr/bin/qemu-static-sparc32plus-binfmt |
140 |
usr/bin/qemu-static-ppc |
141 |
usr/bin/qemu-static-mipsn32el-binfmt |
142 |
usr/bin/qemu-static-sh4eb-binfmt |
143 |
usr/bin/qemu-static-ppc64abi32 |
144 |
usr/bin/qemu-static-ppc64-binfmt |
145 |
usr/bin/qemu-static-armeb-binfmt |
146 |
usr/bin/qemu-static-microblaze-binfmt |
147 |
usr/bin/qemu-static-mips-binfmt |
148 |
usr/bin/qemu-static-mipsel-binfmt |
149 |
usr/bin/qemu-static-sh4-binfmt |
150 |
usr/bin/qemu-static-s390x-binfmt |
151 |
usr/bin/qemu-static-i386-binfmt |
152 |
usr/bin/qemu-static-cris-binfmt |
153 |
usr/bin/qemu-static-arm-binfmt |
154 |
usr/bin/qemu-static-sparc64-binfmt |
155 |
usr/bin/qemu-static-mipsn32-binfmt |
156 |
" |
157 |
|
158 |
|
159 |
src_prepare() { |
160 |
cd "${S}" |
161 |
# prevent docs to get automatically installed |
162 |
sed -i '/$(DESTDIR)$(docdir)/d' Makefile |
163 |
# Alter target makefiles to accept CFLAGS set via flag-o |
164 |
sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ |
165 |
Makefile Makefile.target |
166 |
|
167 |
EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \ |
168 |
EPATCH_FORCE="yes" epatch |
169 |
} |
170 |
|
171 |
src_configure() { |
172 |
filter-flags -fpie -fstack-protector |
173 |
|
174 |
local conf_opts user_targets |
175 |
|
176 |
for target in ${IUSE_USER_TARGETS} ; do |
177 |
use "qemu_user_targets_${target}" && \ |
178 |
user_targets="${user_targets} ${target}-linux-user" |
179 |
done |
180 |
|
181 |
conf_opts="--enable-linux-user --disable-strip" |
182 |
conf_opts+=" --disable-bsd-user" |
183 |
conf_opts+=" --disable-system" |
184 |
conf_opts+=" --disable-vnc-tls" |
185 |
conf_opts+=" --disable-curses" |
186 |
conf_opts+=" --disable-sdl" |
187 |
conf_opts+=" --disable-vde" |
188 |
conf_opts+=" --prefix=/usr --disable-bluez --disable-kvm" |
189 |
conf_opts+=" --cc=$(tc-getCC) --host-cc=$(tc-getBUILD_CC)" |
190 |
conf_opts+=" --disable-smartcard --disable-smartcard-nss" |
191 |
conf_opts+=" --extra-ldflags=-Wl,-z,execheap" |
192 |
conf_opts+=" --disable-strip --disable-werror" |
193 |
conf_opts+=" --static" |
194 |
|
195 |
./configure ${conf_opts} --target-list="${user_targets}" || die "econf failed" |
196 |
} |
197 |
|
198 |
src_compile() { |
199 |
emake || die "emake qemu failed" |
200 |
} |
201 |
|
202 |
src_install() { |
203 |
emake DESTDIR="${ED}" install || die "make install failed" |
204 |
|
205 |
# fixup to avoid collisions with qemu |
206 |
base_dir="${ED}/usr/bin" |
207 |
for qemu_bin in "${base_dir}"/qemu-*; do |
208 |
qemu_bin_name=$(basename "${qemu_bin}") |
209 |
mv "${qemu_bin}" "${base_dir}"/"${qemu_bin_name/qemu-/qemu-static-}" || die |
210 |
done |
211 |
|
212 |
pax-mark r "${ED}"/usr/bin/qemu-static-* |
213 |
rm -fr "${ED}/usr/share" |
214 |
dohtml qemu-doc.html |
215 |
dohtml qemu-tech.html |
216 |
newinitd "${FILESDIR}/qemu-binfmt.initd" qemu-binfmt |
217 |
} |