colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

contrib: update nm-git-bundle to use "main" branch

Browse Source
This commit is contained in:
Thomas Haller
2021-04-01 22:23:56 +02:00
parent 371b64bd70
commit f938ec6977
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/scripts/nm-copr-build-nm-git-bundle.sh
View File

@@ -8,7 +8,7 @@
# downloading the entire upstream git repository of NetworkManager. # downloading the entire upstream git repository of NetworkManager.
# #
# This script is also used by [1] to generate the SRPM. # 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 set -ex
@@ -22,7 +22,7 @@ git clone -n "$GIT_URL"
pushd NetworkManager pushd NetworkManager
REFS=( 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 unset R
@@ -48,7 +48,7 @@ Release: $(date '+%H%M%S')
Summary: git-bundle of NetworkManager upstream repository Summary: git-bundle of NetworkManager upstream repository
License: Public Domain 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://github.com/NetworkManager/NetworkManager'
#global GIT_URL 'https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git' #global GIT_URL 'https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git'

4
contrib/scripts/nm-copr-build.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# environment variables: # 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". # - 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 # - 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. # 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 if [ -n "${NM_GIT_BUNDLE+x}" ]; then
return 0 return 0
fi 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 fi
mkdir nm-git-bundle mkdir nm-git-bundle
pushd nm-git-bundle pushd nm-git-bundle