From 95039ef76b586779c1dd03a4bdfb27a4935f8b55 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 5 Jan 2015 10:51:28 +0000 Subject: mtr: update to 0.86 * Newer automake compatibility fixed upstream, so drop patches. * LIC_FILES_CHKSUM changed due to a trailing space being removed, no actual change to the license text. Signed-off-by: Paul Eggleton Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../recipes-support/mtr/files/configure.patch | 12 --------- .../recipes-support/mtr/files/no-gtk.patch | 31 ---------------------- meta-networking/recipes-support/mtr/mtr_0.82.bb | 20 -------------- meta-networking/recipes-support/mtr/mtr_0.86.bb | 18 +++++++++++++ 4 files changed, 18 insertions(+), 63 deletions(-) delete mode 100644 meta-networking/recipes-support/mtr/files/configure.patch delete mode 100644 meta-networking/recipes-support/mtr/files/no-gtk.patch delete mode 100644 meta-networking/recipes-support/mtr/mtr_0.82.bb create mode 100644 meta-networking/recipes-support/mtr/mtr_0.86.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-support/mtr/files/configure.patch b/meta-networking/recipes-support/mtr/files/configure.patch deleted file mode 100644 index c978b879ec..0000000000 --- a/meta-networking/recipes-support/mtr/files/configure.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: mtr-0.82/configure.in -=================================================================== ---- mtr-0.82.orig/configure.in 2014-07-16 19:52:56.306026346 +0000 -+++ mtr-0.82/configure.in 2014-07-17 21:59:03.208587150 +0000 -@@ -1,5 +1,5 @@ --AC_INIT(mtr.c) --AM_INIT_AUTOMAKE(mtr, 0.82) -+AC_INIT(mtr.c, 0.82) -+AM_INIT_AUTOMAKE([foreign]) - - - AC_SUBST(GTK_OBJ) diff --git a/meta-networking/recipes-support/mtr/files/no-gtk.patch b/meta-networking/recipes-support/mtr/files/no-gtk.patch deleted file mode 100644 index 0dbeb7a297..0000000000 --- a/meta-networking/recipes-support/mtr/files/no-gtk.patch +++ /dev/null @@ -1,31 +0,0 @@ -Disable gtk check that breaks with current autotools - -Ideally we would have a proper fix for this and send that upstream instead. - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton - -diff --git a/configure.in b/configure.in -index 8474543..5118565 100644 ---- a/configure.in -+++ b/configure.in -@@ -48,16 +48,8 @@ AC_ARG_ENABLE(ipv6, - [ --disable-ipv6 Do not enable IPv6], - WANTS_IPV6=$enableval, WANTS_IPV6=yes) - --if test "x$WANTS_GTK" = "xyes"; then -- AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS" -- LIBS="$LIBS $GTK_LIBS -lm", -- AC_MSG_WARN(Building without GTK2 display support) -- AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.]) -- GTK_OBJ="") --else -- AC_DEFINE(NO_GTK) -- GTK_OBJ="" --fi -+AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.]) -+GTK_OBJ="" - - AC_CHECK_FUNC(socket, , - AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found))) diff --git a/meta-networking/recipes-support/mtr/mtr_0.82.bb b/meta-networking/recipes-support/mtr/mtr_0.82.bb deleted file mode 100644 index b9a1ea2863..0000000000 --- a/meta-networking/recipes-support/mtr/mtr_0.82.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Combined traceroute and ping utility" -DESCRIPTION = "mtr combines the functionality of the 'traceroute' and 'ping' programs in a single network diagnostic tool." -HOMEPAGE = "http://www.bitwizard.nl/mtr/" -DEPENDS = "ncurses" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://mtr.c;beginline=5;endline=16;md5=56e390ced194aff352eefab404883057" - -SRC_URI = "ftp://ftp.bitwizard.nl/mtr/mtr-${PV}.tar.gz \ - file://configure.patch \ - file://no-gtk.patch" - -SRC_URI[md5sum] = "10601ea543fda3e51545c4bce195b64c" -SRC_URI[sha256sum] = "f3b457c9623ae03565688a7ffd49d4843a5e2505ccaf3ba8d9fbd86e3ce9b6a0" - -inherit autotools - -EXTRA_OECONF = "--without-gtk" - diff --git a/meta-networking/recipes-support/mtr/mtr_0.86.bb b/meta-networking/recipes-support/mtr/mtr_0.86.bb new file mode 100644 index 0000000000..a60bd347e7 --- /dev/null +++ b/meta-networking/recipes-support/mtr/mtr_0.86.bb @@ -0,0 +1,18 @@ +SUMMARY = "Combined traceroute and ping utility" +DESCRIPTION = "mtr combines the functionality of the 'traceroute' and 'ping' programs in a single network diagnostic tool." +HOMEPAGE = "http://www.bitwizard.nl/mtr/" +DEPENDS = "ncurses" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ + file://mtr.c;beginline=5;endline=16;md5=af1fafbbfa1bfd48af839f4bb3221106" + +SRC_URI = "ftp://ftp.bitwizard.nl/mtr/mtr-${PV}.tar.gz" + +SRC_URI[md5sum] = "8d63592c9d4579ef20cf491b41843eb2" +SRC_URI[sha256sum] = "c5d948920b641cc35f8b380fc356ddfe07cce6a9c6474afe242fc58113f28c06" + +inherit autotools + +EXTRA_OECONF = "--without-gtk" + -- cgit 1.2.3-korg