Skip to contentSkip to conversation

llvm3.2: drop this version

PATCH In review Martin Jansa 3 participants 4 messages Oct 20, 2013 – Oct 21, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 llvm3.2: drop this version

* 3.3 is used by default mesa config, 2.8 is used in meta-java, keep 2.9 as last in 2*

---
 meta-oe/recipes-core/llvm/llvm3.2/arm_fenv_uclibc.patch | 14 --------------
 meta-oe/recipes-core/llvm/llvm3.2_3.2.bb                |  9 ---------
 2 files changed, 23 deletions(-)
 delete mode 100644 meta-oe/recipes-core/llvm/llvm3.2/arm_fenv_uclibc.patch
 delete mode 100644 meta-oe/recipes-core/llvm/llvm3.2_3.2.bb
meta-oe/recipes-core/llvm/llvm3.2/arm_fenv_uclibc.patch deleted +0 -14
deleted file mode 100644
index c3ae494..0000000
@@ -1,14 +0,0 @@
-Index: llvm-2.9/include/llvm/Support/FEnv.h
-===================================================================
---- llvm-2.9.orig/include/llvm/Support/FEnv.h	2010-11-29 20:44:50.000000000 +0100
-+++ llvm-2.9/include/llvm/Support/FEnv.h	2011-11-18 18:42:22.580161297 +0100
-@@ -17,6 +17,9 @@
- 
- #include "llvm/Config/config.h"
- #include <cerrno>
-+
-+#undef HAVE_FENV_H
-+
- #ifdef HAVE_FENV_H
- #include <fenv.h>
- #endif
meta-oe/recipes-core/llvm/llvm3.2_3.2.bb deleted +0 -9
deleted file mode 100644
index 48e27b9..0000000
@@ -1,9 +0,0 @@
-require llvm.inc
-require llvm3.inc
-
-# 3.2 is different then 2.8, 2.9 and 3.3
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=60fdd7739841f04a2ce2171a726be8f3"
-
-SRC_URI_append_libc-uclibc = " file://arm_fenv_uclibc.patch "
-SRC_URI[md5sum] = "71610289bbc819e3e15fdd562809a2d7"
-SRC_URI[sha256sum] = "125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343"
Signature · 1 line
1.8.4
#1 lore raw

PATCH 2/2 bigbuckbunny: Don't use whole avi in LIC_FILES_CHKSUM and add version

* it's causing huge deploy/licenses files:

  211M    deploy/licenses/bigbuckbunny-480p
  317M    deploy/licenses/bigbuckbunny-720p
  886M    deploy/licenses/bigbuckbunny-1080p

and avi checksum is already verified by SRC_URI checksums

---
 .../recipes-multimedia/sample-content/bigbuckbunny-1080p.bb          | 5 +++--
 .../recipes-multimedia/sample-content/bigbuckbunny-480p.bb           | 5 +++--
 .../recipes-multimedia/sample-content/bigbuckbunny-720p.bb           | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)
meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb +3 -2
index 93a52c0..e49b472 100644
@@ -1,6 +1,7 @@
 DESCRIPTION = "Big Buck Bunny movie - 1080P"
-LICENSE = "CC-BY"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/big_buck_bunny_1080p_surround.avi;md5=223991c8b33564eb77988a4c13c1c76a"
+LICENSE = "CC-BY-3.0"
+# http://www.bigbuckbunny.org/index.php/about/
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
 
 SRC_URI = "http://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_1080p_surround.avi"
 SRC_URI[md5sum] = "223991c8b33564eb77988a4c13c1c76a"
meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb +3 -2
index 31a90ca..84f3259 100644
@@ -1,6 +1,7 @@
 DESCRIPTION = "Big Buck Bunny movie - 480P"
-LICENSE = "CC-BY"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/big_buck_bunny_480p_surround-fix.avi;md5=ed7ed01e9aefba8ddd77c13332cec120"
+LICENSE = "CC-BY-3.0"
+# http://www.bigbuckbunny.org/index.php/about/
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
 
 SRC_URI = "http://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_480p_surround-fix.avi"
 SRC_URI[md5sum] = "ed7ed01e9aefba8ddd77c13332cec120"
meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb +3 -2
index 61cdfdc..810e05f 100644
@@ -1,6 +1,7 @@
 DESCRIPTION = "Big Buck Bunny movie - 720P"
-LICENSE = "CC-BY"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/big_buck_bunny_720p_surround.avi;md5=0da8fe124595f5b206d64cb1400bbefc"
+LICENSE = "CC-BY-3.0"
+# http://www.bigbuckbunny.org/index.php/about/
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
 
 SRC_URI = "http://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_720p_surround.avi"
 SRC_URI[md5sum] = "0da8fe124595f5b206d64cb1400bbefc"
Signature · 1 line
1.8.4
Acked-by on v1 2/2
#2 lore raw

Re: [meta-oe][meta-multimedia][PATCH 2/2] bigbuckbunny: Don't use whole avi in LIC_FILES_CHKSUM and add version

Quoted 7 lines · Martin Jansa

* it's causing huge deploy/licenses files:

  211M    deploy/licenses/bigbuckbunny-480p
  317M    deploy/licenses/bigbuckbunny-720p
  886M    deploy/licenses/bigbuckbunny-1080p

and avi checksum is already verified by SRC_URI checksums

Agreed!

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
#3 lore raw
In reply to Martin Jansa
Quoted 1 line · Martin Jansa

* 3.3 is used by default mesa config, 2.8 is used in meta-java, keep 2.9 as last in 2*

who is using 2.9 ? I would suggest to keep the one we know is used.

Quoted 51 lines
---
 meta-oe/recipes-core/llvm/llvm3.2/arm_fenv_uclibc.patch | 14 --------------
 meta-oe/recipes-core/llvm/llvm3.2_3.2.bb                |  9 ---------
 2 files changed, 23 deletions(-)
 delete mode 100644 meta-oe/recipes-core/llvm/llvm3.2/arm_fenv_uclibc.patch
 delete mode 100644 meta-oe/recipes-core/llvm/llvm3.2_3.2.bb
meta-oe/recipes-core/llvm/llvm3.2/arm_fenv_uclibc.patch deleted +0 -14
deleted file mode 100644
index c3ae494..0000000
@@ -1,14 +0,0 @@
-Index: llvm-2.9/include/llvm/Support/FEnv.h
-===================================================================
---- llvm-2.9.orig/include/llvm/Support/FEnv.h  2010-11-29 20:44:50.000000000 +0100
-+++ llvm-2.9/include/llvm/Support/FEnv.h       2011-11-18 18:42:22.580161297 +0100
-@@ -17,6 +17,9 @@
-
- #include "llvm/Config/config.h"
- #include <cerrno>
-+
-+#undef HAVE_FENV_H
-+
- #ifdef HAVE_FENV_H
- #include <fenv.h>
- #endif
meta-oe/recipes-core/llvm/llvm3.2_3.2.bb deleted +0 -10
deleted file mode 100644
index 48e27b9..0000000
@@ -1,9 +0,0 @@
-require llvm.inc
-require llvm3.inc
-
-# 3.2 is different then 2.8, 2.9 and 3.3
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=60fdd7739841f04a2ce2171a726be8f3"
-
-SRC_URI_append_libc-uclibc = " file://arm_fenv_uclibc.patch "
-SRC_URI[md5sum] = "71610289bbc819e3e15fdd562809a2d7"
-SRC_URI[sha256sum] = "125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343"
--

1.8.4

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel