Patchwork [4/5] libarchive: remove undistributable copyright content from source

login
register
mail settings
Submitter Otavio Salvador
Date July 11, 2011, 5:27 p.m.
Message ID <8e42cc4c6a96394988e32d8f8be3ca10c13724ac.1310405202.git.otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/7329/
State New, archived
Headers show

Comments

Otavio Salvador - July 11, 2011, 5:27 p.m.
The original tarball has two undistributable files that we have
removed from the repacked tarball. The issue has been reported
upstream at:

http://code.google.com/p/libarchive/issues/detail?id=162

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 ...rchive_2.8.4.bb => libarchive_2.8.4.yocto.1.bb} |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/libarchive/{libarchive_2.8.4.bb => libarchive_2.8.4.yocto.1.bb} (68%)
Richard Purdie - July 12, 2011, 1:40 p.m.
On Mon, 2011-07-11 at 17:27 +0000, Otavio Salvador wrote:
> The original tarball has two undistributable files that we have
> removed from the repacked tarball. The issue has been reported
> upstream at:
> 
> http://code.google.com/p/libarchive/issues/detail?id=162
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>


Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-extended/libarchive/libarchive_2.8.4.bb b/meta/recipes-extended/libarchive/libarchive_2.8.4.yocto.1.bb
similarity index 68%
rename from meta/recipes-extended/libarchive/libarchive_2.8.4.bb
rename to meta/recipes-extended/libarchive/libarchive_2.8.4.yocto.1.bb
index 6d4fb39..94d261b 100644
--- a/meta/recipes-extended/libarchive/libarchive_2.8.4.bb
+++ b/meta/recipes-extended/libarchive/libarchive_2.8.4.yocto.1.bb
@@ -7,7 +7,9 @@  PR = "r0"
 
 DEPENDS = "libxml2"
 
-SRC_URI = "http://libarchive.googlecode.com/files/libarchive-${PV}.tar.gz \
+# We need to repack the tarball due undistributable content on the upstream one.
+# More details at http://code.google.com/p/libarchive/issues/detail?id=162
+SRC_URI = "http://autobuilder.yoctoproject.org/sources/libarchive-${PV}.tar.gz \
            file://0001-Patch-from-upstream-revision-1990.patch \
            file://0002-Patch-from-upstream-revision-1991.patch \
            file://0003-Patch-from-upstream-rev-2516.patch \
@@ -17,8 +19,8 @@  SRC_URI = "http://libarchive.googlecode.com/files/libarchive-${PV}.tar.gz \
            file://0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch \
            "
 
-SRC_URI[md5sum] = "83b237a542f27969a8d68ac217dc3796"
-SRC_URI[sha256sum] = "86cffa3eaa28d3116f5d0b20284026c3762cf4a2b52b9844df2b494d4a89f688"
+SRC_URI[md5sum] = "71242da5191f1218f13dd520d95a870e"
+SRC_URI[sha256sum] = "8cd55db11b1d6001ff8007e4d22b6f4a4bb215e70750e19ab44b84b99ab76053"
 
 inherit autotools lib_package