Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/completion/zsh/_devtools.in7
-rw-r--r--src/rebuildpkgs.in114
2 files changed, 1 insertions, 120 deletions
diff --git a/contrib/completion/zsh/_devtools.in b/contrib/completion/zsh/_devtools.in
index 5908bd6..39e9ac0 100644
--- a/contrib/completion/zsh/_devtools.in
+++ b/contrib/completion/zsh/_devtools.in
@@ -1,4 +1,4 @@
-#compdef archbuild arch-nspawn archrelease commitpkg pkgctl 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
+#compdef archbuild arch-nspawn archrelease commitpkg pkgctl diffpkg finddeps makechrootpkg mkarchroot 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
@@ -186,11 +186,6 @@ _mkarchroot_args=(
'*:packages:_devtools_completions_all_packages'
)
-_rebuildpkgs_args=(
- '1:chroot_dir:_files -/'
- '*:packages:_devtools_completions_all_packages'
-)
-
_checkpkg_args=(
'(-r --rmdir)'{-r,--rmdir}'[Remove the temporary directory]'
'(-w --warn)'{-w,--warn}'[Print a warning in case of differences]'
diff --git a/src/rebuildpkgs.in b/src/rebuildpkgs.in
deleted file mode 100644
index 7bf8b12..0000000
--- a/src/rebuildpkgs.in
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# This script rebuilds a list of packages in order
-# and reports anything that fails
-#
-# Due to sudo usage, it is recommended to allow makechrootpkg
-# to be run with NOPASSWD in your sudoers file
-#
-# FIXME
-# Currently uses $(pwd)/rebuilds as the directory for rebuilding...
-# TODO make this work for community too
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
-
-if (( $# < 1 )); then
- printf 'Usage: %s <chrootdir> <packages to rebuild>\n' "$(basename "${BASH_SOURCE[0]}")"
- printf ' example: %s ~/chroot readline bash foo bar baz\n' "$(basename "${BASH_SOURCE[0]}")"
- exit 1
-fi
-
-# Source makepkg.conf; fail if it is not found
-if [[ -r '/etc/makepkg.conf' ]]; then
- # shellcheck source=config/makepkg/x86_64.conf
- source '/etc/makepkg.conf'
-else
- die '/etc/makepkg.conf not found!'
-fi
-
-# Source user-specific makepkg.conf overrides
-if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then
- # shellcheck source=/dev/null
- source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf"
-elif [[ -r "$HOME/.makepkg.conf" ]]; then
- # shellcheck source=/dev/null
- source "$HOME/.makepkg.conf"
-fi
-
-bump_pkgrel() {
- # Get the current pkgrel from git and update the working copy with it
- # This prevents us from incrementing out of control :)
- pbuild='.svn/text-base/PKGBUILD.svn-base'
- oldrel=$(grep 'pkgrel=' $pbuild | cut -d= -f2)
-
- #remove decimals
- rel=${oldrel%%.*}
-
- newrel=$((rel + 1))
-
- sed -i "s/pkgrel=$oldrel/pkgrel=$newrel/" PKGBUILD
-}
-
-pkg_from_pkgbuild() {
- # we want the sourcing to be done in a subshell so we don't pollute our current namespace
- export CARCH PKGEXT
- # shellcheck source=contrib/makepkg/PKGBUILD.proto
- (source PKGBUILD; echo "$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT")
-}
-
-chrootdir="$1"; shift
-pkgs=("$@")
-
-SVNPATH='svn+ssh://repos.archlinux.org/srv/repos/svn-packages/svn'
-
-msg "Work will be done in %s" "$(pwd)/rebuilds"
-
-REBUILD_ROOT="$(pwd)/rebuilds"
-mkdir -p "$REBUILD_ROOT"
-cd "$REBUILD_ROOT"
-
-/usr/bin/svn co -N $SVNPATH
-
-FAILED=""
-for pkg in "${pkgs[@]}"; do
- cd "$REBUILD_ROOT/svn-packages"
-
- msg2 "Building '%s'" "$pkg"
- /usr/bin/svn update "$pkg"
- if [[ ! -d "$pkg/trunk" ]]; then
- FAILED="$FAILED $pkg"
- warning "%s does not exist in SVN" "$pkg"
- continue
- fi
- cd "$pkg/trunk/"
-
- bump_pkgrel
-
- if ! sudo makechrootpkg -u -d -r "$chrootdir" -- --noconfirm; then
- FAILED="$FAILED $pkg"
- error "%s Failed!" "$pkg"
- else
- pkgfile=$(pkg_from_pkgbuild)
- if [[ -e $pkgfile ]]; then
- msg2 "%s Complete" "$pkg"
- else
- FAILED="$FAILED $pkg"
- error "%s Failed, no package built!" "$pkg"
- fi
- fi
-done
-
-cd "$REBUILD_ROOT"
-if [[ -n $FAILED ]]; then
- msg 'Packages failed:'
- for pkg in $FAILED; do
- msg2 "%s" "$pkg"
- done
-fi
-
-msg 'SVN pkgbumps in svn-packages/ - commit when ready'