chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools-musl/catalyst: add missing variants of amd64 and i686

Browse source 
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
This commit is contained in:
Felix Janda 2014-05-23 21:48:58 +02:00 • committed by Anthony G. Basile
parent 67fb1ee6fd
commit abfefda263
31 changed files with 115 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools-musl/catalyst/portage.amd64.hardened/bashrc Normal file
View file

@ -0,0 +1,15 @@
post_src_install() {
[[ $PN != musl ]] && return 0
local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
mkdir "${D}"/usr/etc
cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
/lib
/usr/lib
/usr/local/lib
/usr/lib/opengl/xorg-x11/lib
/usr/lib/gcc/${CHOST}/4.7.3
/usr/${CHOST}/lib
/usr/games/lib
EOF
}

2
tools-musl/catalyst/portage.amd64.hardened/env/libintl.conf vendored Normal file
View file

@ -0,0 +1,2 @@
CFLAGS="-Wl,-lintl"
LDFLAGS="-lintl"

1
tools-musl/catalyst/portage.amd64.hardened/env/parallel.conf vendored Normal file
View file

@ -0,0 +1 @@
MAKEOPTS=-j1

1
tools-musl/catalyst/portage.amd64.hardened/make.profile/parent Normal file
View file

@ -0,0 +1 @@
/usr/portage/profiles/hardened/linux/musl/amd64

9
tools-musl/catalyst/portage.amd64.hardened/package.env Normal file
View file

@ -0,0 +1,9 @@
dev-libs/glib libintl.conf
dev-libs/libelf libintl.conf
sys-apps/attr libintl.conf
sys-apps/kbd libintl.conf
sys-apps/man-db parallel.conf
sys-apps/net-tools libintl.conf
sys-fs/e2fsprogs libintl.conf
sys-fs/eudev libintl.conf
sys-process/procps libintl.conf

2
tools-musl/catalyst/portage.amd64.hardened/package.keywords Normal file
View file

@ -0,0 +1,2 @@
=sys-libs/musl-1.1.0 ~*
=sys-apps/getent-0 ~*

3
tools-musl/catalyst/portage.amd64.hardened/package.mask Normal file
View file

@ -0,0 +1,3 @@
>sys-devel/gcc-4.7.3-r99
sys-apps/systemd
sys-fs/udev

1
tools-musl/catalyst/portage.amd64.hardened/package.unmask Normal file
View file

@ -0,0 +1 @@
=dev-libs/openssl-1.0.1g-r99::hardened-dev

1
tools-musl/catalyst/portage.amd64.hardened/package.use Normal file
View file

@ -0,0 +1 @@
sys-libs/musl nls

8
tools-musl/catalyst/portage.amd64.vanilla/bashrc
View file

@ -1,15 +1,15 @@
post_src_install() { post_src_install() {
[[ $PN != musl ]] && return 0 [[ $PN != musl ]] && return 0
local arch=$(basename "${D}"/lib/ld-musl-*.so.1) local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
mkdir "${D}"/usr/etc mkdir "${D}"/usr/etc
cat > "${D}"/usr/etc/${arch%so.1}path <<EOF cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
/lib /lib
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
/usr/lib/opengl/xorg-x11/lib /usr/lib/opengl/xorg-x11/lib
/usr/lib/gcc/x86_64-gentoo-linux-musl/4.7.3 /usr/lib/gcc/${CHOST}/4.7.3
/usr/x86_64-gentoo-linux-musl/lib /usr/${CHOST}/lib
/usr/games/lib /usr/games/lib
EOF EOF
} }

1
tools-musl/catalyst/portage.amd64.vanilla/make.profile/use.mask Normal file
View file

@ -0,0 +1 @@
hardened

15
tools-musl/catalyst/portage.i686.hardened/bashrc Normal file
View file

@ -0,0 +1,15 @@
post_src_install() {
[[ $PN != musl ]] && return 0
local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
mkdir "${D}"/usr/etc
cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
/lib
/usr/lib
/usr/local/lib
/usr/lib/opengl/xorg-x11/lib
/usr/lib/gcc/${CHOST}/4.7.3
/usr/${CHOST}/lib
/usr/games/lib
EOF
}

2
tools-musl/catalyst/portage.i686.hardened/env/libintl.conf vendored Normal file
View file

@ -0,0 +1,2 @@
CFLAGS="-Wl,-lintl"
LDFLAGS="-lintl"

1
tools-musl/catalyst/portage.i686.hardened/env/parallel.conf vendored Normal file
View file

@ -0,0 +1 @@
MAKEOPTS=-j1

1
tools-musl/catalyst/portage.i686.hardened/make.profile/parent Normal file
View file

@ -0,0 +1 @@
/usr/portage/profiles/hardened/linux/musl/x86

9
tools-musl/catalyst/portage.i686.hardened/package.env Normal file
View file

@ -0,0 +1,9 @@
dev-libs/glib libintl.conf
dev-libs/libelf libintl.conf
sys-apps/attr libintl.conf
sys-apps/kbd libintl.conf
sys-apps/man-db parallel.conf
sys-apps/net-tools libintl.conf
sys-fs/e2fsprogs libintl.conf
sys-fs/eudev libintl.conf
sys-process/procps libintl.conf

2
tools-musl/catalyst/portage.i686.hardened/package.keywords Normal file
View file

@ -0,0 +1,2 @@
=sys-libs/musl-1.1.0 ~*
=sys-apps/getent-0 ~*

3
tools-musl/catalyst/portage.i686.hardened/package.mask Normal file
View file

@ -0,0 +1,3 @@
>sys-devel/gcc-4.7.3-r99
sys-apps/systemd
sys-fs/udev

1
tools-musl/catalyst/portage.i686.hardened/package.unmask Normal file
View file

@ -0,0 +1 @@
=dev-libs/openssl-1.0.1g-r99::hardened-dev

1
tools-musl/catalyst/portage.i686.hardened/package.use Normal file
View file

@ -0,0 +1 @@
sys-libs/musl nls

15
tools-musl/catalyst/portage.i686.vanilla/bashrc Normal file
View file

@ -0,0 +1,15 @@
post_src_install() {
[[ $PN != musl ]] && return 0
local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
mkdir "${D}"/usr/etc
cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
/lib
/usr/lib
/usr/local/lib
/usr/lib/opengl/xorg-x11/lib
/usr/lib/gcc/${CHOST}/4.7.3
/usr/${CHOST}/lib
/usr/games/lib
EOF
}

2
tools-musl/catalyst/portage.i686.vanilla/env/libintl.conf vendored Normal file
View file

@ -0,0 +1,2 @@
CFLAGS="-Wl,-lintl"
LDFLAGS="-lintl"

1
tools-musl/catalyst/portage.i686.vanilla/env/parallel.conf vendored Normal file
View file

@ -0,0 +1 @@
MAKEOPTS=-j1

1
tools-musl/catalyst/portage.i686.vanilla/make.profile/parent Normal file
View file

@ -0,0 +1 @@
/usr/portage/profiles/hardened/linux/musl/x86

1
tools-musl/catalyst/portage.i686.vanilla/make.profile/use.mask Normal file
View file

@ -0,0 +1 @@
hardened

9
tools-musl/catalyst/portage.i686.vanilla/package.env Normal file
View file

@ -0,0 +1,9 @@
dev-libs/glib libintl.conf
dev-libs/libelf libintl.conf
sys-apps/attr libintl.conf
sys-apps/kbd libintl.conf
sys-apps/man-db parallel.conf
sys-apps/net-tools libintl.conf
sys-fs/e2fsprogs libintl.conf
sys-fs/eudev libintl.conf
sys-process/procps libintl.conf

2
tools-musl/catalyst/portage.i686.vanilla/package.keywords Normal file
View file

@ -0,0 +1,2 @@
=sys-libs/musl-1.1.0 ~*
=sys-apps/getent-0 ~*

3
tools-musl/catalyst/portage.i686.vanilla/package.mask Normal file
View file

@ -0,0 +1,3 @@
>sys-devel/gcc-4.7.3-r99
sys-apps/systemd
sys-fs/udev

1
tools-musl/catalyst/portage.i686.vanilla/package.unmask Normal file
View file

@ -0,0 +1 @@
=dev-libs/openssl-1.0.1g-r99::hardened-dev

1
tools-musl/catalyst/portage.i686.vanilla/package.use Normal file
View file

@ -0,0 +1 @@
sys-libs/musl nls

12
tools-musl/catalyst/run.sh
View file

@ -106,18 +106,14 @@ main() {
catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
# for arch in amd64 i686; do for arch in amd64 i686; do
# for flavor in hardened vanilla; do for flavor in hardened vanilla; do
for arch in amd64; do
for flavor in vanilla; do
prepare_confs ${arch} ${flavor} prepare_confs ${arch} ${flavor}
done done
done done
# for arch in amd64 i686; do for arch in amd64 i686; do
# for flavor in hardened vanilla; do for flavor in hardened vanilla; do
for arch in amd64; do
for flavor in vanilla; do
do_stages ${arch} ${flavor} do_stages ${arch} ${flavor}
ret=$? ret=$?
if [[ $? == 1 ]]; then if [[ $? == 1 ]]; then