From b49e4c924d46082e774cc84037f78bad40208248 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Thu, 29 Aug 2019 16:30:15 +0300 Subject: [PATCH] Adapt to the lsb -> lsb-release change in OE-core Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- meta-oe/conf/layer.conf | 2 +- .../phoronix-test-suite/phoronix-test-suite_8.8.1.bb | 2 +- meta-oe/recipes-security/keyutils/keyutils_1.6.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index 4ddef29a3d..896a5d6f8b 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -49,7 +49,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ phoronix-test-suite->bash \ phoronix-test-suite->python \ phoronix-test-suite->php \ - phoronix-test-suite->lsb \ + phoronix-test-suite->lsb-release \ phoronix-test-suite->util-linux \ phoronix-test-suite->busybox \ " diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.8.1.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.8.1.bb index 8733844969..c4df1a90b8 100644 --- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.8.1.bb +++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.8.1.bb @@ -29,7 +29,7 @@ do_install() { SYSTEMD_AUTO_ENABLE = "disable" SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service" -RDEPENDS_${PN} += "bash python php-cli util-linux-lscpu os-release lsb" +RDEPENDS_${PN} += "bash python php-cli util-linux-lscpu os-release lsb-release" FILES_${PN} += " \ ${datadir}/phoronix-test-suite \ diff --git a/meta-oe/recipes-security/keyutils/keyutils_1.6.bb b/meta-oe/recipes-security/keyutils/keyutils_1.6.bb index 4d3a96f29b..dca86f3c62 100644 --- a/meta-oe/recipes-security/keyutils/keyutils_1.6.bb +++ b/meta-oe/recipes-security/keyutils/keyutils_1.6.bb @@ -46,7 +46,7 @@ do_install_ptest () { } -RDEPENDS_${PN}-ptest += "lsb" +RDEPENDS_${PN}-ptest += "lsb-release" RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils"