diff --git a/meta-openeuler/conf/distro/openeuler.conf b/meta-openeuler/conf/distro/openeuler.conf index af415eaf7cd525fe64c49d7876eb0120e0461712..51820d338e0f0ef87c23f5629d99d768308f4ac5 100644 --- a/meta-openeuler/conf/distro/openeuler.conf +++ b/meta-openeuler/conf/distro/openeuler.conf @@ -78,3 +78,4 @@ DL_DIR = "downloads" export RPMDEPS = "default" INHERIT += "get_dl_dir get_rpmdeps" do_fetch[file-checksums] = "" +SDK_INCLUDE_BUILDTOOLS = "0" diff --git a/meta-openeuler/conf/local.conf.sample b/meta-openeuler/conf/local.conf.sample index 94b42d637f2040cbe363f373a23f5f80f6da1499..01f32c56cd9fec7b70d2239149fe85bae5f938d8 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 m4" -HOSTTOOLS_remove += "diffstat lz4c pzstd rpcgen g++" +HOSTTOOLS += "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" SANITY_REQUIRED_UTILITIES_remove += "diffstat chrpath" CONNECTIVITY_CHECK_URIS = "" #PREFERRED_VERSION_linux-yocto = "5.10%" diff --git a/meta-openeuler/recipes-core/glibc/glibc_2.25.bb b/meta-openeuler/recipes-core/glibc/glibc_2.25.bb index ad573508dffecb4df7110a0f95bcfde46b2204dd..ac596c9e955b68fc5d2ae3b458778fe7015305d1 100644 --- a/meta-openeuler/recipes-core/glibc/glibc_2.25.bb +++ b/meta-openeuler/recipes-core/glibc/glibc_2.25.bb @@ -7,7 +7,7 @@ SECTION = "kernel" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" -#PACKAGES = "${PN}-dbg catchsegv sln nscd ldconfig ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage malloc-debug libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-src" +PACKAGES = "${PN}-dbg catchsegv sln nscd ldconfig ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage malloc-debug libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-src" #DEPENDS = "virtual/${TARGET_PREFIX}gcc libgcc-initial linux-libc-headers" PROVIDES += " \ @@ -69,3 +69,5 @@ deltask do_package_write_rpm do_packagedata () { : } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openeuler/recipes-core/iSulad/iSulad_2.0.9.bb b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.9.bb index 1cc15310e9ca90e172000600a761c4ffedcd5c5e..c6cef1a329ac535a4f1dae671fde9311833e6490 100644 --- a/meta-openeuler/recipes-core/iSulad/iSulad_2.0.9.bb +++ b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.9.bb @@ -11,6 +11,7 @@ SRC_URI = "file://iSulad/v2.0.9.tar.gz \ FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" DL_DIR = "${LOCAL_FILES}" S = "${WORKDIR}/${BPN}" +WARN_QA_remove += "uppercase-pn" inherit cmake OECMAKE_GENERATOR = "Unix Makefiles" diff --git a/meta-openeuler/recipes-core/images/openeuler-image.bb b/meta-openeuler/recipes-core/images/openeuler-image.bb index f487b848bbffe30f939a4d9b6df21a18f0f7d5ce..b6dab15949e0bd339f8aed9bd824c5c3d35fb6ab 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image.bb +++ b/meta-openeuler/recipes-core/images/openeuler-image.bb @@ -28,7 +28,8 @@ TOOLCHAIN_TARGET_TASK_remove += "${@multilib_pkg_extend(d, 'packagegroup-core-st python do_package() { bb.note("do nothing"); } -#deltask package +TOOLCHAIN_HOST_TASK_task-populate-sdk-ext = "" +TOOLCHAIN_HOST_TASK = "" #do_rootfs depends to command createrepo_c, so create an empty rootfs for do_image_tar python do_rootfs() { bb.note("do nothing"); @@ -41,10 +42,6 @@ python do_image() { os.makedirs(rootfs) } -xxdo_image_complete() { - : -} - IMAGE_INSTALL += " \ busybox \ linux-openeuler \ diff --git a/meta-openeuler/recipes-core/openssh/openssh_8.2p1.bb b/meta-openeuler/recipes-core/openssh/openssh_8.2p1.bb index 9112534460221b68e360a0b9265264767d167491..6f3c0c85903ec61c4371dd12b2ef8db3bad689b6 100644 --- a/meta-openeuler/recipes-core/openssh/openssh_8.2p1.bb +++ b/meta-openeuler/recipes-core/openssh/openssh_8.2p1.bb @@ -161,8 +161,4 @@ RCONFLICTS_${PN}-sshd = "dropbear" CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" -ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN}-scp = "scp" -ALTERNATIVE_${PN}-ssh = "ssh" - BBCLASSEXTEND += "nativesdk" diff --git a/meta-openeuler/recipes-core/shadow/shadow.inc b/meta-openeuler/recipes-core/shadow/shadow.inc index 666231dd2b29d4b8d2285e1ed4e2bc32ba715449..d227de122c9b3eccbacd7ab3e85bb3d23034edb4 100644 --- a/meta-openeuler/recipes-core/shadow/shadow.inc +++ b/meta-openeuler/recipes-core/shadow/shadow.inc @@ -182,18 +182,6 @@ FILES_${PN}-base = "\ " RDEPENDS_${PN} += "${PN}-base" -#inherit update-alternatives - -ALTERNATIVE_PRIORITY = "200" - -ALTERNATIVE_${PN} = "passwd chfn chsh chpasswd vipw vigr nologin login su" -ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd" -ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" -ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" -ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" - -ALTERNATIVE_${PN}-base = "newgrp groups" - PACKAGE_WRITE_DEPS += "shadow-native" pkg_postinst_${PN}_class-target () { if [ "x$D" != "x" ]; then diff --git a/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross.bb b/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross.bb index 4c3a396b8c1ead109b898debf866150ba64d9fde..7cd1f94ba1677ac08190814e2d98ff7868c1cfa0 100644 --- a/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross.bb +++ b/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross.bb @@ -4,6 +4,7 @@ inherit eulertoolchain require gcc-bin-toolchain.inc INHIBIT_DEFAULT_DEPS = "1" +INHIBIT_SYSROOT_STRIP = "1" PROVIDES = "\ virtual/${EULER_TOOLCHAIN_TARGET_PREFIX}binutils \ @@ -40,4 +41,4 @@ do_packagedata () { } addtask do_packagedata -INSANE_SKIP += "already-stripped" +INSANE_SKIP_${PN} += " already-stripped "