Skip to contentSkip to conversation

imagemagick: update SRC_URI branch from master to main

PATCH New Armin Kuster 1 participant 2 messages Apr 4, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 imagemagick: update SRC_URI branch from master to main

From: Daniel Stadelmann <[email protected]>

master branch in imagemagick was renamed to main (https://github.com/ImageMagick/ImageMagick).
Similar change is already in master branch for version 7.0.10 (see 248739128389)

---
 meta-oe/recipes-support/imagemagick/imagemagick_7.0.9.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/imagemagick/imagemagick_7.0.9.bb +1 -1
index 26a5d4a4d2..21f51ff155 100644
@@ -10,7 +10,7 @@ DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool"
 
 BASE_PV := "${PV}"
 PV .= "_13"
-SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https"
 SRCREV = "15b935d64f613b5a0fc9d3fead5c6ec1b0e3908f"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 cli11: switch from default master branch to main to fix do_fetch failure

From: Christian Ege <[email protected]>

The branch was renamed in the upstream repository

---
 meta-oe/recipes-support/cli11/cli11_1.8.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/cli11/cli11_1.8.0.bb +1 -1
index 9e1c2d6214..a49eab72fd 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b73927b18d5c6cd8d2ed28a6ad539733"
 SRCREV = "13becaddb657eacd090537719a669d66d393b8b2"
 PV .= "+git${SRCPV}"
 
-SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=master;protocol=https \
+SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=main;protocol=https \
             file://0001-Add-CLANG_TIDY-check.patch \
             file://0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch \
            "
Signature · 1 line
2.25.1