From ea62a6b30a0c564913ea4bb548b087aa5191edc9 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Tue, 30 Aug 2022 15:22:24 +0800 Subject: tcpreplay: fix buildpaths issue POSIX_SHELL is specified a host tool path as it searches path on build host using `which` when configure. Set it to a fixed path '/bin/sh'. Fixes: QA Issue: File /usr/bin/tcpbridge in package tcpreplay contains reference to TMPDIR File /usr/bin/tcpliveplay in package tcpreplay contains reference to TMPDIR File /usr/bin/tcprewrite in package tcpreplay contains reference to TMPDIR File /usr/bin/tcpcapinfo in package tcpreplay contains reference to TMPDIR File /usr/bin/tcpreplay in package tcpreplay contains reference to TMPDIR File /usr/bin/tcpprep in package tcpreplay contains reference to TMPDIR File /usr/bin/tcpreplay-edit in package tcpreplay contains reference to TMPDIR [buildpaths] QA Issue: File /usr/src/debug/tcpreplay/4.4.2-r0/src/defines.h in package tcpreplay-src contains reference to TMPDIR [buildpaths] Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- ...0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch | 45 ++++++++++++++++++++++ .../recipes-support/tcpreplay/tcpreplay_4.4.2.bb | 7 +++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-support/tcpreplay/tcpreplay/0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch new file mode 100644 index 0000000000..448455fffb --- /dev/null +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch @@ -0,0 +1,45 @@ +From 769e96b60f631e8c208fd7f72900d0bb17760f88 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Tue, 30 Aug 2022 09:54:11 +0800 +Subject: [PATCH] libopts.m4: set POSIX_SHELL to /bin/sh + +POSIX_SHELL is specified a host tool path as it searches path on build +host using `which` when configure. Set it to a fixed path '/bin/sh'. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + m4/libopts.m4 | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/m4/libopts.m4 b/m4/libopts.m4 +index cfbd477..c8047eb 100644 +--- a/m4/libopts.m4 ++++ b/m4/libopts.m4 +@@ -111,21 +111,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ + AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup strchr \ + strrchr strsignal fchmod fstat chmod]) + AC_PROG_SED +- [while : +- do +- POSIX_SHELL=`which bash` +- test -x "$POSIX_SHELL" && break +- POSIX_SHELL=`which dash` +- test -x "$POSIX_SHELL" && break +- POSIX_SHELL=/usr/xpg4/bin/sh +- test -x "$POSIX_SHELL" && break +- POSIX_SHELL=`/bin/sh -c ' +- exec 2>/dev/null +- if ! true ; then exit 1 ; fi +- echo /bin/sh'` +- test -x "$POSIX_SHELL" && break +- ]AC_MSG_ERROR([cannot locate a working POSIX shell])[ +- done] ++ POSIX_SHELL='/bin/sh' + AC_DEFINE_UNQUOTED([POSIX_SHELL], ["${POSIX_SHELL}"], + [define to a working POSIX compliant shell]) + AC_SUBST([POSIX_SHELL]) +-- +2.25.1 + diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.2.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.2.bb index 165a0e735b..7d2a6a14d2 100644 --- a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.2.bb +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.2.bb @@ -7,7 +7,9 @@ SECTION = "net" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8" -SRC_URI = "https://github.com/appneta/tcpreplay/releases/download/v${PV}/tcpreplay-${PV}.tar.gz" +SRC_URI = "https://github.com/appneta/tcpreplay/releases/download/v${PV}/tcpreplay-${PV}.tar.gz \ + file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \ + " SRC_URI[sha256sum] = "5b272cd83b67d6288a234ea15f89ecd93b4fadda65eddc44e7b5fcb2f395b615" @@ -19,3 +21,6 @@ EXTRA_OECONF += "--with-libpcap=${STAGING_DIR_HOST}/usr" inherit siteinfo autotools-brokensep +do_install:append() { + sed -i -e 's:${RECIPE_SYSROOT}::g' ${S}/src/defines.h +} -- cgit 1.2.3-korg