1 |
On Fri, 2013-07-19 at 21:52 -0700, Matt Turner wrote: |
2 |
> I'm not okay with redoing the rename the branches trick. Let's use git |
3 |
> how it's supposed to be used. |
4 |
> |
5 |
> I've rebased the origin/3.0 branch onto master. There are 81 patches in it. |
6 |
> |
7 |
> All of the differences between origin/3.0 and rewrite-on-master seem |
8 |
> to be mistakes in the 3.0 branch. |
9 |
> |
10 |
> I'm not advocating pushing this to master yet. The series needs review |
11 |
> and some clean up. |
12 |
> |
13 |
|
14 |
No, there is no 3.0 mistakes in the diff, a few minor differences and |
15 |
the bindist and unpack_command commits that weren't in my 3.0 rewrite. |
16 |
|
17 |
But I do agree that there is a little more to fix before pushing to |
18 |
master. I explained the differences below in the diffs. |
19 |
|
20 |
|
21 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
22 |
index b0144f6..8f380ab 100644 |
23 |
--- a/catalyst/base/stagebase.py |
24 |
+++ b/catalyst/base/stagebase.py |
25 |
@@ -683,7 +683,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
26 |
unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
27 |
self.settings["chroot_path"] |
28 |
else: |
29 |
- unpack_cmd="tar xpf "+self.settings["source_path"]+" -C "+\ |
30 |
+ unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
31 |
self.settings["chroot_path"] |
32 |
error_msg="Tarball extraction of "+\ |
33 |
self.settings["source_path"]+" to "+\ |
34 |
@@ -698,7 +698,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
35 |
unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
36 |
self.settings["chroot_path"] |
37 |
else: |
38 |
- unpack_cmd="tar xpf "+self.settings["source_path"]+" -C "+\ |
39 |
+ unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
40 |
self.settings["chroot_path"] |
41 |
error_msg="Tarball extraction of "+self.settings["source_path"]+\ |
42 |
" to "+self.settings["chroot_path"]+" failed." |
43 |
|
44 |
|
45 |
This is from the 3 commits Zero_Chaos did which reduces the if: else: code block to the exact |
46 |
same unpack_command no matter what the if evaluates to. |
47 |
No matter, the new compress.py code I have nearly done, completely rewrites this whole section. |
48 |
|
49 |
|
50 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
51 |
index d327a1b..d0def22 100644 |
52 |
--- a/catalyst/defaults.py |
53 |
+++ b/catalyst/defaults.py |
54 |
@@ -104,9 +104,9 @@ option_messages = { |
55 |
"icecream": "Icecream compiler cluster support enabled.", |
56 |
"kerncache": "Kernel cache support enabled.", |
57 |
"pkgcache": "Package cache support enabled.", |
58 |
+ "preserve_libs": "Preserving libs during unmerge.", |
59 |
"purge": "Purge support enabled.", |
60 |
"seedcache": "Seed cache support enabled.", |
61 |
"snapcache": "Snapshot cache support enabled.", |
62 |
- 'preserve_libs': "Preserving libs during unmerge.", |
63 |
#"tarball": "Tarball creation enabled.", |
64 |
} |
65 |
|
66 |
This un-does a sort, where I moved 'preserve_libs' to a sorted order... meh. |
67 |
|
68 |
|
69 |
diff --git a/catalyst/main.py b/catalyst/main.py |
70 |
index 6f8bd8d..08c69ca 100644 |
71 |
--- a/catalyst/main.py |
72 |
+++ b/catalyst/main.py |
73 |
@@ -116,6 +116,14 @@ def parse_config(myconfig): |
74 |
# add our python base directory to use for loading target arch's |
75 |
conf_values["PythonDir"] = __selfpath__ |
76 |
|
77 |
+ |
78 |
+ if "bindist" in string.split(conf_values["options"]): |
79 |
+ print "Binary redistribution enabled" |
80 |
+ else: |
81 |
+ print "Bindist is not enabled in catalyst.conf" |
82 |
+ print "Binary redistribution of generated stages/isos may be prohibited by law." |
83 |
+ print "Please see the use description for bindist on any package you are including." |
84 |
+ |
85 |
# print out any options messages |
86 |
for opt in conf_values['options']: |
87 |
if opt in option_messages: |
88 |
|
89 |
The bindist commit that was not in my branch yet. |
90 |
|
91 |
|
92 |
diff --git a/etc/catalyst.conf b/etc/catalyst.conf |
93 |
index a65413c..d52a5c8 100644 |
94 |
--- a/etc/catalyst.conf |
95 |
+++ b/etc/catalyst.conf |
96 |
@@ -60,7 +60,7 @@ hash_function="crc32" |
97 |
# pkgcache = keeps a tbz2 of every built package (useful if your build stops |
98 |
# prematurely) |
99 |
# preserve_libs = enables portage to preserve used libs when unmerging packages |
100 |
-# (used on installcd-stage2 and stage4 targets) |
101 |
+# (used on installcd-stage2 and stage4 targets) |
102 |
# seedcache = use the build output of a previous target if it exists to speed up |
103 |
# the copy |
104 |
# snapcache = cache the snapshot so that it can be bind-mounted into the chroot. |
105 |
|
106 |
|
107 |
A minor comment indent change I made in 3.0 is lost. |
108 |
|
109 |
|
110 |
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh |
111 |
index a5d6a01..4ddb636 100755 |
112 |
--- a/targets/stage1/stage1-chroot.sh |
113 |
+++ b/targets/stage1/stage1-chroot.sh |
114 |
@@ -41,6 +41,9 @@ if [ -n "${clst_update_seed}" ]; then |
115 |
echo "Invalid setting for update_seed: ${clst_update_seed}" |
116 |
exit 1 |
117 |
fi |
118 |
+ |
119 |
+ # reset emerge options for the target |
120 |
+ clst_update_seed=no setup_myemergeopts |
121 |
else |
122 |
echo "Skipping seed stage update..." |
123 |
fi |
124 |
|
125 |
|
126 |
This one I want to check out more why it is different, but I suspect |
127 |
it is a difference in what Jorge committed to master which was a little different |
128 |
than I had in 3.0. I later rebased those changes a few times once we got the bugs |
129 |
worked out. |
130 |
|
131 |
|
132 |
|
133 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
134 |
index 39bb1cd..6271dc4 100755 |
135 |
--- a/targets/support/chroot-functions.sh |
136 |
+++ b/targets/support/chroot-functions.sh |
137 |
@@ -133,6 +133,7 @@ setup_myemergeopts(){ |
138 |
then |
139 |
export bootstrap_opts="${bootstrap_opts} -f" |
140 |
export clst_myemergeopts="${clst_myemergeopts} -f" |
141 |
+ # if we have PKGCACHE, and either update_seed is empty or 'no', make and use binpkgs |
142 |
elif [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ] |
143 |
then |
144 |
# if you add --usepkg, then also add --binpkg-respect-use=y |
145 |
|
146 |
The difference in jmbvicetto's commit to master, as opposed to mine in 3.0, it's just a comment. |