lsof: update 4.91 -> 4.94.0

Drop all custom sourcedir handling as the source is now a standard
git checkout.

(From OE-Core rev: 13965426b79e8c32f800a4317454321cfd2d06d1)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2021-09-08 20:01:20 +02:00
committed by Richard Purdie
parent ce636119aa
commit 094dcb2936
2 changed files with 13 additions and 32 deletions

View File

@@ -1,25 +1,29 @@
Remove host information from version.h
From 95b8a13c1ea4274f58304bf5c4f7ca3d036b10f3 Mon Sep 17 00:00:00 2001
From: Li Wang <li.wang@windriver.com>
Date: Wed, 30 Aug 2017 15:05:16 +0800
Subject: [PATCH] Remove host information from version.h
make lsof not include host information
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Li Wang <li.wang@windriver.com>
---
dialects/linux/Makefile | 50 +++++++++--------------------------------------
dialects/linux/Makefile | 50 ++++++++---------------------------------
1 file changed, 9 insertions(+), 41 deletions(-)
diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile
index 2bea108..792142b 100644
index 61e8643..5458a0a 100644
--- a/dialects/linux/Makefile
+++ b/dialects/linux/Makefile
@@ -76,48 +76,16 @@ version.h: FRC
@@ -95,48 +95,16 @@ version.h: FRC
@echo Constructing version.h
@rm -f version.h
@echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
- @echo '#define LSOF_CC "${CC}"' >> version.h
- @echo '#define LSOF_CCV "${CCV}"' >> version.h
- @echo '#define LSOF_CCDATE "'`date`'"' >> version.h
- @echo '#define LSOF_CCDATE "$(BUILD_DATE)"' >> version.h
- @echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
+ @echo '#define LSOF_CC ""' >> version.h
+ @echo '#define LSOF_CCV ""' >> version.h
@@ -71,6 +75,3 @@ index 2bea108..792142b 100644
@sed '/VN/s/.ds VN \(.*\)/#define LSOF_VERSION "\1"/' < version >> version.h
FRC:
--
1.7.9.5

View File

@@ -11,33 +11,13 @@ LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429
# https://people.freebsd.org/~abe/ ). http://www.mirrorservice.org seems to be
# the most commonly used alternative.
SRC_URI = "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2 \
SRC_URI = "git://github.com/lsof-org/lsof \
file://lsof-remove-host-information.patch \
"
SRC_URI[md5sum] = "148ed410cb52e08c2adc0c60f480f11f"
SRC_URI[sha256sum] = "c9da946a525fbf82ff80090b6d1879c38df090556f3fe0e6d782cb44172450a3"
SRCREV = "005e014e1abdadb2493d8b3ce87b37a2c0a2351d"
UPSTREAM_CHECK_URI = "https://github.com/lsof-org/lsof/releases/"
UPSTREAM_CHECK_REGEX = "lsof_(?P<pver>.*)\.linux\.tar"
LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
S = "${WORKDIR}/lsof_${PV}_src"
python do_unpack () {
if not bb.data.inherits_class('externalsrc', d) or not d.getVar('EXTERNALSRC'):
# temporarily change S for unpack of lsof_${PV}
s = d.getVar('S', False)
d.setVar('S', '${WORKDIR}/lsof_${PV}')
bb.build.exec_func('base_do_unpack', d)
# temporarily change SRC_URI for unpack of lsof_${PV}_src
src_uri = d.getVar('SRC_URI', False)
d.setVar('SRC_URI', '${LOCALSRC}')
d.setVar('S', s)
bb.build.exec_func('base_do_unpack', d)
d.setVar('SRC_URI', src_uri)
}
S = "${WORKDIR}/git"
export LSOF_INCLUDE = "${STAGING_INCDIR}"
@@ -62,5 +42,5 @@ do_compile () {
do_install () {
install -d ${D}${sbindir} ${D}${mandir}/man8
install -m 0755 lsof ${D}${sbindir}/lsof
install -m 0644 lsof.8 ${D}${mandir}/man8/lsof.8
install -m 0644 Lsof.8 ${D}${mandir}/man8/lsof.8
}