diff options
Diffstat (limited to 'meta/classes/utils.bbclass')
-rw-r--r-- | meta/classes/utils.bbclass | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index e923789c14..6bcaf86b05 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass | |||
@@ -91,7 +91,7 @@ oe_soinstall() { | |||
91 | # | 91 | # |
92 | # oe_ | 92 | # oe_ |
93 | # | 93 | # |
94 | #oenote installing shared library $1 to $2 | 94 | #bbnote installing shared library $1 to $2 |
95 | # | 95 | # |
96 | libname=`basename $1` | 96 | libname=`basename $1` |
97 | install -m 755 $1 $2/$libname | 97 | install -m 755 $1 $2/$libname |
@@ -129,7 +129,7 @@ oe_libinstall() { | |||
129 | require_shared=1 | 129 | require_shared=1 |
130 | ;; | 130 | ;; |
131 | -*) | 131 | -*) |
132 | oefatal "oe_libinstall: unknown option: $1" | 132 | bbfatal "oe_libinstall: unknown option: $1" |
133 | ;; | 133 | ;; |
134 | *) | 134 | *) |
135 | break; | 135 | break; |
@@ -142,7 +142,7 @@ oe_libinstall() { | |||
142 | shift | 142 | shift |
143 | destpath="$1" | 143 | destpath="$1" |
144 | if [ -z "$destpath" ]; then | 144 | if [ -z "$destpath" ]; then |
145 | oefatal "oe_libinstall: no destination path specified" | 145 | bbfatal "oe_libinstall: no destination path specified" |
146 | fi | 146 | fi |
147 | if echo "$destpath/" | egrep '^${STAGING_LIBDIR}/' >/dev/null | 147 | if echo "$destpath/" | egrep '^${STAGING_LIBDIR}/' >/dev/null |
148 | then | 148 | then |
@@ -165,7 +165,7 @@ oe_libinstall() { | |||
165 | # Sanity check that the libname.lai is unique | 165 | # Sanity check that the libname.lai is unique |
166 | number_of_files=`(cd $dir; find . -name "$dotlai") | wc -l` | 166 | number_of_files=`(cd $dir; find . -name "$dotlai") | wc -l` |
167 | if [ $number_of_files -gt 1 ]; then | 167 | if [ $number_of_files -gt 1 ]; then |
168 | oefatal "oe_libinstall: $dotlai is not unique in $dir" | 168 | bbfatal "oe_libinstall: $dotlai is not unique in $dir" |
169 | fi | 169 | fi |
170 | 170 | ||
171 | 171 | ||
@@ -209,7 +209,7 @@ oe_libinstall() { | |||
209 | for f in $files; do | 209 | for f in $files; do |
210 | if [ ! -e "$f" ]; then | 210 | if [ ! -e "$f" ]; then |
211 | if [ -n "$libtool" ]; then | 211 | if [ -n "$libtool" ]; then |
212 | oefatal "oe_libinstall: $dir/$f not found." | 212 | bbfatal "oe_libinstall: $dir/$f not found." |
213 | fi | 213 | fi |
214 | elif [ -L "$f" ]; then | 214 | elif [ -L "$f" ]; then |
215 | __runcmd cp -P "$f" $destpath/ | 215 | __runcmd cp -P "$f" $destpath/ |
@@ -223,7 +223,7 @@ oe_libinstall() { | |||
223 | 223 | ||
224 | if [ -z "$libfile" ]; then | 224 | if [ -z "$libfile" ]; then |
225 | if [ -n "$require_shared" ]; then | 225 | if [ -n "$require_shared" ]; then |
226 | oefatal "oe_libinstall: unable to locate shared library" | 226 | bbfatal "oe_libinstall: unable to locate shared library" |
227 | fi | 227 | fi |
228 | elif [ -z "$libtool" ]; then | 228 | elif [ -z "$libtool" ]; then |
229 | # special case hack for non-libtool .so.#.#.# links | 229 | # special case hack for non-libtool .so.#.#.# links |
@@ -256,17 +256,17 @@ oe_machinstall() { | |||
256 | 256 | ||
257 | for o in `echo ${OVERRIDES} | tr ':' ' '`; do | 257 | for o in `echo ${OVERRIDES} | tr ':' ' '`; do |
258 | if [ -e $dirname/$o/$filename ]; then | 258 | if [ -e $dirname/$o/$filename ]; then |
259 | oenote $dirname/$o/$filename present, installing to $4 | 259 | bbnote $dirname/$o/$filename present, installing to $4 |
260 | install $1 $2 $dirname/$o/$filename $4 | 260 | install $1 $2 $dirname/$o/$filename $4 |
261 | return | 261 | return |
262 | fi | 262 | fi |
263 | done | 263 | done |
264 | # oenote overrides specific file NOT present, trying default=$3... | 264 | # bbnote overrides specific file NOT present, trying default=$3... |
265 | if [ -e $3 ]; then | 265 | if [ -e $3 ]; then |
266 | oenote $3 present, installing to $4 | 266 | bbnote $3 present, installing to $4 |
267 | install $1 $2 $3 $4 | 267 | install $1 $2 $3 $4 |
268 | else | 268 | else |
269 | oenote $3 NOT present, touching empty $4 | 269 | bbnote $3 NOT present, touching empty $4 |
270 | touch $4 | 270 | touch $4 |
271 | fi | 271 | fi |
272 | } | 272 | } |