From cf6291bf64c0f38d85d6b613e25170483d7da340 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Tue, 11 Apr 2023 15:15:17 +0200 Subject: [PATCH] libgpiod: generalize the local files directories In order to avoid having to rename the directories containing ptest scripts on every update, use a more generic, per-major-release name and extend the FILESEXTRAPATHS. Signed-off-by: Bartosz Golaszewski Signed-off-by: Khem Raj --- .../libgpiod/{libgpiod-1.6.4 => libgpiod-1.x}/run-ptest | 0 .../libgpiod/{libgpiod-2.0 => libgpiod-2.x}/run-ptest | 0 meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb | 2 ++ meta-oe/recipes-support/libgpiod/libgpiod_2.0.bb | 2 ++ 4 files changed, 4 insertions(+) rename meta-oe/recipes-support/libgpiod/{libgpiod-1.6.4 => libgpiod-1.x}/run-ptest (100%) rename meta-oe/recipes-support/libgpiod/{libgpiod-2.0 => libgpiod-2.x}/run-ptest (100%) diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-1.6.4/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest similarity index 100% rename from meta-oe/recipes-support/libgpiod/libgpiod-1.6.4/run-ptest rename to meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.0/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest similarity index 100% rename from meta-oe/recipes-support/libgpiod/libgpiod-2.0/run-ptest rename to meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb index df0e3f104a..b28aa8e698 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb +++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" SRC_URI[sha256sum] = "7b146e12f28fbca3df7557f176eb778c5ccf952ca464698dba8a61b2e1e3f9b5" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:" + inherit python3native PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2" diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.0.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.0.bb index 4397641c7f..bdfd72f2e6 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod_2.0.bb +++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.0.bb @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = " \ file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \ " +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" + SRC_URI[sha256sum] = "f74cbf82038b3cb98ebeb25bce55ee2553be28194002d2a9889b9268cce2dd07" # Enable all project features for ptest