From 5caac54029b48140ed5fe419adb2e7864ad4eec7 Mon Sep 17 00:00:00 2001 From: alichinese Date: Thu, 19 Sep 2024 11:32:58 +0800 Subject: [PATCH] hosttools: add zstd to prebuilt tools * the prepare project need unpack rpm which use zstd compressed, * so need unzstd to do it Signed-off-by: alichinese --- meta-openeuler/conf/distro/include/openeuler_hosttools.inc | 3 +++ .../recipes-core/meta/buildtools-extended-tarball.bbappend | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/meta-openeuler/conf/distro/include/openeuler_hosttools.inc b/meta-openeuler/conf/distro/include/openeuler_hosttools.inc index 3aefe6ee43e..522715ff3f3 100644 --- a/meta-openeuler/conf/distro/include/openeuler_hosttools.inc +++ b/meta-openeuler/conf/distro/include/openeuler_hosttools.inc @@ -148,4 +148,7 @@ HOSTTOOLS_NONFATAL += " xsltproc " # used for building oci image and docker image HOSTTOOLS_NONFATAL += " umoci skopeo" +# used for prepare project +HOSTTOOLS += "unzstd" + ASSUME_PROVIDED += " python3-cryptography-native " diff --git a/meta-openeuler/recipes-core/meta/buildtools-extended-tarball.bbappend b/meta-openeuler/recipes-core/meta/buildtools-extended-tarball.bbappend index ae1037f574d..8d6cdccc0b7 100644 --- a/meta-openeuler/recipes-core/meta/buildtools-extended-tarball.bbappend +++ b/meta-openeuler/recipes-core/meta/buildtools-extended-tarball.bbappend @@ -79,6 +79,11 @@ TOOLCHAIN_HOST_TASK += " \ nativesdk-binutils-dev \ " +# for prepare build +TOOLCHAIN_HOST_TASK += " \ + nativesdk-zstd \ +" + # this a workaround: Currently, in the CI environment, # there is a bug in the make operation, which the `realpath xxx_path` in the makefile cannot be executed correctly # So remove nativesdk-make from the prebuilt tool -- Gitee