[gentoo-catalyst] [PATCH 1/2] arch: hoist default CHROOT setting up - gentoo-catalyst

From:	Mike Frysinger <vapier@g.o>
To:	gentoo-catalyst@l.g.o
Subject:	[gentoo-catalyst] [PATCH 1/2] arch: hoist default CHROOT setting up
Date:	Tue, 06 Oct 2015 17:57:02
Message-Id:	`1444154214-3572-1-git-send-email-vapier@gentoo.org`

1

Rather than require every arch to set CHROOT=chroot by default, let the

2

generic core do it.

3

---

4

 catalyst/arch/alpha.py   | 1 -

5

 catalyst/arch/amd64.py   | 1 -

6

 catalyst/arch/arm.py     | 2 --

7

 catalyst/arch/arm64.py   | 1 -

8

 catalyst/arch/hppa.py    | 1 -

9

 catalyst/arch/ia64.py    | 1 -

10

 catalyst/arch/m68k.py    | 1 -

11

 catalyst/arch/mips.py    | 4 ----

12

 catalyst/arch/powerpc.py | 3 ---

13

 catalyst/arch/s390.py    | 2 --

14

 catalyst/arch/sh.py      | 2 --

15

 catalyst/arch/sparc.py   | 3 ---

16

 catalyst/arch/x86.py     | 2 --

17

 catalyst/builder.py      | 1 +

18

 14 files changed, 1 insertion(+), 24 deletions(-)

19

20

diff --git a/catalyst/arch/alpha.py b/catalyst/arch/alpha.py

21

index 01b6382..a4e7caf 100644

22

--- a/catalyst/arch/alpha.py

23

+++ b/catalyst/arch/alpha.py

24

@@ -7,7 +7,6 @@ class generic_alpha(builder.generic):

25

 	"abstract base class for all alpha builders"

26

 	def __init__(self,myspec):

27

 		builder.generic.__init__(self,myspec)

28

-		self.settings["CHROOT"]="chroot"

29

 		self.settings["CFLAGS"]="-mieee -pipe"

30

31

 class arch_alpha(generic_alpha):

32

diff --git a/catalyst/arch/amd64.py b/catalyst/arch/amd64.py

33

index 463e8f5..1d9db0e 100644

34

--- a/catalyst/arch/amd64.py

35

+++ b/catalyst/arch/amd64.py

36

@@ -5,7 +5,6 @@ class generic_amd64(builder.generic):

37

 	"abstract base class for all amd64 builders"

38

 	def __init__(self,myspec):

39

 		builder.generic.__init__(self,myspec)

40

-		self.settings["CHROOT"]="chroot"

41

42

 class arch_amd64(generic_amd64):

43

 	"builder class for generic amd64 (Intel and AMD)"

44

diff --git a/catalyst/arch/arm.py b/catalyst/arch/arm.py

45

index c0d322c..05146f1 100644

46

--- a/catalyst/arch/arm.py

47

+++ b/catalyst/arch/arm.py

48

@@ -6,14 +6,12 @@ class generic_arm(builder.generic):

49

 	"Abstract base class for all arm (little endian) builders"

50

 	def __init__(self,myspec):

51

 		builder.generic.__init__(self,myspec)

52

-		self.settings["CHROOT"]="chroot"

53

 		self.settings["CFLAGS"]="-O2 -pipe"

54

55

 class generic_armeb(builder.generic):

56

 	"Abstract base class for all arm (big endian) builders"

57

 	def __init__(self,myspec):

58

 		builder.generic.__init__(self,myspec)

59

-		self.settings["CHROOT"]="chroot"

60

 		self.settings["CFLAGS"]="-O2 -pipe"

61

62

 class arch_arm(generic_arm):

63

diff --git a/catalyst/arch/arm64.py b/catalyst/arch/arm64.py

64

index 00e7527..c12a0a0 100644

65

--- a/catalyst/arch/arm64.py

66

+++ b/catalyst/arch/arm64.py

67

@@ -5,7 +5,6 @@ class arch_arm64(builder.generic):

68

 	"builder class for arm64"

69

 	def __init__(self,myspec):

70

 		builder.generic.__init__(self,myspec)

71

-		self.settings["CHROOT"]="chroot"

72

 		self.settings["CFLAGS"]="-O2 -pipe"

73

 		self.settings["CFLAGS"]="-O2 -pipe"

74

 		self.settings["CHOST"]="aarch64-unknown-linux-gnu"

75

diff --git a/catalyst/arch/hppa.py b/catalyst/arch/hppa.py

76

index c5589c4..6e96909 100644

77

--- a/catalyst/arch/hppa.py

78

+++ b/catalyst/arch/hppa.py

79

@@ -5,7 +5,6 @@ class generic_hppa(builder.generic):

80

 	"Abstract base class for all hppa builders"

81

 	def __init__(self,myspec):

82

 		builder.generic.__init__(self,myspec)

83

-		self.settings["CHROOT"]="chroot"

84

 		self.settings["CFLAGS"]="-O2 -pipe"

85

 		self.settings["CXXFLAGS"]="-O2 -pipe"

86

87

diff --git a/catalyst/arch/ia64.py b/catalyst/arch/ia64.py

88

index 3f06040..de0ec9e 100644

89

--- a/catalyst/arch/ia64.py

90

+++ b/catalyst/arch/ia64.py

91

@@ -5,7 +5,6 @@ class arch_ia64(builder.generic):

92

 	"builder class for ia64"

93

 	def __init__(self,myspec):

94

 		builder.generic.__init__(self,myspec)

95

-		self.settings["CHROOT"]="chroot"

96

 		self.settings["CFLAGS"]="-O2 -pipe"

97

 		self.settings["CFLAGS"]="-O2 -pipe"

98

 		self.settings["CHOST"]="ia64-unknown-linux-gnu"

99

diff --git a/catalyst/arch/m68k.py b/catalyst/arch/m68k.py

100

index c9f194b..9fc1083 100644

101

--- a/catalyst/arch/m68k.py

102

+++ b/catalyst/arch/m68k.py

103

@@ -5,7 +5,6 @@ class generic_m68k(builder.generic):

104

 	"abstract base class for all m68k builders"

105

 	def __init__(self,myspec):

106

 		builder.generic.__init__(self,myspec)

107

-		self.settings["CHROOT"]="chroot"

108

 		self.settings["CFLAGS"]=" -pipe"

109

110

 class arch_m68k(generic_m68k):

111

diff --git a/catalyst/arch/mips.py b/catalyst/arch/mips.py

112

index 5416d22..9682bf2 100644

113

--- a/catalyst/arch/mips.py

114

+++ b/catalyst/arch/mips.py

115

@@ -5,28 +5,24 @@ class generic_mips(builder.generic):

116

 	"Abstract base class for all mips builders [Big-endian]"

117

 	def __init__(self,myspec):

118

 		builder.generic.__init__(self,myspec)

119

-		self.settings["CHROOT"]="chroot"

120

 		self.settings["CHOST"]="mips-unknown-linux-gnu"

121

122

 class generic_mipsel(builder.generic):

123

 	"Abstract base class for all mipsel builders [Little-endian]"

124

 	def __init__(self,myspec):

125

 		builder.generic.__init__(self,myspec)

126

-		self.settings["CHROOT"]="chroot"

127

 		self.settings["CHOST"]="mipsel-unknown-linux-gnu"

128

129

 class generic_mips64(builder.generic):

130

 	"Abstract base class for all mips64 builders [Big-endian]"

131

 	def __init__(self,myspec):

132

 		builder.generic.__init__(self,myspec)

133

-		self.settings["CHROOT"]="chroot"

134

 		self.settings["CHOST"]="mips64-unknown-linux-gnu"

135

136

 class generic_mips64el(builder.generic):

137

 	"Abstract base class for all mips64el builders [Little-endian]"

138

 	def __init__(self,myspec):

139

 		builder.generic.__init__(self,myspec)

140

-		self.settings["CHROOT"]="chroot"

141

 		self.settings["CHOST"]="mips64el-unknown-linux-gnu"

142

143

 class arch_mips1(generic_mips):

144

diff --git a/catalyst/arch/powerpc.py b/catalyst/arch/powerpc.py

145

index fb98316..0c4861f 100644

146

--- a/catalyst/arch/powerpc.py

147

+++ b/catalyst/arch/powerpc.py

148

@@ -15,14 +15,11 @@ class generic_ppc(builder.generic):

149

 					"(\"emerge setarch\" to fix.)", print_traceback=True)

150

 			self.settings["CHROOT"]="linux32 chroot"

151

 			self.settings["crosscompile"] = False

152

-		else:

153

-			self.settings["CHROOT"]="chroot"

154

155

 class generic_ppc64(builder.generic):

156

 	"abstract base class for all 64-bit powerpc builders"

157

 	def __init__(self,myspec):

158

 		builder.generic.__init__(self,myspec)

159

-		self.settings["CHROOT"]="chroot"

160

161

 class arch_ppc(generic_ppc):

162

 	"builder class for generic powerpc"

163

diff --git a/catalyst/arch/s390.py b/catalyst/arch/s390.py

164

index f2cf80d..8ff287b 100644

165

--- a/catalyst/arch/s390.py

166

+++ b/catalyst/arch/s390.py

167

@@ -5,13 +5,11 @@ class generic_s390(builder.generic):

168

 	"abstract base class for all s390 builders"

169

 	def __init__(self,myspec):

170

 		builder.generic.__init__(self,myspec)

171

-		self.settings["CHROOT"]="chroot"

172

173

 class generic_s390x(builder.generic):

174

 	"abstract base class for all s390x builders"

175

 	def __init__(self,myspec):

176

 		builder.generic.__init__(self,myspec)

177

-		self.settings["CHROOT"]="chroot"

178

179

 class arch_s390(generic_s390):

180

 	"builder class for generic s390"

181

diff --git a/catalyst/arch/sh.py b/catalyst/arch/sh.py

182

index 64d6e0e..fdf3974 100644

183

--- a/catalyst/arch/sh.py

184

+++ b/catalyst/arch/sh.py

185

@@ -5,13 +5,11 @@ class generic_sh(builder.generic):

186

 	"Abstract base class for all sh builders [Little-endian]"

187

 	def __init__(self,myspec):

188

 		builder.generic.__init__(self,myspec)

189

-		self.settings["CHROOT"]="chroot"

190

191

 class generic_sheb(builder.generic):

192

 	"Abstract base class for all sheb builders [Big-endian]"

193

 	def __init__(self,myspec):

194

 		builder.generic.__init__(self,myspec)

195

-		self.settings["CHROOT"]="chroot"

196

197

 class arch_sh(generic_sh):

198

 	"Builder class for SH [Little-endian]"

199

diff --git a/catalyst/arch/sparc.py b/catalyst/arch/sparc.py

200

index ec69386..39f50ca 100644

201

--- a/catalyst/arch/sparc.py

202

+++ b/catalyst/arch/sparc.py

203

@@ -14,14 +14,11 @@ class generic_sparc(builder.generic):

204

 					"(\"emerge setarch\" to fix.)", print_traceback=True)

205

 			self.settings["CHROOT"]="linux32 chroot"

206

 			self.settings["crosscompile"] = False

207

-		else:

208

-			self.settings["CHROOT"]="chroot"

209

210

 class generic_sparc64(builder.generic):

211

 	"abstract base class for all sparc64 builders"

212

 	def __init__(self,myspec):

213

 		builder.generic.__init__(self,myspec)

214

-		self.settings["CHROOT"]="chroot"

215

216

 class arch_sparc(generic_sparc):

217

 	"builder class for generic sparc (sun4cdm)"

218

diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py

219

index 33b29c0..0d6a9ad 100644

220

--- a/catalyst/arch/x86.py

221

+++ b/catalyst/arch/x86.py

222

@@ -14,8 +14,6 @@ class generic_x86(builder.generic):

223

 					"(\"emerge setarch\" to fix.)", print_traceback=True)

224

 			self.settings["CHROOT"]="linux32 chroot"

225

 			self.settings["crosscompile"] = False

226

-		else:

227

-			self.settings["CHROOT"]="chroot"

228

229

 class arch_x86(generic_x86):

230

 	"builder class for generic x86 (386+)"

231

diff --git a/catalyst/builder.py b/catalyst/builder.py

232

index 3ba86c8..adaea90 100644

233

--- a/catalyst/builder.py

234

+++ b/catalyst/builder.py

235

@@ -2,6 +2,7 @@

236

 class generic(object):

237

 	def __init__(self,myspec):

238

 		self.settings=myspec

239

+		self.settings.setdefault('CHROOT', 'chroot')

240

241

 	def mount_safety_check(self):

242

"""

243

--

244

2.5.2

Gentoo Archives: gentoo-catalyst

Replies

1	Rather than require every arch to set CHROOT=chroot by default, let the
2	generic core do it.
3	---
4	catalyst/arch/alpha.py \| 1 -
5	catalyst/arch/amd64.py \| 1 -
6	catalyst/arch/arm.py \| 2 --
7	catalyst/arch/arm64.py \| 1 -
8	catalyst/arch/hppa.py \| 1 -
9	catalyst/arch/ia64.py \| 1 -
10	catalyst/arch/m68k.py \| 1 -
11	catalyst/arch/mips.py \| 4 ----
12	catalyst/arch/powerpc.py \| 3 ---
13	catalyst/arch/s390.py \| 2 --
14	catalyst/arch/sh.py \| 2 --
15	catalyst/arch/sparc.py \| 3 ---
16	catalyst/arch/x86.py \| 2 --
17	catalyst/builder.py \| 1 +
18	14 files changed, 1 insertion(+), 24 deletions(-)
19
20	diff --git a/catalyst/arch/alpha.py b/catalyst/arch/alpha.py
21	index 01b6382..a4e7caf 100644
22	--- a/catalyst/arch/alpha.py
23	+++ b/catalyst/arch/alpha.py
24	@@ -7,7 +7,6 @@ class generic_alpha(builder.generic):
25	"abstract base class for all alpha builders"
26	def __init__(self,myspec):
27	builder.generic.__init__(self,myspec)
28	- self.settings["CHROOT"]="chroot"
29	self.settings["CFLAGS"]="-mieee -pipe"
30
31	class arch_alpha(generic_alpha):
32	diff --git a/catalyst/arch/amd64.py b/catalyst/arch/amd64.py
33	index 463e8f5..1d9db0e 100644
34	--- a/catalyst/arch/amd64.py
35	+++ b/catalyst/arch/amd64.py
36	@@ -5,7 +5,6 @@ class generic_amd64(builder.generic):
37	"abstract base class for all amd64 builders"
38	def __init__(self,myspec):
39	builder.generic.__init__(self,myspec)
40	- self.settings["CHROOT"]="chroot"
41
42	class arch_amd64(generic_amd64):
43	"builder class for generic amd64 (Intel and AMD)"
44	diff --git a/catalyst/arch/arm.py b/catalyst/arch/arm.py
45	index c0d322c..05146f1 100644
46	--- a/catalyst/arch/arm.py
47	+++ b/catalyst/arch/arm.py
48	@@ -6,14 +6,12 @@ class generic_arm(builder.generic):
49	"Abstract base class for all arm (little endian) builders"
50	def __init__(self,myspec):
51	builder.generic.__init__(self,myspec)
52	- self.settings["CHROOT"]="chroot"
53	self.settings["CFLAGS"]="-O2 -pipe"
54
55	class generic_armeb(builder.generic):
56	"Abstract base class for all arm (big endian) builders"
57	def __init__(self,myspec):
58	builder.generic.__init__(self,myspec)
59	- self.settings["CHROOT"]="chroot"
60	self.settings["CFLAGS"]="-O2 -pipe"
61
62	class arch_arm(generic_arm):
63	diff --git a/catalyst/arch/arm64.py b/catalyst/arch/arm64.py
64	index 00e7527..c12a0a0 100644
65	--- a/catalyst/arch/arm64.py
66	+++ b/catalyst/arch/arm64.py
67	@@ -5,7 +5,6 @@ class arch_arm64(builder.generic):
68	"builder class for arm64"
69	def __init__(self,myspec):
70	builder.generic.__init__(self,myspec)
71	- self.settings["CHROOT"]="chroot"
72	self.settings["CFLAGS"]="-O2 -pipe"
73	self.settings["CFLAGS"]="-O2 -pipe"
74	self.settings["CHOST"]="aarch64-unknown-linux-gnu"
75	diff --git a/catalyst/arch/hppa.py b/catalyst/arch/hppa.py
76	index c5589c4..6e96909 100644
77	--- a/catalyst/arch/hppa.py
78	+++ b/catalyst/arch/hppa.py
79	@@ -5,7 +5,6 @@ class generic_hppa(builder.generic):
80	"Abstract base class for all hppa builders"
81	def __init__(self,myspec):
82	builder.generic.__init__(self,myspec)
83	- self.settings["CHROOT"]="chroot"
84	self.settings["CFLAGS"]="-O2 -pipe"
85	self.settings["CXXFLAGS"]="-O2 -pipe"
86
87	diff --git a/catalyst/arch/ia64.py b/catalyst/arch/ia64.py
88	index 3f06040..de0ec9e 100644
89	--- a/catalyst/arch/ia64.py
90	+++ b/catalyst/arch/ia64.py
91	@@ -5,7 +5,6 @@ class arch_ia64(builder.generic):
92	"builder class for ia64"
93	def __init__(self,myspec):
94	builder.generic.__init__(self,myspec)
95	- self.settings["CHROOT"]="chroot"
96	self.settings["CFLAGS"]="-O2 -pipe"
97	self.settings["CFLAGS"]="-O2 -pipe"
98	self.settings["CHOST"]="ia64-unknown-linux-gnu"
99	diff --git a/catalyst/arch/m68k.py b/catalyst/arch/m68k.py
100	index c9f194b..9fc1083 100644
101	--- a/catalyst/arch/m68k.py
102	+++ b/catalyst/arch/m68k.py
103	@@ -5,7 +5,6 @@ class generic_m68k(builder.generic):
104	"abstract base class for all m68k builders"
105	def __init__(self,myspec):
106	builder.generic.__init__(self,myspec)
107	- self.settings["CHROOT"]="chroot"
108	self.settings["CFLAGS"]=" -pipe"
109
110	class arch_m68k(generic_m68k):
111	diff --git a/catalyst/arch/mips.py b/catalyst/arch/mips.py
112	index 5416d22..9682bf2 100644
113	--- a/catalyst/arch/mips.py
114	+++ b/catalyst/arch/mips.py
115	@@ -5,28 +5,24 @@ class generic_mips(builder.generic):
116	"Abstract base class for all mips builders [Big-endian]"
117	def __init__(self,myspec):
118	builder.generic.__init__(self,myspec)
119	- self.settings["CHROOT"]="chroot"
120	self.settings["CHOST"]="mips-unknown-linux-gnu"
121
122	class generic_mipsel(builder.generic):
123	"Abstract base class for all mipsel builders [Little-endian]"
124	def __init__(self,myspec):
125	builder.generic.__init__(self,myspec)
126	- self.settings["CHROOT"]="chroot"
127	self.settings["CHOST"]="mipsel-unknown-linux-gnu"
128
129	class generic_mips64(builder.generic):
130	"Abstract base class for all mips64 builders [Big-endian]"
131	def __init__(self,myspec):
132	builder.generic.__init__(self,myspec)
133	- self.settings["CHROOT"]="chroot"
134	self.settings["CHOST"]="mips64-unknown-linux-gnu"
135
136	class generic_mips64el(builder.generic):
137	"Abstract base class for all mips64el builders [Little-endian]"
138	def __init__(self,myspec):
139	builder.generic.__init__(self,myspec)
140	- self.settings["CHROOT"]="chroot"
141	self.settings["CHOST"]="mips64el-unknown-linux-gnu"
142
143	class arch_mips1(generic_mips):
144	diff --git a/catalyst/arch/powerpc.py b/catalyst/arch/powerpc.py
145	index fb98316..0c4861f 100644
146	--- a/catalyst/arch/powerpc.py
147	+++ b/catalyst/arch/powerpc.py
148	@@ -15,14 +15,11 @@ class generic_ppc(builder.generic):
149	"(\"emerge setarch\" to fix.)", print_traceback=True)
150	self.settings["CHROOT"]="linux32 chroot"
151	self.settings["crosscompile"] = False
152	- else:
153	- self.settings["CHROOT"]="chroot"
154
155	class generic_ppc64(builder.generic):
156	"abstract base class for all 64-bit powerpc builders"
157	def __init__(self,myspec):
158	builder.generic.__init__(self,myspec)
159	- self.settings["CHROOT"]="chroot"
160
161	class arch_ppc(generic_ppc):
162	"builder class for generic powerpc"
163	diff --git a/catalyst/arch/s390.py b/catalyst/arch/s390.py
164	index f2cf80d..8ff287b 100644
165	--- a/catalyst/arch/s390.py
166	+++ b/catalyst/arch/s390.py
167	@@ -5,13 +5,11 @@ class generic_s390(builder.generic):
168	"abstract base class for all s390 builders"
169	def __init__(self,myspec):
170	builder.generic.__init__(self,myspec)
171	- self.settings["CHROOT"]="chroot"
172
173	class generic_s390x(builder.generic):
174	"abstract base class for all s390x builders"
175	def __init__(self,myspec):
176	builder.generic.__init__(self,myspec)
177	- self.settings["CHROOT"]="chroot"
178
179	class arch_s390(generic_s390):
180	"builder class for generic s390"
181	diff --git a/catalyst/arch/sh.py b/catalyst/arch/sh.py
182	index 64d6e0e..fdf3974 100644
183	--- a/catalyst/arch/sh.py
184	+++ b/catalyst/arch/sh.py
185	@@ -5,13 +5,11 @@ class generic_sh(builder.generic):
186	"Abstract base class for all sh builders [Little-endian]"
187	def __init__(self,myspec):
188	builder.generic.__init__(self,myspec)
189	- self.settings["CHROOT"]="chroot"
190
191	class generic_sheb(builder.generic):
192	"Abstract base class for all sheb builders [Big-endian]"
193	def __init__(self,myspec):
194	builder.generic.__init__(self,myspec)
195	- self.settings["CHROOT"]="chroot"
196
197	class arch_sh(generic_sh):
198	"Builder class for SH [Little-endian]"
199	diff --git a/catalyst/arch/sparc.py b/catalyst/arch/sparc.py
200	index ec69386..39f50ca 100644
201	--- a/catalyst/arch/sparc.py
202	+++ b/catalyst/arch/sparc.py
203	@@ -14,14 +14,11 @@ class generic_sparc(builder.generic):
204	"(\"emerge setarch\" to fix.)", print_traceback=True)
205	self.settings["CHROOT"]="linux32 chroot"
206	self.settings["crosscompile"] = False
207	- else:
208	- self.settings["CHROOT"]="chroot"
209
210	class generic_sparc64(builder.generic):
211	"abstract base class for all sparc64 builders"
212	def __init__(self,myspec):
213	builder.generic.__init__(self,myspec)
214	- self.settings["CHROOT"]="chroot"
215
216	class arch_sparc(generic_sparc):
217	"builder class for generic sparc (sun4cdm)"
218	diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
219	index 33b29c0..0d6a9ad 100644
220	--- a/catalyst/arch/x86.py
221	+++ b/catalyst/arch/x86.py
222	@@ -14,8 +14,6 @@ class generic_x86(builder.generic):
223	"(\"emerge setarch\" to fix.)", print_traceback=True)
224	self.settings["CHROOT"]="linux32 chroot"
225	self.settings["crosscompile"] = False
226	- else:
227	- self.settings["CHROOT"]="chroot"
228
229	class arch_x86(generic_x86):
230	"builder class for generic x86 (386+)"
231	diff --git a/catalyst/builder.py b/catalyst/builder.py
232	index 3ba86c8..adaea90 100644
233	--- a/catalyst/builder.py
234	+++ b/catalyst/builder.py
235	@@ -2,6 +2,7 @@
236	class generic(object):
237	def __init__(self,myspec):
238	self.settings=myspec
239	+ self.settings.setdefault('CHROOT', 'chroot')
240
241	def mount_safety_check(self):
242	"""
243	--
244	2.5.2

Subject	Author
[gentoo-catalyst] [PATCH 2/2] arch: add helper for working w/setarch	Mike Frysinger <vapier@g.o>
Re: [gentoo-catalyst] [PATCH 1/2] arch: hoist default CHROOT setting up	Mike Frysinger <vapier@g.o>