diff options
| -rw-r--r-- | app-admin/vasile/files/switch-to-pagure.patch | 71 | ||||
| -rw-r--r-- | app-admin/vasile/vasile-1.1806-r2.ebuild (renamed from app-admin/vasile/vasile-1.1806-r1.ebuild) | 9 |
2 files changed, 76 insertions, 4 deletions
diff --git a/app-admin/vasile/files/switch-to-pagure.patch b/app-admin/vasile/files/switch-to-pagure.patch new file mode 100644 index 00000000..88cc9fbe --- /dev/null +++ b/app-admin/vasile/files/switch-to-pagure.patch @@ -0,0 +1,71 @@ +From 9caaa7afc334e87fc46a038ae01516fed0ad0406 Mon Sep 17 00:00:00 2001 +From: V3n3RiX <venerix@redcorelinux.org> +Date: Jul 21 2018 19:15:53 +0000 +Subject: sadly our cgit doesn't play nice with shallow clones, so switch to pagure.io + + +--- + +diff --git a/src/backend/f_makeiso.sh b/src/backend/f_makeiso.sh +index 936a780..87e6261 100644 +--- a/src/backend/f_makeiso.sh ++++ b/src/backend/f_makeiso.sh +@@ -137,7 +137,7 @@ mkliveimg () { + + cfgbootldr () { + # fetch and install GRUB2 config files +- git clone https://gitlab.com/"$distname"/boot-core.git "$jailbootldrdlpath" ++ git clone https://pagure.io/redcore/boot-core.git "$jailbootldrdlpath" + cp -avx "$jailbootldrcfgpath" "$jailrootpath" + sync + } +diff --git a/src/backend/f_modeswitch.sh b/src/backend/f_modeswitch.sh +index d85f36f..8a40938 100644 +--- a/src/backend/f_modeswitch.sh ++++ b/src/backend/f_modeswitch.sh +@@ -33,7 +33,7 @@ dlmainportfulltree () { + if [ ! -d ""$jailmainportpath"/.git" ] ; then + einfo "I am injecting Gentoo ebuild tree" + cd "$jailmainportpath" && git init > /dev/null 2>&1 +- git remote add origin http://redcorelinux.org/cgit/portage/ ++ git remote add origin https://pagure.io/redcore/portage.git + git pull --depth=1 origin master + git branch -u origin/master master + rm -rf ""$jailmainportpath"/profiles/updates" +@@ -44,7 +44,7 @@ dlmainportmintree () { + if [ ! -d ""$jailmainportpath"/.git" ] ; then + einfo "I am injecting Gentoo ebuild tree" + cd "$jailmainportpath" && git init > /dev/null 2>&1 +- git remote add origin http://redcorelinux.org/cgit/portage/ ++ git remote add origin https://pagure.io/redcore/portage.git + git config core.sparsecheckout true + echo "profiles/*" >> .git/info/sparse-checkout + echo "metadata/*" >> .git/info/sparse-checkout +@@ -59,7 +59,7 @@ dladdonportfulltree () { + if [ ! -d ""$jailaddonportpath"/.git" ] ; then + einfo "I am injecting Redcore ebuild tree" + cd "$jailaddonportpath" && git init > /dev/null 2>&1 +- git remote add origin http://redcorelinux.org/cgit/redcore-desktop/ ++ git remote add origin https://pagure.io/redcore/redcore-desktop.git + git pull --depth=1 origin master + git branch -u origin/master master + fi +@@ -69,7 +69,7 @@ dladdonportmintree () { + if [ ! -d ""$jailaddonportpath"/.git" ] ; then + einfo "I am injecting Redcore ebuild tree" + cd "$jailaddonportpath" && git init > /dev/null 2>&1 +- git remote add origin http://redcorelinux.org/cgit/redcore-desktop/ ++ git remote add origin https://pagure.io/redcore/redcore-desktop.git + git config core.sparsecheckout true + echo "profiles/*" >> .git/info/sparse-checkout + echo "metadata/*" >> .git/info/sparse-checkout +@@ -82,7 +82,7 @@ dladdonportmintree () { + dlportcfgtree () { + pushd /opt > /dev/null 2>&1 + einfo "I am injecting portage configuration" +- git clone http://redcorelinux.org/cgit/redcore-build/ ++ git clone https://pagure.io/redcore/redcore-build.git + popd > /dev/null 2>&1 + } + + diff --git a/app-admin/vasile/vasile-1.1806-r1.ebuild b/app-admin/vasile/vasile-1.1806-r2.ebuild index 76ecc9d9..59f7991c 100644 --- a/app-admin/vasile/vasile-1.1806-r1.ebuild +++ b/app-admin/vasile/vasile-1.1806-r2.ebuild @@ -22,7 +22,8 @@ RDEPEND="${DEPEND} sys-fs/mtools sys-fs/squashfs-tools" -PATCHES=( ${FILESDIR}/nuke-gitlab-switch-to-cgit.patch ) +PATCHES=( ${FILESDIR}/nuke-gitlab-switch-to-cgit.patch + ${FILESDIR}/switch-to-pagure.patch ) S=${WORKDIR}/${PN}-v${PV} @@ -33,9 +34,9 @@ src_install() { dodir var/cache/distfiles } -_cgit_migration_warning() { +_migration_warning() { einfo "" - einfo "We nuked Gitlab due to service unreliability, so from now on vasile will use our own git instance" + einfo "We nuked Gitlab due to service unreliability, vasile will use pagure.io from now on" einfo "" einfo "You must reset your current mode using:" einfo "" @@ -50,5 +51,5 @@ _cgit_migration_warning() { pkg_postinst() { chown portage:portage /var/cache/distfiles chmod 775 /var/cache/distfiles - _cgit_migration_warning + _migration_warning } |