| 1 |
commit: abfefda263b3caf814e9f8d3a7b69959c9c26588 |
| 2 |
Author: Felix Janda <felix.janda <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Fri May 23 19:48:58 2014 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 30 20:21:16 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=abfefda2 |
| 7 |
|
| 8 |
tools-musl/catalyst: add missing variants of amd64 and i686 |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
--- |
| 13 |
tools-musl/catalyst/portage.amd64.hardened/bashrc | 15 +++++++++++++++ |
| 14 |
.../catalyst/portage.amd64.hardened/env/libintl.conf | 2 ++ |
| 15 |
.../catalyst/portage.amd64.hardened/env/parallel.conf | 1 + |
| 16 |
.../catalyst/portage.amd64.hardened/make.profile/parent | 1 + |
| 17 |
tools-musl/catalyst/portage.amd64.hardened/package.env | 9 +++++++++ |
| 18 |
.../catalyst/portage.amd64.hardened/package.keywords | 2 ++ |
| 19 |
tools-musl/catalyst/portage.amd64.hardened/package.mask | 3 +++ |
| 20 |
tools-musl/catalyst/portage.amd64.hardened/package.unmask | 1 + |
| 21 |
tools-musl/catalyst/portage.amd64.hardened/package.use | 1 + |
| 22 |
tools-musl/catalyst/portage.amd64.vanilla/bashrc | 8 ++++---- |
| 23 |
.../catalyst/portage.amd64.vanilla/make.profile/use.mask | 1 + |
| 24 |
tools-musl/catalyst/portage.i686.hardened/bashrc | 15 +++++++++++++++ |
| 25 |
.../catalyst/portage.i686.hardened/env/libintl.conf | 2 ++ |
| 26 |
.../catalyst/portage.i686.hardened/env/parallel.conf | 1 + |
| 27 |
.../catalyst/portage.i686.hardened/make.profile/parent | 1 + |
| 28 |
tools-musl/catalyst/portage.i686.hardened/package.env | 9 +++++++++ |
| 29 |
.../catalyst/portage.i686.hardened/package.keywords | 2 ++ |
| 30 |
tools-musl/catalyst/portage.i686.hardened/package.mask | 3 +++ |
| 31 |
tools-musl/catalyst/portage.i686.hardened/package.unmask | 1 + |
| 32 |
tools-musl/catalyst/portage.i686.hardened/package.use | 1 + |
| 33 |
tools-musl/catalyst/portage.i686.vanilla/bashrc | 15 +++++++++++++++ |
| 34 |
tools-musl/catalyst/portage.i686.vanilla/env/libintl.conf | 2 ++ |
| 35 |
.../catalyst/portage.i686.vanilla/env/parallel.conf | 1 + |
| 36 |
.../catalyst/portage.i686.vanilla/make.profile/parent | 1 + |
| 37 |
.../catalyst/portage.i686.vanilla/make.profile/use.mask | 1 + |
| 38 |
tools-musl/catalyst/portage.i686.vanilla/package.env | 9 +++++++++ |
| 39 |
tools-musl/catalyst/portage.i686.vanilla/package.keywords | 2 ++ |
| 40 |
tools-musl/catalyst/portage.i686.vanilla/package.mask | 3 +++ |
| 41 |
tools-musl/catalyst/portage.i686.vanilla/package.unmask | 1 + |
| 42 |
tools-musl/catalyst/portage.i686.vanilla/package.use | 1 + |
| 43 |
tools-musl/catalyst/run.sh | 12 ++++-------- |
| 44 |
31 files changed, 115 insertions(+), 12 deletions(-) |
| 45 |
|
| 46 |
diff --git a/tools-musl/catalyst/portage.amd64.hardened/bashrc b/tools-musl/catalyst/portage.amd64.hardened/bashrc |
| 47 |
new file mode 100644 |
| 48 |
index 0000000..70b67d2 |
| 49 |
--- /dev/null |
| 50 |
+++ b/tools-musl/catalyst/portage.amd64.hardened/bashrc |
| 51 |
@@ -0,0 +1,15 @@ |
| 52 |
+post_src_install() { |
| 53 |
+ [[ $PN != musl ]] && return 0 |
| 54 |
+ |
| 55 |
+ local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1) |
| 56 |
+ mkdir "${D}"/usr/etc |
| 57 |
+ cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF |
| 58 |
+/lib |
| 59 |
+/usr/lib |
| 60 |
+/usr/local/lib |
| 61 |
+/usr/lib/opengl/xorg-x11/lib |
| 62 |
+/usr/lib/gcc/${CHOST}/4.7.3 |
| 63 |
+/usr/${CHOST}/lib |
| 64 |
+/usr/games/lib |
| 65 |
+EOF |
| 66 |
+} |
| 67 |
|
| 68 |
diff --git a/tools-musl/catalyst/portage.amd64.hardened/env/libintl.conf b/tools-musl/catalyst/portage.amd64.hardened/env/libintl.conf |
| 69 |
new file mode 100644 |
| 70 |
index 0000000..06356b5 |
| 71 |
--- /dev/null |
| 72 |
+++ b/tools-musl/catalyst/portage.amd64.hardened/env/libintl.conf |
| 73 |
@@ -0,0 +1,2 @@ |
| 74 |
+CFLAGS="-Wl,-lintl" |
| 75 |
+LDFLAGS="-lintl" |
| 76 |
|
| 77 |
diff --git a/tools-musl/catalyst/portage.amd64.hardened/env/parallel.conf b/tools-musl/catalyst/portage.amd64.hardened/env/parallel.conf |
| 78 |
new file mode 100644 |
| 79 |
index 0000000..c67232a |
| 80 |
--- /dev/null |
| 81 |
+++ b/tools-musl/catalyst/portage.amd64.hardened/env/parallel.conf |
| 82 |
@@ -0,0 +1 @@ |
| 83 |
+MAKEOPTS=-j1 |
| 84 |
|
| 85 |
diff --git a/tools-musl/catalyst/portage.amd64.hardened/make.profile/parent b/tools-musl/catalyst/portage.amd64.hardened/make.profile/parent |
| 86 |
new file mode 100644 |
| 87 |
index 0000000..d224f93 |
| 88 |
--- /dev/null |
| 89 |
+++ b/tools-musl/catalyst/portage.amd64.hardened/make.profile/parent |
| 90 |
@@ -0,0 +1 @@ |
| 91 |
+/usr/portage/profiles/hardened/linux/musl/amd64 |
| 92 |
|
| 93 |
diff --git a/tools-musl/catalyst/portage.amd64.hardened/package.env b/tools-musl/catalyst/portage.amd64.hardened/package.env |
| 94 |
new file mode 100644 |
| 95 |
index 0000000..3574877 |
| 96 |
--- /dev/null |
| 97 |
+++ b/tools-musl/catalyst/portage.amd64.hardened/package.env |
| 98 |
@@ -0,0 +1,9 @@ |
| 99 |
+dev-libs/glib libintl.conf |
| 100 |
+dev-libs/libelf libintl.conf |
| 101 |
+sys-apps/attr libintl.conf |
| 102 |
+sys-apps/kbd libintl.conf |
| 103 |
+sys-apps/man-db parallel.conf |
| 104 |
+sys-apps/net-tools libintl.conf |
| 105 |
+sys-fs/e2fsprogs libintl.conf |
| 106 |
+sys-fs/eudev libintl.conf |
| 107 |
+sys-process/procps libintl.conf |
| 108 |
|
| 109 |
diff --git a/tools-musl/catalyst/portage.amd64.hardened/package.keywords b/tools-musl/catalyst/portage.amd64.hardened/package.keywords |
| 110 |
new file mode 100644 |
| 111 |
index 0000000..9a9769c |
| 112 |
--- /dev/null |
| 113 |
+++ b/tools-musl/catalyst/portage.amd64.hardened/package.keywords |
| 114 |
@@ -0,0 +1,2 @@ |
| 115 |
+=sys-libs/musl-1.1.0 ~* |
| 116 |
+=sys-apps/getent-0 ~* |
| 117 |
|
| 118 |
diff --git a/tools-musl/catalyst/portage.amd64.hardened/package.mask b/tools-musl/catalyst/portage.amd64.hardened/package.mask |
| 119 |
new file mode 100644 |
| 120 |
index 0000000..794369e |
| 121 |
--- /dev/null |
| 122 |
+++ b/tools-musl/catalyst/portage.amd64.hardened/package.mask |
| 123 |
@@ -0,0 +1,3 @@ |
| 124 |
+>sys-devel/gcc-4.7.3-r99 |
| 125 |
+sys-apps/systemd |
| 126 |
+sys-fs/udev |
| 127 |
|
| 128 |
diff --git a/tools-musl/catalyst/portage.amd64.hardened/package.unmask b/tools-musl/catalyst/portage.amd64.hardened/package.unmask |
| 129 |
new file mode 100644 |
| 130 |
index 0000000..6aabccd |
| 131 |
--- /dev/null |
| 132 |
+++ b/tools-musl/catalyst/portage.amd64.hardened/package.unmask |
| 133 |
@@ -0,0 +1 @@ |
| 134 |
+=dev-libs/openssl-1.0.1g-r99::hardened-dev |
| 135 |
|
| 136 |
diff --git a/tools-musl/catalyst/portage.amd64.hardened/package.use b/tools-musl/catalyst/portage.amd64.hardened/package.use |
| 137 |
new file mode 100644 |
| 138 |
index 0000000..4ef695a |
| 139 |
--- /dev/null |
| 140 |
+++ b/tools-musl/catalyst/portage.amd64.hardened/package.use |
| 141 |
@@ -0,0 +1 @@ |
| 142 |
+sys-libs/musl nls |
| 143 |
|
| 144 |
diff --git a/tools-musl/catalyst/portage.amd64.vanilla/bashrc b/tools-musl/catalyst/portage.amd64.vanilla/bashrc |
| 145 |
index dac928d..70b67d2 100644 |
| 146 |
--- a/tools-musl/catalyst/portage.amd64.vanilla/bashrc |
| 147 |
+++ b/tools-musl/catalyst/portage.amd64.vanilla/bashrc |
| 148 |
@@ -1,15 +1,15 @@ |
| 149 |
post_src_install() { |
| 150 |
[[ $PN != musl ]] && return 0 |
| 151 |
|
| 152 |
- local arch=$(basename "${D}"/lib/ld-musl-*.so.1) |
| 153 |
+ local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1) |
| 154 |
mkdir "${D}"/usr/etc |
| 155 |
- cat > "${D}"/usr/etc/${arch%so.1}path <<EOF |
| 156 |
+ cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF |
| 157 |
/lib |
| 158 |
/usr/lib |
| 159 |
/usr/local/lib |
| 160 |
/usr/lib/opengl/xorg-x11/lib |
| 161 |
-/usr/lib/gcc/x86_64-gentoo-linux-musl/4.7.3 |
| 162 |
-/usr/x86_64-gentoo-linux-musl/lib |
| 163 |
+/usr/lib/gcc/${CHOST}/4.7.3 |
| 164 |
+/usr/${CHOST}/lib |
| 165 |
/usr/games/lib |
| 166 |
EOF |
| 167 |
} |
| 168 |
|
| 169 |
diff --git a/tools-musl/catalyst/portage.amd64.vanilla/make.profile/use.mask b/tools-musl/catalyst/portage.amd64.vanilla/make.profile/use.mask |
| 170 |
new file mode 100644 |
| 171 |
index 0000000..cf56f2f |
| 172 |
--- /dev/null |
| 173 |
+++ b/tools-musl/catalyst/portage.amd64.vanilla/make.profile/use.mask |
| 174 |
@@ -0,0 +1 @@ |
| 175 |
+hardened |
| 176 |
|
| 177 |
diff --git a/tools-musl/catalyst/portage.i686.hardened/bashrc b/tools-musl/catalyst/portage.i686.hardened/bashrc |
| 178 |
new file mode 100644 |
| 179 |
index 0000000..70b67d2 |
| 180 |
--- /dev/null |
| 181 |
+++ b/tools-musl/catalyst/portage.i686.hardened/bashrc |
| 182 |
@@ -0,0 +1,15 @@ |
| 183 |
+post_src_install() { |
| 184 |
+ [[ $PN != musl ]] && return 0 |
| 185 |
+ |
| 186 |
+ local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1) |
| 187 |
+ mkdir "${D}"/usr/etc |
| 188 |
+ cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF |
| 189 |
+/lib |
| 190 |
+/usr/lib |
| 191 |
+/usr/local/lib |
| 192 |
+/usr/lib/opengl/xorg-x11/lib |
| 193 |
+/usr/lib/gcc/${CHOST}/4.7.3 |
| 194 |
+/usr/${CHOST}/lib |
| 195 |
+/usr/games/lib |
| 196 |
+EOF |
| 197 |
+} |
| 198 |
|
| 199 |
diff --git a/tools-musl/catalyst/portage.i686.hardened/env/libintl.conf b/tools-musl/catalyst/portage.i686.hardened/env/libintl.conf |
| 200 |
new file mode 100644 |
| 201 |
index 0000000..06356b5 |
| 202 |
--- /dev/null |
| 203 |
+++ b/tools-musl/catalyst/portage.i686.hardened/env/libintl.conf |
| 204 |
@@ -0,0 +1,2 @@ |
| 205 |
+CFLAGS="-Wl,-lintl" |
| 206 |
+LDFLAGS="-lintl" |
| 207 |
|
| 208 |
diff --git a/tools-musl/catalyst/portage.i686.hardened/env/parallel.conf b/tools-musl/catalyst/portage.i686.hardened/env/parallel.conf |
| 209 |
new file mode 100644 |
| 210 |
index 0000000..c67232a |
| 211 |
--- /dev/null |
| 212 |
+++ b/tools-musl/catalyst/portage.i686.hardened/env/parallel.conf |
| 213 |
@@ -0,0 +1 @@ |
| 214 |
+MAKEOPTS=-j1 |
| 215 |
|
| 216 |
diff --git a/tools-musl/catalyst/portage.i686.hardened/make.profile/parent b/tools-musl/catalyst/portage.i686.hardened/make.profile/parent |
| 217 |
new file mode 100644 |
| 218 |
index 0000000..b9abebd |
| 219 |
--- /dev/null |
| 220 |
+++ b/tools-musl/catalyst/portage.i686.hardened/make.profile/parent |
| 221 |
@@ -0,0 +1 @@ |
| 222 |
+/usr/portage/profiles/hardened/linux/musl/x86 |
| 223 |
|
| 224 |
diff --git a/tools-musl/catalyst/portage.i686.hardened/package.env b/tools-musl/catalyst/portage.i686.hardened/package.env |
| 225 |
new file mode 100644 |
| 226 |
index 0000000..3574877 |
| 227 |
--- /dev/null |
| 228 |
+++ b/tools-musl/catalyst/portage.i686.hardened/package.env |
| 229 |
@@ -0,0 +1,9 @@ |
| 230 |
+dev-libs/glib libintl.conf |
| 231 |
+dev-libs/libelf libintl.conf |
| 232 |
+sys-apps/attr libintl.conf |
| 233 |
+sys-apps/kbd libintl.conf |
| 234 |
+sys-apps/man-db parallel.conf |
| 235 |
+sys-apps/net-tools libintl.conf |
| 236 |
+sys-fs/e2fsprogs libintl.conf |
| 237 |
+sys-fs/eudev libintl.conf |
| 238 |
+sys-process/procps libintl.conf |
| 239 |
|
| 240 |
diff --git a/tools-musl/catalyst/portage.i686.hardened/package.keywords b/tools-musl/catalyst/portage.i686.hardened/package.keywords |
| 241 |
new file mode 100644 |
| 242 |
index 0000000..9a9769c |
| 243 |
--- /dev/null |
| 244 |
+++ b/tools-musl/catalyst/portage.i686.hardened/package.keywords |
| 245 |
@@ -0,0 +1,2 @@ |
| 246 |
+=sys-libs/musl-1.1.0 ~* |
| 247 |
+=sys-apps/getent-0 ~* |
| 248 |
|
| 249 |
diff --git a/tools-musl/catalyst/portage.i686.hardened/package.mask b/tools-musl/catalyst/portage.i686.hardened/package.mask |
| 250 |
new file mode 100644 |
| 251 |
index 0000000..794369e |
| 252 |
--- /dev/null |
| 253 |
+++ b/tools-musl/catalyst/portage.i686.hardened/package.mask |
| 254 |
@@ -0,0 +1,3 @@ |
| 255 |
+>sys-devel/gcc-4.7.3-r99 |
| 256 |
+sys-apps/systemd |
| 257 |
+sys-fs/udev |
| 258 |
|
| 259 |
diff --git a/tools-musl/catalyst/portage.i686.hardened/package.unmask b/tools-musl/catalyst/portage.i686.hardened/package.unmask |
| 260 |
new file mode 100644 |
| 261 |
index 0000000..6aabccd |
| 262 |
--- /dev/null |
| 263 |
+++ b/tools-musl/catalyst/portage.i686.hardened/package.unmask |
| 264 |
@@ -0,0 +1 @@ |
| 265 |
+=dev-libs/openssl-1.0.1g-r99::hardened-dev |
| 266 |
|
| 267 |
diff --git a/tools-musl/catalyst/portage.i686.hardened/package.use b/tools-musl/catalyst/portage.i686.hardened/package.use |
| 268 |
new file mode 100644 |
| 269 |
index 0000000..4ef695a |
| 270 |
--- /dev/null |
| 271 |
+++ b/tools-musl/catalyst/portage.i686.hardened/package.use |
| 272 |
@@ -0,0 +1 @@ |
| 273 |
+sys-libs/musl nls |
| 274 |
|
| 275 |
diff --git a/tools-musl/catalyst/portage.i686.vanilla/bashrc b/tools-musl/catalyst/portage.i686.vanilla/bashrc |
| 276 |
new file mode 100644 |
| 277 |
index 0000000..70b67d2 |
| 278 |
--- /dev/null |
| 279 |
+++ b/tools-musl/catalyst/portage.i686.vanilla/bashrc |
| 280 |
@@ -0,0 +1,15 @@ |
| 281 |
+post_src_install() { |
| 282 |
+ [[ $PN != musl ]] && return 0 |
| 283 |
+ |
| 284 |
+ local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1) |
| 285 |
+ mkdir "${D}"/usr/etc |
| 286 |
+ cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF |
| 287 |
+/lib |
| 288 |
+/usr/lib |
| 289 |
+/usr/local/lib |
| 290 |
+/usr/lib/opengl/xorg-x11/lib |
| 291 |
+/usr/lib/gcc/${CHOST}/4.7.3 |
| 292 |
+/usr/${CHOST}/lib |
| 293 |
+/usr/games/lib |
| 294 |
+EOF |
| 295 |
+} |
| 296 |
|
| 297 |
diff --git a/tools-musl/catalyst/portage.i686.vanilla/env/libintl.conf b/tools-musl/catalyst/portage.i686.vanilla/env/libintl.conf |
| 298 |
new file mode 100644 |
| 299 |
index 0000000..06356b5 |
| 300 |
--- /dev/null |
| 301 |
+++ b/tools-musl/catalyst/portage.i686.vanilla/env/libintl.conf |
| 302 |
@@ -0,0 +1,2 @@ |
| 303 |
+CFLAGS="-Wl,-lintl" |
| 304 |
+LDFLAGS="-lintl" |
| 305 |
|
| 306 |
diff --git a/tools-musl/catalyst/portage.i686.vanilla/env/parallel.conf b/tools-musl/catalyst/portage.i686.vanilla/env/parallel.conf |
| 307 |
new file mode 100644 |
| 308 |
index 0000000..c67232a |
| 309 |
--- /dev/null |
| 310 |
+++ b/tools-musl/catalyst/portage.i686.vanilla/env/parallel.conf |
| 311 |
@@ -0,0 +1 @@ |
| 312 |
+MAKEOPTS=-j1 |
| 313 |
|
| 314 |
diff --git a/tools-musl/catalyst/portage.i686.vanilla/make.profile/parent b/tools-musl/catalyst/portage.i686.vanilla/make.profile/parent |
| 315 |
new file mode 100644 |
| 316 |
index 0000000..b9abebd |
| 317 |
--- /dev/null |
| 318 |
+++ b/tools-musl/catalyst/portage.i686.vanilla/make.profile/parent |
| 319 |
@@ -0,0 +1 @@ |
| 320 |
+/usr/portage/profiles/hardened/linux/musl/x86 |
| 321 |
|
| 322 |
diff --git a/tools-musl/catalyst/portage.i686.vanilla/make.profile/use.mask b/tools-musl/catalyst/portage.i686.vanilla/make.profile/use.mask |
| 323 |
new file mode 100644 |
| 324 |
index 0000000..cf56f2f |
| 325 |
--- /dev/null |
| 326 |
+++ b/tools-musl/catalyst/portage.i686.vanilla/make.profile/use.mask |
| 327 |
@@ -0,0 +1 @@ |
| 328 |
+hardened |
| 329 |
|
| 330 |
diff --git a/tools-musl/catalyst/portage.i686.vanilla/package.env b/tools-musl/catalyst/portage.i686.vanilla/package.env |
| 331 |
new file mode 100644 |
| 332 |
index 0000000..3574877 |
| 333 |
--- /dev/null |
| 334 |
+++ b/tools-musl/catalyst/portage.i686.vanilla/package.env |
| 335 |
@@ -0,0 +1,9 @@ |
| 336 |
+dev-libs/glib libintl.conf |
| 337 |
+dev-libs/libelf libintl.conf |
| 338 |
+sys-apps/attr libintl.conf |
| 339 |
+sys-apps/kbd libintl.conf |
| 340 |
+sys-apps/man-db parallel.conf |
| 341 |
+sys-apps/net-tools libintl.conf |
| 342 |
+sys-fs/e2fsprogs libintl.conf |
| 343 |
+sys-fs/eudev libintl.conf |
| 344 |
+sys-process/procps libintl.conf |
| 345 |
|
| 346 |
diff --git a/tools-musl/catalyst/portage.i686.vanilla/package.keywords b/tools-musl/catalyst/portage.i686.vanilla/package.keywords |
| 347 |
new file mode 100644 |
| 348 |
index 0000000..9a9769c |
| 349 |
--- /dev/null |
| 350 |
+++ b/tools-musl/catalyst/portage.i686.vanilla/package.keywords |
| 351 |
@@ -0,0 +1,2 @@ |
| 352 |
+=sys-libs/musl-1.1.0 ~* |
| 353 |
+=sys-apps/getent-0 ~* |
| 354 |
|
| 355 |
diff --git a/tools-musl/catalyst/portage.i686.vanilla/package.mask b/tools-musl/catalyst/portage.i686.vanilla/package.mask |
| 356 |
new file mode 100644 |
| 357 |
index 0000000..794369e |
| 358 |
--- /dev/null |
| 359 |
+++ b/tools-musl/catalyst/portage.i686.vanilla/package.mask |
| 360 |
@@ -0,0 +1,3 @@ |
| 361 |
+>sys-devel/gcc-4.7.3-r99 |
| 362 |
+sys-apps/systemd |
| 363 |
+sys-fs/udev |
| 364 |
|
| 365 |
diff --git a/tools-musl/catalyst/portage.i686.vanilla/package.unmask b/tools-musl/catalyst/portage.i686.vanilla/package.unmask |
| 366 |
new file mode 100644 |
| 367 |
index 0000000..6aabccd |
| 368 |
--- /dev/null |
| 369 |
+++ b/tools-musl/catalyst/portage.i686.vanilla/package.unmask |
| 370 |
@@ -0,0 +1 @@ |
| 371 |
+=dev-libs/openssl-1.0.1g-r99::hardened-dev |
| 372 |
|
| 373 |
diff --git a/tools-musl/catalyst/portage.i686.vanilla/package.use b/tools-musl/catalyst/portage.i686.vanilla/package.use |
| 374 |
new file mode 100644 |
| 375 |
index 0000000..4ef695a |
| 376 |
--- /dev/null |
| 377 |
+++ b/tools-musl/catalyst/portage.i686.vanilla/package.use |
| 378 |
@@ -0,0 +1 @@ |
| 379 |
+sys-libs/musl nls |
| 380 |
|
| 381 |
diff --git a/tools-musl/catalyst/run.sh b/tools-musl/catalyst/run.sh |
| 382 |
index f72f925..4cfb5b3 100755 |
| 383 |
--- a/tools-musl/catalyst/run.sh |
| 384 |
+++ b/tools-musl/catalyst/run.sh |
| 385 |
@@ -106,18 +106,14 @@ main() { |
| 386 |
|
| 387 |
catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err |
| 388 |
|
| 389 |
-# for arch in amd64 i686; do |
| 390 |
-# for flavor in hardened vanilla; do |
| 391 |
- for arch in amd64; do |
| 392 |
- for flavor in vanilla; do |
| 393 |
+ for arch in amd64 i686; do |
| 394 |
+ for flavor in hardened vanilla; do |
| 395 |
prepare_confs ${arch} ${flavor} |
| 396 |
done |
| 397 |
done |
| 398 |
|
| 399 |
-# for arch in amd64 i686; do |
| 400 |
-# for flavor in hardened vanilla; do |
| 401 |
- for arch in amd64; do |
| 402 |
- for flavor in vanilla; do |
| 403 |
+ for arch in amd64 i686; do |
| 404 |
+ for flavor in hardened vanilla; do |
| 405 |
do_stages ${arch} ${flavor} |
| 406 |
ret=$? |
| 407 |
if [[ $? == 1 ]]; then |
Archives