Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ian Delaney (idella4)" <idella4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/xen: metadata.xml xen-4.2.1-r1.ebuild xen-4.2.0-r1.ebuild ChangeLog
Date: Sat, 23 Feb 2013 16:34:10
Message-Id: 20130223163406.9C0442171E@flycatcher.gentoo.org
1 idella4 13/02/23 16:34:06
2
3 Modified: metadata.xml xen-4.2.1-r1.ebuild
4 xen-4.2.0-r1.ebuild ChangeLog
5 Log:
6 local efi IUSE flag added, efi support to both 4.2.0 & 4.2.1, fixes Bug #458160 by Jiří Moravec
7
8 (Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
9
10 Revision Changes Path
11 1.12 app-emulation/xen/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/metadata.xml?rev=1.12&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/metadata.xml?rev=1.12&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/metadata.xml?r1=1.11&r2=1.12
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen/metadata.xml,v
20 retrieving revision 1.11
21 retrieving revision 1.12
22 diff -u -r1.11 -r1.12
23 --- metadata.xml 5 Dec 2012 01:33:38 -0000 1.11
24 +++ metadata.xml 23 Feb 2013 16:34:06 -0000 1.12
25 @@ -10,5 +10,6 @@
26 <flag name='flask'>Enable the Flask XSM module from NSA</flag>
27 <flag name='pae'>Enable support for PAE kernels (usually x86-32 with >4GB memory)</flag>
28 <flag name='xsm'>Enable the Xen Security Modules (XSM)</flag>
29 + <flag name='efi'>Adds efi boot support, requires LDFLAG -melf_x86_64 for amd64</flag>
30 </use>
31 </pkgmetadata>
32
33
34
35 1.3 app-emulation/xen/xen-4.2.1-r1.ebuild
36
37 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.2.1-r1.ebuild?rev=1.3&view=markup
38 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.2.1-r1.ebuild?rev=1.3&content-type=text/plain
39 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.2.1-r1.ebuild?r1=1.2&r2=1.3
40
41 Index: xen-4.2.1-r1.ebuild
42 ===================================================================
43 RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.1-r1.ebuild,v
44 retrieving revision 1.2
45 retrieving revision 1.3
46 diff -u -r1.2 -r1.3
47 --- xen-4.2.1-r1.ebuild 31 Jan 2013 15:43:53 -0000 1.2
48 +++ xen-4.2.1-r1.ebuild 23 Feb 2013 16:34:06 -0000 1.3
49 @@ -1,6 +1,6 @@
50 # Copyright 1999-2013 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.1-r1.ebuild,v 1.2 2013/01/31 15:43:53 idella4 Exp $
53 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.1-r1.ebuild,v 1.3 2013/02/23 16:34:06 idella4 Exp $
54
55 EAPI=5
56
57 @@ -24,9 +24,10 @@
58
59 LICENSE="GPL-2"
60 SLOT="0"
61 -IUSE="custom-cflags debug flask pae xsm"
62 +IUSE="custom-cflags debug efi flask pae xsm"
63
64 -RDEPEND=""
65 +RDEPEND="efi? ( >=sys-devel/binutils-2.22[multitarget] )
66 + >=sys-devel/binutils-2.22[-multitarget]"
67 PDEPEND="~app-emulation/xen-tools-${PV}"
68
69 RESTRICT="test"
70 @@ -64,6 +65,8 @@
71 # Drop .config and fix gcc-4.6
72 epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
73
74 + use efi && epatch "${FILESDIR}"/${PN}-4-efi.patch
75 +
76 # if the user *really* wants to use their own custom-cflags, let them
77 if use custom-cflags; then
78 einfo "User wants their own CFLAGS - removing defaults"
79 @@ -107,6 +110,7 @@
80 local myopt
81 use debug && myopt="${myopt} debug=y"
82 use pae && myopt="${myopt} pae=y"
83 + use efi && mkdir -p "${D}"/boot/efi
84
85 emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
86 }
87 @@ -116,8 +120,6 @@
88 elog " http://www.gentoo.org/doc/en/xen-guide.xml"
89 elog " http://en.gentoo-wiki.com/wiki/Xen/"
90
91 - if use pae; then
92 - echo
93 - ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
94 - fi
95 + use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
96 + use efi && einfo "The efi executable is installed in boot/efi"
97 }
98
99
100
101 1.7 app-emulation/xen/xen-4.2.0-r1.ebuild
102
103 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.2.0-r1.ebuild?rev=1.7&view=markup
104 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.2.0-r1.ebuild?rev=1.7&content-type=text/plain
105 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.2.0-r1.ebuild?r1=1.6&r2=1.7
106
107 Index: xen-4.2.0-r1.ebuild
108 ===================================================================
109 RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.0-r1.ebuild,v
110 retrieving revision 1.6
111 retrieving revision 1.7
112 diff -u -r1.6 -r1.7
113 --- xen-4.2.0-r1.ebuild 4 Feb 2013 15:43:23 -0000 1.6
114 +++ xen-4.2.0-r1.ebuild 23 Feb 2013 16:34:06 -0000 1.7
115 @@ -1,6 +1,6 @@
116 # Copyright 1999-2013 Gentoo Foundation
117 # Distributed under the terms of the GNU General Public License v2
118 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.0-r1.ebuild,v 1.6 2013/02/04 15:43:23 idella4 Exp $
119 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.0-r1.ebuild,v 1.7 2013/02/23 16:34:06 idella4 Exp $
120
121 EAPI=5
122
123 @@ -24,9 +24,10 @@
124
125 LICENSE="GPL-2"
126 SLOT="0"
127 -IUSE="custom-cflags debug flask pae xsm"
128 +IUSE="custom-cflags debug efi flask pae xsm"
129
130 -RDEPEND=""
131 +RDEPEND="efi? ( >=sys-devel/binutils-2.22[multitarget] )
132 + >=sys-devel/binutils-2.22[-multitarget]"
133 PDEPEND="~app-emulation/xen-tools-${PV}[${PYTHON_USEDEP}]"
134
135 RESTRICT="test"
136 @@ -39,6 +40,7 @@
137 "
138 pkg_setup() {
139 python-single-r1_pkg_setup
140 +
141 if [[ -z ${XEN_TARGET_ARCH} ]]; then
142 if use x86 && use amd64; then
143 die "Confusion! Both x86 and amd64 are set in your use flags!"
144 @@ -63,6 +65,8 @@
145 # Drop .config, fix gcc-4.6
146 epatch "${FILESDIR}"/${PN}-4-fix_dotconfig-gcc.patch
147
148 + use efi && epatch "${FILESDIR}"/${PN}-4-efi.patch
149 +
150 # if the user *really* wants to use their own custom-cflags, let them
151 if use custom-cflags; then
152 einfo "User wants their own CFLAGS - removing defaults"
153 @@ -108,15 +112,16 @@
154
155 src_compile() {
156 # Send raw LDFLAGS so that --as-needed works
157 - emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
158 + emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
159 }
160
161 src_install() {
162 local myopt
163 use debug && myopt="${myopt} debug=y"
164 use pae && myopt="${myopt} pae=y"
165 + use efi && mkdir -p "${D}"/boot/efi
166
167 - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${ED}" -C xen ${myopt} install
168 + emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
169 }
170
171 pkg_postinst() {
172 @@ -124,8 +129,6 @@
173 elog " http://www.gentoo.org/doc/en/xen-guide.xml"
174 elog " http://en.gentoo-wiki.com/wiki/Xen/"
175
176 - if use pae; then
177 - echo
178 - ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
179 - fi
180 + use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
181 + use efi && einfo "The efi executable is installed in boot/efi"
182 }
183
184
185
186 1.109 app-emulation/xen/ChangeLog
187
188 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?rev=1.109&view=markup
189 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?rev=1.109&content-type=text/plain
190 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?r1=1.108&r2=1.109
191
192 Index: ChangeLog
193 ===================================================================
194 RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v
195 retrieving revision 1.108
196 retrieving revision 1.109
197 diff -u -r1.108 -r1.109
198 --- ChangeLog 4 Feb 2013 15:43:23 -0000 1.108
199 +++ ChangeLog 23 Feb 2013 16:34:06 -0000 1.109
200 @@ -1,6 +1,11 @@
201 # ChangeLog for app-emulation/xen
202 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
203 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.108 2013/02/04 15:43:23 idella4 Exp $
204 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.109 2013/02/23 16:34:06 idella4 Exp $
205 +
206 + 23 Feb 2013; Ian Delaney <idella4@g.o> +files/xen-4-efi.patch,
207 + metadata.xml, xen-4.2.0-r1.ebuild, xen-4.2.1-r1.ebuild:
208 + local efi IUSE flag added, efi support to both 4.2.0 & 4.2.1, fixes Bug
209 + #458160 by Jiří Moravec
210
211 04 Feb 2013; Ian Delaney <idella4@g.o> xen-4.2.0-r1.ebuild:
212 Add a missed '\' to added patch, 2nd. time lucky
Report Message
Find on MARC Find on Google Groups