diff --git a/meta-openeuler/conf/local.conf.sample b/meta-openeuler/conf/local.conf.sample index f712b954e270edac71a3221a1dd469a6eeb3d680..94b42d637f2040cbe363f373a23f5f80f6da1499 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 580a722dec027508952049a23a1f5008a62ece61..f487b848bbffe30f939a4d9b6df21a18f0f7d5ce 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image.bb +++ b/meta-openeuler/recipes-core/images/openeuler-image.bb @@ -48,7 +48,7 @@ xxdo_image_complete() { IMAGE_INSTALL += " \ busybox \ linux-openeuler \ -glibc \ +os-base \ zlib \ libcap-ng \ cracklib \