diff options
-rw-r--r-- | meta-filesystems/recipes-utils/xfsprogs/files/drop-configure-check-for-aio.patch (renamed from meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/drop-configure-check-for-aio.patch) | 42 | ||||
-rw-r--r-- | meta-filesystems/recipes-utils/xfsprogs/files/remove-install-as-user.patch | 205 | ||||
-rw-r--r-- | meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb (renamed from meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb) | 5 | ||||
-rw-r--r-- | meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/remove-install-as-user.patch | 368 |
4 files changed, 225 insertions, 395 deletions
diff --git a/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/drop-configure-check-for-aio.patch b/meta-filesystems/recipes-utils/xfsprogs/files/drop-configure-check-for-aio.patch index a1c60424a..760109506 100644 --- a/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/drop-configure-check-for-aio.patch +++ b/meta-filesystems/recipes-utils/xfsprogs/files/drop-configure-check-for-aio.patch | |||
@@ -1,25 +1,20 @@ | |||
1 | Upstream-Status: Pending | 1 | xfsprogs: drop configure check for aio |
2 | |||
3 | From a38bf800a655ea32cbddd6504e15c2f18597fd13 Mon Sep 17 00:00:00 2001 | ||
4 | From: Andreas Oberritter <obi@opendreambox.org> | ||
5 | Date: Wed, 13 Mar 2013 14:40:13 +0100 | ||
6 | Subject: [PATCH] xfsprogs: drop configure check for aio | ||
7 | 2 | ||
8 | It's unused and breaks compilation with uclibc. | 3 | It's unused and breaks compilation with uclibc. |
9 | 4 | ||
10 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | 5 | Upstream-Status: Pending |
6 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
11 | --- | 7 | --- |
12 | configure.in | 6 +++--- | 8 | configure.ac | 6 +++--- |
13 | m4/Makefile | 1 - | 9 | m4/Makefile | 1 - |
14 | m4/package_aiodev.m4 | 37 ------------------------------------- | 10 | m4/package_aiodev.m4 | 36 ------------------------------------ |
15 | 3 files changed, 3 insertions(+), 41 deletions(-) | 11 | 3 files changed, 3 insertions(+), 40 deletions(-) |
16 | delete mode 100644 m4/package_aiodev.m4 | ||
17 | 12 | ||
18 | diff --git a/configure.in b/configure.in | 13 | diff --git a/configure.ac b/configure.ac |
19 | index 664c0e9..f7d35f1 100644 | 14 | index b968977..4e2a263 100644 |
20 | --- a/configure.in | 15 | --- a/configure.ac |
21 | +++ b/configure.in | 16 | +++ b/configure.ac |
22 | @@ -46,6 +46,9 @@ AC_ARG_ENABLE(lib64, | 17 | @@ -47,6 +47,9 @@ AC_ARG_ENABLE(lib64, |
23 | enable_lib64=yes) | 18 | enable_lib64=yes) |
24 | AC_SUBST(enable_lib64) | 19 | AC_SUBST(enable_lib64) |
25 | 20 | ||
@@ -29,7 +24,7 @@ index 664c0e9..f7d35f1 100644 | |||
29 | # | 24 | # |
30 | # If the user specified a libdir ending in lib64 do not append another | 25 | # If the user specified a libdir ending in lib64 do not append another |
31 | # 64 to the library names. | 26 | # 64 to the library names. |
32 | @@ -91,9 +94,6 @@ AC_PACKAGE_GLOBALS(xfsprogs) | 27 | @@ -92,9 +95,6 @@ AC_PACKAGE_GLOBALS(xfsprogs) |
33 | AC_PACKAGE_UTILITIES(xfsprogs) | 28 | AC_PACKAGE_UTILITIES(xfsprogs) |
34 | AC_MULTILIB($enable_lib64) | 29 | AC_MULTILIB($enable_lib64) |
35 | 30 | ||
@@ -52,11 +47,10 @@ index 654a4fb..d282f0a 100644 | |||
52 | package_globals.m4 \ | 47 | package_globals.m4 \ |
53 | package_libcdev.m4 \ | 48 | package_libcdev.m4 \ |
54 | diff --git a/m4/package_aiodev.m4 b/m4/package_aiodev.m4 | 49 | diff --git a/m4/package_aiodev.m4 b/m4/package_aiodev.m4 |
55 | deleted file mode 100644 | 50 | index 490d9c8..8b13789 100644 |
56 | index 490d9c8..0000000 | ||
57 | --- a/m4/package_aiodev.m4 | 51 | --- a/m4/package_aiodev.m4 |
58 | +++ /dev/null | 52 | +++ b/m4/package_aiodev.m4 |
59 | @@ -1,37 +0,0 @@ | 53 | @@ -1,37 +1 @@ |
60 | -# | 54 | -# |
61 | -# Check if we have a libaio.h installed | 55 | -# Check if we have a libaio.h installed |
62 | -# | 56 | -# |
@@ -93,7 +87,7 @@ index 490d9c8..0000000 | |||
93 | - fi | 87 | - fi |
94 | - AC_SUBST(librt) | 88 | - AC_SUBST(librt) |
95 | - ]) | 89 | - ]) |
96 | - | 90 | |
97 | -- | 91 | -- |
98 | 1.7.10.4 | 92 | 1.8.1.2 |
99 | 93 | ||
diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/remove-install-as-user.patch b/meta-filesystems/recipes-utils/xfsprogs/files/remove-install-as-user.patch new file mode 100644 index 000000000..e761db371 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/remove-install-as-user.patch | |||
@@ -0,0 +1,205 @@ | |||
1 | remove install as user | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
6 | --- | ||
7 | include/buildmacros | 2 +- | ||
8 | include/install-sh | 95 ++++++++--------------------------------------------- | ||
9 | 2 files changed, 14 insertions(+), 83 deletions(-) | ||
10 | |||
11 | diff --git a/include/buildmacros b/include/buildmacros | ||
12 | index 7a01880..0840d55 100644 | ||
13 | --- a/include/buildmacros | ||
14 | +++ b/include/buildmacros | ||
15 | @@ -30,7 +30,7 @@ OBJECTS = $(ASFILES:.s=.o) \ | ||
16 | $(LFILES:.l=.o) \ | ||
17 | $(YFILES:%.y=%.tab.o) | ||
18 | |||
19 | -INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) | ||
20 | +INSTALL = $(TOPDIR)/install-sh | ||
21 | |||
22 | IMAGES_DIR = $(TOPDIR)/all-images | ||
23 | DIST_DIR = $(TOPDIR)/dist | ||
24 | diff --git a/include/install-sh b/include/install-sh | ||
25 | index c952a71..b9d66f7 100755 | ||
26 | --- a/include/install-sh | ||
27 | +++ b/include/install-sh | ||
28 | @@ -24,11 +24,11 @@ | ||
29 | # set set | yes yes | ||
30 | # | ||
31 | _usage() { | ||
32 | - echo "Usage: $prog [-o owner] [-g group] [-m mode] -d directory" | ||
33 | - echo "or $prog [-D] [-o owner] [-g group] [-m mode] file directory/file" | ||
34 | - echo "or $prog [-o owner] [-g group] [-m mode] file [file ...] directory" | ||
35 | + echo "Usage: $prog [-m mode] -d directory" | ||
36 | + echo "or $prog [-m mode] file directory/file" | ||
37 | + echo "or $prog [-m mode] file [file ...] directory" | ||
38 | echo "or $prog -S file target (creates \"target\" symlink)" | ||
39 | - echo "or $prog -T lt_arg [-o owner] [-g group] [-m mode] libtool.lai directory" | ||
40 | + echo "or $prog -T lt_arg [-m mode] libtool.lai directory" | ||
41 | echo "" | ||
42 | echo "The \$DIST_MANIFEST and \$DIST_ROOT environment variables affect the" | ||
43 | echo "behaviour of this command - see comments in the script." | ||
44 | @@ -38,32 +38,6 @@ _usage() { | ||
45 | exit 1 | ||
46 | } | ||
47 | |||
48 | -_chown () | ||
49 | -{ | ||
50 | - _st=255 | ||
51 | - if [ $# -eq 3 ] ; then | ||
52 | - chown $1:$2 $3 | ||
53 | - _st=$? | ||
54 | - if [ $_st -ne 0 ] ; then | ||
55 | - if [ $REAL_UID != '0' ] ; then | ||
56 | - if [ ! -f $DIST_ROOT/.chown.quiet ] ; then | ||
57 | - echo '===============================================' | ||
58 | - echo Ownership of files under ${DIST_ROOT:-/} | ||
59 | - echo cannot be changed | ||
60 | - echo '===============================================' | ||
61 | - if [ -n "$DIST_ROOT" ] ; then | ||
62 | - touch $DIST_ROOT/.chown.quiet | ||
63 | - fi | ||
64 | - fi | ||
65 | - _st=0 | ||
66 | - fi | ||
67 | - fi | ||
68 | - fi | ||
69 | - | ||
70 | - return $_st | ||
71 | -} | ||
72 | - | ||
73 | - | ||
74 | _manifest () | ||
75 | { | ||
76 | echo $* | sed -e 's/\/\//\//g' >>${DIST_MANIFEST:-/dev/null} | ||
77 | @@ -77,9 +51,6 @@ Sflag=false | ||
78 | Tflag=false | ||
79 | DIRMODE=755 | ||
80 | FILEMODE=644 | ||
81 | -OWNER=`id -u` | ||
82 | -GROUP=`id -g` | ||
83 | -REAL_UID=$OWNER | ||
84 | |||
85 | # default is to install and don't append manifest | ||
86 | INSTALL=true | ||
87 | @@ -94,24 +65,16 @@ MANIFEST=: | ||
88 | |||
89 | if $INSTALL | ||
90 | then | ||
91 | - CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; CHOWN=_chown | ||
92 | + CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; | ||
93 | else | ||
94 | - CP=true; LN=true; MKDIR=true; CHMOD=true; CHOWN=true | ||
95 | + CP=true; LN=true; MKDIR=true; CHMOD=true; | ||
96 | fi | ||
97 | |||
98 | -[ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true | ||
99 | - | ||
100 | -while getopts "Dcm:d:S:o:g:T:" c $* | ||
101 | +while getopts "Dcm:d:S:T:" c $* | ||
102 | do | ||
103 | case $c in | ||
104 | c) | ||
105 | ;; | ||
106 | - g) | ||
107 | - GROUP=$OPTARG | ||
108 | - ;; | ||
109 | - o) | ||
110 | - OWNER=$OPTARG | ||
111 | - ;; | ||
112 | m) | ||
113 | DIRMODE=`expr $OPTARG` | ||
114 | FILEMODE=$DIRMODE | ||
115 | @@ -146,18 +109,7 @@ then | ||
116 | # first usage | ||
117 | # | ||
118 | $MKDIR -p $dir | ||
119 | - status=$? | ||
120 | - if [ $status -eq 0 ] | ||
121 | - then | ||
122 | - $CHMOD $DIRMODE $dir | ||
123 | - status=$? | ||
124 | - fi | ||
125 | - if [ $status -eq 0 ] | ||
126 | - then | ||
127 | - $CHOWN $OWNER $GROUP $dir | ||
128 | - status=$? | ||
129 | - fi | ||
130 | - $MANIFEST d $DIRMODE $OWNER $GROUP ${dir#$DIST_ROOT} | ||
131 | + $MANIFEST d $DIRMODE ${dir#$DIST_ROOT} | ||
132 | elif $Sflag | ||
133 | then | ||
134 | # | ||
135 | @@ -203,7 +155,7 @@ then | ||
136 | install_name=$target/$solib | ||
137 | $CP $solib $install_name | ||
138 | status=$? | ||
139 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib ${install_name#$DIST_ROOT} | ||
140 | + $MANIFEST f $FILEMODE $HERE/$solib ${install_name#$DIST_ROOT} | ||
141 | break | ||
142 | fi | ||
143 | done | ||
144 | @@ -254,7 +206,7 @@ then | ||
145 | install_name=$target/$old_library | ||
146 | $CP $old_library $install_name | ||
147 | status=$? | ||
148 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library ${install_name#$DIST_ROOT} | ||
149 | + $MANIFEST f $FILEMODE $HERE/$old_library ${install_name#$DIST_ROOT} | ||
150 | ;; | ||
151 | *) | ||
152 | echo "$prog: -T $lt_install invalid" | ||
153 | @@ -267,7 +219,6 @@ then | ||
154 | if [ $status -eq 0 ] | ||
155 | then | ||
156 | $CHMOD $FILEMODE $install_name | ||
157 | - $CHOWN $OWNER $GROUP $install_name | ||
158 | fi | ||
159 | ;; | ||
160 | esac | ||
161 | @@ -292,23 +243,10 @@ else | ||
162 | then | ||
163 | if [ -f $dir/$f ] | ||
164 | then | ||
165 | - $CHMOD $FILEMODE $dir/$f | ||
166 | - status=$? | ||
167 | - if [ $status -eq 0 ] | ||
168 | - then | ||
169 | - $CHOWN $OWNER $GROUP $dir/$f | ||
170 | - status=$? | ||
171 | - fi | ||
172 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f | ||
173 | + $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f | ||
174 | else | ||
175 | $CHMOD $FILEMODE $dir | ||
176 | - status=$? | ||
177 | - if [ $status -eq 0 ] | ||
178 | - then | ||
179 | - $CHOWN $OWNER $GROUP $dir | ||
180 | - status=$? | ||
181 | - fi | ||
182 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$dir ${dir#$DIST_ROOT} | ||
183 | + $MANIFEST f $FILEMODE $HERE/$dir ${dir#$DIST_ROOT} | ||
184 | fi | ||
185 | fi | ||
186 | else | ||
187 | @@ -334,14 +272,7 @@ else | ||
188 | status=$? | ||
189 | if [ $status -eq 0 ] | ||
190 | then | ||
191 | - $CHMOD $FILEMODE $dir/$f | ||
192 | - status=$? | ||
193 | - if [ $status -eq 0 ] | ||
194 | - then | ||
195 | - $CHOWN $OWNER $GROUP $dir/$f | ||
196 | - status=$? | ||
197 | - fi | ||
198 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f | ||
199 | + $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f | ||
200 | fi | ||
201 | [ $status -ne 0 ] && break | ||
202 | done | ||
203 | -- | ||
204 | 1.8.1.2 | ||
205 | |||
diff --git a/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb index ba3490d1c..ceb0ddf16 100644 --- a/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb +++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb | |||
@@ -5,15 +5,14 @@ LICENSE = "GPLv2" | |||
5 | LICENSE_libhandle = "LGPLv2.1" | 5 | LICENSE_libhandle = "LGPLv2.1" |
6 | LIC_FILES_CHKSUM = "file://doc/COPYING;md5=dbdb5f4329b7e7145de650e9ecd4ac2a" | 6 | LIC_FILES_CHKSUM = "file://doc/COPYING;md5=dbdb5f4329b7e7145de650e9ecd4ac2a" |
7 | DEPENDS = "util-linux" | 7 | DEPENDS = "util-linux" |
8 | PR = "r1" | ||
9 | 8 | ||
10 | SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz \ | 9 | SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz \ |
11 | file://remove-install-as-user.patch \ | 10 | file://remove-install-as-user.patch \ |
12 | file://drop-configure-check-for-aio.patch \ | 11 | file://drop-configure-check-for-aio.patch \ |
13 | " | 12 | " |
14 | 13 | ||
15 | SRC_URI[md5sum] = "f70b2e7200d4c29f0af1cf70e7be1db6" | 14 | SRC_URI[md5sum] = "de9f1f45026c2f4e0776058d429ff4b6" |
16 | SRC_URI[sha256sum] = "74409e2e3748074999df25c00f722621659a0bd3607e677f0bcc4373b8c93eab" | 15 | SRC_URI[sha256sum] = "adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be" |
17 | 16 | ||
18 | inherit autotools | 17 | inherit autotools |
19 | 18 | ||
diff --git a/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/remove-install-as-user.patch b/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/remove-install-as-user.patch deleted file mode 100644 index 1263aafa2..000000000 --- a/meta-oe/recipes-support/xfsprogs/xfsprogs-3.1.8/remove-install-as-user.patch +++ /dev/null | |||
@@ -1,368 +0,0 @@ | |||
1 | diff -urN a/include/buildmacros b/include/buildmacros | ||
2 | --- a/include/buildmacros 2011-12-27 23:32:31.554197934 -0600 | ||
3 | +++ b/include/buildmacros 2011-12-27 23:33:17.895485348 -0600 | ||
4 | @@ -30,7 +30,7 @@ | ||
5 | $(LFILES:.l=.o) \ | ||
6 | $(YFILES:%.y=%.tab.o) | ||
7 | |||
8 | -INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) | ||
9 | +INSTALL = $(TOPDIR)/install-sh | ||
10 | |||
11 | IMAGES_DIR = $(TOPDIR)/all-images | ||
12 | DIST_DIR = $(TOPDIR)/dist | ||
13 | diff -urN a/include/install-sh b/include/install-sh | ||
14 | --- a/include/install-sh 2011-12-27 23:32:31.556198121 -0600 | ||
15 | +++ b/include/install-sh 2011-12-27 23:32:57.012201738 -0600 | ||
16 | @@ -24,11 +24,11 @@ | ||
17 | # set set | yes yes | ||
18 | # | ||
19 | _usage() { | ||
20 | - echo "Usage: $prog [-o owner] [-g group] [-m mode] -d directory" | ||
21 | - echo "or $prog [-D] [-o owner] [-g group] [-m mode] file directory/file" | ||
22 | - echo "or $prog [-o owner] [-g group] [-m mode] file [file ...] directory" | ||
23 | + echo "Usage: $prog [-m mode] -d directory" | ||
24 | + echo "or $prog [-m mode] file directory/file" | ||
25 | + echo "or $prog [-m mode] file [file ...] directory" | ||
26 | echo "or $prog -S file target (creates \"target\" symlink)" | ||
27 | - echo "or $prog -T lt_arg [-o owner] [-g group] [-m mode] libtool.lai directory" | ||
28 | + echo "or $prog -T lt_arg [-m mode] libtool.lai directory" | ||
29 | echo "" | ||
30 | echo "The \$DIST_MANIFEST and \$DIST_ROOT environment variables affect the" | ||
31 | echo "behaviour of this command - see comments in the script." | ||
32 | @@ -38,32 +38,6 @@ | ||
33 | exit 1 | ||
34 | } | ||
35 | |||
36 | -_chown () | ||
37 | -{ | ||
38 | - _st=255 | ||
39 | - if [ $# -eq 3 ] ; then | ||
40 | - chown $1:$2 $3 | ||
41 | - _st=$? | ||
42 | - if [ $_st -ne 0 ] ; then | ||
43 | - if [ $REAL_UID != '0' ] ; then | ||
44 | - if [ ! -f $DIST_ROOT/.chown.quiet ] ; then | ||
45 | - echo '===============================================' | ||
46 | - echo Ownership of files under ${DIST_ROOT:-/} | ||
47 | - echo cannot be changed | ||
48 | - echo '===============================================' | ||
49 | - if [ -n "$DIST_ROOT" ] ; then | ||
50 | - touch $DIST_ROOT/.chown.quiet | ||
51 | - fi | ||
52 | - fi | ||
53 | - _st=0 | ||
54 | - fi | ||
55 | - fi | ||
56 | - fi | ||
57 | - | ||
58 | - return $_st | ||
59 | -} | ||
60 | - | ||
61 | - | ||
62 | _manifest () | ||
63 | { | ||
64 | echo $* | sed -e 's/\/\//\//g' >>${DIST_MANIFEST:-/dev/null} | ||
65 | @@ -77,9 +51,6 @@ | ||
66 | Tflag=false | ||
67 | DIRMODE=755 | ||
68 | FILEMODE=644 | ||
69 | -OWNER=`id -u` | ||
70 | -GROUP=`id -g` | ||
71 | -REAL_UID=$OWNER | ||
72 | |||
73 | # default is to install and don't append manifest | ||
74 | INSTALL=true | ||
75 | @@ -92,24 +63,16 @@ | ||
76 | |||
77 | if $INSTALL | ||
78 | then | ||
79 | - CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; CHOWN=_chown | ||
80 | + CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; | ||
81 | else | ||
82 | - CP=true; LN=true; MKDIR=true; CHMOD=true; CHOWN=true | ||
83 | + CP=true; LN=true; MKDIR=true; CHMOD=true; | ||
84 | fi | ||
85 | |||
86 | -[ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true | ||
87 | - | ||
88 | -while getopts "Dcm:d:S:o:g:T:" c $* | ||
89 | +while getopts "Dcm:d:S:T:" c $* | ||
90 | do | ||
91 | case $c in | ||
92 | c) | ||
93 | ;; | ||
94 | - g) | ||
95 | - GROUP=$OPTARG | ||
96 | - ;; | ||
97 | - o) | ||
98 | - OWNER=$OPTARG | ||
99 | - ;; | ||
100 | m) | ||
101 | DIRMODE=`expr $OPTARG` | ||
102 | FILEMODE=$DIRMODE | ||
103 | @@ -144,18 +107,7 @@ | ||
104 | # first usage | ||
105 | # | ||
106 | $MKDIR -p $dir | ||
107 | - status=$? | ||
108 | - if [ $status -eq 0 ] | ||
109 | - then | ||
110 | - $CHMOD $DIRMODE $dir | ||
111 | - status=$? | ||
112 | - fi | ||
113 | - if [ $status -eq 0 ] | ||
114 | - then | ||
115 | - $CHOWN $OWNER $GROUP $dir | ||
116 | - status=$? | ||
117 | - fi | ||
118 | - $MANIFEST d $DIRMODE $OWNER $GROUP ${dir#$DIST_ROOT} | ||
119 | + $MANIFEST d $DIRMODE ${dir#$DIST_ROOT} | ||
120 | elif $Sflag | ||
121 | then | ||
122 | # | ||
123 | @@ -201,7 +153,7 @@ | ||
124 | install_name=$target/$solib | ||
125 | $CP $solib $install_name | ||
126 | status=$? | ||
127 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib ${install_name#$DIST_ROOT} | ||
128 | + $MANIFEST f $FILEMODE $HERE/$solib ${install_name#$DIST_ROOT} | ||
129 | break | ||
130 | fi | ||
131 | done | ||
132 | @@ -252,7 +204,7 @@ | ||
133 | install_name=$target/$old_library | ||
134 | $CP $old_library $install_name | ||
135 | status=$? | ||
136 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library ${install_name#$DIST_ROOT} | ||
137 | + $MANIFEST f $FILEMODE $HERE/$old_library ${install_name#$DIST_ROOT} | ||
138 | ;; | ||
139 | *) | ||
140 | echo "$prog: -T $lt_install invalid" | ||
141 | @@ -265,7 +217,6 @@ | ||
142 | if [ $status -eq 0 ] | ||
143 | then | ||
144 | $CHMOD $FILEMODE $install_name | ||
145 | - $CHOWN $OWNER $GROUP $install_name | ||
146 | fi | ||
147 | ;; | ||
148 | esac | ||
149 | @@ -290,23 +241,10 @@ | ||
150 | then | ||
151 | if [ -f $dir/$f ] | ||
152 | then | ||
153 | - $CHMOD $FILEMODE $dir/$f | ||
154 | - status=$? | ||
155 | - if [ $status -eq 0 ] | ||
156 | - then | ||
157 | - $CHOWN $OWNER $GROUP $dir/$f | ||
158 | - status=$? | ||
159 | - fi | ||
160 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f | ||
161 | + $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f | ||
162 | else | ||
163 | $CHMOD $FILEMODE $dir | ||
164 | - status=$? | ||
165 | - if [ $status -eq 0 ] | ||
166 | - then | ||
167 | - $CHOWN $OWNER $GROUP $dir | ||
168 | - status=$? | ||
169 | - fi | ||
170 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$dir ${dir#$DIST_ROOT} | ||
171 | + $MANIFEST f $FILEMODE $HERE/$dir ${dir#$DIST_ROOT} | ||
172 | fi | ||
173 | fi | ||
174 | else | ||
175 | @@ -332,14 +270,7 @@ | ||
176 | status=$? | ||
177 | if [ $status -eq 0 ] | ||
178 | then | ||
179 | - $CHMOD $FILEMODE $dir/$f | ||
180 | - status=$? | ||
181 | - if [ $status -eq 0 ] | ||
182 | - then | ||
183 | - $CHOWN $OWNER $GROUP $dir/$f | ||
184 | - status=$? | ||
185 | - fi | ||
186 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f | ||
187 | + $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f | ||
188 | fi | ||
189 | [ $status -ne 0 ] && break | ||
190 | done | ||
191 | diff -urN a/install-sh b/install-sh | ||
192 | --- a/install-sh 2011-12-27 23:32:31.565200349 -0600 | ||
193 | +++ b/install-sh 2011-12-27 23:32:51.854178224 -0600 | ||
194 | @@ -24,11 +24,11 @@ | ||
195 | # set set | yes yes | ||
196 | # | ||
197 | _usage() { | ||
198 | - echo "Usage: $prog [-o owner] [-g group] [-m mode] -d directory" | ||
199 | - echo "or $prog [-D] [-o owner] [-g group] [-m mode] file directory/file" | ||
200 | - echo "or $prog [-o owner] [-g group] [-m mode] file [file ...] directory" | ||
201 | + echo "Usage: $prog [-m mode] -d directory" | ||
202 | + echo "or $prog [-m mode] file directory/file" | ||
203 | + echo "or $prog [-m mode] file [file ...] directory" | ||
204 | echo "or $prog -S file target (creates \"target\" symlink)" | ||
205 | - echo "or $prog -T lt_arg [-o owner] [-g group] [-m mode] libtool.lai directory" | ||
206 | + echo "or $prog -T lt_arg [-m mode] libtool.lai directory" | ||
207 | echo "" | ||
208 | echo "The \$DIST_MANIFEST and \$DIST_ROOT environment variables affect the" | ||
209 | echo "behaviour of this command - see comments in the script." | ||
210 | @@ -38,32 +38,6 @@ | ||
211 | exit 1 | ||
212 | } | ||
213 | |||
214 | -_chown () | ||
215 | -{ | ||
216 | - _st=255 | ||
217 | - if [ $# -eq 3 ] ; then | ||
218 | - chown $1:$2 $3 | ||
219 | - _st=$? | ||
220 | - if [ $_st -ne 0 ] ; then | ||
221 | - if [ $REAL_UID != '0' ] ; then | ||
222 | - if [ ! -f $DIST_ROOT/.chown.quiet ] ; then | ||
223 | - echo '===============================================' | ||
224 | - echo Ownership of files under ${DIST_ROOT:-/} | ||
225 | - echo cannot be changed | ||
226 | - echo '===============================================' | ||
227 | - if [ -n "$DIST_ROOT" ] ; then | ||
228 | - touch $DIST_ROOT/.chown.quiet | ||
229 | - fi | ||
230 | - fi | ||
231 | - _st=0 | ||
232 | - fi | ||
233 | - fi | ||
234 | - fi | ||
235 | - | ||
236 | - return $_st | ||
237 | -} | ||
238 | - | ||
239 | - | ||
240 | _manifest () | ||
241 | { | ||
242 | echo $* | sed -e 's/\/\//\//g' >>${DIST_MANIFEST:-/dev/null} | ||
243 | @@ -77,9 +51,6 @@ | ||
244 | Tflag=false | ||
245 | DIRMODE=755 | ||
246 | FILEMODE=644 | ||
247 | -OWNER=`id -u` | ||
248 | -GROUP=`id -g` | ||
249 | -REAL_UID=$OWNER | ||
250 | |||
251 | # default is to install and don't append manifest | ||
252 | INSTALL=true | ||
253 | @@ -92,24 +63,16 @@ | ||
254 | |||
255 | if $INSTALL | ||
256 | then | ||
257 | - CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; CHOWN=_chown | ||
258 | + CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; | ||
259 | else | ||
260 | - CP=true; LN=true; MKDIR=true; CHMOD=true; CHOWN=true | ||
261 | + CP=true; LN=true; MKDIR=true; CHMOD=true; | ||
262 | fi | ||
263 | |||
264 | -[ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true | ||
265 | - | ||
266 | -while getopts "Dcm:d:S:o:g:T:" c $* | ||
267 | +while getopts "Dcm:d:S:T:" c $* | ||
268 | do | ||
269 | case $c in | ||
270 | c) | ||
271 | ;; | ||
272 | - g) | ||
273 | - GROUP=$OPTARG | ||
274 | - ;; | ||
275 | - o) | ||
276 | - OWNER=$OPTARG | ||
277 | - ;; | ||
278 | m) | ||
279 | DIRMODE=`expr $OPTARG` | ||
280 | FILEMODE=$DIRMODE | ||
281 | @@ -144,18 +107,7 @@ | ||
282 | # first usage | ||
283 | # | ||
284 | $MKDIR -p $dir | ||
285 | - status=$? | ||
286 | - if [ $status -eq 0 ] | ||
287 | - then | ||
288 | - $CHMOD $DIRMODE $dir | ||
289 | - status=$? | ||
290 | - fi | ||
291 | - if [ $status -eq 0 ] | ||
292 | - then | ||
293 | - $CHOWN $OWNER $GROUP $dir | ||
294 | - status=$? | ||
295 | - fi | ||
296 | - $MANIFEST d $DIRMODE $OWNER $GROUP ${dir#$DIST_ROOT} | ||
297 | + $MANIFEST d $DIRMODE ${dir#$DIST_ROOT} | ||
298 | elif $Sflag | ||
299 | then | ||
300 | # | ||
301 | @@ -201,7 +153,7 @@ | ||
302 | install_name=$target/$solib | ||
303 | $CP $solib $install_name | ||
304 | status=$? | ||
305 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib ${install_name#$DIST_ROOT} | ||
306 | + $MANIFEST f $FILEMODE $HERE/$solib ${install_name#$DIST_ROOT} | ||
307 | break | ||
308 | fi | ||
309 | done | ||
310 | @@ -252,7 +204,7 @@ | ||
311 | install_name=$target/$old_library | ||
312 | $CP $old_library $install_name | ||
313 | status=$? | ||
314 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library ${install_name#$DIST_ROOT} | ||
315 | + $MANIFEST f $FILEMODE $HERE/$old_library ${install_name#$DIST_ROOT} | ||
316 | ;; | ||
317 | *) | ||
318 | echo "$prog: -T $lt_install invalid" | ||
319 | @@ -265,7 +217,6 @@ | ||
320 | if [ $status -eq 0 ] | ||
321 | then | ||
322 | $CHMOD $FILEMODE $install_name | ||
323 | - $CHOWN $OWNER $GROUP $install_name | ||
324 | fi | ||
325 | ;; | ||
326 | esac | ||
327 | @@ -290,23 +241,10 @@ | ||
328 | then | ||
329 | if [ -f $dir/$f ] | ||
330 | then | ||
331 | - $CHMOD $FILEMODE $dir/$f | ||
332 | - status=$? | ||
333 | - if [ $status -eq 0 ] | ||
334 | - then | ||
335 | - $CHOWN $OWNER $GROUP $dir/$f | ||
336 | - status=$? | ||
337 | - fi | ||
338 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f | ||
339 | + $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f | ||
340 | else | ||
341 | $CHMOD $FILEMODE $dir | ||
342 | - status=$? | ||
343 | - if [ $status -eq 0 ] | ||
344 | - then | ||
345 | - $CHOWN $OWNER $GROUP $dir | ||
346 | - status=$? | ||
347 | - fi | ||
348 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$dir ${dir#$DIST_ROOT} | ||
349 | + $MANIFEST f $FILEMODE $HERE/$dir ${dir#$DIST_ROOT} | ||
350 | fi | ||
351 | fi | ||
352 | else | ||
353 | @@ -332,14 +270,7 @@ | ||
354 | status=$? | ||
355 | if [ $status -eq 0 ] | ||
356 | then | ||
357 | - $CHMOD $FILEMODE $dir/$f | ||
358 | - status=$? | ||
359 | - if [ $status -eq 0 ] | ||
360 | - then | ||
361 | - $CHOWN $OWNER $GROUP $dir/$f | ||
362 | - status=$? | ||
363 | - fi | ||
364 | - $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f | ||
365 | + $MANIFEST f $FILEMODE $HERE/$f ${dir#$DIST_ROOT}/$f | ||
366 | fi | ||
367 | [ $status -ne 0 ] && break | ||
368 | done | ||