summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-05-05 07:05:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-05 21:17:38 +0100
commitbfac9978003212768b8951864235d5fb07b45021 (patch)
tree0efdba24851590e6a9c9caea7eafbcbcb95121cf
parent2a39819c3943a0a31b7ab1559f938d7a161795d4 (diff)
downloadpoky-bfac9978003212768b8951864235d5fb07b45021.tar.gz
lsof: update 4.94.0 -> 4.95.0
(From OE-Core rev: 2bdeb1067a27fc478556bee9d22672be554611db) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/lsof/files/lsof-remove-host-information.patch12
-rw-r--r--meta/recipes-extended/lsof/lsof_4.95.0.bb (renamed from meta/recipes-extended/lsof/lsof_4.94.0.bb)2
2 files changed, 6 insertions, 8 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
index 70155f9a1d..08f083cf83 100644
--- a/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch
+++ b/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch
@@ -1,4 +1,4 @@
1From 95b8a13c1ea4274f58304bf5c4f7ca3d036b10f3 Mon Sep 17 00:00:00 2001 1From 4233b5ac1629c225a7a80f33efc0eff527a95851 Mon Sep 17 00:00:00 2001
2From: Li Wang <li.wang@windriver.com> 2From: Li Wang <li.wang@windriver.com>
3Date: Wed, 30 Aug 2017 15:05:16 +0800 3Date: Wed, 30 Aug 2017 15:05:16 +0800
4Subject: [PATCH] Remove host information from version.h 4Subject: [PATCH] Remove host information from version.h
@@ -10,24 +10,22 @@ Upstream-Status: Inappropriate [embedded specific]
10Signed-off-by: Li Wang <li.wang@windriver.com> 10Signed-off-by: Li Wang <li.wang@windriver.com>
11 11
12--- 12---
13 dialects/linux/Makefile | 50 ++++++++--------------------------------- 13 dialects/linux/Makefile | 48 +++++++----------------------------------
14 1 file changed, 9 insertions(+), 41 deletions(-) 14 1 file changed, 8 insertions(+), 40 deletions(-)
15 15
16diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile 16diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile
17index 61e8643..5458a0a 100644 17index 46c83c2..50f03cc 100644
18--- a/dialects/linux/Makefile 18--- a/dialects/linux/Makefile
19+++ b/dialects/linux/Makefile 19+++ b/dialects/linux/Makefile
20@@ -95,48 +95,16 @@ version.h: FRC 20@@ -84,47 +84,15 @@ version.h: FRC
21 @echo Constructing version.h 21 @echo Constructing version.h
22 @rm -f version.h 22 @rm -f version.h
23 @echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h; 23 @echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
24- @echo '#define LSOF_CC "${CC}"' >> version.h 24- @echo '#define LSOF_CC "${CC}"' >> version.h
25- @echo '#define LSOF_CCV "${CCV}"' >> version.h 25- @echo '#define LSOF_CCV "${CCV}"' >> version.h
26- @echo '#define LSOF_CCDATE "$(BUILD_DATE)"' >> version.h
27- @echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h 26- @echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
28+ @echo '#define LSOF_CC ""' >> version.h 27+ @echo '#define LSOF_CC ""' >> version.h
29+ @echo '#define LSOF_CCV ""' >> version.h 28+ @echo '#define LSOF_CCV ""' >> version.h
30+ @echo '#define LSOF_CCDATE ""' >> version.h
31+ @echo '#define LSOF_CCFLAGS ""' >> version.h 29+ @echo '#define LSOF_CCFLAGS ""' >> version.h
32 @echo '#define LSOF_CINFO "${CINFO}"' >> version.h 30 @echo '#define LSOF_CINFO "${CINFO}"' >> version.h
33- @if [ "X${LSOF_HOST}" = "X" ]; then \ 31- @if [ "X${LSOF_HOST}" = "X" ]; then \
diff --git a/meta/recipes-extended/lsof/lsof_4.94.0.bb b/meta/recipes-extended/lsof/lsof_4.95.0.bb
index c2b8bc839b..f380de0b6b 100644
--- a/meta/recipes-extended/lsof/lsof_4.94.0.bb
+++ b/meta/recipes-extended/lsof/lsof_4.95.0.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \
15 file://lsof-remove-host-information.patch \ 15 file://lsof-remove-host-information.patch \
16 " 16 "
17 17
18SRCREV = "005e014e1abdadb2493d8b3ce87b37a2c0a2351d" 18SRCREV = "67d8c828e7bdc01ba93f8ff79765dd424da0c9d7"
19 19
20S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
21 21