From 2bdeb1067a27fc478556bee9d22672be554611db Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 5 May 2022 07:05:39 +0200 Subject: lsof: update 4.94.0 -> 4.95.0 Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- .../lsof/files/lsof-remove-host-information.patch | 12 +++--- meta/recipes-extended/lsof/lsof_4.94.0.bb | 46 ---------------------- meta/recipes-extended/lsof/lsof_4.95.0.bb | 46 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-extended/lsof/lsof_4.94.0.bb create mode 100644 meta/recipes-extended/lsof/lsof_4.95.0.bb 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 70155f9a1d..08f083cf83 100644 --- a/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch +++ b/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch @@ -1,4 +1,4 @@ -From 95b8a13c1ea4274f58304bf5c4f7ca3d036b10f3 Mon Sep 17 00:00:00 2001 +From 4233b5ac1629c225a7a80f33efc0eff527a95851 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 @@ -10,24 +10,22 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Li Wang --- - dialects/linux/Makefile | 50 ++++++++--------------------------------- - 1 file changed, 9 insertions(+), 41 deletions(-) + dialects/linux/Makefile | 48 +++++++---------------------------------- + 1 file changed, 8 insertions(+), 40 deletions(-) diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile -index 61e8643..5458a0a 100644 +index 46c83c2..50f03cc 100644 --- a/dialects/linux/Makefile +++ b/dialects/linux/Makefile -@@ -95,48 +95,16 @@ version.h: FRC +@@ -84,47 +84,15 @@ 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 "$(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 -+ @echo '#define LSOF_CCDATE ""' >> version.h + @echo '#define LSOF_CCFLAGS ""' >> version.h @echo '#define LSOF_CINFO "${CINFO}"' >> version.h - @if [ "X${LSOF_HOST}" = "X" ]; then \ diff --git a/meta/recipes-extended/lsof/lsof_4.94.0.bb b/meta/recipes-extended/lsof/lsof_4.94.0.bb deleted file mode 100644 index c2b8bc839b..0000000000 --- a/meta/recipes-extended/lsof/lsof_4.94.0.bb +++ /dev/null @@ -1,46 +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 = "git://github.com/lsof-org/lsof;branch=master;protocol=https \ - 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 -} diff --git a/meta/recipes-extended/lsof/lsof_4.95.0.bb b/meta/recipes-extended/lsof/lsof_4.95.0.bb new file mode 100644 index 0000000000..f380de0b6b --- /dev/null +++ b/meta/recipes-extended/lsof/lsof_4.95.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;branch=master;protocol=https \ + file://lsof-remove-host-information.patch \ + " + +SRCREV = "67d8c828e7bdc01ba93f8ff79765dd424da0c9d7" + +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 1.2.3-korg