diff --git a/meta-openeuler/recipes-core/busybox/busybox_1.33.1.bb b/meta-openeuler/recipes-core/busybox/busybox_1.33.1.bb index afcb1162477a7c0510fb464d306ae039198e7678..0c58fe71cb83e5ec625a27a7df2f12fa72c3e978 100644 --- a/meta-openeuler/recipes-core/busybox/busybox_1.33.1.bb +++ b/meta-openeuler/recipes-core/busybox/busybox_1.33.1.bb @@ -44,7 +44,11 @@ FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf ${sysconfd FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" FILES_${PN}-hwclock = "${sysconfdir}/init.d/hwclock.sh" -FILES_${PN}-linuxrc = "/linuxrc" +FILES_${PN}-linuxrc = "/linuxrc /init" +PACKAGES =+ "${PN}-bash ${PN}-login ${PN}-groups" +FILES_${PN}-bash = "${base_bindir}/bash" +FILES_${PN}-login = "${base_bindir}/login" +FILES_${PN}-groups = "${bindir}/groups" INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev ${PN}-hwclock" @@ -106,5 +110,8 @@ do_compile () { do_install () { oe_runmake CONFIG_PREFIX="${D}" install + pushd "${D}" + ln -s bin/busybox init + popd } INSANE_SKIP += "already-stripped" diff --git a/meta-openeuler/recipes-core/glibc/glibc_2.25.bb b/meta-openeuler/recipes-core/glibc/glibc_2.25.bb index d5167a4a458f895b5e29fd5058f14796f01ed1a1..b4a42602b2807dd60ecd5a1404d4b5130ded3561 100644 --- a/meta-openeuler/recipes-core/glibc/glibc_2.25.bb +++ b/meta-openeuler/recipes-core/glibc/glibc_2.25.bb @@ -27,10 +27,11 @@ SRC_URI_aarch64 = "file://openeuler_gcc_arm64le" SRC_URI_arm = "file://openeuler_gcc_arm32le" #Not strip toolchain INHIBIT_SYSROOT_STRIP = "1" +INSANE_SKIP_${PN} += "already-stripped" #FILESPATH_prepend += "${LOCAL_FILES}:" DL_DIR = "${LOCAL_SYSROOT_DL_DIR}" -S_aarch64 = "${WORKDIR}/openeuler_gcc_arm64le/sysroot" -S_arm = "${WORKDIR}/openeuler_gcc_arm32le/sysroot" +S_aarch64 = "${WORKDIR}/openeuler_gcc_arm64le" +S_arm = "${WORKDIR}/openeuler_gcc_arm32le" PSEUDO_DISABLED = "1" PRIVATE_LIBS_${PN}-dev_append = "libdl.so.2 libresolv.so.2 libm.so.6 librt.so.1 libnsl.so.1 libnss_files.so.2 " @@ -44,30 +45,41 @@ do_compile () { do_install() { install -m 0755 -d ${D}/ - cp -pPR ${S}/* ${D}/ - #for f in ${D}${bindir}/${EULER_TOOLCHAIN_SYSNAME}-*; do - echo "EULER_TOOLCHAIN_SYSNAME:$EULER_TOOLCHAIN_SYSNAME" - echo "TARGET_PREFIX:$TARGET_PREFIX" - EULER_TOOLCHAIN_SYSNAME="aarch64-openeuler-linux-gnu" - EULER_TOOLCHAIN_TARGET_PREFIX="aarch64-openeuler-linux-" - echo "D:${D}" + install -m 0755 -d ${D}/${base_libdir} + install -m 0755 -d ${D}/${libdir} + cp -pPR ${S}/sysroot/* ${D}/ rm -rf ${D}/etc/rpc rm -rf ${D}/${base_libdir}/debug - echo ${libdir} - echo ${base_libdir} + chown root:root ${D}/ -R } +FILES_${PN} = " \ +${base_libdir}/ld-linux*.so.* \ +${libdir}/libc.so \ +${base_libdir}/libm.so \ +${base_libdir}/libc.so.6 \ +${base_libdir}/libm.so.6 \ +${libdir}/libcrypt.so \ +${libdir}/libnss_compat.so \ +${libdir}/libresolv.so \ +${base_libdir}/libcrypt.so.1 \ +${base_libdir}/libnss_compat.so.2 \ +${base_libdir}/libnsl.so.1 \ +{base_libdir}/libnss_files.so.2 \ +${base_libdir}/libresolv.so.2 \ +${base_libdir}/librt* \ +${base_libdir}/libpthread* \ +${base_libdir}/libutil* \ +${base_libdir}/libgcc_s.so.1 \ +${base_libdir}/libtirpc.so* \ +" +INSANE_SKIP_${PN} += "installed-vs-shipped" +INSANE_SKIP += "dev-elf dev-so" + SYSROOT_DIRS += "/*" #depends by glibc-locale do_stash_locale() { : } addtask do_stash_locale -deltask do_package -deltask do_package_write_rpm -#depends by libgcc -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 22cf83388f484c5b8f4ad6f6886d5c8122fd9c28..925051030e6f291b80fbbe797bff5c39c2f8d861 100644 --- a/meta-openeuler/recipes-core/iSulad/iSulad_2.0.9.bb +++ b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.9.bb @@ -29,6 +29,8 @@ EXTRA_OECMAKE = "-DENABLE_GRPC=OFF -DENABLE_SYSTEMD_NOTIFY=OFF -DENABLE_SELINUX= INHIBIT_PACKAGE_DEBUG_SPLIT = "1" FILES_${PN} += "${libdir}/* " +#remove so from ${PN}-dev +FILES_SOLIBSDEV = "" do_configure_prepend() { grep -q CMAKE_SYSROOT ${WORKDIR}/toolchain.cmake || cat >> ${WORKDIR}/toolchain.cmake <