From 936eba3e1059d1dcd5e58c1ce76870fff7b11b3c Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 10 Nov 2016 14:45:20 +1300 Subject: oe-selftest: devtool: test that updating a file with subdir= works If you have a file:// entry in SRC_URI with a subdir= parameter that makes it extract into the source tree, then when you update that file in oe-local-files and run devtool update-recipe then you want the original file to be updated. This was made to work by OE-Core commit 9069fef5dad5a873c8a8f720f7bcbc7625556309 together with 31f1bbad248c36a8c86dde4ff57ce42efc664082, however until now there was no oe-selftest test to verify it. Note that in order to succeed this test also requires the fix "lib/oe/recipeutils: ignore archives by default in get_recipe_local_files()" since the test recipe uses a local tarball. Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton --- meta-selftest/recipes-test/devtool/devtool-test-subdir.bb | 7 +++++++ .../devtool-test-subdir/devtool-test-subdir.tar.gz | Bin 0 -> 181 bytes .../recipes-test/devtool/devtool-test-subdir/testfile | 1 + 3 files changed, 8 insertions(+) create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-subdir.bb create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-subdir/devtool-test-subdir.tar.gz create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-subdir/testfile (limited to 'meta-selftest/recipes-test') diff --git a/meta-selftest/recipes-test/devtool/devtool-test-subdir.bb b/meta-selftest/recipes-test/devtool/devtool-test-subdir.bb new file mode 100644 index 0000000000..1a163f8a4a --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-test-subdir.bb @@ -0,0 +1,7 @@ +LICENSE = "CLOSED" +INHIBIT_DEFAULT_DEPS = "1" + +SRC_URI = "file://devtool-test-subdir.tar.gz \ + file://testfile;subdir=${BPN}" + +S = "${WORKDIR}/${BPN}" diff --git a/meta-selftest/recipes-test/devtool/devtool-test-subdir/devtool-test-subdir.tar.gz b/meta-selftest/recipes-test/devtool/devtool-test-subdir/devtool-test-subdir.tar.gz new file mode 100644 index 0000000000..3d44f803cb Binary files /dev/null and b/meta-selftest/recipes-test/devtool/devtool-test-subdir/devtool-test-subdir.tar.gz differ diff --git a/meta-selftest/recipes-test/devtool/devtool-test-subdir/testfile b/meta-selftest/recipes-test/devtool/devtool-test-subdir/testfile new file mode 100644 index 0000000000..12b519c0d6 --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-test-subdir/testfile @@ -0,0 +1 @@ +Modified version -- cgit v1.2.3