diff options
Diffstat (limited to 'patches/rename-mtr-conflicts-with-mtr-product.patch')
| -rw-r--r-- | patches/rename-mtr-conflicts-with-mtr-product.patch | 75 |
1 files changed, 17 insertions, 58 deletions
diff --git a/patches/rename-mtr-conflicts-with-mtr-product.patch b/patches/rename-mtr-conflicts-with-mtr-product.patch index 1a07a37..38c1ed6 100644 --- a/patches/rename-mtr-conflicts-with-mtr-product.patch +++ b/patches/rename-mtr-conflicts-with-mtr-product.patch @@ -1,58 +1,17 @@ -diff -Naru orig/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb new/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb ---- orig/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb 2021-07-14 14:05:59.000000000 -0500 -+++ new/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb 1969-12-31 18:00:00.000000000 -0600 -@@ -1,25 +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/" --SECTION = "net" --DEPENDS = "ncurses" -- --LICENSE = "GPLv2" --LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ -- file://ui/mtr.c;beginline=5;endline=16;md5=00a894a39d53726a27386534d1c4e468" -- --SRCREV = "304349bad86229aedbc62c07d5e98a8292967991" --SRC_URI = "git://github.com/traviscross/mtr" -- --S = "${WORKDIR}/git" -- --inherit autotools pkgconfig -- --EXTRA_OECONF = "--without-gtk" -- --PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" --PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -- --PACKAGES += "${PN}-bash-completions" -- --FILES_${PN}-bash-completions = "${datadir}/bash-completion/" -diff -Naru orig/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.93.bb new/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.93.bb ---- orig/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.93.bb 1969-12-31 18:00:00.000000000 -0600 -+++ new/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.93.bb 2021-07-14 14:05:59.000000000 -0500 -@@ -0,0 +1,25 @@ -+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/" -+SECTION = "net" -+DEPENDS = "ncurses" -+ -+LICENSE = "GPLv2" -+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ -+ file://ui/mtr.c;beginline=5;endline=16;md5=00a894a39d53726a27386534d1c4e468" -+ -+SRCREV = "304349bad86229aedbc62c07d5e98a8292967991" -+SRC_URI = "git://github.com/traviscross/mtr" -+ -+S = "${WORKDIR}/git" -+ -+inherit autotools pkgconfig -+ -+EXTRA_OECONF = "--without-gtk" -+ -+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -+ -+PACKAGES += "${PN}-bash-completions" -+ -+FILES_${PN}-bash-completions = "${datadir}/bash-completion/" +From b8d7bfbd9bc64cc2b5fbe652b37a337ff81f0de6 Mon Sep 17 00:00:00 2001 +From: John Klug <john.klug@multitech.com> +Date: Tue, 24 May 2022 16:06:50 -0500 +Subject: [PATCH] Rename mtr recipe to prevent mtr machine conflict + +--- + .../mtr/{mtr_0.93.bb => mtr-conflicts-with-mtr-product_0.93.bb} | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + rename meta-networking/recipes-support/mtr/{mtr_0.93.bb => mtr-conflicts-with-mtr-product_0.93.bb} (100%) + +diff --git a/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb b/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.93.bb +similarity index 100% +rename from layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb +rename to layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.93.bb +-- +2.17.1 + |