mirror of
https://git.yoctoproject.org/poky
synced 2026-06-03 01:40:07 +00:00
meta: Add explict branch to git SRC_URIs, handle github url changes
This update was made with the convert-scruri.py script in scripts/contrib
This script handles two emerging issues:
1. There is uncertainty about the default branch name in git going forward.
To try and cover the different possible outcomes, add branch names to all
git:// and gitsm:// SRC_URI entries.
2. Github are dropping support for git:// protocol fetching, so remap github
urls as needed. For more details see:
https://github.blog/2021-09-01-improving-git-protocol-security-github/
(From OE-Core rev: 827a805349f9732b2a5fa9184dc7922af36de327)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
afe0ef0a07
commit
07be05c698
@@ -90,7 +90,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=44ac4678311254db62edf8fd39cb8124"
|
||||
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
|
||||
|
||||
SRC_URI = "git://github.com/xrmx/bootchart.git \
|
||||
SRC_URI = "git://github.com/xrmx/bootchart.git;branch=master;protocol=https \
|
||||
file://bootchartd_stop.sh \
|
||||
file://0001-collector-Allocate-space-on-heap-for-chunks.patch \
|
||||
file://0001-bootchart2-support-usrmerge.patch \
|
||||
|
||||
@@ -15,7 +15,7 @@ DEPENDS_append_class-target = " udev"
|
||||
RDEPENDS_${PN} = "libgcc"
|
||||
|
||||
SRCREV = "3fc2326d3474a5e4df2449f5e3043f7298501334"
|
||||
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
|
||||
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master \
|
||||
file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
|
||||
"
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/openSUSE/build-compare"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||
|
||||
SRC_URI = "git://github.com/openSUSE/build-compare.git \
|
||||
SRC_URI = "git://github.com/openSUSE/build-compare.git;branch=master;protocol=https \
|
||||
file://Ignore-DWARF-sections.patch;striplevel=1 \
|
||||
"
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/rpm-software-management/createrepo_c/wiki"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||
|
||||
SRC_URI = "git://github.com/rpm-software-management/createrepo_c \
|
||||
SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;protocol=https \
|
||||
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
|
||||
"
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
|
||||
|
||||
RRECOMMENDS_${PN}-server = "avahi-daemon"
|
||||
|
||||
SRC_URI = "git://github.com/distcc/distcc.git \
|
||||
SRC_URI = "git://github.com/distcc/distcc.git;branch=master;protocol=https \
|
||||
file://fix-gnome.patch \
|
||||
file://separatebuilddir.patch \
|
||||
file://default \
|
||||
|
||||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://PACKAGE-LICENSING;md5=4a0548e303dbc77f067335b4d688e745 \
|
||||
"
|
||||
|
||||
SRC_URI = "git://github.com/rpm-software-management/dnf.git \
|
||||
SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protocol=https \
|
||||
file://0001-Corretly-install-tmpfiles.d-configuration.patch \
|
||||
file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \
|
||||
file://0005-Do-not-prepend-installroot-to-logdir.patch \
|
||||
|
||||
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \
|
||||
SECTION = "base"
|
||||
DEPENDS = "util-linux attr"
|
||||
|
||||
SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git"
|
||||
SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git;branch=master"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit autotools gettext texinfo pkgconfig multilib_header update-alternatives ptest
|
||||
|
||||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdd
|
||||
DEPENDS = "file-replacement-native"
|
||||
DEPENDS_class-native = "bzip2-replacement-native"
|
||||
|
||||
SRC_URI = "git://github.com/file/file.git"
|
||||
SRC_URI = "git://github.com/file/file.git;branch=master;protocol=https"
|
||||
|
||||
SRCREV = "ec41083645689a787cdd00cb3b5bf578aa79e46c"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@@ -5,7 +5,7 @@ LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=54905cf894f8cc416a92f4fc350c35b2"
|
||||
|
||||
GO_IMPORT = "github.com/Masterminds/glide"
|
||||
SRC_URI = "git://${GO_IMPORT}"
|
||||
SRC_URI = "git://${GO_IMPORT};branch=master"
|
||||
SRCREV = "8ed5b9292379d86c39592a7e6a58eb9c903877cf"
|
||||
|
||||
inherit go
|
||||
|
||||
@@ -12,7 +12,7 @@ INHIBIT_DEFAULT_DEPS = "1"
|
||||
SRCREV = "5256817ace8493502ec88501a19e4051c2e220b0"
|
||||
PV = "20200117+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://git.savannah.gnu.org/config.git \
|
||||
SRC_URI = "git://git.savannah.gnu.org/config.git;branch=master \
|
||||
file://gnu-configize.in"
|
||||
S = "${WORKDIR}/git"
|
||||
UPSTREAM_CHECK_COMMITS = "1"
|
||||
|
||||
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=1bad315647751fab0007812f70d42c0d"
|
||||
|
||||
GO_IMPORT = "github.com/golang/dep"
|
||||
SRC_URI = "git://${GO_IMPORT} \
|
||||
SRC_URI = "git://${GO_IMPORT};branch=master \
|
||||
file://0001-Add-support-for-mips-mips64.patch;patchdir=src/github.com/golang/dep \
|
||||
file://0001-bolt_riscv64-Add-support-for-riscv64.patch;patchdir=src/github.com/golang/dep \
|
||||
"
|
||||
|
||||
@@ -4,7 +4,7 @@ DESCRIPTION = "Libcomps is alternative for yum.comps library. It's written in pu
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||
|
||||
SRC_URI = "git://github.com/rpm-software-management/libcomps.git \
|
||||
SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;protocol=https \
|
||||
file://0001-Add-crc32.c-to-sources-list.patch \
|
||||
file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
|
||||
"
|
||||
|
||||
@@ -4,7 +4,7 @@ DESCRIPTION = "This library provides a high level package-manager. It's core lib
|
||||
LICENSE = "LGPLv2.1+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
SRC_URI = "git://github.com/rpm-software-management/libdnf \
|
||||
SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=master;protocol=https \
|
||||
file://0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch \
|
||||
file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \
|
||||
file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \
|
||||
|
||||
@@ -5,7 +5,7 @@ DESCRIPTION = "${SUMMARY}"
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
SRC_URI = "git://github.com/rpm-software-management/librepo.git \
|
||||
SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;protocol=https \
|
||||
file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \
|
||||
file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
|
||||
file://CVE-2020-14352.patch \
|
||||
|
||||
@@ -30,7 +30,7 @@ LLVM_DIR = "llvm${LLVM_RELEASE}"
|
||||
|
||||
BRANCH = "release/${MAJOR_VERSION}.x"
|
||||
SRCREV = "c1a0a213378a458fbea1a5c77b315c7dce08fd05"
|
||||
SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \
|
||||
SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \
|
||||
file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \
|
||||
file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \
|
||||
file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \
|
||||
|
||||
@@ -14,7 +14,7 @@ RDEPENDS_mtd-utils-tests += "bash"
|
||||
PV = "2.1.3"
|
||||
|
||||
SRCREV = "42ea7cd48d2b3c306d59bb6c530d79f8c25bf9f5"
|
||||
SRC_URI = "git://git.infradead.org/mtd-utils.git \
|
||||
SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
|
||||
file://add-exclusion-to-mkfs-jffs2-git-2.patch \
|
||||
"
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ DEPENDS = "re2c-native ninja-native"
|
||||
|
||||
SRCREV = "ed7f67040b370189d989adbd60ff8ea29957231f"
|
||||
|
||||
SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release"
|
||||
SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release;protocol=https"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/NixOS/patchelf"
|
||||
|
||||
LICENSE = "GPLv3"
|
||||
|
||||
SRC_URI = "git://github.com/NixOS/patchelf;protocol=https \
|
||||
SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \
|
||||
file://handle-read-only-files.patch \
|
||||
file://fix-adjusting-startPage.patch \
|
||||
file://fix-phdrs.patch \
|
||||
|
||||
@@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org"
|
||||
LICENSE = "GPL-2.0"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c0bf017c0fd1920e6158a333acabfd4a"
|
||||
|
||||
SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \
|
||||
SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x;protocol=https \
|
||||
file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \
|
||||
file://0001-Do-not-read-config-files-from-HOME.patch \
|
||||
file://0001-When-cross-installing-execute-package-scriptlets-wit.patch \
|
||||
|
||||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||
|
||||
PV = "4.4"
|
||||
SRCREV = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"
|
||||
SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
|
||||
SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=master \
|
||||
file://0001-squashfs-tools-fix-build-failure-against-gcc-10.patch;striplevel=2 \
|
||||
file://CVE-2021-40153.patch;striplevel=2 \
|
||||
"
|
||||
|
||||
@@ -8,7 +8,7 @@ LICENSE = "LGPLv2.1 & GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \
|
||||
file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe"
|
||||
|
||||
SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https \
|
||||
SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https;branch=master \
|
||||
file://0001-architecture-Recognise-RISCV-32-RISCV-64.patch \
|
||||
file://mips64.patch \
|
||||
"
|
||||
|
||||
@@ -10,7 +10,7 @@ SRCREV = "a022ef2f1acfd9209a1bf792dda14ae4b0d1b60f"
|
||||
PV = "1.7.0+git${SRCPV}"
|
||||
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
|
||||
SRC_URI = "git://git.eclipse.org/r/tcf/org.eclipse.tcf.agent.git;protocol=https \
|
||||
SRC_URI = "git://git.eclipse.org/r/tcf/org.eclipse.tcf.agent.git;protocol=https;branch=master \
|
||||
file://fix_ranlib.patch \
|
||||
file://ldflags.patch \
|
||||
file://tcf-agent.init \
|
||||
|
||||
@@ -14,7 +14,7 @@ DEPENDS_append_class-nativesdk = " flex-nativesdk"
|
||||
ASNEEDED = ""
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https \
|
||||
SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https;branch=master \
|
||||
file://unfs3_parallel_build.patch \
|
||||
file://alternate_rpc_ports.patch \
|
||||
file://fix_pid_race_parent_writes_child_pid.patch \
|
||||
|
||||
Reference in New Issue
Block a user