summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2022-07-27 15:51:02 +0800
committerKhem Raj <raj.khem@gmail.com>2022-07-27 11:59:40 -0400
commitf563466af7a71d2ce9752948bc36808697b51a56 (patch)
tree78292cac8920ff0dd47bc41d5996413ec65be186
parent86b58eb81986f8f771eb6a02e1c4dc24b967ad92 (diff)
downloadmeta-openembedded-f563466af7a71d2ce9752948bc36808697b51a56.tar.gz
s-nail: fix buildpaths issue
Fixes: WARNING: s-nail-14.9.24-r0 do_package_qa: QA Issue: File /usr/bin/s-nail in package s-nail contains reference to TMPDIR [buildpaths] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/s-nail/files/0001-mk-make-config.sh-not-reveal-the-build-env.patch43
-rw-r--r--meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb1
2 files changed, 44 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/s-nail/files/0001-mk-make-config.sh-not-reveal-the-build-env.patch b/meta-oe/recipes-extended/s-nail/files/0001-mk-make-config.sh-not-reveal-the-build-env.patch
new file mode 100644
index 000000000..18ef6cae2
--- /dev/null
+++ b/meta-oe/recipes-extended/s-nail/files/0001-mk-make-config.sh-not-reveal-the-build-env.patch
@@ -0,0 +1,43 @@
1From fa93dab6393527673e642f26b6ea2c4413dd3cfe Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Wed, 27 Jul 2022 13:40:12 +0800
4Subject: [PATCH] make-config.sh: hidden the build info
5
6Use the CC as placeholder to replace the real build information which
7will be collected via src/mx/accmacvar.c and then added in the final
8binary s-nail, so hidden the build info to avoid revealing the detailed
9build info.
10
11Upstream-Status: Inappropriate [oe specific]
12
13Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
14---
15 mk/make-config.sh | 6 +++---
16 1 file changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/mk/make-config.sh b/mk/make-config.sh
19index 2d7c619..9146004 100644
20--- a/mk/make-config.sh
21+++ b/mk/make-config.sh
22@@ -3637,15 +3637,15 @@ LIBS=`squeeze_ws "${LIBS}"`
23 COMMLINE=`printf '%s\n' "${COMMLINE}" | ${sed} -e 's/.*--\(.*\)/\1/'`
24 COMMLINE=`squeeze_ws "${COMMLINE}"`
25
26-i=`printf '%s %s %s\n' "${CC}" "${CFLAGS}" "${i}"`
27+i="CC"
28 printf '#define VAL_BUILD_CC "%s"\n' "$i" >> ${h}
29 i=`string_to_char_array "${i}"`
30 printf '#define VAL_BUILD_CC_ARRAY %s\n' "$i" >> ${h}
31-i=`printf '%s %s %s\n' "${CC}" "${LDFLAGS}" "${LIBS}"`
32+i="CC"
33 printf '#define VAL_BUILD_LD "%s"\n' "$i" >> ${h}
34 i=`string_to_char_array "${i}"`
35 printf '#define VAL_BUILD_LD_ARRAY %s\n' "$i" >> ${h}
36-i=${COMMLINE}
37+i="CC"
38 printf '#define VAL_BUILD_REST "%s"\n' "$i" >> ${h}
39 i=`string_to_char_array "${i}"`
40 printf '#define VAL_BUILD_REST_ARRAY %s\n' "$i" >> ${h}
41--
422.25.1
43
diff --git a/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb b/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb
index 6e004fc90..bcdb1e478 100644
--- a/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb
+++ b/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb
@@ -10,6 +10,7 @@ SRC_URI = "https://ftp.sdaoden.eu/${BP}.tar.xz \
10 file://0001-make.rc-set-VAL_MTA.patch \ 10 file://0001-make.rc-set-VAL_MTA.patch \
11 file://0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch \ 11 file://0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch \
12 file://0001-su_INLINE-eh-no-give-up-share-detection.patch \ 12 file://0001-su_INLINE-eh-no-give-up-share-detection.patch \
13 file://0001-mk-make-config.sh-not-reveal-the-build-env.patch \
13" 14"
14SRC_URI[sha256sum] = "2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c" 15SRC_URI[sha256sum] = "2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c"
15 16