From d691725280a221f92de9a09fb1beee9100dc90c1 Mon Sep 17 00:00:00 2001 From: Michael Opdenacker Date: Thu, 16 Feb 2023 10:18:32 +0100 Subject: ipcalc: update to 1.0.2 - Now built with meson - Update the source git repository and home page https://github.com/nmav/ipcalc redirects to https://gitlab.com/ipcalc/ipcalc - USE_GEOIP = "no" not necessary in the recipe, already set by default in the code. Signed-off-by: Michael Opdenacker Signed-off-by: Khem Raj --- .../0001-Makefile-pass-extra-linker-flags.patch | 29 ---------------------- .../recipes-support/ipcalc/ipcalc_0.2.3.bb | 21 ---------------- .../recipes-support/ipcalc/ipcalc_1.0.2.bb | 14 +++++++++++ 3 files changed, 14 insertions(+), 50 deletions(-) delete mode 100644 meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch delete mode 100644 meta-networking/recipes-support/ipcalc/ipcalc_0.2.3.bb create mode 100644 meta-networking/recipes-support/ipcalc/ipcalc_1.0.2.bb diff --git a/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch b/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch deleted file mode 100644 index e95b6f993f..0000000000 --- a/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7fd0e0b88df692dfc67335f235a1bb74854a0498 Mon Sep 17 00:00:00 2001 -From: Mariia Movchan -Date: Tue, 6 Mar 2018 16:03:39 +0200 -Subject: [PATCH] Makefile: pass extra linker flags - -Fixes -ERROR: QA Issue: No GNU_HASH in the elf binary - -Upstream-Status: Pending - -Signed-off-by: Mariia Movchan - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 54569c1..798988f 100644 ---- a/Makefile -+++ b/Makefile -@@ -8,7 +8,7 @@ LIBS?= - VERSION=0.2.3 - CC?=gcc - CFLAGS?=-O2 -g -Wall --LDFLAGS=$(LIBS) -+LDFLAGS+=$(LIBS) - - ifeq ($(USE_GEOIP),yes) - ifeq ($(USE_DYN_GEOIP),yes) diff --git a/meta-networking/recipes-support/ipcalc/ipcalc_0.2.3.bb b/meta-networking/recipes-support/ipcalc/ipcalc_0.2.3.bb deleted file mode 100644 index efac3c86eb..0000000000 --- a/meta-networking/recipes-support/ipcalc/ipcalc_0.2.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Tool to assist in network address calculations for IPv4 and IPv6." -HOMEPAGE = "https://github.com/nmav/ipcalc" - -SECTION = "net" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -S = "${WORKDIR}/git" -SRCREV = "c3ee70c878b9c5833a77a1f339f1ca4dc6f225c5" -SRC_URI = "\ - git://github.com/nmav/ipcalc.git;protocol=https;;branch=master \ - file://0001-Makefile-pass-extra-linker-flags.patch \ -" - -export USE_GEOIP = "no" - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${S}/ipcalc ${D}/${bindir} -} diff --git a/meta-networking/recipes-support/ipcalc/ipcalc_1.0.2.bb b/meta-networking/recipes-support/ipcalc/ipcalc_1.0.2.bb new file mode 100644 index 0000000000..1b7b68a7a0 --- /dev/null +++ b/meta-networking/recipes-support/ipcalc/ipcalc_1.0.2.bb @@ -0,0 +1,14 @@ +SUMMARY = "Tool to assist in network address calculations for IPv4 and IPv6." +HOMEPAGE = "https://gitlab.com/ipcalc/ipcalc" + +SECTION = "net" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://gitlab.com/ipcalc/ipcalc.git;protocol=https;branch=master" +SRCREV = "4c4261a47f355946ee74013d4f5d0494487cc2d6" + +S = "${WORKDIR}/git" + +inherit meson -- cgit v1.2.3-54-g00ecf