From 094dcb2936e0157ccb5916b72fcf4d86a3d2e347 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 8 Sep 2021 20:01:20 +0200 Subject: 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 Signed-off-by: Richard Purdie --- .../lsof/files/lsof-remove-host-information.patch | 17 +++--- meta/recipes-extended/lsof/lsof_4.91.bb | 66 ---------------------- meta/recipes-extended/lsof/lsof_4.94.0.bb | 46 +++++++++++++++ 3 files changed, 55 insertions(+), 74 deletions(-) delete mode 100644 meta/recipes-extended/lsof/lsof_4.91.bb create mode 100644 meta/recipes-extended/lsof/lsof_4.94.0.bb (limited to 'meta') 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 @@ -Remove host information from version.h +From 95b8a13c1ea4274f58304bf5c4f7ca3d036b10f3 Mon Sep 17 00:00:00 2001 +From: Li Wang +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 + --- - 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 - diff --git a/meta/recipes-extended/lsof/lsof_4.91.bb b/meta/recipes-extended/lsof/lsof_4.91.bb deleted file mode 100644 index d7428ea2c4..0000000000 --- a/meta/recipes-extended/lsof/lsof_4.91.bb +++ /dev/null @@ -1,66 +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://00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a" - -# Upstream lsof releases are hosted on an ftp server which times out download -# attempts from hosts for which it can not perform a DNS reverse-lookup (See: -# 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 \ - file://lsof-remove-host-information.patch \ - " - -SRC_URI[md5sum] = "148ed410cb52e08c2adc0c60f480f11f" -SRC_URI[sha256sum] = "c9da946a525fbf82ff80090b6d1879c38df090556f3fe0e6d782cb44172450a3" - -UPSTREAM_CHECK_URI = "https://github.com/lsof-org/lsof/releases/" -UPSTREAM_CHECK_REGEX = "lsof_(?P.*)\.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) -} - -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}' -} - -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 -} diff --git a/meta/recipes-extended/lsof/lsof_4.94.0.bb b/meta/recipes-extended/lsof/lsof_4.94.0.bb new file mode 100644 index 0000000000..9659fa8246 --- /dev/null +++ b/meta/recipes-extended/lsof/lsof_4.94.0.bb @@ -0,0 +1,46 @@ +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://00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a" + +# Upstream lsof releases are hosted on an ftp server which times out download +# attempts from hosts for which it can not perform a DNS reverse-lookup (See: +# https://people.freebsd.org/~abe/ ). http://www.mirrorservice.org seems to be +# the most commonly used alternative. + +SRC_URI = "git://github.com/lsof-org/lsof \ + file://lsof-remove-host-information.patch \ + " + +SRCREV = "005e014e1abdadb2493d8b3ce87b37a2c0a2351d" + +S = "${WORKDIR}/git" + +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}' +} + +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 +} -- cgit v1.2.3-54-g00ecf