mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-04 16:10:04 +00:00
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>
This commit is contained in:
Alexander Kanavin
Richard Purdie
parent
3a20168e70
commit
71c2eb3ac9
|
|
@ -1,14 +1,50 @@
|
|||
From 4f05492ac07a7bbaf06dd8265b9cba329e1b53e9 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@arm.com>
|
||||
Date: Wed, 30 Aug 2017 15:05:16 +0800
|
||||
Subject: [PATCH] lsof: remove host information from version.h
|
||||
|
||||
lsof doesn't embed the username or hostname in the build if SOURCE_DATE_EPOCH is
|
||||
defined, but this still embeds build paths. Delete all of the host details to
|
||||
ensure that no host information is leaked into the binary.
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
autotools/version.h.in | 16 ++++-----
|
||||
lib/dialects/linux/Makefile | 69 ++++++-------------------------------
|
||||
2 files changed, 19 insertions(+), 66 deletions(-)
|
||||
|
||||
diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile
|
||||
index 176a4c2..ef5a633 100644
|
||||
--- a/dialects/linux/Makefile
|
||||
+++ b/dialects/linux/Makefile
|
||||
diff --git a/autotools/version.h.in b/autotools/version.h.in
|
||||
index aac0b80..2e635a5 100644
|
||||
--- a/autotools/version.h.in
|
||||
+++ b/autotools/version.h.in
|
||||
@@ -37,13 +37,13 @@
|
||||
|
||||
#include "config.h"
|
||||
#define LSOF_VERSION PACKAGE_VERSION
|
||||
-#define LSOF_HOST "@host@"
|
||||
-#define LSOF_LOGNAME "@logname@"
|
||||
-#define LSOF_USER "@user@"
|
||||
-#define LSOF_CC "@cc@"
|
||||
-#define LSOF_CCV "@ccv@"
|
||||
-#define LSOF_CCFLAGS "@ccflags@"
|
||||
-#define LSOF_LDFLAGS "@ldflags@"
|
||||
-#define LSOF_SYSINFO "@sysinfo@"
|
||||
+#define LSOF_HOST ""
|
||||
+#define LSOF_LOGNAME ""
|
||||
+#define LSOF_USER ""
|
||||
+#define LSOF_CC ""
|
||||
+#define LSOF_CCV ""
|
||||
+#define LSOF_CCFLAGS ""
|
||||
+#define LSOF_LDFLAGS ""
|
||||
+#define LSOF_SYSINFO ""
|
||||
|
||||
#endif
|
||||
diff --git a/lib/dialects/linux/Makefile b/lib/dialects/linux/Makefile
|
||||
index f8adaa6..7a79ca7 100644
|
||||
--- a/lib/dialects/linux/Makefile
|
||||
+++ b/lib/dialects/linux/Makefile
|
||||
@@ -83,64 +83,17 @@ ${LIB}: FRC
|
||||
version.h: FRC
|
||||
@echo Constructing version.h
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
SUMMARY = "LiSt Open Files tool"
|
||||
DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \
|
||||
Its name stands for LiSt Open Files, and it does just that."
|
||||
HOMEPAGE = "http://people.freebsd.org/~abe/"
|
||||
SECTION = "devel"
|
||||
LICENSE = "Spencer-94"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a48ac97a8550eff12395a2c0d6151510"
|
||||
|
||||
SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \
|
||||
file://remove-host-information.patch"
|
||||
SRCREV = "546eb1c9910e7c137fdff551683c35a736021e05"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
||||
inherit update-alternatives
|
||||
|
||||
ALTERNATIVE:${PN} = "lsof"
|
||||
ALTERNATIVE_LINK_NAME[lsof] = "${sbindir}/lsof"
|
||||
# Make our priority higher than busybox
|
||||
ALTERNATIVE_PRIORITY = "100"
|
||||
|
||||
|
||||
export LSOF_INCLUDE = "${STAGING_INCDIR}"
|
||||
|
||||
do_configure () {
|
||||
export LSOF_AR="${AR} cr"
|
||||
export LSOF_RANLIB="${RANLIB}"
|
||||
if [ "x${GLIBCVERSION}" != "x" ]; then
|
||||
LINUX_CLIB=`echo ${GLIBCVERSION} |sed -e 's,\.,,g'`
|
||||
LINUX_CLIB="-DGLIBCV=${LINUX_CLIB}"
|
||||
export LINUX_CLIB
|
||||
fi
|
||||
yes | ./Configure linux
|
||||
}
|
||||
|
||||
export I = "${STAGING_INCDIR}"
|
||||
export L = "${STAGING_INCDIR}"
|
||||
|
||||
do_compile () {
|
||||
oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS} -I..'
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
23
meta/recipes-extended/lsof/lsof_4.99.3.bb
Normal file
23
meta/recipes-extended/lsof/lsof_4.99.3.bb
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
SUMMARY = "LiSt Open Files tool"
|
||||
DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \
|
||||
Its name stands for LiSt Open Files, and it does just that."
|
||||
HOMEPAGE = "http://people.freebsd.org/~abe/"
|
||||
SECTION = "devel"
|
||||
LICENSE = "Spencer-94"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a48ac97a8550eff12395a2c0d6151510"
|
||||
|
||||
SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \
|
||||
file://remove-host-information.patch"
|
||||
SRCREV = "2e4c7a1a9bc7258dc5b6a3ab28ebca44174279a8"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit update-alternatives autotools pkgconfig manpages
|
||||
PACKAGECONFIG[manpages] = ""
|
||||
|
||||
DEPENDS += "groff-native"
|
||||
|
||||
ALTERNATIVE:${PN} = "lsof"
|
||||
ALTERNATIVE_LINK_NAME[lsof] = "${bindir}/lsof"
|
||||
# Make our priority higher than busybox
|
||||
ALTERNATIVE_PRIORITY = "100"
|
||||
Loading…
Reference in New Issue
Block a user