From c775ec16ef2f63d6f90857bbaf0a73780d9c8fb4 Mon Sep 17 00:00:00 2001 From: liangfangping Date: Tue, 7 Dec 2021 15:13:22 +0800 Subject: [PATCH] modify busybox bb file for glibc 2.34 Signed-off-by: liangfangping --- .../recipes-core/busybox/busybox_1.33.1.bb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 c08122ac9f7..c04d71af9ca 100644 --- a/meta-openeuler/recipes-core/busybox/busybox_1.33.1.bb +++ b/meta-openeuler/recipes-core/busybox/busybox_1.33.1.bb @@ -11,6 +11,7 @@ INHIBIT_DEFAULT_DEPS = "1" PR = "r1" DEPENDS += "virtual/libc" +DEPENDS += "libtirpc" #get arch info inherit kernel-arch @@ -69,7 +70,18 @@ RDEPENDS_${PN} = "${@["", "busybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_man do_configure() { cp ../yocto-embedded-tools/config/arm64/defconfig-busybox .config - set -e + set +e + grep -E '^CONFIG_FEATURE_MOUNT_NFS=y|^CONFIG_FEATURE_INETD_RPC=y' .config + ret=$? + if [ $ret -eq 0 ]; then + grep -E '^CONFIG_EXTRA_CFLAGS=".*-I/usr/include/tirpc|^CONFIG_EXTRA_LDLIBS=".*tirpc' .config + ret=$? + if [ $ret -ne 0 ]; then + sed -i 's/^CONFIG_EXTRA_CFLAGS="/CONFIG_EXTRA_CFLAGS="-I\/usr\/include\/tirpc /g' .config + sed -i 's/^CONFIG_EXTRA_LDLIBS="/CONFIG_EXTRA_LDLIBS="tirpc /g' .config + fi + fi + set -e yes '' | oe_runmake oldconfig } -- Gitee