Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile13
-rw-r--r--contrib/completion/bash/devtools.in2
-rw-r--r--contrib/completion/zsh/_devtools.in2
-rw-r--r--doc/man/devtools.7.asciidoc2
-rw-r--r--src/crossrepomove.in91
5 files changed, 3 insertions, 107 deletions
diff --git a/Makefile b/Makefile
index eb121e1..70e977c 100644
--- a/Makefile
+++ b/Makefile
@@ -38,14 +38,7 @@ ARCHBUILD_LINKS = \
kde-unstable-x86_64-build \
gnome-unstable-x86_64-build
-CROSSREPOMOVE_LINKS = \
- extra2community \
- community2extra
-
COMPLETIONS = $(addprefix $(BUILDDIR)/,$(patsubst %.in,%,$(wildcard contrib/completion/*/*)))
-BASHCOMPLETION_LINKS = \
- archco \
- communityco
all: binprogs completion man
@@ -101,12 +94,9 @@ install: all
for a in ${SETARCH_ALIASES}; do install -m0644 $$a -t $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d; done
for l in ${COMMITPKG_LINKS}; do ln -sf commitpkg $(DESTDIR)$(PREFIX)/bin/$$l; done
for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)$(PREFIX)/bin/$$l; done
- for l in ${CROSSREPOMOVE_LINKS}; do ln -sf crossrepomove $(DESTDIR)$(PREFIX)/bin/$$l; done
ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
install -Dm0644 $(BUILDDIR)/contrib/completion/bash/devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
- for l in ${BASHCOMPLETION_LINKS}; do ln -sf devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$l; done
install -Dm0644 $(BUILDDIR)/contrib/completion/zsh/_devtools $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
- ln -sf archco $(DESTDIR)$(PREFIX)/bin/communityco
for manfile in $(MANS); do \
install -Dm644 $$manfile -t $(DESTDIR)$(MANDIR)/man$${manfile##*.}; \
done;
@@ -118,11 +108,8 @@ uninstall:
for f in $(notdir $(SETARCH_ALIASES)); do rm -f $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d/$$f; done
for l in ${COMMITPKG_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
for l in ${ARCHBUILD_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
- for l in ${CROSSREPOMOVE_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
- for l in ${BASHCOMPLETION_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$l; done
rm $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
rm $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
- rm -f $(DESTDIR)$(PREFIX)/bin/communityco
rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
for manfile in $(notdir $(MANS)); do rm -f $(DESTDIR)$(MANDIR)/man$${manfile##*.}/$${manfile}; done;
rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d $(DESTDIR)$(PREFIX)/share/devtools
diff --git a/contrib/completion/bash/devtools.in b/contrib/completion/bash/devtools.in
index e7925b3..8183395 100644
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -29,7 +29,7 @@ _archco() {
_archco_pkg Slq
true
} &&
-complete -F _archco archco communityco
+complete -F _archco archco
_makechrootpkg() {
local cur
diff --git a/contrib/completion/zsh/_devtools.in b/contrib/completion/zsh/_devtools.in
index 48d3dfd..707e3fa 100644
--- a/contrib/completion/zsh/_devtools.in
+++ b/contrib/completion/zsh/_devtools.in
@@ -1,4 +1,4 @@
-#compdef archbuild archco arch-nspawn archrelease commitpkg diffpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco checkpkg sogrep offload-build makerepropkg
+#compdef archbuild archco arch-nspawn archrelease commitpkg diffpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild checkpkg sogrep offload-build makerepropkg
#
# SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/doc/man/devtools.7.asciidoc b/doc/man/devtools.7.asciidoc
index 9062278..1bd118f 100644
--- a/doc/man/devtools.7.asciidoc
+++ b/doc/man/devtools.7.asciidoc
@@ -11,7 +11,7 @@ Description
Devtools contains tools for package maintenance in Arch Linux. The toolset
varies from tools for building packages in a clean chroot ('mkarchroot',...),
packaging related tools for sonames ('sogrep', 'lddd') and tools for
-repository management such as ('archco', 'extra2community')
+repository management such as ('archco')
Programs
--------
diff --git a/src/crossrepomove.in b/src/crossrepomove.in
deleted file mode 100644
index 08a3067..0000000
--- a/src/crossrepomove.in
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-m4_include(lib/common.sh)
-
-scriptname=${0##*/}
-
-if [[ -z $1 ]]; then
- printf 'Usage: %s [pkgbase]\n' "$scriptname"
- exit 1
-fi
-
-pkgbase="${1}"
-
-case $scriptname in
- extra2community)
- source_name='packages'
- target_name='community'
- source_repo='extra'
- target_repo='community'
- ;;
- community2extra)
- source_name='community'
- target_name='packages'
- source_repo='community'
- target_repo='extra'
- ;;
- *)
- die "Couldn't find configuration for %s" "$scriptname"
- ;;
-esac
-
-server='repos.archlinux.org'
-source_svn="svn+ssh://svn-${source_name}@${server}/srv/repos/svn-${source_name}/svn"
-target_svn="svn+ssh://svn-${target_name}@${server}/srv/repos/svn-${target_name}/svn"
-source_dbscripts="/srv/repos/svn-${source_name}/dbscripts"
-target_dbscripts="/srv/repos/svn-${target_name}/dbscripts"
-
-setup_workdir
-
-pushd "$WORKDIR" >/dev/null
-
-msg "Downloading sources for %s" "${pkgbase}"
-svn -q checkout -N "${target_svn}" target_checkout
-mkdir -p "target_checkout/${pkgbase}/repos"
-svn -q export "${source_svn}/${pkgbase}/trunk" "target_checkout/${pkgbase}/trunk" || die
-# shellcheck source=contrib/makepkg/PKGBUILD.proto
-. "target_checkout/${pkgbase}/trunk/PKGBUILD"
-
-msg "Downloading packages for %s" "${pkgbase}"
-for _arch in "${arch[@]}"; do
- if [[ "${_arch[*]}" == 'any' ]]; then
- repo_arch='x86_64'
- else
- repo_arch=${_arch}
- fi
- for _pkgname in "${pkgname[@]}"; do
- fullver=$(get_full_version "$_pkgname")
- pkgpath="/srv/ftp/${source_repo}/os/${repo_arch}/${_pkgname}-${fullver}-${_arch}.pkg.tar.*"
- debugpath="/srv/ftp/${source_repo}-debug/os/${repo_arch}/${_pkgname}-debug-${fullver}-${_arch}.pkg.tar.*"
- # Fail if $pkgpath doesn't match but keep $debugpath optional
- # shellcheck disable=2029
- ssh "${server}" "bash -c '
- install ${pkgpath} -Dt staging/${target_repo} &&
- (install ${debugpath} -Dt staging/${target_repo} 2>/dev/null || true)
- '" || die
- done
-done
-
-msg "Adding %s to %s" "${pkgbase}" "${target_repo}"
-svn -q add "target_checkout/${pkgbase}"
-svn -q commit -m"${scriptname}: Moving ${pkgbase} from ${source_repo} to ${target_repo}" target_checkout
-pushd "target_checkout/${pkgbase}/trunk" >/dev/null
-archrelease "${arch[@]/#/$target_repo-}" || die
-popd >/dev/null
-
-# shellcheck disable=2029
-ssh "${server}" "${target_dbscripts}/db-update" || die
-
-msg "Removing %s from %s" "${pkgbase}" "${source_repo}"
-for _arch in "${arch[@]}"; do
- # shellcheck disable=2029
- ssh "${server}" "${source_dbscripts}/db-remove ${source_repo} ${_arch} ${pkgbase}"
-done
-svn -q checkout -N "${source_svn}" source_checkout
-svn -q up "source_checkout/${pkgbase}"
-svn -q rm "source_checkout/${pkgbase}"
-svn -q commit -m"${scriptname}: Moving ${pkgbase} from ${source_repo} to ${target_repo}" source_checkout
-
-popd >/dev/null