diff options
author | Alexander Kanavin <alex@linutronix.de> | 2021-09-08 20:01:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-11 18:41:37 +0100 |
commit | 094dcb2936e0157ccb5916b72fcf4d86a3d2e347 (patch) | |
tree | d2053266443cf2692dbbb0c552c6f4b1584e7a2f | |
parent | ce636119aaede58b3b0b5fdf1f87dff7b42a0b7a (diff) | |
download | poky-094dcb2936e0157ccb5916b72fcf4d86a3d2e347.tar.gz |
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>
-rw-r--r-- | meta/recipes-extended/lsof/files/lsof-remove-host-information.patch | 17 | ||||
-rw-r--r-- | meta/recipes-extended/lsof/lsof_4.94.0.bb (renamed from meta/recipes-extended/lsof/lsof_4.91.bb) | 28 |
2 files changed, 13 insertions, 32 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 b7d2323dc9..70155f9a1d 100644 --- a/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch +++ b/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch | |||
@@ -1,25 +1,29 @@ | |||
1 | Remove host information from version.h | 1 | From 95b8a13c1ea4274f58304bf5c4f7ca3d036b10f3 Mon Sep 17 00:00:00 2001 |
2 | From: Li Wang <li.wang@windriver.com> | ||
3 | Date: Wed, 30 Aug 2017 15:05:16 +0800 | ||
4 | Subject: [PATCH] Remove host information from version.h | ||
2 | 5 | ||
3 | make lsof not include host information | 6 | make lsof not include host information |
4 | 7 | ||
5 | Upstream-Status: Inappropriate [embedded specific] | 8 | Upstream-Status: Inappropriate [embedded specific] |
6 | 9 | ||
7 | Signed-off-by: Li Wang <li.wang@windriver.com> | 10 | Signed-off-by: Li Wang <li.wang@windriver.com> |
11 | |||
8 | --- | 12 | --- |
9 | dialects/linux/Makefile | 50 +++++++++-------------------------------------- | 13 | dialects/linux/Makefile | 50 ++++++++--------------------------------- |
10 | 1 file changed, 9 insertions(+), 41 deletions(-) | 14 | 1 file changed, 9 insertions(+), 41 deletions(-) |
11 | 15 | ||
12 | diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile | 16 | diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile |
13 | index 2bea108..792142b 100644 | 17 | index 61e8643..5458a0a 100644 |
14 | --- a/dialects/linux/Makefile | 18 | --- a/dialects/linux/Makefile |
15 | +++ b/dialects/linux/Makefile | 19 | +++ b/dialects/linux/Makefile |
16 | @@ -76,48 +76,16 @@ version.h: FRC | 20 | @@ -95,48 +95,16 @@ version.h: FRC |
17 | @echo Constructing version.h | 21 | @echo Constructing version.h |
18 | @rm -f version.h | 22 | @rm -f version.h |
19 | @echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h; | 23 | @echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h; |
20 | - @echo '#define LSOF_CC "${CC}"' >> version.h | 24 | - @echo '#define LSOF_CC "${CC}"' >> version.h |
21 | - @echo '#define LSOF_CCV "${CCV}"' >> version.h | 25 | - @echo '#define LSOF_CCV "${CCV}"' >> version.h |
22 | - @echo '#define LSOF_CCDATE "'`date`'"' >> version.h | 26 | - @echo '#define LSOF_CCDATE "$(BUILD_DATE)"' >> version.h |
23 | - @echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h | 27 | - @echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h |
24 | + @echo '#define LSOF_CC ""' >> version.h | 28 | + @echo '#define LSOF_CC ""' >> version.h |
25 | + @echo '#define LSOF_CCV ""' >> version.h | 29 | + @echo '#define LSOF_CCV ""' >> version.h |
@@ -71,6 +75,3 @@ index 2bea108..792142b 100644 | |||
71 | @sed '/VN/s/.ds VN \(.*\)/#define LSOF_VERSION "\1"/' < version >> version.h | 75 | @sed '/VN/s/.ds VN \(.*\)/#define LSOF_VERSION "\1"/' < version >> version.h |
72 | 76 | ||
73 | FRC: | 77 | FRC: |
74 | -- | ||
75 | 1.7.9.5 | ||
76 | |||
diff --git a/meta/recipes-extended/lsof/lsof_4.91.bb b/meta/recipes-extended/lsof/lsof_4.94.0.bb index d7428ea2c4..9659fa8246 100644 --- a/meta/recipes-extended/lsof/lsof_4.91.bb +++ b/meta/recipes-extended/lsof/lsof_4.94.0.bb | |||
@@ -11,33 +11,13 @@ 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 | ||
14 | SRC_URI = "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2 \ | 14 | SRC_URI = "git://github.com/lsof-org/lsof \ |
15 | file://lsof-remove-host-information.patch \ | 15 | file://lsof-remove-host-information.patch \ |
16 | " | 16 | " |
17 | 17 | ||
18 | SRC_URI[md5sum] = "148ed410cb52e08c2adc0c60f480f11f" | 18 | SRCREV = "005e014e1abdadb2493d8b3ce87b37a2c0a2351d" |
19 | SRC_URI[sha256sum] = "c9da946a525fbf82ff80090b6d1879c38df090556f3fe0e6d782cb44172450a3" | ||
20 | 19 | ||
21 | UPSTREAM_CHECK_URI = "https://github.com/lsof-org/lsof/releases/" | 20 | S = "${WORKDIR}/git" |
22 | UPSTREAM_CHECK_REGEX = "lsof_(?P<pver>.*)\.linux\.tar" | ||
23 | |||
24 | LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar" | ||
25 | |||
26 | S = "${WORKDIR}/lsof_${PV}_src" | ||
27 | |||
28 | python do_unpack () { | ||
29 | if not bb.data.inherits_class('externalsrc', d) or not d.getVar('EXTERNALSRC'): | ||
30 | # temporarily change S for unpack of lsof_${PV} | ||
31 | s = d.getVar('S', False) | ||
32 | d.setVar('S', '${WORKDIR}/lsof_${PV}') | ||
33 | bb.build.exec_func('base_do_unpack', d) | ||
34 | # temporarily change SRC_URI for unpack of lsof_${PV}_src | ||
35 | src_uri = d.getVar('SRC_URI', False) | ||
36 | d.setVar('SRC_URI', '${LOCALSRC}') | ||
37 | d.setVar('S', s) | ||
38 | bb.build.exec_func('base_do_unpack', d) | ||
39 | d.setVar('SRC_URI', src_uri) | ||
40 | } | ||
41 | 21 | ||
42 | export LSOF_INCLUDE = "${STAGING_INCDIR}" | 22 | export LSOF_INCLUDE = "${STAGING_INCDIR}" |
43 | 23 | ||
@@ -62,5 +42,5 @@ do_compile () { | |||
62 | do_install () { | 42 | do_install () { |
63 | install -d ${D}${sbindir} ${D}${mandir}/man8 | 43 | install -d ${D}${sbindir} ${D}${mandir}/man8 |
64 | install -m 0755 lsof ${D}${sbindir}/lsof | 44 | install -m 0755 lsof ${D}${sbindir}/lsof |
65 | install -m 0644 lsof.8 ${D}${mandir}/man8/lsof.8 | 45 | install -m 0644 Lsof.8 ${D}${mandir}/man8/lsof.8 |
66 | } | 46 | } |