From f938ec6977b8027bf0abeac8e646bef310d6f0ce Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 1 Apr 2021 22:23:56 +0200 Subject: [PATCH] contrib: update nm-git-bundle to use "main" branch --- contrib/scripts/nm-copr-build-nm-git-bundle.sh | 6 +++--- contrib/scripts/nm-copr-build.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/scripts/nm-copr-build-nm-git-bundle.sh b/contrib/scripts/nm-copr-build-nm-git-bundle.sh index 4e47d164f..c4281834b 100755 --- a/contrib/scripts/nm-copr-build-nm-git-bundle.sh +++ b/contrib/scripts/nm-copr-build-nm-git-bundle.sh @@ -8,7 +8,7 @@ # downloading the entire upstream git repository of NetworkManager. # # This script is also used by [1] to generate the SRPM. -# [1] https://copr.fedorainfracloud.org/coprs/networkmanager/NetworkManager-master/package/nm-git-bundle/ +# [1] https://copr.fedorainfracloud.org/coprs/networkmanager/NetworkManager-main/package/nm-git-bundle/ set -ex @@ -22,7 +22,7 @@ git clone -n "$GIT_URL" pushd NetworkManager REFS=( - $(git branch -a | sed -n 's#^ *remotes/origin/\(master\|nm-1-[0-9]\+\)$#\1#p') + $(git branch -a | sed -n 's#^ *remotes/origin/\(main\|nm-1-[0-9]\+\)$#\1#p') ) unset R @@ -48,7 +48,7 @@ Release: $(date '+%H%M%S') Summary: git-bundle of NetworkManager upstream repository License: Public Domain -URL: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/tree/master/contrib/fedora/rpm/nm-git-bundle.spec +URL: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/tree/main/contrib/fedora/rpm/nm-git-bundle.spec %global GIT_URL 'https://github.com/NetworkManager/NetworkManager' #global GIT_URL 'https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git' diff --git a/contrib/scripts/nm-copr-build.sh b/contrib/scripts/nm-copr-build.sh index 29712b6f4..c334fe801 100755 --- a/contrib/scripts/nm-copr-build.sh +++ b/contrib/scripts/nm-copr-build.sh @@ -1,7 +1,7 @@ #!/bin/bash # environment variables: -# - GIT_REF: the ref that should be build. Can be "master" or a git sha. +# - GIT_REF: the ref that should be build. Can be "main" or a git sha. # - DEBUG: set to 1 to build "--with debug". # - NM_GIT_BUNDLE: set to a HTTP url where to fetch the nm-git-bundle-*.noarch.rpm # from. Set to empty to skip it. By default, it fetches the bundle from copr. @@ -36,7 +36,7 @@ get_nm_git_bundle() { if [ -n "${NM_GIT_BUNDLE+x}" ]; then return 0 fi - NM_GIT_BUNDLE='https://download.copr.fedorainfracloud.org/results/networkmanager/NetworkManager-master/fedora-33-x86_64/01999272-nm-git-bundle/nm-git-bundle-20210219-141432.noarch.rpm' + NM_GIT_BUNDLE='https://download.copr.fedorainfracloud.org/results/networkmanager/NetworkManager-main/fedora-34-x86_64/02112661-nm-git-bundle/nm-git-bundle-20210401-201640.noarch.rpm' fi mkdir nm-git-bundle pushd nm-git-bundle