From e47d21624dfec6f71742b837e91da553f18a28c5 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 10 Nov 2016 14:45:17 +1300 Subject: devtool: update-recipe: fix handling of compressed local patches It is possible to use gzip or bzip2 to compress patches and still refer to them in compressed form in the SRC_URI value within a recipe. If you run "devtool modify" on such a recipe, make changes to the commit for the patch and then run devtool update-recipe, we need to correctly associate the commit back to the compressed patch file and re-compress the patch, neither of which we were doing previously. Additionally, add an oe-selftest test to ensure this doesn't regress in future. Fixes [YOCTO #8278]. Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton --- .../recipes-test/devtool/devtool-test-patch-gz.bb | 16 ++++++++++++++++ .../devtool/devtool-test-patch-gz/readme.patch.gz | Bin 0 -> 449 bytes 2 files changed, 16 insertions(+) create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-patch-gz/readme.patch.gz (limited to 'meta-selftest') diff --git a/meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb b/meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb new file mode 100644 index 0000000000..719a5f1c9e --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb @@ -0,0 +1,16 @@ +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "libxres libxext virtual/libx11 ncurses" + +SRC_URI = "http://downloads.yoctoproject.org/releases/xrestop/xrestop-0.4.tar.gz \ + file://readme.patch.gz \ + " + +S = "${WORKDIR}/xrestop-0.4" + +SRC_URI[md5sum] = "d8a54596cbaf037e62b80c4585a3ca9b" +SRC_URI[sha256sum] = "67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257" + +inherit autotools pkgconfig + diff --git a/meta-selftest/recipes-test/devtool/devtool-test-patch-gz/readme.patch.gz b/meta-selftest/recipes-test/devtool/devtool-test-patch-gz/readme.patch.gz new file mode 100644 index 0000000000..4752492ccd Binary files /dev/null and b/meta-selftest/recipes-test/devtool/devtool-test-patch-gz/readme.patch.gz differ -- cgit 1.2.3-korg