diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-09-23 23:46:37 +0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-28 14:58:47 +0100 |
| commit | 62ea046099c9220a3b08b0898e26104da76614fe (patch) | |
| tree | 5307aa739a9a66f9909ae80cf683a45c2afb9eb1 /meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch | |
| parent | 82785064ac9059da83aa657b9ed8f8ff4a488ef8 (diff) | |
| download | poky-62ea046099c9220a3b08b0898e26104da76614fe.tar.gz | |
icecc-create-env-native: provide the script right in the tree
There is no point in downloading a tarball with no clear upstream (other than
icecc itself) and then patching it. Rather put new script in the source tree.
(From OE-Core rev: 409fa8ca4d37ad407faaa2a8935e9d2bb89776c9)
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch')
| -rw-r--r-- | meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch b/meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch deleted file mode 100644 index a7af2e3a98..0000000000 --- a/meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch +++ /dev/null | |||
| @@ -1,103 +0,0 @@ | |||
| 1 | --- a/icecc-create-env 2006-12-14 09:50:46.000000000 +0300 | ||
| 2 | +++ b/icecc-create-env 2011-08-31 17:52:45.000000000 +0400 | ||
| 3 | @@ -27,9 +27,6 @@ | ||
| 4 | # readlink is not portable enough. | ||
| 5 | path=`ls -H $path` | ||
| 6 | toadd="$name=$path" | ||
| 7 | - if test "$name" = "$path"; then | ||
| 8 | - toadd=$path | ||
| 9 | - fi | ||
| 10 | is_contained "$toadd" && return | ||
| 11 | if test -z "$silent"; then | ||
| 12 | echo "adding file $toadd" | ||
| 13 | @@ -117,6 +114,14 @@ | ||
| 14 | add_file "$specfile" | ||
| 15 | fi | ||
| 16 | |||
| 17 | +ltofile=`$added_gcc -print-prog-name=lto1` | ||
| 18 | +pluginfile="${ltofile%lto1}liblto_plugin.so" | ||
| 19 | +if test -r "$pluginfile" | ||
| 20 | +then | ||
| 21 | + add_file $pluginfile ${pluginfile#*usr} | ||
| 22 | + add_file $pluginfile /usr${pluginfile#*usr} | ||
| 23 | +fi | ||
| 24 | + | ||
| 25 | tempdir=`mktemp -d /tmp/iceccenvXXXXXX` | ||
| 26 | new_target_files= | ||
| 27 | for i in $target_files; do | ||
| 28 | @@ -140,49 +147,44 @@ | ||
| 29 | done | ||
| 30 | |||
| 31 | #sort the files | ||
| 32 | - target_files=`for i in $new_target_files; do echo $i; done | sort` | ||
| 33 | +target_files=`for i in $new_target_files; do echo $i; done | sort` | ||
| 34 | |||
| 35 | #test if an archive name was supplied | ||
| 36 | #if not use the md5 of all files as the archive name | ||
| 37 | if test -z "$archive_name"; then | ||
| 38 | -md5sum=NONE | ||
| 39 | -for file in /usr/bin/md5sum /bin/md5 /usr/bin/md5; do | ||
| 40 | - if test -x $file; then | ||
| 41 | - md5sum=$file | ||
| 42 | - break | ||
| 43 | - fi | ||
| 44 | -done | ||
| 45 | + md5sum=NONE | ||
| 46 | + for file in /usr/bin/md5sum /bin/md5 /usr/bin/md5; do | ||
| 47 | + if test -x $file; then | ||
| 48 | + md5sum=$file | ||
| 49 | + break | ||
| 50 | + fi | ||
| 51 | + done | ||
| 52 | |||
| 53 | -#calculate md5 and use it as the archive name | ||
| 54 | -archive_name=`for i in $target_files; do $md5sum $tempdir/$i; done | sed -e 's/ .*$//' | $md5sum | sed -e 's/ .*$//'` || { | ||
| 55 | - if test -z "$silent"; then | ||
| 56 | - echo "Couldn't compute MD5 sum." | ||
| 57 | + #calculate md5 and use it as the archive name | ||
| 58 | + archive_name=`for i in $target_files; do test -f $tempdir/$i && $md5sum $tempdir/$i; done | sed -e 's/ .*$//' | $md5sum | sed -e 's/ .*$//'`.tar.gz || { | ||
| 59 | + if test -z "$silent"; then | ||
| 60 | + echo "Couldn't compute MD5 sum." | ||
| 61 | + fi | ||
| 62 | + exit 2 | ||
| 63 | + } | ||
| 64 | + mydir=`pwd` | ||
| 65 | +else | ||
| 66 | + mydir="`dirname "$archive_name"`" | ||
| 67 | + | ||
| 68 | + #check if we have a full path or only a filename | ||
| 69 | + if test "$mydir" = "." ; then | ||
| 70 | + mydir=`pwd` | ||
| 71 | + else | ||
| 72 | + mydir="" | ||
| 73 | fi | ||
| 74 | - exit 2 | ||
| 75 | -} | ||
| 76 | - | ||
| 77 | fi | ||
| 78 | |||
| 79 | if test -z "$silent"; then | ||
| 80 | -echo "creating $archive_name.tar.gz" | ||
| 81 | +echo "creating $archive_name" | ||
| 82 | fi | ||
| 83 | |||
| 84 | -if test -z "$archive_name"; then | ||
| 85 | - mydir=`pwd` | ||
| 86 | -else | ||
| 87 | -# mydir=dirname ${archive_name} | ||
| 88 | - mydir=${archive_name%/*} | ||
| 89 | - | ||
| 90 | -#check if we have a full path or only a filename | ||
| 91 | - if test -z "$mydir"; then | ||
| 92 | - mydir=`pwd` | ||
| 93 | - else | ||
| 94 | - mydir="" | ||
| 95 | - fi | ||
| 96 | - | ||
| 97 | -fi | ||
| 98 | cd $tempdir | ||
| 99 | -tar -czhf "$mydir/$archive_name".tar.gz $target_files || { | ||
| 100 | +tar -czhf "$mydir/$archive_name" $target_files || { | ||
| 101 | if test -z "$silent"; then | ||
| 102 | echo "Couldn't create archive" | ||
| 103 | fi | ||
