Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: tools-musl/portage.i686.hardened/, tools-musl/portage.armv7a.hardened/, ...
Date: Sat, 23 Aug 2014 10:08:32
Message-Id: 1408788638.a371568bb9d8adec2a5b688ddfca2bc658e8355a.blueness@gentoo
1 commit: a371568bb9d8adec2a5b688ddfca2bc658e8355a
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 23 10:10:38 2014 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 23 10:10:38 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=a371568b
7
8 tools-musl: move ld-musl-<arch>.path to /etc
9
10 ---
11 tools-musl/portage.amd64.hardened/bashrc | 3 +--
12 tools-musl/portage.amd64.vanilla/bashrc | 5 ++---
13 tools-musl/portage.armv7a.hardened/bashrc | 3 +--
14 tools-musl/portage.armv7a.vanilla/bashrc | 3 +--
15 tools-musl/portage.i686.hardened/bashrc | 3 +--
16 tools-musl/portage.i686.vanilla/bashrc | 5 ++---
17 tools-musl/portage.mipsel3.vanilla/bashrc | 3 +--
18 7 files changed, 9 insertions(+), 16 deletions(-)
19
20 diff --git a/tools-musl/portage.amd64.hardened/bashrc b/tools-musl/portage.amd64.hardened/bashrc
21 index b44ab32..ec261e7 100644
22 --- a/tools-musl/portage.amd64.hardened/bashrc
23 +++ b/tools-musl/portage.amd64.hardened/bashrc
24 @@ -2,8 +2,7 @@ post_src_install() {
25 [[ $PN != musl ]] && return 0
26
27 local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
28 - mkdir "${D}"/usr/etc
29 - cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
30 + cat > "${D}"/etc/${LDSO_ARCH%so.1}path <<EOF
31 /lib
32 /usr/lib
33 /usr/local/lib
34
35 diff --git a/tools-musl/portage.amd64.vanilla/bashrc b/tools-musl/portage.amd64.vanilla/bashrc
36 index adaf162..ec261e7 100644
37 --- a/tools-musl/portage.amd64.vanilla/bashrc
38 +++ b/tools-musl/portage.amd64.vanilla/bashrc
39 @@ -2,13 +2,12 @@ post_src_install() {
40 [[ $PN != musl ]] && return 0
41
42 local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
43 - mkdir "${D}"/usr/etc
44 - cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
45 + cat > "${D}"/etc/${LDSO_ARCH%so.1}path <<EOF
46 /lib
47 /usr/lib
48 /usr/local/lib
49 /usr/lib/opengl/xorg-x11/lib
50 -/usr/lib/gcc/${CHOST}/4.7.7
51 +/usr/lib/gcc/${CHOST}/4.7.4
52 /usr/${CHOST}/lib
53 /usr/games/lib
54 EOF
55
56 diff --git a/tools-musl/portage.armv7a.hardened/bashrc b/tools-musl/portage.armv7a.hardened/bashrc
57 index b44ab32..ec261e7 100644
58 --- a/tools-musl/portage.armv7a.hardened/bashrc
59 +++ b/tools-musl/portage.armv7a.hardened/bashrc
60 @@ -2,8 +2,7 @@ post_src_install() {
61 [[ $PN != musl ]] && return 0
62
63 local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
64 - mkdir "${D}"/usr/etc
65 - cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
66 + cat > "${D}"/etc/${LDSO_ARCH%so.1}path <<EOF
67 /lib
68 /usr/lib
69 /usr/local/lib
70
71 diff --git a/tools-musl/portage.armv7a.vanilla/bashrc b/tools-musl/portage.armv7a.vanilla/bashrc
72 index b44ab32..ec261e7 100644
73 --- a/tools-musl/portage.armv7a.vanilla/bashrc
74 +++ b/tools-musl/portage.armv7a.vanilla/bashrc
75 @@ -2,8 +2,7 @@ post_src_install() {
76 [[ $PN != musl ]] && return 0
77
78 local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
79 - mkdir "${D}"/usr/etc
80 - cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
81 + cat > "${D}"/etc/${LDSO_ARCH%so.1}path <<EOF
82 /lib
83 /usr/lib
84 /usr/local/lib
85
86 diff --git a/tools-musl/portage.i686.hardened/bashrc b/tools-musl/portage.i686.hardened/bashrc
87 index b44ab32..ec261e7 100644
88 --- a/tools-musl/portage.i686.hardened/bashrc
89 +++ b/tools-musl/portage.i686.hardened/bashrc
90 @@ -2,8 +2,7 @@ post_src_install() {
91 [[ $PN != musl ]] && return 0
92
93 local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
94 - mkdir "${D}"/usr/etc
95 - cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
96 + cat > "${D}"/etc/${LDSO_ARCH%so.1}path <<EOF
97 /lib
98 /usr/lib
99 /usr/local/lib
100
101 diff --git a/tools-musl/portage.i686.vanilla/bashrc b/tools-musl/portage.i686.vanilla/bashrc
102 index 70b67d2..ec261e7 100644
103 --- a/tools-musl/portage.i686.vanilla/bashrc
104 +++ b/tools-musl/portage.i686.vanilla/bashrc
105 @@ -2,13 +2,12 @@ post_src_install() {
106 [[ $PN != musl ]] && return 0
107
108 local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
109 - mkdir "${D}"/usr/etc
110 - cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
111 + cat > "${D}"/etc/${LDSO_ARCH%so.1}path <<EOF
112 /lib
113 /usr/lib
114 /usr/local/lib
115 /usr/lib/opengl/xorg-x11/lib
116 -/usr/lib/gcc/${CHOST}/4.7.3
117 +/usr/lib/gcc/${CHOST}/4.7.4
118 /usr/${CHOST}/lib
119 /usr/games/lib
120 EOF
121
122 diff --git a/tools-musl/portage.mipsel3.vanilla/bashrc b/tools-musl/portage.mipsel3.vanilla/bashrc
123 index b44ab32..ec261e7 100644
124 --- a/tools-musl/portage.mipsel3.vanilla/bashrc
125 +++ b/tools-musl/portage.mipsel3.vanilla/bashrc
126 @@ -2,8 +2,7 @@ post_src_install() {
127 [[ $PN != musl ]] && return 0
128
129 local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
130 - mkdir "${D}"/usr/etc
131 - cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
132 + cat > "${D}"/etc/${LDSO_ARCH%so.1}path <<EOF
133 /lib
134 /usr/lib
135 /usr/local/lib