summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Wang <li.wang@windriver.com>2017-08-30 15:05:16 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 17:41:41 +0100
commitccf65a6b478b6cf6152859885160ca400a95a43c (patch)
tree68bb36521666b710f5ed81946d9636f21ed6f959
parentbbd38c5d4b89a7194f06d7d66570c58e8811c030 (diff)
downloadpoky-ccf65a6b478b6cf6152859885160ca400a95a43c.tar.gz
lsof: remove host information from version.h
lsof -v would show some information for host. Clean up these from version.h. (From OE-Core rev: a822bf7843f0f22f898ce667c8fb0aafbb317826) Signed-off-by: Li Wang <li.wang@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/lsof/files/lsof-remove-host-information.patch76
-rw-r--r--meta/recipes-extended/lsof/lsof_4.89.bb4
2 files changed, 79 insertions, 1 deletions
diff --git a/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch b/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch
new file mode 100644
index 0000000000..b7d2323dc9
--- /dev/null
+++ b/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch
@@ -0,0 +1,76 @@
1Remove host information from version.h
2
3make lsof not include host information
4
5Upstream-Status: Inappropriate [embedded specific]
6
7Signed-off-by: Li Wang <li.wang@windriver.com>
8---
9 dialects/linux/Makefile | 50 +++++++++--------------------------------------
10 1 file changed, 9 insertions(+), 41 deletions(-)
11
12diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile
13index 2bea108..792142b 100644
14--- a/dialects/linux/Makefile
15+++ b/dialects/linux/Makefile
16@@ -76,48 +76,16 @@ version.h: FRC
17 @echo Constructing version.h
18 @rm -f version.h
19 @echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
20- @echo '#define LSOF_CC "${CC}"' >> version.h
21- @echo '#define LSOF_CCV "${CCV}"' >> version.h
22- @echo '#define LSOF_CCDATE "'`date`'"' >> version.h
23- @echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
24+ @echo '#define LSOF_CC ""' >> version.h
25+ @echo '#define LSOF_CCV ""' >> version.h
26+ @echo '#define LSOF_CCDATE ""' >> version.h
27+ @echo '#define LSOF_CCFLAGS ""' >> version.h
28 @echo '#define LSOF_CINFO "${CINFO}"' >> version.h
29- @if [ "X${LSOF_HOST}" = "X" ]; then \
30- echo '#define LSOF_HOST "'`uname -n`'"' >> version.h; \
31- else \
32- if [ "${LSOF_HOST}" = "none" ]; then \
33- echo '#define LSOF_HOST ""' >> version.h; \
34- else \
35- echo '#define LSOF_HOST "${LSOF_HOST}"' >> version.h; \
36- fi \
37- fi
38- @echo '#define LSOF_LDFLAGS "${CFGL}"' >> version.h
39- @if [ "X${LSOF_LOGNAME}" = "X" ]; then \
40- echo '#define LSOF_LOGNAME "${LOGNAME}"' >> version.h; \
41- else \
42- if [ "${LSOF_LOGNAME}" = "none" ]; then \
43- echo '#define LSOF_LOGNAME ""' >> version.h; \
44- else \
45- echo '#define LSOF_LOGNAME "${LSOF_LOGNAME}"' >> version.h; \
46- fi; \
47- fi
48- @if [ "X${LSOF_SYSINFO}" = "X" ]; then \
49- echo '#define LSOF_SYSINFO "'`uname -a`'"' >> version.h; \
50- else \
51- if [ "${LSOF_SYSINFO}" = "none" ]; then \
52- echo '#define LSOF_SYSINFO ""' >> version.h; \
53- else \
54- echo '#define LSOF_SYSINFO "${LSOF_SYSINFO}"' >> version.h; \
55- fi \
56- fi
57- @if [ "X${LSOF_USER}" = "X" ]; then \
58- echo '#define LSOF_USER "${USER}"' >> version.h; \
59- else \
60- if [ "${LSOF_USER}" = "none" ]; then \
61- echo '#define LSOF_USER ""' >> version.h; \
62- else \
63- echo '#define LSOF_USER "${LSOF_USER}"' >> version.h; \
64- fi \
65- fi
66+ @echo '#define LSOF_HOST ""' >> version.h;
67+ @echo '#define LSOF_LDFLAGS ""' >> version.h
68+ @echo '#define LSOF_LOGNAME ""' >> version.h;
69+ @echo '#define LSOF_SYSINFO ""' >> version.h;
70+ @echo '#define LSOF_USER ""' >> version.h;
71 @sed '/VN/s/.ds VN \(.*\)/#define LSOF_VERSION "\1"/' < version >> version.h
72
73 FRC:
74--
751.7.9.5
76
diff --git a/meta/recipes-extended/lsof/lsof_4.89.bb b/meta/recipes-extended/lsof/lsof_4.89.bb
index 29245b1ab9..14546db23c 100644
--- a/meta/recipes-extended/lsof/lsof_4.89.bb
+++ b/meta/recipes-extended/lsof/lsof_4.89.bb
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429
11# https://people.freebsd.org/~abe/ ). http://www.mirrorservice.org seems to be 11# https://people.freebsd.org/~abe/ ). http://www.mirrorservice.org seems to be
12# the most commonly used alternative. 12# the most commonly used alternative.
13 13
14SRC_URI = "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2" 14SRC_URI = "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2 \
15 file://lsof-remove-host-information.patch \
16 "
15 17
16SRC_URI[md5sum] = "1b9cd34f3fb86856a125abbf2be3a386" 18SRC_URI[md5sum] = "1b9cd34f3fb86856a125abbf2be3a386"
17SRC_URI[sha256sum] = "81ac2fc5fdc944793baf41a14002b6deb5a29096b387744e28f8c30a360a3718" 19SRC_URI[sha256sum] = "81ac2fc5fdc944793baf41a14002b6deb5a29096b387744e28f8c30a360a3718"