Patchwork [CONSOLIDATED,PULL,07/17] libarchive: update to 2.8.5

login
mail settings
Submitter Saul Wold
Date Nov. 8, 2011, 7:22 p.m.
Message ID <fb19df5b21e551c5dfdfa340438952560c5fa528.1320780004.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/14545/
State New
Headers show

Comments

Saul Wold - Nov. 8, 2011, 7:22 p.m.
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Remove patch "0003-Patch-from-upstream-rev-2516.patch" because it has been merged
to source codes.

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 ...rchive_2.8.4.yocto.1.bb => libarchive_2.8.5.bb} |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-extended/libarchive/{libarchive_2.8.4.yocto.1.bb => libarchive_2.8.5.bb} (76%)
Paul Menzel - Nov. 8, 2011, 10:08 p.m.
Dear Xiaofeng,


do I need to put people in CC?

Am Dienstag, den 08.11.2011, 11:22 -0800 schrieb Saul Wold:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> 
> Remove patch "0003-Patch-from-upstream-rev-2516.patch" because it has been merged
> to source codes.

Mentioning of the SRC_URI change would be also nice.

> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
>  ...rchive_2.8.4.yocto.1.bb => libarchive_2.8.5.bb} |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
>  rename meta/recipes-extended/libarchive/{libarchive_2.8.4.yocto.1.bb => libarchive_2.8.5.bb} (76%)
> 
> diff --git a/meta/recipes-extended/libarchive/libarchive_2.8.4.yocto.1.bb b/meta/recipes-extended/libarchive/libarchive_2.8.5.bb
> similarity index 76%
> rename from meta/recipes-extended/libarchive/libarchive_2.8.4.yocto.1.bb
> rename to meta/recipes-extended/libarchive/libarchive_2.8.5.bb
> index 94d261b..1bc49e2 100644
> --- a/meta/recipes-extended/libarchive/libarchive_2.8.4.yocto.1.bb
> +++ b/meta/recipes-extended/libarchive/libarchive_2.8.5.bb
> @@ -9,19 +9,19 @@ DEPENDS = "libxml2"
>  
>  # 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 \
> +SRC_URI = "http://libarchive.googlecode.com/files/libarchive-${PV}.tar.gz \

Reading the issues mentioned in the comment, I guess

    I've just deleted them from libarchive/2.8 branch as well.

means this landed in version 2.8.5? Please remove the comment then.

>             file://0001-Patch-from-upstream-revision-1990.patch \
>             file://0002-Patch-from-upstream-revision-1991.patch \
> -           file://0003-Patch-from-upstream-rev-2516.patch \
>             file://0004-Patch-from-upstream-rev-2514.patch \
>             file://0005-Patch-from-upstream-rev-2520.patch \
>             file://0006-Patch-from-upstream-rev-2521.patch \
>             file://0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch \
>             "
>  
> -SRC_URI[md5sum] = "71242da5191f1218f13dd520d95a870e"
> -SRC_URI[sha256sum] = "8cd55db11b1d6001ff8007e4d22b6f4a4bb215e70750e19ab44b84b99ab76053"
> +SRC_URI[md5sum] = "9caf51dcf6213e9c9f5a1c27448b9c90"
> +SRC_URI[sha256sum] = "13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d"
>  
>  inherit autotools lib_package
>  
>  BBCLASSEXTEND = "nativesdk"
> +

No new line please.


Thanks,

Paul

Patch

diff --git a/meta/recipes-extended/libarchive/libarchive_2.8.4.yocto.1.bb b/meta/recipes-extended/libarchive/libarchive_2.8.5.bb
similarity index 76%
rename from meta/recipes-extended/libarchive/libarchive_2.8.4.yocto.1.bb
rename to meta/recipes-extended/libarchive/libarchive_2.8.5.bb
index 94d261b..1bc49e2 100644
--- a/meta/recipes-extended/libarchive/libarchive_2.8.4.yocto.1.bb
+++ b/meta/recipes-extended/libarchive/libarchive_2.8.5.bb
@@ -9,19 +9,19 @@  DEPENDS = "libxml2"
 
 # 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 \
+SRC_URI = "http://libarchive.googlecode.com/files/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 \
            file://0004-Patch-from-upstream-rev-2514.patch \
            file://0005-Patch-from-upstream-rev-2520.patch \
            file://0006-Patch-from-upstream-rev-2521.patch \
            file://0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch \
            "
 
-SRC_URI[md5sum] = "71242da5191f1218f13dd520d95a870e"
-SRC_URI[sha256sum] = "8cd55db11b1d6001ff8007e4d22b6f4a4bb215e70750e19ab44b84b99ab76053"
+SRC_URI[md5sum] = "9caf51dcf6213e9c9f5a1c27448b9c90"
+SRC_URI[sha256sum] = "13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d"
 
 inherit autotools lib_package
 
 BBCLASSEXTEND = "nativesdk"
+