Gentoo Archives: gentoo-commits

From: Ian Delaney <della5@×××××××××.au>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/virtualization:master commit in: app-emulation/xen/, app-emulation/xen-tools/, app-emulation/xen-pvgrub/
Date: Tue, 29 Nov 2011 11:05:38
Message-Id: 47c6a22c1867aa1b6a312556346b03cc4b5a42ea.ian_delaney@gentoo
1 commit: 47c6a22c1867aa1b6a312556346b03cc4b5a42ea
2 Author: Ian Delaney <idell5 <AT> iinet <DOT> com <DOT> au>
3 AuthorDate: Tue Nov 29 11:02:12 2011 +0000
4 Commit: Ian Delaney <della5 <AT> iinet <DOT> com <DOT> au>
5 CommitDate: Tue Nov 29 11:02:12 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=commit;h=47c6a22c
7
8 bump xen-pvgrub to EAPI4
9
10 (Portage version: 2.1.10.11/git/Linux x86_64, unsigned Manifest commit)
11
12 ---
13 app-emulation/xen-pvgrub/Manifest | 4 ++-
14 app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild | 24 +++++++++-------------
15 app-emulation/xen-tools/Manifest | 17 ++++++++++++++++
16 app-emulation/xen/Manifest | 2 +
17 4 files changed, 32 insertions(+), 15 deletions(-)
18
19 diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
20 index f3a7038..ea46525 100644
21 --- a/app-emulation/xen-pvgrub/Manifest
22 +++ b/app-emulation/xen-pvgrub/Manifest
23 @@ -1,5 +1,7 @@
24 DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
25 DIST lwip-1.3.0.tar.gz 398933 RMD160 72c63bf5e3b29e185c46a5fc116146ea902def83 SHA1 241f917ba9dffc614346472e3c5871217ad0a91c SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f
26 DIST newlib-1.16.0.tar.gz 12024353 RMD160 fa40ff43e858da3093c9f3b5b203724b9b327696 SHA1 841edec33d19a9e549984982fb92445ee967e265 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07
27 -DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e
28 +DIST pciutils-2.2.9.tar.bz2 212265 RMD160 781a3d30c5c429a0d92110a46711144f74acde06 SHA1 2871be0890f0406c7f86fa01646e23935fda789e SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24
29 DIST zlib-1.2.3.tar.gz 496597 RMD160 89a57e336c24f7f6eebda3a1724e14b71187e117 SHA1 60faeaaf250642db5c0ea36cd6dcc9f99c8f3902 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e
30 +EBUILD xen-pvgrub-9999.ebuild 3181 RMD160 73ae162a1a06c7d203d96c081da07847ef8ce674 SHA1 2cc87c24a2ba825cf6c37c198617b666f2b0c3e6 SHA256 9e4fc5fd80b788064169cfdd11abe5c9fffb7b2aaebf4e1b2544cfe549a586b9
31 +MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
32
33 diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild
34 index c505281..eee7447 100644
35 --- a/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild
36 +++ b/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild
37 @@ -2,7 +2,7 @@
38 # Distributed under the terms of the GNU General Public License v2
39 # $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild,v 1.4 2011/09/21 07:55:04 mgorny Exp $
40
41 -EAPI="2"
42 +EAPI="4"
43
44 inherit flag-o-matic eutils multilib mercurial git-2
45
46 @@ -39,21 +39,17 @@ pkg_setup() {
47 export "CONFIG_QEMU=${WORKDIR}/${GIT_REPO}"
48 }
49
50 -src_unpack() {
51 +src_prepare() {
52 default_src_unpack
53 -
54 # unpack xen
55 mercurial_src_unpack
56
57 local EGIT_COMMIT=$(sed -n -e "s/QEMU_TAG := \(.*\)/\1/p" "${S}"/Config.mk)
58 -
59 # unpack ioemu repos
60 local S=${WORKDIR}/${GIT_REPO}
61 local EGIT_NOUNPACK=1
62 git-2_src_unpack
63 -}
64
65 -src_prepare() {
66 # if the user *really* wants to use their own custom-cflags, let them
67 if use custom-cflags; then
68 einfo "User wants their own CFLAGS - removing defaults"
69 @@ -64,7 +60,7 @@ src_prepare() {
70 -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
71 -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
72 -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
73 - -i {} \;
74 + -i {} \; || die
75 fi
76
77 sed -i \
78 @@ -81,28 +77,28 @@ src_compile() {
79 append-flags -fno-strict-overflow
80 fi
81
82 - emake -C tools/include || die "prepare libelf headers failed"
83 + emake -C tools/include
84
85 if use x86; then
86 - emake XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub || die "compile pv-grub_x86_32 failed"
87 + emake XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
88 fi
89 if use amd64; then
90 - emake XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub || die "compile pv-grub_x86_64 failed"
91 + emake XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
92 if use multilib; then
93 multilib_toolchain_setup x86
94 - emake XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub || die "compile pv-grub_x86_32 failed"
95 + emake XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
96 fi
97 fi
98 }
99
100 src_install() {
101 if use x86; then
102 - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_32 failed"
103 + emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
104 fi
105 if use amd64; then
106 - emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_64 failed"
107 + emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
108 if use multilib; then
109 - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_32 failed"
110 + emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
111 fi
112 fi
113 }
114
115 diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
116 new file mode 100644
117 index 0000000..0f21f8a
118 --- /dev/null
119 +++ b/app-emulation/xen-tools/Manifest
120 @@ -0,0 +1,17 @@
121 +AUX ipxe-nopie.patch 952 RMD160 243c65b1e9e27fde14b10c5f605cce635de88032 SHA1 06870bb3bb063aabe16e721f487f0756a5889e8f SHA256 22d1e84568e4bdf204404c45cd4d323a78a1b5a5a29cc4a0707894e22f40bd48
122 +AUX xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SHA1 6f88a4da3349aade6070dfc5c4465e2c00f3e68c SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19
123 +AUX xen-tools-3.3.0-nostrip.patch 1021 RMD160 f702b588596dfdebf71fafbf866d270ac5bb549e SHA1 bb4db097af6e206ed68bcc1a1c3ef48b02e9a4c5 SHA256 2debac718c01a7eac4daf3182a7ae04aa562137d791cd510ecf1848d7eaccebd
124 +AUX xen-tools-3.4.0-network-bridge-broadcast.patch 496 RMD160 3a8c57fe70837861f6f69d1d260c6fa6adad43e3 SHA1 cc02643eee7a39e97b53674066516c80ec0c3b38 SHA256 d00a1954447fc29500ab2f1a8c7900310e0dee81942be5c922ad66b6b42dfb74
125 +AUX xen-tools-4.1.1-bridge.patch 449 RMD160 165524a3a92014f79e886b0a20dba8b1c1920cc2 SHA1 32db884422a48819d71003860f99779b7b82540a SHA256 71eea5408e3600c3c6f7ce4e8363ea2c19db36c1882e20cf0ef8143af527782b
126 +AUX xen-tools-4.1.1-curl.patch 550 RMD160 87e09f92f292d89c86416036d4207b0460a3dc6e SHA1 dec0e47d62d85cb21d9fb6d097ab183f02b80310 SHA256 4bdb2875b36e7dbb0bd8d61b697da78007bb22922f56e020795c91ebb9ddd50b
127 +AUX xen-tools-4.1.2-pyxml.patch 408 RMD160 131ff6e6a1b3bd71ff584d3cbfca4b078abd77b1 SHA1 5fa6ce64ef125e97df65ed357e1c40964a7a3619 SHA256 6a8d8ca5478bc68850fd930749ca22207807c87f8624c0c3596a8cd70bc06c65
128 +AUX xenconsoled.confd 44 RMD160 0134f85258cf524807c4e2eae94739a70808c20d SHA1 6435bba449e9cffd3f99c5afdeb3cc37ecbd744d SHA256 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060
129 +AUX xenconsoled.initd 652 RMD160 5aa785e9c73c5eb8460863af2c1bc50d2a07faf4 SHA1 dceffade1f3f5f2503fc6c3ccb4b9f9788365d00 SHA256 1a5594e4e924b94490c5c942b1b63e5fe857b8ad8061060e5d8a3bdfc9f0f1b7
130 +AUX xend.initd-r2 1064 RMD160 07b94d60a9c93577864086945389ef9821913522 SHA1 60f246da00f829776f1bb9a16ec07a6f91cbd24e SHA256 b9dcd925856eb5213b9052169492492d686b5d1ccae65b1c94a8ac944708d155
131 +AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a
132 +AUX xendomains.confd 291 RMD160 75d55db5360da12fc3d721c37001ccbfbb844e52 SHA1 e7be8973a4bcbfc7680258e369b07e2ed097ef49 SHA256 2fac318bb96b357dd185f7729d83c0a0b941799cdb89c24ed83051bb085735dc
133 +AUX xendomains.initd-r2 2933 RMD160 acea9ca432aa83631e6422493facf475379e5a94 SHA1 44d0957a2c073a94642736cf2a430833a664b646 SHA256 ecf9b0b2f04fd2f0f3c87b8a2bbf0c0eefa6a8d13d0391ac88f67109a00b4dc2
134 +AUX xenstored.confd 42 RMD160 3407e1ff0958d5797e257da284798a21fe31a5db SHA1 c18f64d2a41de25695b7dfb924478e3fa64ed0c3 SHA256 afcc14f014fe4ec478f85d230efefba9ffad024bf8c83b30074e8a3712cc7831
135 +AUX xenstored.initd 812 RMD160 57a880e0024f3733bb3ebe945389eed6474b96f5 SHA1 9837c052afac31ee623ef02280a43114866869c8 SHA256 8f9df8ad835e45f9c995244e9e80d1a9ee630787bf2da88b7c4a73354d056fd8
136 +EBUILD xen-tools-9999.ebuild 8928 RMD160 4eb7ec3a074835346ecba276c670f59fe7c77a7a SHA1 c9646b4727309ad839f047874a4dac3fff34a649 SHA256 be2761c8b2935bcbd4fee16dc6e7ebecc2628260fad580e9966a1c1230e0ac6e
137 +MISC metadata.xml 821 RMD160 a05d03fc9accefb4261be9a66ce63d25db2134ae SHA1 8abd3ea5f2c54c1682af838c9d13df43ef13897e SHA256 5e77961ab06a700cc9292df0bce39dca6803a019720ca915baf43b50c2916f02
138
139 diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
140 new file mode 100644
141 index 0000000..38d1863
142 --- /dev/null
143 +++ b/app-emulation/xen/Manifest
144 @@ -0,0 +1,2 @@
145 +EBUILD xen-9999.ebuild 3170 RMD160 5bbc3bb7dec7d099f639334843c3c6607ff1c5c5 SHA1 799030d125b2acb9976df9e39896937a3c591973 SHA256 b75349eb41edeb16f4571355b963de576cf58e9c7d86a4c4f74d4892d43b094f
146 +MISC metadata.xml 514 RMD160 95cf78168a2f1d3f4faca6a9e43baf074b645367 SHA1 dedec1c846c87b33e38d07158a0df111e03b19a8 SHA256 4c46b725c2abaac7b4a859b8e34d25803ecfca09f83092ad0e2299870052c320