diff --git a/meta-openeuler/classes/get_rpmdeps.bbclass b/meta-openeuler/classes/get_rpmdeps.bbclass index 28583665bb2a141afc4beeb476de87cad7934f8e..cd0328156424d419f12fc0d6f4d6ad1d78f861a2 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 a199305016e8acac9b79da055445e4bcdd99695a..7c98f752e719ffd6758647cc26105d35e4f53e0e 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] = ""