From 16d47976ad1877079c6d8a7c3a7796188d689d61 Mon Sep 17 00:00:00 2001 From: liangfangping Date: Tue, 7 Dec 2021 14:54:12 +0800 Subject: [PATCH 1/2] modify busybox bb file for glibc 2.34 Signed-off-by: liangfangping --- .../recipes-core/busybox/busybox_1.33.1.bb | 13 ++++++++++++- 1 file changed, 12 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..56a6d5b50ce 100644 --- a/meta-openeuler/recipes-core/busybox/busybox_1.33.1.bb +++ b/meta-openeuler/recipes-core/busybox/busybox_1.33.1.bb @@ -69,7 +69,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 From 040ce6e53cbec0a634499ac5dee072f49ffb842a Mon Sep 17 00:00:00 2001 From: liangfangping Date: Tue, 7 Dec 2021 14:54:12 +0800 Subject: [PATCH 2/2] modify busybox bb file for glibc 2.34 Signed-off-by: liangfangping --- lfp-busybox.patch | 24 +++++++++++++++++++ .../recipes-core/busybox/busybox_1.33.1.bb | 14 ++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 lfp-busybox.patch diff --git a/lfp-busybox.patch b/lfp-busybox.patch new file mode 100644 index 00000000000..296e1fd76f0 --- /dev/null +++ b/lfp-busybox.patch @@ -0,0 +1,24 @@ +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 c08122a..56a6d5b 100644 +--- a/meta-openeuler/recipes-core/busybox/busybox_1.33.1.bb ++++ b/meta-openeuler/recipes-core/busybox/busybox_1.33.1.bb +@@ -69,7 +69,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 + } + 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