diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-06 07:42:15 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-07 17:25:02 +0000 |
commit | 71c2eb3ac9b0cfd26fc6f481dc1f86634ffe7387 (patch) | |
tree | 3e853196e5e34044f7a0a12cf5116e7073c3f507 /meta/recipes-extended | |
parent | 3a20168e703743aef276dba7d382defd39d49ecc (diff) | |
download | poky-71c2eb3ac9b0cfd26fc6f481dc1f86634ffe7387.tar.gz |
lsof: upgrade 4.98.0 -> 4.99.3
Convert from handcrafted makefiles to autotools (added in 4.97.0).
(From OE-Core rev: c86b575446699864c102dd0408ebe58b5729881c)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/lsof/files/remove-host-information.patch | 44 | ||||
-rw-r--r-- | meta/recipes-extended/lsof/lsof_4.98.0.bb | 48 | ||||
-rw-r--r-- | meta/recipes-extended/lsof/lsof_4.99.3.bb | 23 |
3 files changed, 63 insertions, 52 deletions
diff --git a/meta/recipes-extended/lsof/files/remove-host-information.patch b/meta/recipes-extended/lsof/files/remove-host-information.patch index fb90366ffa..1f2b4afa69 100644 --- a/meta/recipes-extended/lsof/files/remove-host-information.patch +++ b/meta/recipes-extended/lsof/files/remove-host-information.patch | |||
@@ -1,14 +1,50 @@ | |||
1 | From 4f05492ac07a7bbaf06dd8265b9cba329e1b53e9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Wed, 30 Aug 2017 15:05:16 +0800 | ||
4 | Subject: [PATCH] lsof: remove host information from version.h | ||
5 | |||
1 | lsof doesn't embed the username or hostname in the build if SOURCE_DATE_EPOCH is | 6 | lsof doesn't embed the username or hostname in the build if SOURCE_DATE_EPOCH is |
2 | defined, but this still embeds build paths. Delete all of the host details to | 7 | defined, but this still embeds build paths. Delete all of the host details to |
3 | ensure that no host information is leaked into the binary. | 8 | ensure that no host information is leaked into the binary. |
4 | 9 | ||
5 | Upstream-Status: Inappropriate | 10 | Upstream-Status: Inappropriate |
6 | Signed-off-by: Ross Burton <ross.burton@arm.com> | 11 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
12 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
13 | --- | ||
14 | autotools/version.h.in | 16 ++++----- | ||
15 | lib/dialects/linux/Makefile | 69 ++++++------------------------------- | ||
16 | 2 files changed, 19 insertions(+), 66 deletions(-) | ||
7 | 17 | ||
8 | diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile | 18 | diff --git a/autotools/version.h.in b/autotools/version.h.in |
9 | index 176a4c2..ef5a633 100644 | 19 | index aac0b80..2e635a5 100644 |
10 | --- a/dialects/linux/Makefile | 20 | --- a/autotools/version.h.in |
11 | +++ b/dialects/linux/Makefile | 21 | +++ b/autotools/version.h.in |
22 | @@ -37,13 +37,13 @@ | ||
23 | |||
24 | #include "config.h" | ||
25 | #define LSOF_VERSION PACKAGE_VERSION | ||
26 | -#define LSOF_HOST "@host@" | ||
27 | -#define LSOF_LOGNAME "@logname@" | ||
28 | -#define LSOF_USER "@user@" | ||
29 | -#define LSOF_CC "@cc@" | ||
30 | -#define LSOF_CCV "@ccv@" | ||
31 | -#define LSOF_CCFLAGS "@ccflags@" | ||
32 | -#define LSOF_LDFLAGS "@ldflags@" | ||
33 | -#define LSOF_SYSINFO "@sysinfo@" | ||
34 | +#define LSOF_HOST "" | ||
35 | +#define LSOF_LOGNAME "" | ||
36 | +#define LSOF_USER "" | ||
37 | +#define LSOF_CC "" | ||
38 | +#define LSOF_CCV "" | ||
39 | +#define LSOF_CCFLAGS "" | ||
40 | +#define LSOF_LDFLAGS "" | ||
41 | +#define LSOF_SYSINFO "" | ||
42 | |||
43 | #endif | ||
44 | diff --git a/lib/dialects/linux/Makefile b/lib/dialects/linux/Makefile | ||
45 | index f8adaa6..7a79ca7 100644 | ||
46 | --- a/lib/dialects/linux/Makefile | ||
47 | +++ b/lib/dialects/linux/Makefile | ||
12 | @@ -83,64 +83,17 @@ ${LIB}: FRC | 48 | @@ -83,64 +83,17 @@ ${LIB}: FRC |
13 | version.h: FRC | 49 | version.h: FRC |
14 | @echo Constructing version.h | 50 | @echo Constructing version.h |
diff --git a/meta/recipes-extended/lsof/lsof_4.98.0.bb b/meta/recipes-extended/lsof/lsof_4.98.0.bb deleted file mode 100644 index 835ce3b8df..0000000000 --- a/meta/recipes-extended/lsof/lsof_4.98.0.bb +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | SUMMARY = "LiSt Open Files tool" | ||
2 | DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \ | ||
3 | Its name stands for LiSt Open Files, and it does just that." | ||
4 | HOMEPAGE = "http://people.freebsd.org/~abe/" | ||
5 | SECTION = "devel" | ||
6 | LICENSE = "Spencer-94" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=a48ac97a8550eff12395a2c0d6151510" | ||
8 | |||
9 | SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \ | ||
10 | file://remove-host-information.patch" | ||
11 | SRCREV = "546eb1c9910e7c137fdff551683c35a736021e05" | ||
12 | |||
13 | S = "${WORKDIR}/git" | ||
14 | |||
15 | |||
16 | inherit update-alternatives | ||
17 | |||
18 | ALTERNATIVE:${PN} = "lsof" | ||
19 | ALTERNATIVE_LINK_NAME[lsof] = "${sbindir}/lsof" | ||
20 | # Make our priority higher than busybox | ||
21 | ALTERNATIVE_PRIORITY = "100" | ||
22 | |||
23 | |||
24 | export LSOF_INCLUDE = "${STAGING_INCDIR}" | ||
25 | |||
26 | do_configure () { | ||
27 | export LSOF_AR="${AR} cr" | ||
28 | export LSOF_RANLIB="${RANLIB}" | ||
29 | if [ "x${GLIBCVERSION}" != "x" ]; then | ||
30 | LINUX_CLIB=`echo ${GLIBCVERSION} |sed -e 's,\.,,g'` | ||
31 | LINUX_CLIB="-DGLIBCV=${LINUX_CLIB}" | ||
32 | export LINUX_CLIB | ||
33 | fi | ||
34 | yes | ./Configure linux | ||
35 | } | ||
36 | |||
37 | export I = "${STAGING_INCDIR}" | ||
38 | export L = "${STAGING_INCDIR}" | ||
39 | |||
40 | do_compile () { | ||
41 | oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS} -I..' | ||
42 | } | ||
43 | |||
44 | do_install () { | ||
45 | install -d ${D}${sbindir} ${D}${mandir}/man8 | ||
46 | install -m 0755 lsof ${D}${sbindir}/lsof | ||
47 | install -m 0644 Lsof.8 ${D}${mandir}/man8/lsof.8 | ||
48 | } | ||
diff --git a/meta/recipes-extended/lsof/lsof_4.99.3.bb b/meta/recipes-extended/lsof/lsof_4.99.3.bb new file mode 100644 index 0000000000..93e91fb427 --- /dev/null +++ b/meta/recipes-extended/lsof/lsof_4.99.3.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | SUMMARY = "LiSt Open Files tool" | ||
2 | DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \ | ||
3 | Its name stands for LiSt Open Files, and it does just that." | ||
4 | HOMEPAGE = "http://people.freebsd.org/~abe/" | ||
5 | SECTION = "devel" | ||
6 | LICENSE = "Spencer-94" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=a48ac97a8550eff12395a2c0d6151510" | ||
8 | |||
9 | SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \ | ||
10 | file://remove-host-information.patch" | ||
11 | SRCREV = "2e4c7a1a9bc7258dc5b6a3ab28ebca44174279a8" | ||
12 | |||
13 | S = "${WORKDIR}/git" | ||
14 | |||
15 | inherit update-alternatives autotools pkgconfig manpages | ||
16 | PACKAGECONFIG[manpages] = "" | ||
17 | |||
18 | DEPENDS += "groff-native" | ||
19 | |||
20 | ALTERNATIVE:${PN} = "lsof" | ||
21 | ALTERNATIVE_LINK_NAME[lsof] = "${bindir}/lsof" | ||
22 | # Make our priority higher than busybox | ||
23 | ALTERNATIVE_PRIORITY = "100" | ||