1 |
Author: rieggepp |
2 |
Date: Mon Jun 23 08:54:35 2008 |
3 |
New Revision: 119 |
4 |
|
5 |
Modified: |
6 |
trunk/tools/rebuild_stages/Makefile |
7 |
trunk/tools/rebuild_stages/i386-uclibc/Makefile |
8 |
|
9 |
Log: |
10 |
Added autogeneration of catalyst.conf and catalystrc. |
11 |
|
12 |
Modified: trunk/tools/rebuild_stages/Makefile |
13 |
============================================================================== |
14 |
--- trunk/tools/rebuild_stages/Makefile (original) |
15 |
+++ trunk/tools/rebuild_stages/Makefile Mon Jun 23 08:54:35 2008 |
16 |
@@ -1,27 +1,33 @@ |
17 |
+# Autogenerated Stage/Tinderbox/Livecd Specifications |
18 |
STAGE1_SPEC = stage1.spec |
19 |
STAGE2_SPEC = stage2.spec |
20 |
STAGE3_SPEC = stage3.spec |
21 |
STAGE4_SPEC = stage4.spec |
22 |
- |
23 |
TINDERBOX_SPEC = tinderbox.spec |
24 |
- |
25 |
LIVECD_STAGE1_SPEC = livecd-stage1.spec |
26 |
LIVECD_STAGE2_SPEC = livecd-stage2.spec |
27 |
|
28 |
-STAGEDIR = $(CATALYST_DIR)/builds/$(RELTYPE) |
29 |
+# Autogenerated Configuration Files |
30 |
+CATALYST_CONF = catalyst.conf |
31 |
+CATALYST_RC = catalyst.rc |
32 |
|
33 |
+# Stage Target Filenames |
34 |
STAGE1 = stage1-$(SUBARCH)-$(VERSION).tar.bz2 |
35 |
STAGE2 = stage2-$(SUBARCH)-$(VERSION).tar.bz2 |
36 |
STAGE3 = stage3-$(SUBARCH)-$(VERSION).tar.bz2 |
37 |
STAGE4 = stage4-$(SUBARCH)-$(VERSION).tar.bz2 |
38 |
|
39 |
+STAGEDIR = $(CATALYST_STORE_DIR)/builds/$(RELTYPE) |
40 |
+ |
41 |
.PHONY: all |
42 |
|
43 |
all: $(STAGE1) $(STAGE2) $(STAGE3) |
44 |
-#all: $(STAGE1) $(STAGE2) $(STAGE3) tinderbox |
45 |
|
46 |
fetch: $(PORTAGE_SNAPSHOT) $(SEEDSTAGE) |
47 |
|
48 |
+clean: |
49 |
+ @rm -fr $(STAGE1_SPEC) $(STAGE2_SPEC) $(STAGE3_SPEC) $(STAGE4_SPEC) |
50 |
$(TINDERBOX_SPEC) $(LIVECD_STAGE1_SPEC) $(LIVECD_STAGE2_SPEC) |
51 |
$(CATALYST_CONF) $(CATALYST_RC) |
52 |
+ |
53 |
$(PORTAGE_SNAPSHOT): $(MIRROR_DIR)/snapshots/$(PORTAGE_SNAPSHOT) |
54 |
cp $? $@ |
55 |
|
56 |
@@ -38,8 +44,8 @@ |
57 |
@echo "snapshot: $(VERSION)" >> $@ |
58 |
@echo "source_subpath: $(RELTYPE)/$(SEEDSTAGE:.tar.bz2=)" >> $@ |
59 |
# no distcc |
60 |
- @if [ -d "$(PORTAGE_CONFDIR)" ] ; then \ |
61 |
- echo "portage_confdir: $(PORTAGE_CONFDIR)" >> $@ ; fi |
62 |
+ @if [ -d "$(PORTAGE_CONF_DIR)" ] ; then \ |
63 |
+ echo "portage_confdir: $(PORTAGE_CONF_DIR)" >> $@ ; fi |
64 |
@echo "chost: $(CHOST)" >> $@ |
65 |
@echo "cflags: $(CFLAGS)" >> $@ |
66 |
@echo "cxxflags: $(CXXFLAGS)" >> $@ |
67 |
@@ -56,8 +62,8 @@ |
68 |
@echo "snapshot: $(VERSION)" >> $@ |
69 |
@echo "source_subpath: $(RELTYPE)/$(STAGE1:.tar.bz2=)" >> $@ |
70 |
# no distcc |
71 |
- @if [ -d "$(PORTAGE_CONFDIR)" ] ; then \ |
72 |
- echo "portage_confdir: $(PORTAGE_CONFDIR)" >> $@ ; fi |
73 |
+ @if [ -d "$(PORTAGE_CONF_DIR)" ] ; then \ |
74 |
+ echo "portage_confdir: $(PORTAGE_CONF_DIR)" >> $@ ; fi |
75 |
@echo "chost: $(CHOST)" >> $@ |
76 |
@echo "cflags: $(CFLAGS)" >> $@ |
77 |
@echo "cxxflags: $(CXXFLAGS)" >> $@ |
78 |
@@ -73,8 +79,8 @@ |
79 |
@echo "snapshot: $(VERSION)" >> $@ |
80 |
@echo "source_subpath: $(RELTYPE)/$(STAGE2:.tar.bz2=)" >> $@ |
81 |
# no distcc |
82 |
- @if [ -d "$(PORTAGE_CONFDIR)" ] ; then \ |
83 |
- echo "portage_confdir: $(PORTAGE_CONFDIR)" >> $@ ; fi |
84 |
+ @if [ -d "$(PORTAGE_CONF_DIR)" ] ; then \ |
85 |
+ echo "portage_confdir: $(PORTAGE_CONF_DIR)" >> $@ ; fi |
86 |
|
87 |
$(TINDERBOX_SPEC): Makefile |
88 |
@rm -f $@ |
89 |
@@ -86,8 +92,8 @@ |
90 |
@echo "snapshot: $(VERSION)" >> $@ |
91 |
@echo "source_subpath: $(RELTYPE)/$(STAGE3:.tar.bz2=)" >> $@ |
92 |
# no distcc_hosts |
93 |
- @if [ -d "$(PORTAGE_CONFDIR)" ] ; then \ |
94 |
- echo "portage_confdir: $(PORTAGE_CONFDIR)" >> $@ ; fi |
95 |
+ @if [ -d "$(PORTAGE_CONF_DIR)" ] ; then \ |
96 |
+ echo "portage_confdir: $(PORTAGE_CONF_DIR)" >> $@ ; fi |
97 |
# default pkgcache_path |
98 |
@echo "tinderbox/use: $(TINDERBOX_USE)" >> $@ |
99 |
@echo "tinderbox/packages: $(TINDERBOX_PACKAGES)" >> $@ |
100 |
@@ -103,8 +109,8 @@ |
101 |
@echo "snapshot: $(VERSION)" >> $@ |
102 |
@echo "source_subpath: $(RELTYPE)/$(STAGE3:.tar.bz2=)" >> $@ |
103 |
# no distcc |
104 |
- @if [ -d "$(PORTAGE_CONFDIR)" ] ; then \ |
105 |
- echo "portage_confdir: $(PORTAGE_CONFDIR)" >> $@ ; fi |
106 |
+ @if [ -d "$(PORTAGE_CONF_DIR)" ] ; then \ |
107 |
+ echo "portage_confdir: $(PORTAGE_CONF_DIR)" >> $@ ; fi |
108 |
# no overlay |
109 |
# default pkgcache |
110 |
# default kerncache |
111 |
@@ -143,9 +149,9 @@ |
112 |
@echo "profile: $(STAGE2_PROFILE)" >> $@ |
113 |
@echo "snapshot: $(VERSION)" >> $@ |
114 |
@echo "source_subpath: $(RELTYPE)/$(STAGE3:.tar.bz2=)" >> $@ |
115 |
- @if [ -d "$(PORTAGE_CONFDIR)" ] ; then \ |
116 |
- echo "portage_confdir: $(PORTAGE_CONFDIR)" >> $@ ; fi |
117 |
- @cat "$(PACKAGE_FILE)" >> $@ |
118 |
+ @if [ -d "$(PORTAGE_CONF_DIR)" ] ; then \ |
119 |
+ echo "portage_confdir: $(PORTAGE_CONF_DIR)" >> $@ ; fi |
120 |
+ @cat "$(PACKAGE_CONF)" >> $@ |
121 |
|
122 |
$(LIVECD_STAGE2_SPEC): Makefile |
123 |
@rm -f $@ |
124 |
@@ -162,48 +168,62 @@ |
125 |
@echo "livecd/iso: $(RELTYPE)-$(VERSION).iso" >> $@ |
126 |
@echo "livecd/fsscript: $(FS_SCRIPT)" >> $@ |
127 |
@echo "livecd/root_overlay: $(ROOT_OVERLAY)" >> $@ |
128 |
- @if [ -d "$(PORTAGE_CONFDIR)" ] ; then \ |
129 |
- echo "portage_confdir: $(PORTAGE_CONFDIR)" >> $@ ; fi |
130 |
- @cat "$(LIVECD_FILE)" >> $@ |
131 |
+ @if [ -d "$(PORTAGE_CONF_DIR)" ] ; then \ |
132 |
+ echo "portage_confdir: $(PORTAGE_CONF_DIR)" >> $@ ; fi |
133 |
+ @cat "$(LIVECD_CONF)" >> $@ |
134 |
+ |
135 |
+$(CATALYST_RC): Makefile |
136 |
+ @touch $@ |
137 |
+ |
138 |
+$(CATALYST_CONF): Makefile $(CATALYST_RC) |
139 |
+ @rm -fr $@ |
140 |
+ @echo "digests=\"$(CATALYST_DIGESTS)\"" >> $@ |
141 |
+ @echo "distdir=\"$(CATALYST_DIST_DIR)\"" >> $@ |
142 |
+ @echo "envscript=\"$(WORK_DIR)/$(CATALYST_RC)\"" >> $@ |
143 |
+ @echo "hash_function=\"$(CATALYST_HASH)\"" >> $@ |
144 |
+ @echo "options=\"$(CATALYST_OPTIONS)\"" >> $@ |
145 |
+ @echo "portdir=\"$(CATALYST_PORT_DIR)\"" >> $@ |
146 |
+ @echo "sharedir=\"$(CATALYST_SHARE_DIR)\"" >> $@ |
147 |
+ @echo "snapshot_cache=\"$(TMP_DIR)/catalyst/snapshot_cache\"" >> $@ |
148 |
+ @echo "storedir=\"$(CATALYST_STORE_DIR)\"" >> $@ |
149 |
|
150 |
$(STAGEDIR)/$(SEEDSTAGE): $(SEEDSTAGE) |
151 |
mkdir -p $(STAGEDIR) |
152 |
cp "$(SEEDSTAGE)" "$(STAGEDIR)/$(SEEDSTAGE)" |
153 |
|
154 |
+$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2: $(PORTAGE_SNAPSHOT) |
155 |
+ mkdir -p $(CATALYST_STORE_DIR)/snapshots |
156 |
+ cp "$(PORTAGE_SNAPSHOT)" "$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2" |
157 |
|
158 |
-$(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2: $(PORTAGE_SNAPSHOT) |
159 |
- mkdir -p $(CATALYST_DIR)/snapshots |
160 |
- cp "$(PORTAGE_SNAPSHOT)" "$(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2" |
161 |
- |
162 |
-$(STAGEDIR)/$(STAGE1): $(STAGE1_SPEC) $(STAGEDIR)/$(SEEDSTAGE) $(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
163 |
- $(CATALYST_BIN) -c $(CATALYST_CONF) -f $(STAGE1_SPEC) |
164 |
+$(STAGEDIR)/$(STAGE1): $(STAGE1_SPEC) $(STAGEDIR)/$(SEEDSTAGE) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
165 |
+ $(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE1_SPEC) |
166 |
|
167 |
$(STAGE1): $(STAGEDIR)/$(STAGE1) |
168 |
cp "$(STAGEDIR)/$(STAGE1)" $@ |
169 |
|
170 |
-$(STAGEDIR)/$(STAGE2): $(STAGE2_SPEC) $(STAGEDIR)/$(STAGE1) $(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
171 |
- $(CATALYST_BIN) -c $(CATALYST_CONF) -f $(STAGE2_SPEC) |
172 |
+$(STAGEDIR)/$(STAGE2): $(STAGE2_SPEC) $(STAGEDIR)/$(STAGE1) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
173 |
+ $(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE2_SPEC) |
174 |
|
175 |
$(STAGE2): $(STAGEDIR)/$(STAGE2) |
176 |
cp "$(STAGEDIR)/$(STAGE2)" $@ |
177 |
|
178 |
-$(STAGEDIR)/$(STAGE3): $(STAGE3_SPEC) $(STAGEDIR)/$(STAGE2) $(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
179 |
- $(CATALYST_BIN) -c $(CATALYST_CONF) -f $(STAGE3_SPEC) |
180 |
+$(STAGEDIR)/$(STAGE3): $(STAGE3_SPEC) $(STAGEDIR)/$(STAGE2) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
181 |
+ $(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE3_SPEC) |
182 |
|
183 |
$(STAGE3): $(STAGEDIR)/$(STAGE3) |
184 |
cp "$(STAGEDIR)/$(STAGE3)" $@ |
185 |
|
186 |
-$(STAGEDIR)/$(STAGE4): $(STAGE4_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
187 |
- $(CATALYST_BIN) -c $(CATALYST_CONF) -f $(STAGE4_SPEC) |
188 |
+$(STAGEDIR)/$(STAGE4): $(STAGE4_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
189 |
+ $(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE4_SPEC) |
190 |
|
191 |
$(STAGE4): $(STAGEDIR)/$(STAGE4) |
192 |
cp "$(STAGEDIR)/$(STAGE4)" $@ |
193 |
|
194 |
-livecd-stage1: $(LIVECD_STAGE1_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
195 |
- $(CATALYST_BIN) -c $(CATALYST_CONF) -f $(LIVECD_STAGE1_SPEC) |
196 |
+livecd-stage1: $(LIVECD_STAGE1_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
197 |
+ $(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(LIVECD_STAGE1_SPEC) |
198 |
|
199 |
-livecd-stage2: $(LIVECD_STAGE2_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
200 |
- $(CATALYST_BIN) -c $(CATALYST_CONF) -f $(LIVECD_STAGE2_SPEC) |
201 |
+livecd-stage2: $(LIVECD_STAGE2_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
202 |
+ $(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(LIVECD_STAGE2_SPEC) |
203 |
|
204 |
-tinderbox: $(TINDERBOX_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
205 |
- $(CATALYST_BIN) -c $(CATALYST_CONF) -f $(TINDERBOX_SPEC) |
206 |
+tinderbox: $(TINDERBOX_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
207 |
+ $(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(TINDERBOX_SPEC) |
208 |
|
209 |
Modified: trunk/tools/rebuild_stages/i386-uclibc/Makefile |
210 |
============================================================================== |
211 |
--- trunk/tools/rebuild_stages/i386-uclibc/Makefile (original) |
212 |
+++ trunk/tools/rebuild_stages/i386-uclibc/Makefile Mon Jun 23 08:54:35 2008 |
213 |
@@ -22,27 +22,37 @@ |
214 |
TINDERBOX_USE = |
215 |
TINDERBOX_PACKAGES = vim cups samba ntp apache |
216 |
|
217 |
+# LiveCD Configuration |
218 |
+PACKAGE_CONF = packages.conf |
219 |
+LIVECD_CONF = livecd.conf |
220 |
+FS_SCRIPT = fsscript |
221 |
+ROOT_OVERLAY = root_overlay |
222 |
+ |
223 |
# Portage Snapshot Configuration |
224 |
PORTAGE_VERSION = $(VERSION) |
225 |
PORTAGE_SNAPSHOT = portage-${PORTAGE_VERSION}.tar.bz2 |
226 |
|
227 |
+# Catalyst Configuration |
228 |
+CATALYST_BIN = /usr/bin/catalyst |
229 |
+CATALYST_SHARE_DIR = /usr/lib/catalyst |
230 |
+CATALYST_STORE_DIR = $(TMP_DIR)/catalyst_i386-uclibc |
231 |
+CATALYST_DIGESTS = md5 sha1 |
232 |
+CATALYST_HASH = crc32 |
233 |
+CATALYST_OPTIONS = kerncache pkgcache seedcache snapcache |
234 |
+CATALYST_PORT_DIR = /usr/portage |
235 |
+CATALYST_DIST_DIR = $(CATALYST_PORT_DIR)/distfiles |
236 |
+ |
237 |
# Directory Configuration |
238 |
WORK_DIR = /root/work/catalyst/i386-uclibc |
239 |
+TMP_DIR = /var/tmp |
240 |
MIRROR_DIR = /home/stoile/public_html/gentoo |
241 |
|
242 |
#STAGE3_TARBALL = releases/experimental/x86/embedded/stages/stage3-x86-uclibc-2006.1.tar.bz2 |
243 |
-CATALYST_BIN = /usr/bin/catalyst |
244 |
-CATALYST_CONF = $(WORK_DIR)/catalyst.conf |
245 |
|
246 |
-CATALYST_DIR = /var/tmp/catalyst_i386-uclibc |
247 |
-PACKAGE_FILE = packages.conf |
248 |
-LIVECD_FILE = livecd.conf |
249 |
-FS_SCRIPT = fsscript |
250 |
-ROOT_OVERLAY = root_overlay |
251 |
|
252 |
SEEDSTAGE = seedstage-x86-latest-r2.tar.bz2 |
253 |
#SEEDSTAGE = stage3-x86-uclibc-2008.0_beta2.tar.bz2 |
254 |
|
255 |
-PORTAGE_CONFDIR = $(WORK_DIR)/portage |
256 |
+PORTAGE_CONF_DIR = $(WORK_DIR)/portage |
257 |
|
258 |
include ../Makefile |
259 |
-- |
260 |
gnap-dev@l.g.o mailing list |