From patchwork Thu Nov 10 07:42:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [CONSOLIDATED, PULL, (v2), 04/33] libarchive: Remove obsolete comment and empty line at the end Date: Thu, 10 Nov 2011 07:42:46 -0000 From: Saul Wold X-Patchwork-Id: 14695 Message-Id: To: openembedded-core@lists.openembedded.org From: Paul Menzel This is a fix up for commit fb19df5b21e551c5dfdfa340438952560c5fa528 Author: Xiaofeng Yan Date: Mon Nov 7 20:03:53 2011 +0800 libarchive: update to 2.8.5 Remove patch "0003-Patch-from-upstream-rev-2516.patch" because it has been merged to source codes. Signed-off-by: Xiaofeng Yan removing a now obsolete comment because the undistributable content was removed [1] from upstream’s tarball. Also remove an empty line at the end introduced in the above commit. [1] http://code.google.com/p/libarchive/issues/detail?id=162 Signed-off-by: Paul Menzel --- .../libarchive/libarchive_2.8.5.bb | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/libarchive/libarchive_2.8.5.bb b/meta/recipes-extended/libarchive/libarchive_2.8.5.bb index 1bc49e2..5cf13e6 100644 --- a/meta/recipes-extended/libarchive/libarchive_2.8.5.bb +++ b/meta/recipes-extended/libarchive/libarchive_2.8.5.bb @@ -7,8 +7,6 @@ PR = "r0" 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://libarchive.googlecode.com/files/libarchive-${PV}.tar.gz \ file://0001-Patch-from-upstream-revision-1990.patch \ file://0002-Patch-from-upstream-revision-1991.patch \ @@ -24,4 +22,3 @@ SRC_URI[sha256sum] = "13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c inherit autotools lib_package BBCLASSEXTEND = "nativesdk" -