From c44f3edfa6de060ac0cf76b5612bacb5c4cb5738 Mon Sep 17 00:00:00 2001 From: zhuyan Date: Sun, 19 Sep 2021 17:09:02 +0800 Subject: [PATCH 1/2] fix shadow compile error Signed-off-by: zhuyan --- meta-openeuler/conf/local.conf.sample | 4 ++-- meta-openeuler/recipes-core/images/openeuler-image.bb | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-openeuler/conf/local.conf.sample b/meta-openeuler/conf/local.conf.sample index f712b954e27..94b42d637f2 100644 --- a/meta-openeuler/conf/local.conf.sample +++ b/meta-openeuler/conf/local.conf.sample @@ -271,8 +271,8 @@ BB_DISKMON_DIRS ??= "\ # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. CONF_VERSION = "2" -HOSTTOOLS += "patchelf python chrpath rpmbuild pkg-config flex bison bc automake autoreconf libtool ninja xz autopoint autoreconf aclocal libtoolize autoscan autom4te autoconf autoheader autoupdate libtool libtoolize pkg-config cmake fmt gperf" -HOSTTOOLS_remove += "diffstat lz4c pzstd rpcgen" +HOSTTOOLS += "patchelf python chrpath rpmbuild pkg-config flex bison bc automake autoreconf libtool ninja xz autopoint autoreconf aclocal libtoolize autoscan autom4te autoconf autoheader autoupdate libtool libtoolize pkg-config cmake fmt gperf m4" +HOSTTOOLS_remove += "diffstat lz4c pzstd rpcgen g++" SANITY_REQUIRED_UTILITIES_remove += "diffstat chrpath" CONNECTIVITY_CHECK_URIS = "" #PREFERRED_VERSION_linux-yocto = "5.10%" diff --git a/meta-openeuler/recipes-core/images/openeuler-image.bb b/meta-openeuler/recipes-core/images/openeuler-image.bb index 580a722dec0..25f913306aa 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image.bb +++ b/meta-openeuler/recipes-core/images/openeuler-image.bb @@ -48,7 +48,6 @@ xxdo_image_complete() { IMAGE_INSTALL += " \ busybox \ linux-openeuler \ -glibc \ zlib \ libcap-ng \ cracklib \ -- Gitee From 30ea326e65121f013e400ec0b6f050262bad815f Mon Sep 17 00:00:00 2001 From: zhuyan Date: Sun, 19 Sep 2021 17:25:20 +0800 Subject: [PATCH 2/2] add os-base to release Signed-off-by: zhuyan --- meta-openeuler/recipes-core/images/openeuler-image.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-openeuler/recipes-core/images/openeuler-image.bb b/meta-openeuler/recipes-core/images/openeuler-image.bb index 25f913306aa..f487b848bbf 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image.bb +++ b/meta-openeuler/recipes-core/images/openeuler-image.bb @@ -48,6 +48,7 @@ xxdo_image_complete() { IMAGE_INSTALL += " \ busybox \ linux-openeuler \ +os-base \ zlib \ libcap-ng \ cracklib \ -- Gitee