From 2923608cb5b2bc2531970f7afeb73f446b654d4d Mon Sep 17 00:00:00 2001 From: lisimin Date: Thu, 16 Sep 2021 18:10:51 +0800 Subject: [PATCH] support get RPMDEPS installed at host Signed-off-by: lisimin --- meta-openeuler/classes/get_rpmdeps.bbclass | 2 +- meta-openeuler/conf/distro/openeuler.conf | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-openeuler/classes/get_rpmdeps.bbclass b/meta-openeuler/classes/get_rpmdeps.bbclass index 28583665bb2..cd032815642 100644 --- a/meta-openeuler/classes/get_rpmdeps.bbclass +++ b/meta-openeuler/classes/get_rpmdeps.bbclass @@ -1,7 +1,7 @@ python set_rpmdeps() { import subprocess rpmdeps = d.getVar('RPMDEPS', True) - if not rpmdeps: + if not rpmdeps or rpmdeps == "default": rpmdeps = subprocess.Popen('rpm --eval="%{_rpmconfigdir}"', shell=True, stdout=subprocess.PIPE) stdout, stderr = rpmdeps.communicate() d.setVar('RPMDEPS', os.path.join(str(stdout, "utf-8").strip(), "rpmdeps")) diff --git a/meta-openeuler/conf/distro/openeuler.conf b/meta-openeuler/conf/distro/openeuler.conf index a199305016e..7c98f752e71 100644 --- a/meta-openeuler/conf/distro/openeuler.conf +++ b/meta-openeuler/conf/distro/openeuler.conf @@ -75,5 +75,6 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" DEPENDS_remove += "cmake-native ninja-native" #DL_DIR = "${LOCAL_FILES}" DL_DIR = "downloads" +export RPMDEPS = "default" INHERIT += "get_dl_dir get_rpmdeps" do_fetch[file-checksums] = "" -- Gitee