From c033333b2ac1d68324a6b7875b0ea3f853cb2821 Mon Sep 17 00:00:00 2001 From: John Klug Date: Thu, 25 May 2023 10:56:11 -0500 Subject: Update patches for Dunfell branch --- patches/meta-openembedded-github-https.patch | 171 --------------------- patches/openembedded-core-github-https.patch | 14 -- .../rename-mtr-conflicts-with-mtr-product.patch | 75 ++------- 3 files changed, 17 insertions(+), 243 deletions(-) delete mode 100644 patches/meta-openembedded-github-https.patch delete mode 100644 patches/openembedded-core-github-https.patch (limited to 'patches') diff --git a/patches/meta-openembedded-github-https.patch b/patches/meta-openembedded-github-https.patch deleted file mode 100644 index 9a49b85..0000000 --- a/patches/meta-openembedded-github-https.patch +++ /dev/null @@ -1,171 +0,0 @@ -github no longer allows clear git protocol, so switch to https -=============================================================== -diff --git a/layers/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_git.bb b/layers/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_git.bb -index 23583650b..ed003ee7b 100644 ---- a/layers/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_git.bb -+++ b/layers/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_git.bb -@@ -8,7 +8,7 @@ BRANCH ?= "dev" - - SRCREV = "a3cf93b66f4606a46354cf884d24aa966661f848" - --SRC_URI = "git://github.com/westerndigitalcorporation/ufs-utils.git;protocol=git;branch=${BRANCH} \ -+SRC_URI = "git://github.com/westerndigitalcorporation/ufs-utils.git;protocol=https;branch=${BRANCH} \ - file://0001-Replace-u_intXX_t-with-kernel-typedefs.patch \ - " - -diff --git a/layers/meta-openembedded/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb b/layers/meta-openembedded/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb -index d7911681c..c499119c6 100644 ---- a/layers/meta-openembedded/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb -+++ b/layers/meta-openembedded/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb -@@ -11,7 +11,7 @@ LICENSE = "Fraunhofer_FDK_AAC_Codec_Library_for_Android" - LICENSE_FLAGS = "commercial" - LIC_FILES_CHKSUM = "file://NOTICE;md5=5985e1e12f4afa710d64ed7bfd291875" - --SRC_URI = "git://github.com/mstorsjo/fdk-aac.git;protocol=git;branch=master" -+SRC_URI = "git://github.com/mstorsjo/fdk-aac.git;protocol=https;branch=master" - SRCREV = "d387d3b6ed79ff9a82c60440bdd86e6e5e324bec" - - S = "${WORKDIR}/git" -diff --git a/layers/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb b/layers/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb -index 6dd15ad9f..46b50c26b 100644 ---- a/layers/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb -+++ b/layers/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb -@@ -12,7 +12,7 @@ SECTION = "net" - LICENSE = "MIT" - LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" - --SRC_URI = "git://github.com/jech/babeld.git;protocol=git" -+SRC_URI = "git://github.com/jech/babeld.git;protocol=https" - SRCREV = "0835d5d894ea016ab7b81562466cade2c51a12d4" - - UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P\d+(\.\d+)+)" -diff --git a/layers/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.4.4.bb b/layers/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.4.4.bb -index 0b63f79ac..d8a1f6140 100644 ---- a/layers/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.4.4.bb -+++ b/layers/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.4.4.bb -@@ -6,7 +6,7 @@ LICENSE = "GPLv2+" - LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - - SRCREV = "a8e5847e5f7e411be424f9b52a6cdf9d2ed4aeb5" --SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=git" -+SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=https" - - S = "${WORKDIR}/git" - -diff --git a/layers/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb b/layers/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb -index c8e81a412..f0e928d0d 100644 ---- a/layers/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb -+++ b/layers/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb -@@ -12,7 +12,7 @@ DEPENDS += "gperf-native gettext-native util-linux libcap" - - SRCREV = "efb536d0cbe2e58f80e501d19999928c75e08f6a" - SRCBRANCH = "v243-stable" --SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" -+SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}" - - SRC_URI += "file://static-libsystemd-pkgconfig.patch" - -diff --git a/layers/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb b/layers/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb -index 29f8de8d2..b2f38728d 100644 ---- a/layers/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb -+++ b/layers/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb -@@ -6,7 +6,7 @@ DEPENDS = "redis" - - LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" - SRCREV = "685030652cd98c5414ce554ff5b356dfe8437870" --SRC_URI = "git://github.com/redis/hiredis;protocol=git \ -+SRC_URI = "git://github.com/redis/hiredis;protocol=https \ - file://0001-Makefile-remove-hardcoding-of-CC.patch" - - S = "${WORKDIR}/git" -diff --git a/layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb -index 519368817..5015ac53b 100644 ---- a/layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb -+++ b/layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb -@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=44;md5=a9e1169c6c9a114a61 - - DEPENDS = "libsocketcan" - --SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git" -+SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https" - - SRCREV = "da65fdfe0d1986625ee00af0b56ae17ec132e700" - -diff --git a/layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb b/layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb -index 3800d147f..37631acae 100644 ---- a/layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb -+++ b/layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb -@@ -13,7 +13,7 @@ SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77" - - DEPENDS = "ncurses bison-native" - --SRC_URI = "git://github.com/telmich/gpm;protocol=git \ -+SRC_URI = "git://github.com/telmich/gpm;protocol=https \ - file://init \ - file://gpm.service.in \ - file://0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch \ -diff --git a/layers/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb b/layers/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb -index 3a437659e..0e3e5ff73 100644 ---- a/layers/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb -+++ b/layers/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb -@@ -7,7 +7,7 @@ DEPENDS = "pidgin json-glib glib-2.0" - - inherit pkgconfig - --SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=git" -+SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=https" - SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f" - - S = "${WORKDIR}/git" -diff --git a/layers/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/layers/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb -index 092e6059b..854920d2e 100644 ---- a/layers/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb -+++ b/layers/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb -@@ -7,7 +7,7 @@ DEPENDS = "pidgin json-glib glib-2.0 zlib" - - inherit pkgconfig - --SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=git" -+SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=https" - SRCREV = "14f1b69b6292bbdc98cca484b050ec8359394c4e" - - S = "${WORKDIR}/git" -diff --git a/layers/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/layers/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb -index 33f5dccca..6fe8aa76f 100644 ---- a/layers/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb -+++ b/layers/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb -@@ -25,7 +25,7 @@ RDEPENDS_${PN} = "rsync \ - SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9" - PV = "1.4.3+git${SRCPV}" - --SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ -+SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=https \ - file://configure-fix-cmd_rsync.patch \ - " - -diff --git a/layers/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb b/layers/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb -index 39629cce0..9294d1a70 100644 ---- a/layers/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb -+++ b/layers/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb -@@ -4,7 +4,7 @@ LICENSE = "MIT" - LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - - SRCREV = "cf6f1dd01e660d5865d68bf5fa78f6376b89470a" --SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;" -+SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x;" - - S = "${WORKDIR}/git" - -diff --git a/layers/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb b/layers/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb -index 625756873..31c87c96f 100644 ---- a/layers/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb -+++ b/layers/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb -@@ -10,7 +10,7 @@ SRCREV = "4a36a84f7df291ddaebd397aecf0c8515256a8e0" - - S = "${WORKDIR}/git" - --SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=git" -+SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=https" - - - inherit autotools diff --git a/patches/openembedded-core-github-https.patch b/patches/openembedded-core-github-https.patch deleted file mode 100644 index bbeea1d..0000000 --- a/patches/openembedded-core-github-https.patch +++ /dev/null @@ -1,14 +0,0 @@ -github no longer allows clear git protocol, so switch to https -=============================================================== -diff --git a/layers/openembedded-core/meta/recipes-core/systemd/systemd.inc b/layers/openembedded-core/meta/recipes-core/systemd/systemd.inc -index 3165d13f03..8b5260bb0d 100644 ---- a/layers/openembedded-core/meta/recipes-core/systemd/systemd.inc -+++ b/layers/openembedded-core/meta/recipes-core/systemd/systemd.inc -@@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ - - SRCREV = "3ceaa81c61b654ebf562464d142675bd4d57d7b6" - SRCBRANCH = "v244-stable" --SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" -+SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}" - - S = "${WORKDIR}/git" 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 +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 + -- cgit v1.2.3