[gentoo-commits] proj/virtualization:master commit in: app-emulation/xen-tools/ - gentoo-commits

From:	Ian Delaney <della5@×××××××××.au>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/virtualization:master commit in: app-emulation/xen-tools/
Date:	Fri, 02 Mar 2012 10:20:55
Message-Id:	`1330683294.20d8cacd15dbcd776ed61bb53b3185890c6c0a13.ian_delaney@gentoo`

1

commit:     20d8cacd15dbcd776ed61bb53b3185890c6c0a13

2

Author:     Ian Delaney <idell5 <AT> iinet <DOT> com <DOT> au>

3

AuthorDate: Fri Mar  2 10:14:54 2012 +0000

4

Commit:     Ian Delaney <della5 <AT> iinet <DOT> com <DOT> au>

5

CommitDate: Fri Mar  2 10:14:54 2012 +0000

6

URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=commit;h=20d8cacd

7

8

Added the latest xen-tools version, Manifest

9

10

(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)

11

12

---

13

 app-emulation/xen-tools/Manifest                   |    2 +

14

 ...tools-9999.ebuild => xen-tools-4.1.2-r2.ebuild} |   50 +++++++++++++-------

15

 app-emulation/xen-tools/xen-tools-9999.ebuild      |    1 -

16

 3 files changed, 34 insertions(+), 19 deletions(-)

17

18

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest

19

index ad78afc..5e67615 100644

20

--- a/app-emulation/xen-tools/Manifest

21

+++ b/app-emulation/xen-tools/Manifest

22

@@ -1 +1,3 @@

23

 DIST ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz 2888480 SHA256 ea2a52a999afab7fefa6300e0f1b38409c170a7503a51d8b572d790e71f2d0f0 SHA512 02314727af850bdf51c1963e8da258a65868f3ef116e9833918c770b8737cd1501891d4dc90d787702a1f34e35198e57373d730b7e2e6671e5fa93ece7c2f073 WHIRLPOOL 9a232852c3dee266dcbd27fae6814497814a0f65123484c37196a99c6cc746a348cf38c77ba084e62e052c64e950b34aa2f152a154e99c0366746f97941b23d7

24

+DIST ipxe-git-v1.0.0.tar.gz 1996881 SHA256 d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723 SHA512 6921fb857ca615899a5912d5590ca36b6f46daf828b85edc75461c08a189d9fed71ee74a82e42724da7a1355e45070d28a0a61694b3a4872c3554390e4bb4147 WHIRLPOOL 160e24eea479c9d67a8a5c7c5182864904ee594167f061adc40a3e74974197b6befe2ecdb76af1c101ff1a5697b060dae71dd3f9f969c8e18054526584d57031

25

+DIST xen-4.1.2.tar.gz 1084824 SHA256 e0b082fde62e0ca4d7f61eca96c221be92c51e1a6161eb4e7eaa4ccfee3420e8 SHA512 670a5dbbfccecd4c100d30c61037acb24e7039e5b7f641b1508b1300d056f55ce75a6bf9c062344a2940ebca08197a1956d453acdb1754034e2f5280adf41649 WHIRLPOOL 3ac2d6cc5ec35ed9e063e4468b03437e209bbae8f70dc02deba23fc62fe8d12703e8cde81e0eee2cd51b7b2f1bed9838f75044720baeb6b93f017d09e2edcc50

26

27

diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild

28

similarity index 86%

29

copy from app-emulation/xen-tools/xen-tools-9999.ebuild

30

copy to app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild

31

index 8468c3d..3ce8a54 100644

32

--- a/app-emulation/xen-tools/xen-tools-9999.ebuild

33

+++ b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild

34

@@ -1,6 +1,6 @@

35

-# Copyright 1999-2011 Gentoo Foundation

36

+# Copyright 1999-2012 Gentoo Foundation

37

 # Distributed under the terms of the GNU General Public License v2

38

-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-9999.ebuild,v 1.7 2011/10/23 10:49:29 patrick Exp $

39

+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild,v 1.3 2012/01/12 13:40:01 alexxy Exp $

40

41

 EAPI="4"

42

 PYTHON_DEPEND="2"

43

@@ -9,10 +9,7 @@ PYTHON_USE_WITH="xml threads"

44

 if [[ $PV == *9999 ]]; then

45

 	KEYWORDS=""

46

 	REPO="xen-unstable.hg"

47

-	XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"

48

-	IPXE_COMMIT="9a93db3f0947484e30e753bbd61a10b17336e20e"

49

 	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"

50

-	SRC_URI="http://dev.gentoo.org/~alexxy/distfiles/ipxe-git-${IPXE_COMMIT}.tar.gz"

51

 	S="${WORKDIR}/${REPO}"

52

 	live_eclass="mercurial"

53

 else

54

@@ -125,7 +122,7 @@ pkg_setup() {

55

}

56

57

 src_prepare() {

58

-	cp "$DISTDIR/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz

59

+	cp "$DISTDIR/ipxe-git-v1.0.0.tar.gz" tools/firmware/etherboot/ipxe.tar.gz

60

 	sed -e 's/-Wall//' -i Config.mk || die "Couldn't sanitize CFLAGS"

61

62

 	# Drop .config

63

@@ -169,19 +166,35 @@ src_prepare() {

64

fi

65

66

 	# Fix build for gcc-4.6

67

-	local WERROR=(

68

-		"tools/libxl/Makefile"

69

-		"tools/xenstat/xentop/Makefile"

70

-		)

71

-	for mf in ${WERROR[@]} ; do

72

-		sed -e "s:-Werror::g" -i $mf || die

73

-	done

74

+	sed -e "s:-Werror::g" -i  tools/xenstat/xentop/Makefile || die

75

+

76

+	# Fix network broadcast on bridged networks

77

+	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"

78

+

79

+	# Do not strip binaries

80

+	epatch "${FILESDIR}/${PN}-3.3.0-nostrip.patch"

81

82

 	# Prevent the downloading of ipxe

83

 	sed -e 's:^\tif ! wget -O _$T:#\tif ! wget -O _$T:' \

84

 		-e 's:^\tfi:#\tfi:' -i \

85

 		-e 's:^\tmv _$T $T:#\tmv _$T $T:' \

86

 		-i tools/firmware/etherboot/Makefile || die

87

+

88

+	# Fix bridge by idella4, bug #362575

89

+	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"

90

+

91

+	# Remove check_curl, new fix to Bug #386487

92

+	epatch "${FILESDIR}/${PN}-4.1.1-curl.patch"

93

+	sed -i -e 's|has_or_fail curl-config|has_or_fail curl-config\nset -ux|' \

94

+		tools/check/check_curl || die

95

+

96

+	# Don't build ipxe with pie on hardened, Bug #360805

97

+	if gcc-specs-pie; then

98

+		epatch "${FILESDIR}/ipxe-nopie.patch"

99

+	fi

100

+

101

+	# Fix create.py for pyxml Bug 367735

102

+	epatch "${FILESDIR}/xen-tools-4.1.2-pyxml.patch"

103

}

104

105

 src_compile() {

106

@@ -211,7 +224,7 @@ src_install() {

107

 	export INITD_DIR=/etc/init.d

108

 	export CONFIG_LEAF_DIR=default

109

110

-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools

111

+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools

112

 	python_convert_shebangs -r 2 "${ED}"

113

114

 	# Remove RedHat-specific stuff

115

@@ -223,26 +236,28 @@ src_install() {

116

 		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \

117

 		-i tools/examples/xl.conf  || die

118

119

+#	dodoc README docs/README.xen-bugtool docs/ChangeLog

120

 	if use doc; then

121

 		emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-docs

122

123

 		dohtml -r docs/api/

124

 		docinto pdf

125

 		dodoc ${DOCS[@]}

126

+	#docs/api/tools/python/latex/refman.pdf

127

 		[ -d "${ED}"/usr/share/doc/xen ] && mv "${ED}"/usr/share/doc/xen/* "${ED}"/usr/share/doc/${PF}/html

128

fi

129

 	rm -rf "${ED}"/usr/share/doc/xen/

130

 	doman docs/man?/*

131

132

 	if use xend; then

133

-		newinitd "${FILESDIR}"/xend.initd-r2 xend

134

+		newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"

135

fi

136

 	newconfd "${FILESDIR}"/xendomains.confd xendomains

137

 	newconfd "${FILESDIR}"/xenstored.confd xenstored

138

 	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled

139

 	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains

140

-	newinitd "${FILESDIR}"/xenstored.initd xenstored \

141

-		"${FILESDIR}"/xenconsoled.initd xenconsoled

142

+	newinitd "${FILESDIR}"/xenstored.initd xenstored

143

+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled

144

145

 	if use screen; then

146

 		cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die

147

@@ -307,4 +322,3 @@ pkg_postinst() {

148

 pkg_postrm() {

149

 	python_mod_cleanup $(use pygrub && echo grub) xen

150

}

151

-

152

153

diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulation/xen-tools/xen-tools-9999.ebuild

154

index 8468c3d..452628a 100644

155

--- a/app-emulation/xen-tools/xen-tools-9999.ebuild

156

+++ b/app-emulation/xen-tools/xen-tools-9999.ebuild

157

@@ -307,4 +307,3 @@ pkg_postinst() {

158

 pkg_postrm() {

159

 	python_mod_cleanup $(use pygrub && echo grub) xen

160

}

161

-

1	commit: 20d8cacd15dbcd776ed61bb53b3185890c6c0a13
2	Author: Ian Delaney <idell5 <AT> iinet <DOT> com <DOT> au>
3	AuthorDate: Fri Mar 2 10:14:54 2012 +0000
4	Commit: Ian Delaney <della5 <AT> iinet <DOT> com <DOT> au>
5	CommitDate: Fri Mar 2 10:14:54 2012 +0000
6	URL: http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=commit;h=20d8cacd
7
8	Added the latest xen-tools version, Manifest
9
10	(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)
11
12	---
13	app-emulation/xen-tools/Manifest \| 2 +
14	...tools-9999.ebuild => xen-tools-4.1.2-r2.ebuild} \| 50 +++++++++++++-------
15	app-emulation/xen-tools/xen-tools-9999.ebuild \| 1 -
16	3 files changed, 34 insertions(+), 19 deletions(-)
17
18	diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
19	index ad78afc..5e67615 100644
20	--- a/app-emulation/xen-tools/Manifest
21	+++ b/app-emulation/xen-tools/Manifest
22	@@ -1 +1,3 @@
23	DIST ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz 2888480 SHA256 ea2a52a999afab7fefa6300e0f1b38409c170a7503a51d8b572d790e71f2d0f0 SHA512 02314727af850bdf51c1963e8da258a65868f3ef116e9833918c770b8737cd1501891d4dc90d787702a1f34e35198e57373d730b7e2e6671e5fa93ece7c2f073 WHIRLPOOL 9a232852c3dee266dcbd27fae6814497814a0f65123484c37196a99c6cc746a348cf38c77ba084e62e052c64e950b34aa2f152a154e99c0366746f97941b23d7
24	+DIST ipxe-git-v1.0.0.tar.gz 1996881 SHA256 d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723 SHA512 6921fb857ca615899a5912d5590ca36b6f46daf828b85edc75461c08a189d9fed71ee74a82e42724da7a1355e45070d28a0a61694b3a4872c3554390e4bb4147 WHIRLPOOL 160e24eea479c9d67a8a5c7c5182864904ee594167f061adc40a3e74974197b6befe2ecdb76af1c101ff1a5697b060dae71dd3f9f969c8e18054526584d57031
25	+DIST xen-4.1.2.tar.gz 1084824 SHA256 e0b082fde62e0ca4d7f61eca96c221be92c51e1a6161eb4e7eaa4ccfee3420e8 SHA512 670a5dbbfccecd4c100d30c61037acb24e7039e5b7f641b1508b1300d056f55ce75a6bf9c062344a2940ebca08197a1956d453acdb1754034e2f5280adf41649 WHIRLPOOL 3ac2d6cc5ec35ed9e063e4468b03437e209bbae8f70dc02deba23fc62fe8d12703e8cde81e0eee2cd51b7b2f1bed9838f75044720baeb6b93f017d09e2edcc50
26
27	diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
28	similarity index 86%
29	copy from app-emulation/xen-tools/xen-tools-9999.ebuild
30	copy to app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
31	index 8468c3d..3ce8a54 100644
32	--- a/app-emulation/xen-tools/xen-tools-9999.ebuild
33	+++ b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
34	@@ -1,6 +1,6 @@
35	-# Copyright 1999-2011 Gentoo Foundation
36	+# Copyright 1999-2012 Gentoo Foundation
37	# Distributed under the terms of the GNU General Public License v2
38	-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-9999.ebuild,v 1.7 2011/10/23 10:49:29 patrick Exp $
39	+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild,v 1.3 2012/01/12 13:40:01 alexxy Exp $
40
41	EAPI="4"
42	PYTHON_DEPEND="2"
43	@@ -9,10 +9,7 @@ PYTHON_USE_WITH="xml threads"
44	if [[ $PV == *9999 ]]; then
45	KEYWORDS=""
46	REPO="xen-unstable.hg"
47	- XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
48	- IPXE_COMMIT="9a93db3f0947484e30e753bbd61a10b17336e20e"
49	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
50	- SRC_URI="http://dev.gentoo.org/~alexxy/distfiles/ipxe-git-${IPXE_COMMIT}.tar.gz"
51	S="${WORKDIR}/${REPO}"
52	live_eclass="mercurial"
53	else
54	@@ -125,7 +122,7 @@ pkg_setup() {
55	}
56
57	src_prepare() {
58	- cp "$DISTDIR/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz
59	+ cp "$DISTDIR/ipxe-git-v1.0.0.tar.gz" tools/firmware/etherboot/ipxe.tar.gz
60	sed -e 's/-Wall//' -i Config.mk \|\| die "Couldn't sanitize CFLAGS"
61
62	# Drop .config
63	@@ -169,19 +166,35 @@ src_prepare() {
64	fi
65
66	# Fix build for gcc-4.6
67	- local WERROR=(
68	- "tools/libxl/Makefile"
69	- "tools/xenstat/xentop/Makefile"
70	- )
71	- for mf in ${WERROR[@]} ; do
72	- sed -e "s:-Werror::g" -i $mf \|\| die
73	- done
74	+ sed -e "s:-Werror::g" -i tools/xenstat/xentop/Makefile \|\| die
75	+
76	+ # Fix network broadcast on bridged networks
77	+ epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
78	+
79	+ # Do not strip binaries
80	+ epatch "${FILESDIR}/${PN}-3.3.0-nostrip.patch"
81
82	# Prevent the downloading of ipxe
83	sed -e 's:^\tif ! wget -O _$T:#\tif ! wget -O _$T:' \
84	-e 's:^\tfi:#\tfi:' -i \
85	-e 's:^\tmv _$T $T:#\tmv _$T $T:' \
86	-i tools/firmware/etherboot/Makefile \|\| die
87	+
88	+ # Fix bridge by idella4, bug #362575
89	+ epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
90	+
91	+ # Remove check_curl, new fix to Bug #386487
92	+ epatch "${FILESDIR}/${PN}-4.1.1-curl.patch"
93	+ sed -i -e 's\|has_or_fail curl-config\|has_or_fail curl-config\nset -ux\|' \
94	+ tools/check/check_curl \|\| die
95	+
96	+ # Don't build ipxe with pie on hardened, Bug #360805
97	+ if gcc-specs-pie; then
98	+ epatch "${FILESDIR}/ipxe-nopie.patch"
99	+ fi
100	+
101	+ # Fix create.py for pyxml Bug 367735
102	+ epatch "${FILESDIR}/xen-tools-4.1.2-pyxml.patch"
103	}
104
105	src_compile() {
106	@@ -211,7 +224,7 @@ src_install() {
107	export INITD_DIR=/etc/init.d
108	export CONFIG_LEAF_DIR=default
109
110	- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools
111	+ emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools
112	python_convert_shebangs -r 2 "${ED}"
113
114	# Remove RedHat-specific stuff
115	@@ -223,26 +236,28 @@ src_install() {
116	-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
117	-i tools/examples/xl.conf \|\| die
118
119	+# dodoc README docs/README.xen-bugtool docs/ChangeLog
120	if use doc; then
121	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-docs
122
123	dohtml -r docs/api/
124	docinto pdf
125	dodoc ${DOCS[@]}
126	+ #docs/api/tools/python/latex/refman.pdf
127	[ -d "${ED}"/usr/share/doc/xen ] && mv "${ED}"/usr/share/doc/xen/* "${ED}"/usr/share/doc/${PF}/html
128	fi
129	rm -rf "${ED}"/usr/share/doc/xen/
130	doman docs/man?/*
131
132	if use xend; then
133	- newinitd "${FILESDIR}"/xend.initd-r2 xend
134	+ newinitd "${FILESDIR}"/xend.initd-r2 xend \|\| die "Couldn't install xen.initd"
135	fi
136	newconfd "${FILESDIR}"/xendomains.confd xendomains
137	newconfd "${FILESDIR}"/xenstored.confd xenstored
138	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
139	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
140	- newinitd "${FILESDIR}"/xenstored.initd xenstored \
141	- "${FILESDIR}"/xenconsoled.initd xenconsoled
142	+ newinitd "${FILESDIR}"/xenstored.initd xenstored
143	+ newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
144
145	if use screen; then
146	cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains \|\| die
147	@@ -307,4 +322,3 @@ pkg_postinst() {
148	pkg_postrm() {
149	python_mod_cleanup $(use pygrub && echo grub) xen
150	}
151	-
152
153	diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulation/xen-tools/xen-tools-9999.ebuild
154	index 8468c3d..452628a 100644
155	--- a/app-emulation/xen-tools/xen-tools-9999.ebuild
156	+++ b/app-emulation/xen-tools/xen-tools-9999.ebuild
157	@@ -307,4 +307,3 @@ pkg_postinst() {
158	pkg_postrm() {
159	python_mod_cleanup $(use pygrub && echo grub) xen
160	}
161	-

Gentoo Archives: gentoo-commits