Compare commits

...

36 Commits

Author SHA1 Message Date
Levente Polyak
c081ddf2ba wip: diff soname 2023-04-07 12:51:35 +02:00
Levente Polyak
12c63702f6 WIP: REMOVE after POC, map community to extra 2023-04-07 12:48:00 +02:00
Levente Polyak
ac743ac437 WIP: set git packaging namespace to bot-test for testing 2023-04-07 12:48:00 +02:00
Levente Polyak
6dfd8bc70d config: fixup file permissions to be more strict
Normally the default in Arch is that all home directories are private.
However, this may have been changed locally. To make sure we never
expose secrets, lets use a umask of 0077 when writing the config.

Additionally add some temporary fixup code to migrate the file and
directory permissions of already existing paths.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-04-07 12:48:00 +02:00
Levente Polyak
951fe3bc08 build: support nocheck for initial bootstrap builds
Output a warning when this option is used to remind packagers to rebuild
the packages with checks once the bootstrap cycle has been completed.
2023-04-07 12:48:00 +02:00
Levente Polyak
39d46036fb doc: add dependency declaration to the README.md
This will help to make sure dependencies are explicitly stated and
reflected in the PKGBUILD.
2023-04-07 12:48:00 +02:00
Christian Heusel
cb36536c7a config: allow suppying the gitlab token via env var
This would allow to supply the gitlab tokens via the env var
DEVTOOLS_GITLAB_TOKEN and therefore allow users to choose whatever
program they want to fill this env var.

Closes #113

Signed-off-by: Christian Heusel <christian@heusel.eu>
2023-04-07 12:48:00 +02:00
Campbell Jones
10450ac610 edit: improve editor presence checking
Adds a check for the configured Git editor (git config core.editor) in
both commitpkg and build.sh.

Additionally, instead of blindly executing vi when all other options are
exhausted, remove it instead as it is a none standard installed editor
anyway.

Closes #106

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-04-07 12:48:00 +02:00
Levente Polyak
33e6ee7999 rebuildpkgs: drop legacy script, will be replaced with a smarter UX
Instead of trying to port this ancient script, which doesn't even seem
to work with community, let's instead remove it. We will be adding a
replacement script in pkgctl soon with a smarter and more convenient UX.
2023-04-07 12:48:00 +02:00
Levente Polyak
ef299af575 doc: update manpage footer for GitLab and remove static list of maintainers
The list of all maintainers that have worked so far on devtools is
exceeding a sane amount making each manpage convulsed. The authors can
be pulled from GitLab directly without occupying lots of space on every
manpage. We would like to express gratitude to all our maintainers.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-04-07 12:48:00 +02:00
Levente Polyak
104d173aa9 gitlab: add project path function to map special chars
Automatic path conversion is limited to GitLab API v4 and will be
removed in the future. It's expected that the caller does the path
conversion on caller side and only passes a valid path to the API within
its limitations.

Hence convert project names to valid paths:
  1. replace single '+' between word boundaries with '-'
  2. replace any other '+' with literal 'plus'
  3. replace any special chars other than '_', '-' and '.' with '-'

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-04-07 12:48:00 +02:00
Levente Polyak
c3c14f7a39 repo-configure: automatically determine protocol from packager identity
The remote protocol is automatically determined from the author email
address by choosing SSH for all official packager identities and
read-only HTTPS otherwise.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-04-07 12:47:59 +02:00
Levente Polyak
6d3456c635 build: command to build packages inside a clean chroot 2023-04-07 12:47:59 +02:00
Levente Polyak
3d4bb4a0b3 commitpkg: error out if the repo is not configured to latest specs
This ensures the repository we try to commit and release from uses the
latest distro specs for its local git config. The check errors out early
before touching anything and prints a recommendation how to update the
repo.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-03-19 22:04:48 +01:00
Levente Polyak
4527874b8e commitpkg: print deprecation warning when executed directly 2023-03-19 22:04:48 +01:00
Levente Polyak
3f7fda02a1 archrelease: print deprecation warning when executed directly 2023-03-19 22:04:48 +01:00
Levente Polyak
52e937a498 test: added pkgctl devel wrapper for convenient development testing
For local development testing, there is a convenience wrapper for
`pkgctl` that will automatically build the project using make and proxy
all calls to the local build directory.

Either `./test/bin/pkgctl` can be run directly or the `test/bin`
directory can be added to the PATH.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-03-19 22:04:48 +01:00
Levente Polyak
38a56a056a archrelease: add checks for valid remote and up-to-date branch ref
It's safest to probe for the validity of the remote origin and abort
early otherwise. This also allows to print some hints how to create or
configure new repositories at appropriate times.
Additionally fetch remote changes and check the local branch contains
the remote branch ref, otherwise abort and print a hint how to pull and
update the branch.

This should add all check needed for the average failure case that may
lead to a weird state or creation of a local tag that may not be
pushable.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-03-19 22:04:48 +01:00
Levente Polyak
bf64b5750c build: replace m4 defines with sed scripts during build
There is no reason anymore to use m4 since we got rid of the includes by
using library files. Let's replace the last usage of m4 and completely
red rid of it.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-03-19 22:04:47 +01:00
Levente Polyak
199c0dffcc conf: move makepkg and pacman config into separate conf.d dirs
We have used the datadir like a kitchen sink, lets clean up a bit by
having a better and well structured layout. Put makepkg and pacman
configs in separate directories: makepkg.conf.d and pacman.conf.d.
2023-03-19 22:04:47 +01:00
Levente Polyak
8d46f05c1f release: command to commit, tag and upload build artifacts
This is a smart and more convenient invocation of the classical
commitpkg and archrelease with auto-discovery for target repositories
and a shorthand option to directly call db-update.
2023-03-19 22:04:47 +01:00
Levente Polyak
a90f2074ee git: convert repos and tags config to new repo layout 2023-03-19 22:04:47 +01:00
Levente Polyak
3ea2367693 db: command for Pacman database modification like update, move etc 2023-03-19 22:04:47 +01:00
Levente Polyak
8569687ced commitpkg: add exported pgp keys with git 2023-03-19 22:04:47 +01:00
Levente Polyak
8202b3aed6 repo: added command to create a new packaging repository 2023-03-19 22:04:47 +01:00
Levente Polyak
9922beb1df auth: implemented module to authenticate against our GitLab
This helps to have a convenient way to manage and test our personal
GitLab tokens. Those are used for certain API calls like creating new
repositories.
2023-03-19 22:04:47 +01:00
Levente Polyak
cd6eb29035 gitlab: implemented module for required API calls
We need to use API calls as we can't create repositories in protected
namespaces by simply pushing a none existing repository. For privacy
reasons this is limited to private personal repositories in GitLab.
2023-03-19 22:04:47 +01:00
Levente Polyak
f8ca042b0f config: implemented simple config module to store token and settings 2023-03-19 22:04:47 +01:00
Levente Polyak
83a0587bc5 src: modularize repo layout into a library
This will greatly help us to structure the functionality and commands in
a more sane way. We will distribute the sources as actual libraries and
reuse code with imports instead of processing everything with m4 and
duplicating a lot of code.
2023-03-19 22:04:47 +01:00
Levente Polyak
4e82d313c6 pkgctl: add a unified command-line frontend for devtools
This is the first step of a simple and highly structured unified
interface to devtools commands in a single wrapper.

The split is based on groups like `repo`, `build` and `diff`

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-03-19 22:02:05 +01:00
Levente Polyak
a5cc17a61f pkgrepo: add subcommand to open the packaging repository's website
This can be quite handy if a packager quickly wants to check the GitLab
page for merge requests or but reports. Quickly calling a cli command
inside the current packaging clone or with the pkgname provided will
open the remote location inside the browser.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-03-19 22:02:05 +01:00
Levente Polyak
080bef6012 pkgrepo: add option to clone all existing packages
This can be very handy for cache warming on the repo server or
to perform mass operations on all PKGBUILDs.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-03-19 22:02:05 +01:00
Levente Polyak
ea47d22c20 pkgrepo: rename archco as a general purpose tool for packaging repos
Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-03-19 22:02:05 +01:00
Levente Polyak
727fba8eb4 commitpkg: use library location for common server and remote properties
It makes a lot of sense to have them in a central place that can be
swapped and also re-used across different execution units. Hence lets
move the repos.archlinux.org host to lib/common.sh

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-03-19 22:02:05 +01:00
Levente Polyak
126d99ac9a archco: add option to clone all packages of a maintainer
Query Archweb to retrieve a list of all packages of a maintainer by
their pkgbase. AFterwards loop through all packages and clone them.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-03-19 22:02:05 +01:00
Levente Polyak
79eb6680dd archco: implement clone and configure subcommands
Manages Git packaging repositories and helps with their configuration
according to distro specs.

Git author information and the used signing key is set up from
makepkg.conf read from any valid location like /etc or XDG_CONFIG_HOME.

The configure command can be used to synchronize the distro specs and
makepkg.conf settings for previously cloned repositories.

The unprivileged option can be used for cloning packaging repositories
without SSH access using read-only HTTPS.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
2023-03-19 22:02:05 +01:00
62 changed files with 3127 additions and 291 deletions

2
.gitignore vendored
View File

@@ -1,3 +1,3 @@
*~
devtools-*.tar.gz*
build/
/build/

View File

@@ -1,24 +1,30 @@
SHELL=/bin/bash
V=20230307
BUILDTOOLVER ?= $(V)
PREFIX = /usr/local
MANDIR = $(PREFIX)/share/man
DATADIR = $(PREFIX)/share/devtools
BUILDDIR = build
BINPROGS = $(addprefix $(BUILDDIR)/,$(patsubst src/%,bin/%,$(patsubst %.in,%,$(wildcard src/*.in))))
LIBUTILS = $(wildcard lib/*)
rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))
BINPROGS_SRC = $(wildcard src/*.in)
BINPROGS = $(addprefix $(BUILDDIR)/,$(patsubst src/%,bin/%,$(patsubst %.in,%,$(BINPROGS_SRC))))
LIBRARY_SRC = $(call rwildcard,src/lib,*.sh)
LIBRARY = $(addprefix $(BUILDDIR)/,$(patsubst src/%,%,$(patsubst %.in,%,$(LIBRARY_SRC))))
MAKEPKG_CONFIGS=$(wildcard config/makepkg/*)
PACMAN_CONFIGS=$(wildcard config/pacman/*)
SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*)
MANS = $(addprefix $(BUILDDIR)/,$(patsubst %.asciidoc,%,$(wildcard doc/man/*.asciidoc)))
COMMITPKG_LINKS = \
core-testingpkg \
core-stagingpkg \
extrapkg \
testingpkg \
stagingpkg \
communitypkg \
community-testingpkg \
community-stagingpkg \
extra-testingpkg \
extra-stagingpkg \
multilibpkg \
multilib-testingpkg \
multilib-stagingpkg \
@@ -41,8 +47,9 @@ ARCHBUILD_LINKS = \
COMPLETIONS = $(addprefix $(BUILDDIR)/,$(patsubst %.in,%,$(wildcard contrib/completion/*/*)))
all: binprogs completion man
all: binprogs library conf completion man
binprogs: $(BINPROGS)
library: $(LIBRARY)
completion: $(COMPLETIONS)
man: $(MANS)
@@ -61,37 +68,49 @@ ifneq ($(wildcard setarch-aliases.d/*),)
endif
edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g"
edit = sed \
-e "s|@pkgdatadir[@]|$(DATADIR)|g" \
-e "s|@buildtoolver[@]|$(BUILDTOOLVER)|g"
GEN_MSG = @echo "GEN $(patsubst $(BUILDDIR)/%,%,$@)"
define buildInScript
$(1)/%: $(2)%.in $(LIBUTILS)
$(1)/%: $(2)%$(3)
$$(GEN_MSG)
@mkdir -p $$(dir $$@)
@$(RM) "$$@"
@{ echo -n 'm4_changequote([[[,]]])'; cat $$<; } | m4 -P --define=m4_devtools_version=$$(BUILDTOOLVER) | $(edit) >$$@
@chmod $(3) "$$@"
@cat $$< | $(edit) >$$@
@chmod $(4) "$$@"
@bash -O extglob -n "$$@"
endef
$(eval $(call buildInScript,build/bin,src/,555))
$(foreach completion,$(wildcard contrib/completion/*),$(eval $(call buildInScript,build/$(completion),$(completion)/,444)))
$(eval $(call buildInScript,build/bin,src/,.in,755))
$(eval $(call buildInScript,build/lib,src/lib/,,644))
$(foreach completion,$(wildcard contrib/completion/*),$(eval $(call buildInScript,build/$(completion),$(completion)/,.in,444)))
$(BUILDDIR)/doc/man/%: doc/man/%.asciidoc doc/asciidoc.conf doc/man/include/footer.asciidoc
$(GEN_MSG)
@mkdir -p $(BUILDDIR)/doc/man
@a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage --destination-dir=$(BUILDDIR)/doc/man -a pkgdatadir=$(PREFIX)/share/devtools $<
@a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage --destination-dir=$(BUILDDIR)/doc/man -a pkgdatadir=$(DATADIR) $<
conf:
@install -d $(BUILDDIR)/makepkg.conf.d $(BUILDDIR)/pacman.conf.d
@cp -a $(MAKEPKG_CONFIGS) $(BUILDDIR)/makepkg.conf.d
@cp -a $(PACMAN_CONFIGS) $(BUILDDIR)/pacman.conf.d
clean:
rm -rf $(BUILDDIR)
install: all
install -dm0755 $(DESTDIR)$(PREFIX)/bin
install -dm0755 $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d
install -dm0755 $(DESTDIR)$(DATADIR)/setarch-aliases.d
install -dm0755 $(DESTDIR)$(DATADIR)/makepkg.conf.d
install -dm0755 $(DESTDIR)$(DATADIR)/pacman.conf.d
install -m0755 ${BINPROGS} $(DESTDIR)$(PREFIX)/bin
for conf in ${MAKEPKG_CONFIGS}; do install -Dm0644 $$conf $(DESTDIR)$(PREFIX)/share/devtools/makepkg-$${conf##*/}; done
for conf in ${PACMAN_CONFIGS}; do install -Dm0644 $$conf $(DESTDIR)$(PREFIX)/share/devtools/pacman-$${conf##*/}; done
for a in ${SETARCH_ALIASES}; do install -m0644 $$a -t $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d; done
install -dm0755 $(DESTDIR)$(DATADIR)/lib
cp -ra $(BUILDDIR)/lib/* $(DESTDIR)$(DATADIR)/lib
for conf in $(notdir $(MAKEPKG_CONFIGS)); do install -Dm0644 $(BUILDDIR)/makepkg.conf.d/$$conf $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
for conf in $(notdir $(PACMAN_CONFIGS)); do install -Dm0644 $(BUILDDIR)/pacman.conf.d/$$conf $(DESTDIR)$(DATADIR)/pacman.conf.d/$${conf##*/}; done
for a in ${SETARCH_ALIASES}; do install -m0644 $$a -t $(DESTDIR)$(DATADIR)/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
ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
@@ -103,16 +122,22 @@ install: all
uninstall:
for f in $(notdir $(BINPROGS)); do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
for conf in ${MAKEPKG_CONFIGS}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/makepkg-$${conf##*/}; done
for conf in ${PACMAN_CONFIGS}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/pacman-$${conf##*/}; done
for f in $(notdir $(SETARCH_ALIASES)); do rm -f $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d/$$f; done
for f in $(notdir $(LIBRARY)); do rm -f $(DESTDIR)$(DATADIR)/lib/$$f; done
for conf in $(notdir $(MAKEPKG_CONFIGS)); do rm -f $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
for conf in $(notdir $(PACMAN_CONFIGS)); do rm -f $(DESTDIR)$(DATADIR)/pacman.conf.d/$${conf##*/}; done
for f in $(notdir $(SETARCH_ALIASES)); do rm -f $(DESTDIR)$(DATADIR)/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
rm $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
rm $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
rm -f $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
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
rmdir --ignore-fail-on-non-empty \
$(DESTDIR)$(DATADIR)/setarch-aliases.d \
$(DESTDIR)$(DATADIR)/makepkg.conf.d \
$(DESTDIR)$(DATADIR)/pacman.conf.d \
$(DESTDIR)$(DATADIR)/lib \
$(DESTDIR)$(DATADIR)
TODAY=$(shell date +"%Y%m%d")
tag:
@@ -127,8 +152,8 @@ dist:
upload:
scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig repos.archlinux.org:/srv/ftp/other/devtools/
check: $(BINPROGS) $(BUILDDIR)/contrib/completion/bash/devtools config/makepkg/x86_64.conf contrib/makepkg/PKGBUILD.proto
check: $(BINPROGS_SRC) $(LIBRARY_SRC) contrib/completion/bash/devtools.in config/makepkg/x86_64.conf contrib/makepkg/PKGBUILD.proto
shellcheck $^
.PHONY: all completion man clean install uninstall dist upload check tag
.PHONY: all binprogs library completion conf man clean install uninstall tag dist upload check
.DELETE_ON_ERROR:

View File

@@ -14,6 +14,15 @@ files like `makepkg.conf`.
BUILDTOOLVER="${pkgver}-${pkgrel}-${arch}" make all
```
## Development
For local development testing, there is a convenience wrapper for `pkgctl` that
will automatically build the project and proxy all calls to the local build directory:
```sh
./test/bin/pkgctl --help
```
## Releasing
1. bump the version in the Makefile
@@ -23,6 +32,36 @@ BUILDTOOLVER="${pkgver}-${pkgrel}-${arch}" make all
5. Upload the source tarball with ```make dist upload```
6. Update the package
## Dependencies
### Runtime
- arch-install-scripts
- awk
- bash
- binutils
- coreutils
- diffutils
- findutils
- grep
- jq
- openssh
- parallel
- rsync
- sed
- util-linux
- bzr
- git
- mercurial
- subversion
### Development
- asciidoc
- make
- shellcheck
## License
Devtools is licensed under the terms of the **GPL-3.0-or-later** (see [LICENSE](LICENSE)).

View File

@@ -14,22 +14,22 @@ _devtools_compgen() {
done
}
_archco_pkg() {
_pkgrepo_pkg() {
_devtools_compgen "$(
command pacman "-$1"
)"
}
_archco() {
local cur prev
_pkgrepo() {
local cur prev
COMPREPLY=()
cur=$(_get_cword)
prev=${COMP_WORDS[COMP_CWORD-1]}
_archco_pkg Slq
_pkgrepo_pkg Slq
true
} &&
complete -F _archco archco
complete -F _pkgrepo pkgrepo
_makechrootpkg() {
local cur

View File

@@ -1,9 +1,12 @@
#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
#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
m4_include(lib/valid-tags.sh)
m4_include(lib/valid-repos.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/valid-tags.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-tags.sh
# shellcheck source=src/lib/valid-repos.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh
_binary_arch=${_arch[*]:0:-1}
_colors=(never always auto)
@@ -15,10 +18,108 @@ _archbuild_args=(
'--[Introduce makechrootpkg options]:*::makechrootpkg options:= _dispatch makechrootpkg makechrootpkg'
)
_archco_args=(
_pkgctl_auth_cmds=(
"pkgctl auth command"
"login[Authenticate with the GitLab instance]"
"status[View authentication status]"
)
_pkgctl_auth_login_args=(
'(-g --gen-access-token)'{-g,--gen-access-token}'[Open the URL to generate a new personal access token]'
'(-h --help)'{-h,--help}'[Display usage]'
)
_pkgctl_auth_status_args=(
'(-t --show-token)'{-t,--show-token}'[Display the auth token]'
'(-h --help)'{-h,--help}'[Display usage]'
)
_pkgctl_build_args=(
"--arch=[Specify architectures to build for (disables auto-detection)]:arch:($_arch[*])"
"--repo=[Specify a target repository (disables auto-detection)]:repo:($_repos[*])"
'(-s --staging)'{-s,--staging}'[Build against the staging counterpart of the auto-detected repo]'
'(-t --testing)'{-t,--testing}'[Build against the testing counterpart of the auto-detected repo]'
'(-o --offload)'{-o,--offload}'[Build on a remote server and transfer artifacts afterwards]'
'(-c --clean)'{-c,--clean}'[Recreate the chroot before building]'
'(-I --install)'{-I,--install}'[Install a package into the working copy of the chroot]:target:_files -g "*.pkg.tar.*(.)"'
'--nocheck[Do not run the check() function in the PKGBUILD]'
'--pkgver=[Set pkgver, reset pkgrel and update checksums]:pkgver:'
'--pkgrel=[Set pkgrel to a given value]:pkgrel:'
'--rebuild[Increment the pkgrel variable]'
'(-e --edit)'{-e,--edit}'[Edit the PKGBUILD before building]'
'(-r --release)'{-r,--release}'[Automatically commit, tag and release after building]'
'(-m --message=)'{-m,--message=}"[Use the given <msg> as the commit message]:message:"
'(-u --db-update)'{-u,--db-update}'[Automatically update the pacman database as last action]'
'(-h --help)'{-h,--help}'[Display usage]'
'*:git_dir:_files -/'
)
_pkgctl_db_cmds=(
"pkgctl db command"
"move[Move packages between pacman repositories]"
"remove[Remove packages from pacman repositories]"
"update[Update the pacman database as final release step]"
)
_pkgctl_db_move_args=(
'(-h --help)'{-h,--help}'[Display usage]'
"1:src-repo:($_repos[*])"
"2:target-repo:($_repos[*])"
'*:pkgbase:_devtools_completions_all_packages'
)
_pkgctl_db_remove_args=(
'(-a --arch=)'{-a,--arch=}"[Override the architecture (disables auto-detection)]:arch:($_arch[*])"
'(-h --help)'{-h,--help}'[Display usage]'
"1:repo:($_repos[*])"
'*:pkgbase:_devtools_completions_all_packages'
)
_pkgctl_db_update_args=(
'(-h --help)'{-h,--help}'[Display usage]'
)
_pkgctl_release_args=(
'(-m --message=)'{-m,--message=}"[Use the given <msg> as the commit message]:message:"
'(-r --repo=)'{-r,--repo=}"[Specify a target repository (disables auto-detection)]:repo:($_repos[*])"
'(-s --staging)'{-s,--staging}'[Release to the staging counterpart of the auto-detected repo]'
'(-t --testing)'{-t,--testing}'[Release to the testing counterpart of the auto-detected repo]'
'(-u --db-update)'{-u,--db-update}'[Automatically update the pacman database after uploading]'
'(-h --help)'{-h,--help}'[Display usage]'
'*:git_dir:_files -/'
)
_pkgctl_repo_cmds=(
"pkgctl repo command"
"clone[Clone a package repository]"
"configure[Configure a clone according to distro specs]"
"create[Create a new GitLab package repository]"
"web[Open the packaging repository's website]"
)
_pkgctl_repo_clone_args=(
'(-m --maintainer=)'{-m,--maintainer=}'[Clone all packages of the named maintainer]:maintainer:'
'--universe[Clone all existing packages, useful for cache warming]'
'(-h --help)'{-h,--help}'[Display usage]'
'*:packages:_devtools_completions_all_packages'
)
_pkgctl_repo_configure_args=(
'(-h --help)'{-h,--help}'[Display usage]'
'*:git_dir:_files -/'
)
_pkgctl_repo_create_args=(
'(-c --clone)'{-c,--clone}'[Clone the Git repository after creation]'
'(-h --help)'{-h,--help}'[Display usage]'
'1:pkgbase'
)
_pkgctl_repo_web_args=(
'(-h --help)'{-h,--help}'[Display usage]'
'*:git_dir:_files -/'
)
_arch_nspawn_args=(
'-C[Location of a pacman config file]:pacman_config:_files -g "*.conf(.)"'
'-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
@@ -86,11 +187,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]'
@@ -127,9 +223,47 @@ _devtools_completions_all_packages() {
compadd - "${(@)packages}"
}
_pkgctl_cmds=(
"pkgctl command"
"auth[Authenticate with services like GitLab]"
"build[Build packages inside a clean chroot]"
"db[Pacman database modification for packge update, move etc]"
"diff[Compare package files using different modes]"
"release[Release step to commit, tag and upload build artifacts]"
"repo[Manage Git packaging repositories and their configuration]"
)
_pkgctl_diff_args=("${_diffpkg_args[@]}")
_handle_subcommands() {
local service_name=${1}
if typeset -p ${service_name}_cmds &> /dev/null; then
_arguments -C \
"1: :->cmds" \
'*::arg:->args'
case $state in
cmds)
local service_cmds=${service_name}_cmds[@]
_values "${(P)service_cmds}"
;;
args)
local service_sub=${service_name}_$line[1]
if typeset -p ${service_sub}_args &> /dev/null; then
local cmd_args=${service_sub}_args[@]
_arguments -s "${(P)cmd_args}"
elif typeset -p ${service_sub}_cmds &> /dev/null; then
_handle_subcommands "${service_sub}"
fi
;;
esac
elif typeset -p ${service_name}_args &> /dev/null; then
local argname="${service_name}_args[@]"
_arguments -s "${(P)argname}"
fi
}
_devtools() {
local argname="_${service//-/_}_args[@]"
_arguments -s "${(P)argname}"
_handle_subcommands _${service//-/_}
}
_devtools

View File

@@ -23,7 +23,7 @@ Description
* staging-x86_64-build
* testing-x86_64-build
The symlink used to run it will be inspected by archbuild, to determine which target you want it to use. It will load the available pacman configuration from 'pacman-reponame-arch.conf' with a fallback to 'pacman-reponame.conf' from {pkgdatadir}. The makepkg configuration is loaded from 'makepkg-repo-arch.conf' with a fallback to 'makepkg-reponame.conf' from {pkgdatadir}.
The symlink used to run it will be inspected by archbuild, to determine which target you want it to use. It will load the available pacman configuration from 'reponame-arch.conf' with a fallback to 'reponame.conf' from {pkgdatadir}/pacman.conf.d. The makepkg configuration is loaded from 'repo-arch.conf' with a fallback to 'reponame.conf' from {pkgdatadir}/makepkg.conf.d.
It will also load the bind mount configuration from 'mount.d/arch' in {pkgdatadir}. The file format is that each line starting with ro and rw will be used, other lines will be ignored, and the rest of the used line is out/path:in/path preceded by a space as a separator. ro means it is a read-only mount, rw means a read-write mount.

View File

@@ -8,16 +8,22 @@ devtools - Developer tools for the Arch Linux distribution
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')
Devtools contains tools for package maintenance in Arch Linux. It comes with a
unified command-line frontend called 'pkgctl' that aids to conveniently
interact with all the different tools this collection provides.
The toolset varies from tools for building packages in a clean chroot
('mkarchroot', 'archbuild', ...), packaging related tools ('sogrep', 'diffpkg',
'lddd') and tools for repository management such as ('pkgrepo').
Programs
--------
The list below gives a short overview; see the respective documentation
for details.
linkman:pkgctl[1]
Unified command-line frontend for devtools
linkman:archbuild[1]
Build an Arch Linux package inside a clean chroot
@@ -27,6 +33,12 @@ linkman:arch-nspawn[1]
linkman:checkpkg[1]
Compare the current build package with the repository version
linkman:diffpkg[1]
Compare package files using different modes
linkman:export-pkgbuild-keys[1]
Export valid source signing keys from a PKGBUILD
linkman:find-libdeps[1]
Find soname dependencies for a package

View File

@@ -30,7 +30,6 @@ Options
*-M, --makepkg-config*::
Set an alternate makepkg configuration file
*-P, --pool*='DIR'::
Search diff target in pool dir (default `'/srv/ftp/pool'`)
@@ -71,7 +70,4 @@ Modes
*-b, --buildinfo*::
Activate .BUILDINFO diff mode
See Also
--------
include::include/footer.asciidoc[]

View File

@@ -1,27 +1,7 @@
Bugs
----
Bugs can be reported on the project's GitLab bug tracker 'https://gitlab.archlinux.org/archlinux/devtools'
Homepage
--------
'https://gitlab.archlinux.org/archlinux/devtools'
Authors
-------
Maintainers:
* Aaron Griffin <aaronmgriffin@gmail.com>
* Allan McRae <allan@archlinux.org>
* Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
* Dan McGee <dan@archlinux.org>
* Dave Reisner <dreisner@archlinux.org>
* Evangelos Foutras <evangelos@foutrelis.com>
* Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
* Jelle van der Waa <jelle@archlinux.org>
* Levente Polyak <anthraxx@archlinux.org>
* Pierre Schmitz <pierre@archlinux.de>
* Sébastien Luttringer <seblu@seblu.net>
* Sven-Hendrik Haase <svenstaro@gmail.com>
* Thomas Bächler <thomas@archlinux.org>
For additional contributors, use `git shortlog -s` on the devtools.git
repository.
Please report bugs and feature requests in the issue tracker. Please do your best to provide a reproducible test case for bugs.

View File

@@ -0,0 +1,83 @@
pkgctl-build(1)
===============
Name
----
pkgctl-build - Build packages inside a clean chroot
Synopsis
--------
pkgctl build [OPTIONS] [PATH...]
Description
-----------
TODO
Build Options
-------------
*--arch* 'ARCH'::
Specify architectures to build for (disables auto-detection)
*--repo* 'REPO'::
Specify a target repository (disables auto-detection)
*-s, --staging*::
Build against the staging counterpart of the auto-detected repo
*-t, --testing*::
Build against the testing counterpart of the auto-detected repo
*-o, --offload*::
Build on a remote server and transfer artifacts afterwards
*-c, --clean*::
Recreate the chroot before building
*-I, --install* 'FILE'::
Install a package into the working copy of the chroot
*--nocheck*::
Do not run the check() function in the PKGBUILD
PKGBUILD Options
----------------
*--pkgver*='PKGVER'::
Set pkgver, reset pkgrel and update checksums
*--pkgrel*='PKGREL'::
Set pkgrel to a given value
*--rebuild*::
Increment the current pkgrel variable
*-e, --edit*::
Edit the PKGBUILD before building
Release Options
---------------
*-r, --release*::
Automatically commit, tag and release after building
*-m, --message* 'MSG'::
Use the given <msg> as the commit message
*-u, --db-update*::
Automatically update the pacman database as last action
Options
-------
*-h, --help*::
Show a help text
See Also
--------
linkman:pkgctl-release[1]
linkman:pkgctl-db-update[1]
include::include/footer.asciidoc[]

View File

@@ -0,0 +1,24 @@
pkgctl-db-move(1)
=================
Name
----
pkgctl-db-update - Update the binary repository as final release step
Synopsis
--------
pkgctl db update [OPTIONS]
Description
-----------
Update the pacman database as final release step for packages that
have been transfered and staged on 'repos.archlinux.org'.
Options
-------
*-h, --help*::
Show a help text
include::include/footer.asciidoc[]

View File

@@ -0,0 +1,26 @@
pkgctl-db-remove(1)
===================
Name
----
pkgctl-db-remove - Remove packages from binary repositories
Synopsis
--------
pkgctl db remove [OPTIONS] [REPO] [PKGBASE]...
Description
-----------
Remove packages from pacman repositories.
Options
-------
*-a, --arch* 'ARCH'::
Override the architecture (disables auto-detection)
*-h, --help*::
Show a help text
include::include/footer.asciidoc[]

View File

@@ -0,0 +1,23 @@
pkgctl-db-move(1)
=================
Name
----
pkgctl-db-move - Move packages between binary repositories
Synopsis
--------
pkgctl db move [OPTIONS] [SOURCE_REPO] [TARGET_REPO] [PKGBASE]...
Description
-----------
Move packages between pacman repositories.
Options
-------
*-h, --help*::
Show a help text
include::include/footer.asciidoc[]

View File

@@ -0,0 +1,73 @@
pkgctl-diff(1)
==============
Name
----
pkgctl-diff - Compare package files using different modes.
Synopsis
--------
pkgctl diff [OPTIONS] [MODES] [FILE|PKGNAME...]
Description
-----------
Searches for a locally built package corresponding to the PKGBUILD, and
downloads the last version of that package from the Pacman repositories.
It then compares the package archives using different modes while using
simple tar content list by default.
When given one package, use it to diff against the locally built one.
When given two packages, diff both packages against each other.
In either case, a package name will be converted to a filename from the cache
or pool, and 'pkgctl diff' will proceed as though this filename was initially
specified.
Options
-------
*-M, --makepkg-config*::
Set an alternate makepkg configuration file
*-P, --pool*='DIR'::
Search diff target in pool dir (default `'/srv/ftp/pool'`)
*-v, --verbose*::
Provide more detailed/unfiltered output
*-h, --help*::
Show a help text
Output Options
--------------
*--color*[='WHEN']::
Color output; 'WHEN' is `'never'`, `'always'`, or `'auto'`; Plain *--color* means *--color='auto'*
*-u, -U, --unified*::
Output 3 lines of unified context
*-y, --side-by-side*::
Output in two columns
*-W, --width*[='NUM']::
Output at most 'NUM' (default `'auto'`) print columns; 'NUM' can be `'auto'`, `'columns'` or a number.
`'auto'` will be resolved to the maximum line length of both files, guaranteeing the diff to be uncut.
Modes
-----
*-l, --list*::
Activate tar content list diff mode (default)
*-d, --diffoscope*::
Activate diffoscope diff mode
*-p, --pkginfo*::
Activate .PKGINFO diff mode
*-b, --buildinfo*::
Activate .BUILDINFO diff mode
include::include/footer.asciidoc[]

View File

@@ -0,0 +1,49 @@
pkgctl-release(1)
=================
Name
----
pkgctl-release - Release step to commit, tag and upload build artifacts
Synopsis
--------
pkgctl release [OPTIONS] [PATH...]
Description
-----------
Modified version controlled files will first be staged for commit,
afterwards a Git tag matching the pkgver will be created and finally
all build artifacts will be uploaded.
By default the target pacman repository will be auto-detected by querying
the repo it is currently released in. When initially adding a new package
to the repositories, the target repo must be specified manually.
Options
-------
*-m, --message* 'MSG'::
Use the given <msg> as the commit message
*-r, --repo* 'REPO'::
Specify a target repository (disables auto-detection)
*-s, --staging*::
Build against the staging counterpart of the auto-detected repo
*-t, --testing*::
Build against the testing counterpart of the auto-detected repo
*-u, --db-update*::
Automatically update the pacman database after uploading
*-h, --help*::
Show a help text
See Also
--------
linkman:pkgctl-db-update[1]
include::include/footer.asciidoc[]

View File

@@ -0,0 +1,39 @@
pkgctl-repo-clone(1)
======================
Name
----
pkgctl-repo-clone - Clone a package repository
Synopsis
--------
pkgctl repo clone [OPTIONS] [PKGNAME...]
Description
-----------
Clone Git packaging repositories from the canonical namespace.
The configure command is subsequently invoked to synchronize the distro
specs and makepkg.conf settings. The unprivileged option can be used
for cloning packaging repositories without SSH access using read-only
HTTPS.
Options
-------
*-m, --maintainer* 'NAME'::
Clone all packages of the named maintainer
*--universe*::
Clone all existing packages, useful for cache warming
*-h, --help*::
Show a help text
See Also
--------
linkman:pkgctl-repo-configure[1]
include::include/footer.asciidoc[]

View File

@@ -0,0 +1,31 @@
pkgctl-repo-configure(1)
========================
Name
----
pkgctl-repo-configure - Configure a clone according to distro specs
Synopsis
--------
pkgctl repo configure [OPTIONS] [PATH...]
Description
-----------
Configure Git packaging repositories according to distro specs and
'makepkg.conf' settings.
Git author information and the used signing key is set up from
'makepkg.conf' read from any valid location like '/etc' or 'XDG_CONFIG_HOME'.
The remote protocol is automatically determined from the author email
address by choosing SSH for all official packager identities and
read-only HTTPS otherwise.
Options
-------
*-h, --help*::
Show a help text
include::include/footer.asciidoc[]

View File

@@ -0,0 +1,40 @@
pkgctl-repo-create(1)
======================
Name
----
pkgctl-repo-create - Create a new GitLab package repository
Synopsis
--------
pkgctl repo create [OPTIONS] [PKGBASE...]
Description
-----------
Create a new Git packaging repository in the canonical GitLab namespace.
This command requires a valid GitLab API authentication. To setup a new
GitLab token or check the currently configured one please consult the
'auth' subcommand for further instructions.
If invoked without a parameter, try to create a packaging repository
based on the 'PKGBUILD' from the current working directory.
Options
-------
*-c, --clone*::
Clone the Git repository after creation
*-h, --help*::
Show a help text
See Also
--------
linkman:pkgctl-auth[1]
linkman:pkgctl-repo-clone[1]
linkman:pkgctl-repo-configure[1]
include::include/footer.asciidoc[]

View File

@@ -0,0 +1,24 @@
pkgctl-repo-web(1)
==================
Name
----
pkgctl-repo-web - Open the packaging repository's website
Synopsis
--------
pkgctl repo web [OPTIONS] [PKGBASE...]
Description
-----------
Open the packaging repository's website via xdg-open. If called with
no arguments, open the package cloned in the current working directory.
Options
-------
*-h, --help*::
Show a help text
include::include/footer.asciidoc[]

View File

@@ -0,0 +1,55 @@
pkgctl-repo(1)
================
Name
----
pkgctl-repo - Manage Git packaging repositories and their configuration
Synopsis
--------
pkgctl repo [OPTIONS] [SUBCOMMAND]
Description
-----------
Manage Git packaging repositories and helps with their configuration
according to distro specs.
Git author information and the used signing key is set up from
'makepkg.conf' read from any valid location like '/etc' or 'XDG_CONFIG_HOME'.
The configure command can be used to synchronize the distro specs and
makepkg.conf settings for previously cloned repositories.
The unprivileged option can be used for cloning packaging repositories
without SSH access using read-only HTTPS.
Options
-------
*-h, --help*::
Show a help text
Subcommands
-----------
pkgctl repo clone::
Clone a package repository
pkgctl repo configure::
Configure a clone according to distro specs
pkgctl repo create::
Create a new GitLab package repository
pkgctl repo web::
Open the packaging repository's website
See Also
--------
linkman:pkgctl-repo-clone[1]
linkman:pkgctl-repo-configure[1]
linkman:pkgctl-repo-create[1]
linkman:pkgctl-repo-web[1]
include::include/footer.asciidoc[]

48
doc/man/pkgctl.1.asciidoc Normal file
View File

@@ -0,0 +1,48 @@
pkgctl(1)
=========
Name
----
pkgctl - Unified command-line frontend for devtools
Synopsis
--------
pkgctl [SUBCOMMAND] [OPTIONS]
Description
-----------
TODO
Subcommands
-----------
pkgctl auth::
Authenticate with services like GitLab
pkgctl build::
Build packages inside a clean chroot
pkgctl db::
Pacman database modification for packge update, move etc
pkgctl diff::
Compare package files using different modes
pkgctl release::
Release step to commit, tag and upload build artifacts
pkgctl repo::
Manage Git packaging repositories and their configuration
See Also
--------
linkman:pkgctl-auth[1]
linkman:pkgctl-build[1]
linkman:pkgctl-db[1]
linkman:pkgctl-diff[1]
linkman:pkgctl-release[1]
linkman:pkgctl-repo[1]
include::include/footer.asciidoc[]

View File

@@ -2,8 +2,12 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
m4_include(lib/common.sh)
m4_include(lib/archroot.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/archroot.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/archroot.sh
# umask might have been changed in /etc/profile
# ensure that sane default is set again

View File

@@ -2,8 +2,12 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
m4_include(lib/common.sh)
m4_include(lib/archroot.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/archroot.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/archroot.sh
base_packages=(base-devel)
makechrootpkg_args=(-c -n -C)
@@ -42,13 +46,13 @@ done
chroots='/var/lib/archbuild'
clean_first=false
pacman_config="@pkgdatadir@/pacman-${repo}.conf"
if [[ -f @pkgdatadir@/pacman-${repo}-${arch}.conf ]]; then
pacman_config="@pkgdatadir@/pacman-${repo}-${arch}.conf"
pacman_config="@pkgdatadir@/pacman.conf.d/${repo}.conf"
if [[ -f @pkgdatadir@/pacman.conf.d/${repo}-${arch}.conf ]]; then
pacman_config="@pkgdatadir@/pacman.conf.d/${repo}-${arch}.conf"
fi
makepkg_config="@pkgdatadir@/makepkg-${arch}.conf"
if [[ -f @pkgdatadir@/makepkg-${repo}-${arch}.conf ]]; then
makepkg_config="@pkgdatadir@/makepkg-${repo}-${arch}.conf"
makepkg_config="@pkgdatadir@/makepkg.conf.d${arch}.conf"
if [[ -f @pkgdatadir@/makepkg.conf.d/${repo}-${arch}.conf ]]; then
makepkg_config="@pkgdatadir@/makepkg.conf.d/${repo}-${arch}.conf"
fi
usage() {

View File

@@ -1,24 +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 <package name>...\n' "$scriptname"
exit 1
fi
case $scriptname in
archco)
GITURL="ssh://git@gitlab.archlinux.org:222/bot-test/packages";;
*)
die "Couldn't find Git url for %s" "$scriptname"
;;
esac
for pkgbase in "$@"; do
git clone --origin origin --config commit.gpgsign=true "${GITURL}/${pkgbase}.git"
done

View File

@@ -2,8 +2,19 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
m4_include(lib/common.sh)
m4_include(lib/valid-tags.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/valid-tags.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-tags.sh
set -e
# Deprecation warning
if [[ -z $_DEVTOOLS_COMMAND ]]; then
warning "${0##*/} is deprecated and will be removed. Use 'pkgctl release' instead"
fi
# parse command line options
FORCE=
@@ -34,13 +45,36 @@ if [[ ! -f PKGBUILD ]]; then
die 'archrelease: PKGBUILD not found'
fi
# shellcheck source=contrib/makepkg/PKGBUILD.proto
. ./PKGBUILD
pkgbase=${pkgbase:-$pkgname}
pkgver=$(get_full_version "$pkgbase")
gittag=$(get_tag_from_pkgver "$pkgver")
if git rev-parse "$gittag" >/dev/null 2>&1; then
die "archrelease: the tag $gittag for version $pkgver already exists in the repository!"
# Check if releasing from a branch
if ! branchname=$(git symbolic-ref --short HEAD); then
die 'not on any branch'
fi
if [[ "${branchname}" != main ]]; then
die 'must be run from the main branch'
fi
# Check if remote origin is setup properly
if ! giturl=$(git remote get-url origin) || [[ ${giturl} != *${GIT_PACKAGING_URL_SSH}* ]]; then
die "remote origin is not configured, run 'pkgctl repo configure'"
fi
if ! git ls-remote origin >/dev/null; then
die "configured remote origin may not exist, run 'pkgctl repo create ${pkgbase}' to create it"
fi
msg 'Fetching remote changes'
git fetch --prune --prune-tags origin || die 'failed to fetch remote changes'
# Check if local branch is up to date and contains the latest origin commit
if remoteref=$(git rev-parse "origin/${branchname}" 2>/dev/null); then
if [[ $(git branch "${branchname}" --contains "${remoteref}" --format '%(refname:short)') != "${branchname}" ]]; then
die "local branch is out of date, run 'git pull --rebase'"
fi
fi
# If the tag exists we check if it's properly signed and that it
@@ -51,10 +85,11 @@ if git tag --verify "$gittag" &> /dev/null; then
if [[ "$cwd_checksum" != "$tag_checksum" ]]; then
die "tagged PKGBUILD is not the same as the working dir PKGBUILD"
fi
git push --tags --set-upstream origin main || abort
exit 0
fi
stat_busy "Releasing package"
git tag --sign --message="Package release ${pkgver}" "$gittag" || abort
git push --tags main || abort
git push --tags --set-upstream origin main || abort
stat_done

View File

@@ -2,7 +2,10 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
m4_include(lib/common.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
usage() {
cat <<- _EOF_

View File

@@ -2,7 +2,12 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
m4_include(lib/common.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
source /usr/share/makepkg/util/util.sh
check_pkgbuild_validity() {
# shellcheck source=contrib/makepkg/PKGBUILD.proto
@@ -50,10 +55,21 @@ fi
cmd=${0##*/}
# Deprecation warning
if [[ -z $_DEVTOOLS_COMMAND ]]; then
warning "${cmd} is deprecated and will be removed. Use 'pkgctl release' instead"
fi
if [[ ! -f PKGBUILD ]]; then
die 'No PKGBUILD file'
fi
if ! repo_spec=$(git config --local devtools.version) || [[ ${repo_spec} != "${GIT_REPO_SPEC_VERSION}" ]]; then
error "repository specs are out of date, try:"
msg2 'pkgctl repo configure'
exit 1
fi
if [[ "$(git symbolic-ref --short HEAD)" != main ]]; then
die 'must be run from the main branch'
fi
@@ -91,7 +107,7 @@ if (( ${#validpgpkeys[@]} != 0 )); then
export-pkgbuild-keys || die 'Failed to export valid PGP keys for source files'
fi
svn add --parents --force keys/pgp/*
git add --force -- keys/pgp/*
fi
# find files which should be under source control
@@ -119,6 +135,8 @@ if (( ${#needsversioning[*]} )); then
done
fi
server=${PACKAGING_REPO_RELEASE_HOST}
rsyncopts=(-e ssh -p '--chmod=ug=rw,o=r' -c -h -L --progress --partial -y)
archreleaseopts=()
while getopts ':l:a:s:f' flag; do
@@ -155,10 +173,6 @@ done
# check for PKGBUILD standards
check_pkgbuild_validity
if [[ -z $server ]]; then
server='repos.archlinux.org'
fi
if [[ -n $(git status --short --untracked-files=no) ]]; then
stat_busy 'Staging files'
for f in $(git ls-files --modified); do
@@ -184,8 +198,10 @@ if [[ -n $(git status --short --untracked-files=no) ]]; then
$VISUAL "$msgfile" || die
elif [[ -n $EDITOR ]]; then
$EDITOR "$msgfile" || die
elif giteditor=$(git config --get core.editor); then
$giteditor "$msgfile" || die
else
vi "$msgfile" || die
die "No usable editor found (tried \$GIT_EDITOR, \$VISUAL, \$EDITOR, git config [core.editor])."
fi
[[ -s $msgfile ]] || die
stat_busy 'Committing changes'

View File

@@ -2,11 +2,17 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
m4_include(lib/common.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/util/util.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/util.sh
usage() {
cat <<- _EOF_
Usage: ${BASH_SOURCE[0]##*/} [OPTIONS] [MODES] [FILE|PKGNAME...]
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [OPTIONS] [MODES] [FILE|PKGNAME...]
Searches for a locally built package corresponding to the PKGBUILD, and
downloads the last version of that package from the Pacman repositories.
@@ -17,11 +23,13 @@ usage() {
When given two packages, diff both packages against each other.
In either case, a package name will be converted to a filename from the
cache, and diffpkg will proceed as though this filename was initially
specified.
cache, and '${COMMAND}' will proceed as though this filename was
initially specified.
OPTIONS
-M, --makepkg-config Set an alternate makepkg configuration file
-M, --pacman-config Set an alternate pacman configuration file
--dbpath Set an alternate pacman database path
-P, --pool=DIR Search diff target in pool dir (default '/srv/ftp/pool')
-v, --verbose Provide more detailed/unfiltered output
-h, --help Show this help text
@@ -33,12 +41,14 @@ usage() {
-y, --side-by-side Output in two columns
-W, --width=NUM Output at most NUM (default 'auto') print columns
NUM can be 'auto', 'columns' or a number
--summary Print a summary or warning message on disparity
MODES
-l, --list Activate content list diff mode (default)
-d, --diffoscope Activate diffoscope diff mode
-p, --pkginfo Activate .PKGINFO diff mode
-b, --buildinfo Activate .BUILDINFO diff mode
-s, --soname Activate library SONAME diff mode
_EOF_
}
@@ -50,11 +60,13 @@ TARLIST=0
DIFFOSCOPE=0
PKGINFO=0
BUILDINFO=0
SONAME=0
SUMMARY=0
DIFFMODE=--side-by-side
DIFFCOLOR=--color=auto
DIFFWIDTH=--width=auto
DIFFOPTIONS=(--expand-tabs)
DIFFOPTIONS=(--expand-tabs --suppress-common-lines)
# option checking
while (( $# )); do
@@ -84,10 +96,18 @@ while (( $# )); do
BUILDINFO=1
shift
;;
-s|--soname)
SONAME=1
shift
;;
-v|--verbose)
VERBOSE=1
shift
;;
--summary)
SUMMARY=1
shift
;;
-u|-U|--unified)
DIFFMODE=--unified
shift
@@ -131,7 +151,7 @@ while (( $# )); do
shift
break
;;
-*|--*)
-*)
die "invalid argument: %s" "$1"
;;
*)
@@ -154,6 +174,9 @@ fi
if [[ $DIFFWIDTH != --width=auto ]]; then
DIFFOPTIONS+=("${DIFFWIDTH}")
fi
if [[ $DIFFCOLOR == --color=auto ]] && is_tty; then
DIFFCOLOR="--color=always"
fi
DIFFOPTIONS+=("${DIFFMODE}" "${DIFFCOLOR}")
if ! (( DIFFOSCOPE || TARLIST || PKGINFO || BUILDINFO )); then
@@ -228,23 +251,31 @@ diff_pkgs() {
bsdtar xOqf "$newpkg" .BUILDINFO > "$TMPDIR/new"
fi
if (( TARLIST || PKGINFO || BUILDINFO )); then
if (( SONAME )); then
find-libprovides "$oldpkg" 2>/dev/null | sort > "$TMPDIR/old"
find-libprovides "$newpkg" 2>/dev/null | sort > "$TMPDIR/new"
fi
if (( TARLIST || PKGINFO || BUILDINFO || SONAME )); then
# Resolve dynamic auto width one we know the content to diff
if [[ $DIFFWIDTH == --width=auto ]]; then
AUTOLENGTH=$(file_diff_columns "$TMPDIR/old" "$TMPDIR/new")
DIFFOPTIONS+=("--width=${AUTOLENGTH}")
fi
# Print a header for side-by-side view as it lacks labels
if [[ $DIFFMODE == --side-by-side ]]; then
printf -- "--- %s\n+++ %s\n" "${oldpkg}" "${newpkg}"
if ! output=$(diff "${DIFFOPTIONS[@]}" "$TMPDIR/old" "$TMPDIR/new"); then
# Print a header for side-by-side view as it lacks labels
if [[ $DIFFMODE == --side-by-side ]]; then
printf -- "%s--- %s\n+++ %s%s\n" "${BOLD}" "${oldpkg}" "${newpkg}" "${ALL_OFF}"
fi
printf "%s\n" "${output}"
return 1
fi
diff "${DIFFOPTIONS[@]}" "$TMPDIR/old" "$TMPDIR/new"
fi
if (( DIFFOSCOPE )); then
diffoscope "${DIFFCOLOR/--color/--text-color}" "$oldpkg" "$newpkg"
return $?
fi
}
@@ -273,13 +304,14 @@ fetch_pkg() {
fi
# Search via pacman database if no pool file exists
if [[ ! -f ${pkgurl} ]]; then
pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$pkg") ||
pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm -- "$pkg") ||
die "Couldn't download previous package for %s." "$pkg"
# TODO: check and download via Swdd so we also do signatures checks before processing
fi
fi
pkg=${pkgurl##*/}
pkgdest=$(mktemp -t -d "${pkg}-XXXXXX")/${pkg}
pkgdest=$(mktemp -t -d -- "${pkg}-XXXXXX")/${pkg}
if [[ $pkgurl = file://* || ( $pkgurl = /* && -f $pkgurl ) ]]; then
ln -sf "${pkgurl#file://}" "$pkgdest"
@@ -300,7 +332,7 @@ shopt -u extglob
if (( $# < 2 )); then
if [[ ! -f PKGBUILD ]]; then
die "This must be run in the directory of a built package.\nTry '$(basename "$0") --help' for more information."
die "This must be run in the directory of a built package.\nTry '${COMMAND} --help' for more information."
fi
# shellcheck source=contrib/makepkg/PKGBUILD.proto
@@ -309,6 +341,7 @@ if (( $# < 2 )); then
CARCH='any'
fi
ret=0
for _pkgname in "${pkgname[@]}"; do
comparepkg=$_pkgname
pkgurl=
@@ -326,10 +359,13 @@ if (( $# < 2 )); then
oldpkg=$(fetch_pkg "$comparepkg") || exit 1
diff_pkgs "$oldpkg" "$pkgfile"
ret+=$?
done
exit $ret
else
file1=$(fetch_pkg "$1") || exit 1
file2=$(fetch_pkg "$2") || exit 1
diff_pkgs "$file1" "$file2"
exit $?
fi

View File

@@ -2,7 +2,10 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
m4_include(lib/common.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
usage() {
cat <<- _EOF_
@@ -35,7 +38,7 @@ if [[ ! -f PKGBUILD ]]; then
fi
mapfile -t validpgpkeys < <(
# shellcheck source=PKGBUILD.proto
# shellcheck source=contrib/makepkg/PKGBUILD.proto
. ./PKGBUILD
if (( ${#validpgpkeys[@]} )); then
printf "%s\n" "${validpgpkeys[@]}"

View File

@@ -2,7 +2,10 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
m4_include(lib/common.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
set -e

View File

@@ -4,7 +4,10 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
m4_include(lib/common.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
match=$1

View File

@@ -4,7 +4,10 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
m4_include(lib/common.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
ifs=$IFS
IFS="${IFS}:"

122
src/lib/api/gitlab.sh Normal file
View File

@@ -0,0 +1,122 @@
#!/hint/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_API_GITLAB_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_API_GITLAB_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/config.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/config.sh
set -e
gitlab_api_call() {
local outfile=$1
local request=$2
local endpoint=$3
local data=${4:-}
local error
# empty token
if [[ -z "${GITLAB_TOKEN}" ]]; then
msg_error " api call failed: No token provided"
return 1
fi
if ! curl --request "${request}" \
--url "https://${GITLAB_HOST}/api/v4/${endpoint}" \
--header "PRIVATE-TOKEN: ${GITLAB_TOKEN}" \
--header "Content-Type: application/json" \
--data "${data}" \
--output "${outfile}" \
--silent; then
msg_error " api call failed: $(cat "${outfile}")"
return 1
fi
# check for general purpose api error
if error=$(jq --raw-output --exit-status '.error' < "${outfile}"); then
msg_error " api call failed: ${error}"
return 1
fi
# check for api specific error messages
if ! jq --raw-output --exit-status '.id' < "${outfile}" >/dev/null; then
if jq --raw-output --exit-status '.message | keys[]' < "${outfile}" &>/dev/null; then
while read -r error; do
msg_error " api call failed: ${error}"
done < <(jq --raw-output --exit-status '.message|to_entries|map("\(.key) \(.value[])")[]' < "${outfile}")
elif error=$(jq --raw-output --exit-status '.message' < "${outfile}"); then
msg_error " api call failed: ${error}"
fi
return 1
fi
return 0
}
gitlab_api_get_user() {
local outfile username
[[ -z ${WORKDIR:-} ]] && setup_workdir
outfile=$(mktemp --tmpdir="${WORKDIR}" pkgctl-gitlab-api.XXXXXXXXXX)
# query user details
if ! gitlab_api_call "${outfile}" GET "user/"; then
msg_warn " Invalid token provided?"
exit 1
fi
# extract username from details
if ! username=$(jq --raw-output --exit-status '.username' < "${outfile}"); then
msg_error " failed to query username: $(cat "${outfile}")"
return 1
fi
printf "%s" "${username}"
return 0
}
# 1. replace single '+' between word boundaries with '-'
# 2. replace any other '+' with literal 'plus'
# 3. replace any special chars other than '_', '-' and '.' with '-'
gitlab_project_name_to_path() {
local name=$1
printf "%s" "${name}" \
| sed -E 's/([a-zA-Z0-9]+)\+([a-zA-Z]+)/\1-\2/g' \
| sed -E 's/\+/plus/g' \
| sed -E 's/[^a-zA-Z0-9_\-\.]/-/g'
}
gitlab_api_create_project() {
local pkgbase=$1
local outfile data path project_path
[[ -z ${WORKDIR:-} ]] && setup_workdir
outfile=$(mktemp --tmpdir="${WORKDIR}" pkgctl-gitlab-api.XXXXXXXXXX)
project_path=$(gitlab_project_name_to_path "${pkgbase}")
# create GitLab project
data='{
"name": "'"${pkgbase}"'",
"path": "'"${project_path}"'",
"namespace_id": "'"${GIT_PACKAGING_NAMESPACE_ID}"'",
"request_access_enabled": "false"
}'
if ! gitlab_api_call "${outfile}" POST "projects/" "${data}"; then
return 1
fi
if ! path=$(jq --raw-output --exit-status '.path' < "${outfile}"); then
msg_error " failed to query path: $(cat "${outfile}")"
return 1
fi
printf "%s" "${path}"
return 0
}

72
src/lib/auth.sh Normal file
View File

@@ -0,0 +1,72 @@
#!/hint/bash
#
# This may be included with or without `set -euE`
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_AUTH_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_AUTH_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
set -e
pkgctl_auth_usage() {
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [COMMAND] [OPTIONS]
Authenticate with services like GitLab.
COMMANDS
login Authenticate with the GitLab instance
status View authentication status
OPTIONS
-h, --help Show this help text
EXAMPLES
$ ${COMMAND} login --gen-access-token
$ ${COMMAND} status
_EOF_
}
pkgctl_auth() {
if (( $# < 1 )); then
pkgctl_auth_usage
exit 0
fi
# option checking
while (( $# )); do
case $1 in
-h|--help)
pkgctl_auth_usage
exit 0
;;
login)
_DEVTOOLS_COMMAND+=" $1"
shift
# shellcheck source=src/lib/auth/login.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/auth/login.sh
pkgctl_auth_login "$@"
exit 0
;;
status)
_DEVTOOLS_COMMAND+=" $1"
shift
# shellcheck source=src/lib/auth/status.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/auth/status.sh
pkgctl_auth_status "$@"
exit 0
;;
-*)
die "invalid argument: %s" "$1"
;;
*)
die "invalid command: %s" "$1"
;;
esac
done
}

93
src/lib/auth/login.sh Normal file
View File

@@ -0,0 +1,93 @@
#!/hint/bash
#
# This may be included with or without `set -euE`
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_AUTH_LOGIN_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_AUTH_LOGIN_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/config.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/config.sh
# shellcheck source=src/lib/api/gitlab.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
set -e
pkgctl_auth_login_usage() {
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [OPTIONS]
Authenticate with the GitLab instance.
The minimum required scopes for the token are: "api", "write_repository".
OPTIONS
-g, --gen-access-token Open the URL to generate a new personal access token
-h, --help Show this help text
EXAMPLES
$ ${COMMAND}
$ ${COMMAND} --gen-access-token
_EOF_
}
pkgctl_auth_login() {
local token personal_access_token_url
local GEN_ACESS_TOKEN=0
# option checking
while (( $# )); do
case $1 in
-h|--help)
pkgctl_auth_login_usage
exit 0
;;
-g|--gen-access-token)
GEN_ACESS_TOKEN=1
shift
;;
*)
die "invalid argument: %s" "$1"
;;
esac
done
personal_access_token_url="https://${GITLAB_HOST}/-/profile/personal_access_tokens"
cat <<- _EOF_
Logging into ${BOLD}${GITLAB_HOST}${ALL_OFF}
Tip: you can generate a Personal Access Token here ${personal_access_token_url}
The minimum required scopes are 'api' and 'write_repository'.
_EOF_
if (( GEN_ACESS_TOKEN )); then
xdg-open "${personal_access_token_url}" 2>/dev/null
fi
# read token from stdin
read -s -r -p "${GREEN}?${ALL_OFF} ${BOLD}Paste your authentication token:${ALL_OFF} " token
echo
if [[ -z ${token} ]]; then
msg_error " No token provided"
exit 1
fi
# check if the passed token works
GITLAB_TOKEN="${token}"
if ! result=$(gitlab_api_get_user); then
printf "%s\n" "$result"
exit 1
fi
msg_success " Logged in as ${BOLD}${result}${ALL_OFF}"
save_devtools_config
}

69
src/lib/auth/status.sh Normal file
View File

@@ -0,0 +1,69 @@
#!/hint/bash
#
# This may be included with or without `set -euE`
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_AUTH_STATUS_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_AUTH_STATUS_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/api/gitlab.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
set -e
pkgctl_auth_status_usage() {
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [OPTIONS]
Verifies and displays information about your authentication state of
services like the GitLab instance and reports issues if any.
OPTIONS
-t, --show-token Display the auth token
-h, --help Show this help text
EXAMPLES
$ ${COMMAND}
$ ${COMMAND} --show-token
_EOF_
}
pkgctl_auth_status() {
local SHOW_TOKEN=0
# option checking
while (( $# )); do
case $1 in
-h|--help)
pkgctl_auth_status_usage
exit 0
;;
-t|--show-token)
SHOW_TOKEN=1
shift
;;
*)
die "invalid argument: %s" "$1"
;;
esac
done
printf "%s\n" "${BOLD}${GITLAB_HOST}${ALL_OFF}"
# shellcheck disable=2119
if ! username=$(gitlab_api_get_user); then
printf "%s\n" "${username}"
exit 1
fi
msg_success " Logged in as ${BOLD}${username}${ALL_OFF}"
if (( SHOW_TOKEN )); then
msg_success " Token: ${GITLAB_TOKEN}"
else
msg_success " Token: **************************"
fi
}

416
src/lib/build/build.sh Normal file
View File

@@ -0,0 +1,416 @@
#!/hint/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_BUILD_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_BUILD_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/db/update.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/update.sh
# shellcheck source=src/lib/release.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/release.sh
# shellcheck source=src/lib/util/git.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/git.sh
# shellcheck source=src/lib/util/pacman.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/pacman.sh
# shellcheck source=src/lib/valid-repos.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh
# shellcheck source=src/lib/valid-tags.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-tags.sh
source /usr/share/makepkg/util/config.sh
source /usr/share/makepkg/util/message.sh
set -e
pkgctl_build_usage() {
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [OPTIONS] [PATH]...
Build packages inside a clean chroot
When a new pkgver is set using the appropriate PKGBUILD options the
checksums are automatically updated.
TODO
BUILD OPTIONS
--arch ARCH Specify architectures to build for (disables auto-detection)
--repo REPO Specify a target repository (disables auto-detection)
-s, --staging Build against the staging counterpart of the auto-detected repo
-t, --testing Build against the testing counterpart of the auto-detected repo
-o, --offload Build on a remote server and transfer artifacts afterwards
-c, --clean Recreate the chroot before building
-I, --install FILE Install a package into the working copy of the chroot
--nocheck Do not run the check() function in the PKGBUILD
PKGBUILD OPTIONS
--pkgver=PKGVER Set pkgver, reset pkgrel and update checksums
--pkgrel=PKGREL Set pkgrel to a given value
--rebuild Increment the current pkgrel variable
-e, --edit Edit the PKGBUILD before building
RELEASE OPTIONS
-r, --release Automatically commit, tag and release after building
-m, --message MSG Use the given <msg> as the commit message
-u, --db-update Automatically update the pacman database as last action
OPTIONS
-h, --help Show this help text
EXAMPLES
$ ${COMMAND}
$ ${COMMAND} --rebuild --staging --message 'libyay 0.42 rebuild' libfoo libbar
$ ${COMMAND} --pkgver 1.42 --release --db-update
_EOF_
}
pkgctl_build_check_option_group_repo() {
local option=$1
local repo=$2
local testing=$3
local staging=$4
if ( (( testing )) && (( staging )) ) ||
( [[ $repo =~ ^.*-(staging|testing)$ ]] && ( (( testing )) || (( staging )) )); then
die "The argument '%s' cannot be used with one or more of the other specified arguments" "${option}"
exit 1
fi
return 0
}
pkgctl_build_check_option_group_ver() {
local option=$1
local pkgver=$2
local pkgrel=$3
local rebuild=$4
if [[ -n "${pkgver}" ]] || [[ -n "${pkgrel}" ]] || (( rebuild )); then
die "The argument '%s' cannot be used with one or more of the other specified arguments" "${option}"
exit 1
fi
return 0
}
# TODO: import pgp keys
pkgctl_build() {
if (( $# < 1 )) && [[ ! -f PKGBUILD ]]; then
pkgctl_build_usage
exit 1
fi
local UPDPKGSUMS=0
local EDIT=0
local REBUILD=0
local OFFLOAD=0
local STAGING=0
local TESTING=0
local RELEASE=0
local DB_UPDATE=0
local REPO=
local PKGVER=
local PKGREL=
local MESSAGE=
local paths=()
local BUILD_ARCH=()
local BUILD_OPTIONS=()
local MAKECHROOT_OPTIONS=()
local RELEASE_OPTIONS=()
local MAKEPKG_OPTIONS=()
local PTS
PTS="$(tty | sed 's|/dev/pts/||')"
local WORKER="${USER}-${PTS}"
# variables
local path pkgbase pkgrepo source soname_changed=0
while (( $# )); do
case $1 in
-h|--help)
pkgctl_build_usage
exit 0
;;
--repo)
(( $# <= 1 )) && die "missing argument for %s" "$1"
REPO="${2}"
pkgctl_build_check_option_group_repo '--repo' "${REPO}" "${TESTING}" "${STAGING}"
shift 2
;;
--arch)
(( $# <= 1 )) && die "missing argument for %s" "$1"
if [[ ${2} == all ]]; then
BUILD_ARCH=("${_arch[@]::${#_arch[@]}-1}")
elif [[ ${2} == any ]]; then
BUILD_ARCH=("${_arch[0]}")
elif ! in_array "${2}" "${BUILD_ARCH[@]}"; then
if ! in_array "${2}" "${_arch[@]}"; then
die 'invalid architecture: %s' "${2}"
fi
BUILD_ARCH+=("${2}")
fi
shift 2
;;
--pkgver=*)
pkgctl_build_check_option_group_ver '--pkgver' "${PKGVER}" "${PKGREL}" "${REBUILD}"
PKGVER="${1#*=}"
PKGREL=1
UPDPKGSUMS=1
shift
;;
--pkgrel=*)
pkgctl_build_check_option_group_ver '--pkgrel' "${PKGVER}" "${PKGREL}" "${REBUILD}"
PKGREL="${1#*=}"
shift
;;
--rebuild)
pkgctl_build_check_option_group_ver '--rebuild' "${PKGVER}" "${PKGREL}" "${REBUILD}"
REBUILD=1
shift
;;
-e|--edit)
EDIT=1
shift
;;
-o|--offload)
OFFLOAD=1
shift
;;
-s|--staging)
STAGING=1
pkgctl_build_check_option_group_repo '--staging' "${REPO}" "${TESTING}" "${STAGING}"
shift
;;
-t|--testing)
TESTING=1
pkgctl_build_check_option_group_repo '--testing' "${REPO}" "${TESTING}" "${STAGING}"
shift
;;
-c|--clean)
BUILD_OPTIONS+=("-c")
shift
;;
-I|--install)
(( $# <= 1 )) && die "missing argument for %s" "$1"
MAKECHROOT_OPTIONS+=("-I" "$2")
warning 'installing packages into the chroot may break reproducible builds, use with caution!'
shift 2
;;
--nocheck)
MAKEPKG_OPTIONS+=("--nocheck")
warning 'not running checks is disallowed for official packages, except for bootstrapping. Please rebuild after bootstrapping is completed!'
shift
;;
-r|--release)
# shellcheck source=src/lib/release.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/release.sh
RELEASE=1
shift
;;
-m|--message)
(( $# <= 1 )) && die "missing argument for %s" "$1"
MESSAGE=$2
RELEASE_OPTIONS+=("--message" "${MESSAGE}")
shift 2
;;
-u|--db-update)
DB_UPDATE=1
shift
;;
--)
shift
break
;;
-*)
die "invalid argument: %s" "$1"
;;
*)
paths=("$@")
break
;;
esac
done
# check if invoked without any path from within a packaging repo
if (( ${#paths[@]} == 0 )); then
if [[ -f PKGBUILD ]]; then
paths=(".")
else
pkgctl_build_usage
exit 1
fi
fi
# Update pacman cache for auto-detection
if [[ -z ${REPO} ]]; then
update_pacman_repo_cache
# Check valid repos if not resolved dynamically
elif ! in_array "${REPO}" "${_repos[@]}"; then
die "Invalid repository target: %s" "${REPO}"
fi
for path in "${paths[@]}"; do
pushd "${path}" >/dev/null
if [[ ! -f PKGBUILD ]]; then
die 'PKGBUILD not found in %s' "${path}"
fi
source=()
# shellcheck source=contrib/makepkg/PKGBUILD.proto
. ./PKGBUILD
pkgbase=${pkgbase:-$pkgname}
pkgrepo=${REPO}
soname_changed=0
msg "Building ${pkgbase}"
# auto-detection of build target
if [[ -z ${pkgrepo} ]]; then
if ! pkgrepo=$(get_pacman_repo_from_pkgbuild PKGBUILD); then
die 'failed to get pacman repo'
fi
if [[ -z "${pkgrepo}" ]]; then
die 'unknown repo, please specify --repo for new packages'
fi
fi
# TODO: REMOVE AFTER POC
if [[ ${pkgrepo} == community ]]; then
pkgrepo=extra
fi
# special cases to resolve final build target
if (( TESTING )); then
pkgrepo="${pkgrepo}-testing"
elif (( STAGING )); then
pkgrepo="${pkgrepo}-staging"
elif [[ $pkgrepo == core ]]; then
pkgrepo="${pkgrepo}-testing"
fi
# auto-detection of build architecture
if [[ $pkgrepo = multilib* ]]; then
BUILD_ARCH=("")
elif (( ${#BUILD_ARCH[@]} == 0 )); then
if in_array any "${arch[@]}"; then
BUILD_ARCH=("${_arch[0]}")
else
BUILD_ARCH+=("${arch[@]}")
fi
fi
# print gathered build modes
msg2 "repo: ${pkgrepo}"
msg2 "arch: ${BUILD_ARCH[*]}"
# increment pkgrel on rebuild
if (( REBUILD )); then
# try to figure out of pkgrel has been changed
if ! old_pkgrel=$(git_diff_tree HEAD PKGBUILD | grep --perl-regexp --only-matching --max-count=1 '^-pkgrel=\K\w+'); then
old_pkgrel=${pkgrel}
fi
# check if pkgrel conforms expectations
[[ ${pkgrel/.*} =~ ^[0-9]+$ ]] || die "Non-standard pkgrel declaration"
[[ ${old_pkgrel/.*} =~ ^[0-9]+$ ]] || die "Non-standard pkgrel declaration"
# increment pkgrel if it hasn't been changed yet
if [[ ${pkgrel} = "${old_pkgrel}" ]]; then
PKGREL=$((${pkgrel/.*}+1))
else
warning 'ignoring --rebuild as pkgrel has already been incremented from %s to %s' "${old_pkgrel}" "${pkgrel}"
fi
fi
# update pkgver
if [[ -n ${PKGVER} ]]; then
if [[ $(type -t pkgver) == function ]]; then
# TODO: check if die or warn, if we provide _commit _gitcommit setter maybe?
warning 'setting pkgver variable has no effect if the PKGBUILD has a pkgver() function'
fi
msg "Bumping pkgver to ${PKGVER}"
grep --extended-regexp --quiet --max-count=1 "^pkgver=${pkgver}$" PKGBUILD || die "Non-standard pkgver declaration"
sed --regexp-extended "s|^(pkgver=)${pkgver}$|\1${PKGVER}|g" -i PKGBUILD
fi
# update pkgrel
if [[ -n ${PKGREL} ]]; then
msg "Bumping pkgrel to ${PKGREL}"
grep --extended-regexp --quiet --max-count=1 "^pkgrel=${pkgrel}$" PKGBUILD || die "Non-standard pkgrel declaration"
sed --regexp-extended "s|^(pkgrel=)${pkgrel}$|\1${PKGREL}|g" -i PKGBUILD
fi
# edit PKGBUILD
if (( EDIT )); then
stat_busy 'Editing PKGBUILD'
if [[ -n $GIT_EDITOR ]]; then
$GIT_EDITOR PKGBUILD || die
elif [[ -n $VISUAL ]]; then
$VISUAL PKGBUILD || die
elif [[ -n $EDITOR ]]; then
$EDITOR PKGBUILD || die
elif giteditor=$(git config --get core.editor); then
$giteditor PKGBUILD || die
else
die "No usable editor found (tried \$GIT_EDITOR, \$VISUAL, \$EDITOR, git config [core.editor])."
fi
stat_done
fi
# update checksums if any sources are declared
if (( UPDPKGSUMS )) && (( ${#source[@]} >= 1 )); then
updpkgsums
fi
# execute build
for arch in "${BUILD_ARCH[@]}"; do
if [[ -n $arch ]]; then
msg "Building ${pkgbase} for [${pkgrepo}] (${arch})"
BUILDTOOL="${pkgrepo}-${arch}-build"
else
msg "Building ${pkgbase} for [${pkgrepo}]"
BUILDTOOL="${pkgrepo}-build"
fi
# TODO: REMOVE AFTER POC
offload_tool=${pkgrepo}
if [[ ${pkgrepo} == core-* ]]; then
BUILDTOOL=${BUILDTOOL/core-/}
offload_tool=${offload_tool/core-/}
elif [[ ${pkgrepo} == extra-* ]]; then
BUILDTOOL=${BUILDTOOL/extra-/}
offload_tool=${offload_tool/extra-/}
fi
if (( OFFLOAD )); then
offload-build --repo "${offload_tool}" -- "${BUILD_OPTIONS[@]}" -- "${MAKECHROOT_OPTIONS[@]}" -l "${WORKER}" -- "${MAKEPKG_OPTIONS[@]}"
else
"${BUILDTOOL}" "${BUILD_OPTIONS[@]}" -- "${MAKECHROOT_OPTIONS[@]}" -l "${WORKER}" -- "${MAKEPKG_OPTIONS[@]}"
fi
done
# release the build
if (( RELEASE )); then
if [[ ${pkgrepo} != *-staging ]] && ! diffpkg --soname >/dev/null; then
die "abort none staging auto-release: package contains soname differences"
fi
echo RELEASE, ABORT
exit 0
pkgctl_release --repo "${pkgrepo}" "${RELEASE_OPTIONS[@]}"
fi
# reset common PKGBUILD variables
unset pkgbase pkgname arch pkgrepo source pkgver pkgrel validpgpkeys
popd >/dev/null
done
# update the binary package repo db as last action
if (( RELEASE )) && (( DB_UPDATE )); then
# shellcheck disable=2119
pkgctl_db_update
fi
}

View File

@@ -4,20 +4,30 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${_INCLUDE_COMMON_SH:-} ]] || return 0
_INCLUDE_COMMON_SH="$(set +o|grep nounset)"
[[ -z ${DEVTOOLS_INCLUDE_COMMON_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_COMMON_SH="$(set +o|grep nounset)"
set +u +o posix
# shellcheck disable=1091
. /usr/share/makepkg/util.sh
$_INCLUDE_COMMON_SH
$DEVTOOLS_INCLUDE_COMMON_SH
# Avoid any encoding problems
export LANG=C
# Set buildtool properties
export BUILDTOOL=devtools
export BUILDTOOLVER=m4_devtools_version
export BUILDTOOLVER=@buildtoolver@
# Set common properties
export PACMAN_KEYRING_DIR=/etc/pacman.d/gnupg
export GITLAB_HOST=gitlab.archlinux.org
export GIT_REPO_SPEC_VERSION=0
export GIT_PACKAGING_NAMESPACE=bot-test/packages
export GIT_PACKAGING_NAMESPACE_ID=11233
export GIT_PACKAGING_URL_SSH="ssh://git@${GITLAB_HOST}:222/${GIT_PACKAGING_NAMESPACE}"
export GIT_PACKAGING_URL_HTTPS="https://${GITLAB_HOST}/${GIT_PACKAGING_NAMESPACE}"
export PACKAGING_REPO_RELEASE_HOST=repos.sandbox.archlinux.org
# check if messages are to be printed using color
if [[ -t 2 && "$TERM" != dumb ]]; then
@@ -33,11 +43,40 @@ stat_busy() {
printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2
}
stat_progress() {
# shellcheck disable=2059
printf "${BOLD}.${ALL_OFF}" >&2
}
stat_done() {
# shellcheck disable=2059
printf "${BOLD}done${ALL_OFF}\n" >&2
}
msg_success() {
local msg=$1
local padding
padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
printf "%s %s\n" "${padding}${GREEN}${ALL_OFF}" "${msg}" >&2
}
msg_error() {
local msg=$1
local padding
padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
printf "%s %s\n" "${padding}${RED}x${ALL_OFF}" "${msg}" >&2
}
msg_warn() {
local msg=$1
local padding
padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
printf "%s %s\n" "${padding}${YELLOW}!${ALL_OFF}" "${msg}" >&2
}
_setup_workdir=false
setup_workdir() {
[[ -z ${WORKDIR:-} ]] && WORKDIR=$(mktemp -d --tmpdir "${0##*/}.XXXXXXXXXX")

44
src/lib/config.sh Normal file
View File

@@ -0,0 +1,44 @@
#!/hint/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_CONFIG_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_CONFIG_SH=1
set -e
readonly XDG_DEVTOOLS_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/devtools"
readonly XDG_DEVTOOLS_GITLAB_CONFIG="${XDG_DEVTOOLS_DIR}/gitlab.conf"
# default config variables
export GITLAB_TOKEN=""
load_devtools_config() {
# temporary permission fixup
if [[ -d "${XDG_DEVTOOLS_DIR}" ]]; then
chmod 700 "${XDG_DEVTOOLS_DIR}"
fi
if [[ -f "${XDG_DEVTOOLS_GITLAB_CONFIG}" ]]; then
chmod 600 "${XDG_DEVTOOLS_GITLAB_CONFIG}"
fi
if [[ -n "${DEVTOOLS_GITLAB_TOKEN}" ]]; then
GITLAB_TOKEN="${DEVTOOLS_GITLAB_TOKEN}"
return
fi
if [[ -f "${XDG_DEVTOOLS_GITLAB_CONFIG}" ]]; then
GITLAB_TOKEN=$(grep GITLAB_TOKEN "${XDG_DEVTOOLS_GITLAB_CONFIG}"|cut -d= -f2|cut -d\" -f2)
return
fi
GITLAB_TOKEN=""
}
save_devtools_config() {
# temporary permission fixup
chmod 700 "${XDG_DEVTOOLS_DIR}"
chmod 600 "${XDG_DEVTOOLS_GITLAB_CONFIG}"
(
umask 0077
mkdir -p "${XDG_DEVTOOLS_DIR}"
printf 'GITLAB_TOKEN="%s"\n' "${GITLAB_TOKEN}" > "${XDG_DEVTOOLS_GITLAB_CONFIG}"
)
}

80
src/lib/db.sh Normal file
View File

@@ -0,0 +1,80 @@
#!/hint/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_DB_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_DB_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
set -e
pkgctl_db_usage() {
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [COMMAND] [OPTIONS]
Pacman database modification for packge update, move etc
COMMANDS
move Move packages between pacman repositories
remove Remove packages from pacman repositories
update Update the pacman database as final release step
OPTIONS
-h, --help Show this help text
EXAMPLES
$ ${COMMAND} move extra-staging extra-testing libfoo libbar
$ ${COMMAND} remove core-testing libfoo libbar
$ ${COMMAND} update
_EOF_
}
pkgctl_db() {
if (( $# < 1 )); then
pkgctl_db_usage
exit 0
fi
# option checking
while (( $# )); do
case $1 in
-h|--help)
pkgctl_db_usage
exit 0
;;
move)
_DEVTOOLS_COMMAND+=" $1"
shift
# shellcheck source=src/lib/db/move.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/move.sh
pkgctl_db_move "$@"
exit 0
;;
remove)
_DEVTOOLS_COMMAND+=" $1"
shift
# shellcheck source=src/lib/db/remove.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/remove.sh
pkgctl_db_remove "$@"
exit 0
;;
update)
_DEVTOOLS_COMMAND+=" $1"
shift
# shellcheck source=src/lib/db/update.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/update.sh
pkgctl_db_update "$@"
exit 0
;;
-*)
die "invalid argument: %s" "$1"
;;
*)
die "invalid command: %s" "$1"
;;
esac
done
}

64
src/lib/db/move.sh Normal file
View File

@@ -0,0 +1,64 @@
#!/hint/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_DB_MOVE_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_DB_MOVE_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
set -e
pkgctl_db_move_usage() {
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [OPTIONS] [SOURCE_REPO] [TARGET_REPO] [PKGBASE]...
Move packages between binary repositories.
OPTIONS
-h, --help Show this help text
EXAMPLES
$ ${COMMAND} extra-staging extra-testing libfoo libbar
$ ${COMMAND} extra core libfoo libbar
_EOF_
}
pkgctl_db_move() {
local SOURCE_REPO=""
local TARGET_REPO=""
local PKGBASES=()
# option checking
while (( $# )); do
case $1 in
-h|--help)
pkgctl_db_move_usage
exit 0
;;
-*)
die "invalid argument: %s" "$1"
;;
*)
break
;;
esac
done
if (( $# < 3 )); then
pkgctl_db_move_usage
exit 1
fi
SOURCE_REPO=$1
TARGET_REPO=$2
shift 2
PKGBASES+=("$@")
# shellcheck disable=SC2029
ssh "${PACKAGING_REPO_RELEASE_HOST}" db-move "${SOURCE_REPO}" "${TARGET_REPO}" "${PKGBASES[@]}"
}

69
src/lib/db/remove.sh Normal file
View File

@@ -0,0 +1,69 @@
#!/hint/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_DB_REMOVE_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_DB_REMOVE_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
set -e
pkgctl_db_remove_usage() {
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [OPTIONS] [REPO] [PKGBASE]...
Remove packages from binary repositories.
OPTIONS
-a, --arch Override the architecture (disables auto-detection)
-h, --help Show this help text
EXAMPLES
$ ${COMMAND} core-testing libfoo libbar
$ ${COMMAND} core --arch x86_64 libyay
_EOF_
}
pkgctl_db_remove() {
local REPO=""
local ARCH=any
local PKGBASES=()
# option checking
while (( $# )); do
case $1 in
-h|--help)
pkgctl_db_remove_usage
exit 0
;;
-a|--arch)
(( $# <= 1 )) && die "missing argument for %s" "$1"
ARCH=$2
shift 2
;;
-*)
die "invalid argument: %s" "$1"
;;
*)
break
;;
esac
done
if (( $# < 2 )); then
pkgctl_db_remove_usage
exit 1
fi
REPO=$1
shift
PKGBASES+=("$@")
# shellcheck disable=SC2029
ssh "${PACKAGING_REPO_RELEASE_HOST}" db-remove "${REPO}" "${ARCH}" "${PKGBASES[@]}"
}

46
src/lib/db/update.sh Normal file
View File

@@ -0,0 +1,46 @@
#!/hint/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_DB_UPDATE_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_DB_UPDATE_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
set -e
pkgctl_db_update_usage() {
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [OPTIONS]
Update the binary repository as final release step for packages that
have been transfered and staged on ${PACKAGING_REPO_RELEASE_HOST}.
OPTIONS
-h, --help Show this help text
EXAMPLES
$ ${COMMAND}
_EOF_
}
pkgctl_db_update() {
# option checking
while (( $# )); do
case $1 in
-h|--help)
pkgctl_db_update_usage
exit 0
;;
*)
die "invalid argument: %s" "$1"
;;
esac
done
ssh "${PACKAGING_REPO_RELEASE_HOST}" db-update
}

172
src/lib/release.sh Normal file
View File

@@ -0,0 +1,172 @@
#!/hint/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_RELEASE_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_RELEASE_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/db/update.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/update.sh
# shellcheck source=src/lib/util/pacman.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/pacman.sh
# shellcheck source=src/lib/valid-repos.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh
source /usr/share/makepkg/util/util.sh
set -e
pkgctl_release_usage() {
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [OPTIONS] [PATH]...
Release step to commit, tag and upload build artifacts
Modified version controlled files will first be staged for commit,
afterwards a Git tag matching the pkgver will be created and finally
all build artifacts will be uploaded.
By default the target pacman repository will be auto-detected by querying
the repo it is currently released in. When initially adding a new package
to the repositories, the target repo must be specified manually.
OPTIONS
-m, --message MSG Use the given <msg> as the commit message
-r, --repo REPO Specify a target repository (disables auto-detection)
-s, --staging Release to the staging counterpart of the auto-detected repo
-t, --testing Release to the testing counterpart of the auto-detected repo
-u, --db-update Automatically update the pacman database after uploading
-h, --help Show this help text
EXAMPLES
$ ${COMMAND}
$ ${COMMAND} --repo core-testing --message 'libyay 0.42 rebuild' libfoo libbar
$ ${COMMAND} --staging --db-update libfoo
_EOF_
}
pkgctl_release_check_option_group() {
local option=$1
local repo=$2
local testing=$3
local staging=$4
if [[ -n "${repo}" ]] || (( testing )) || (( staging )); then
die "The argument '%s' cannot be used with one or more of the other specified arguments" "${option}"
exit 1
fi
return 0
}
pkgctl_release() {
if (( $# < 1 )) && [[ ! -f PKGBUILD ]]; then
pkgctl_release_usage
exit 1
fi
local MESSAGE=""
local PKGBASES=()
local REPO=""
local TESTING=0
local STAGING=0
local DB_UPDATE=0
local path pkgbase pkgnames repo repos
# option checking
while (( $# )); do
case $1 in
-h|--help)
pkgctl_release_usage
exit 0
;;
-m|--message)
(( $# <= 1 )) && die "missing argument for %s" "$1"
MESSAGE=$2
shift 2
;;
-r|--repo)
(( $# <= 1 )) && die "missing argument for %s" "$1"
pkgctl_release_check_option_group '--repo' "${REPO}" "${TESTING}" "${STAGING}"
REPO=$2
shift 2
;;
-s|--staging)
pkgctl_release_check_option_group '--staging' "${REPO}" "${TESTING}" "${STAGING}"
STAGING=1
shift
;;
-t|--testing)
pkgctl_release_check_option_group '--testing' "${REPO}" "${TESTING}" "${STAGING}"
TESTING=1
shift
;;
-u|--db-update)
DB_UPDATE=1
shift
;;
-*)
die "invalid option: %s" "$1"
;;
*)
PKGBASES+=("$@")
break
;;
esac
done
# Resolve package from current working directory
if (( 0 == ${#PKGBASES[@]} )); then
PKGBASES=("$PWD")
fi
# Update pacman cache for auto-detection
if [[ -z ${REPO} ]]; then
update_pacman_repo_cache
# Check valid repos if not resolved dynamically
elif ! in_array "${REPO}" "${_repos[@]}"; then
die "Invalid repository target: %s" "${REPO}"
fi
for path in "${PKGBASES[@]}"; do
pushd "${path}" >/dev/null
pkgbase=$(basename "${path}")
if [[ -n ${REPO} ]]; then
repo=${REPO}
else
if ! repo=$(get_pacman_repo_from_pkgbuild PKGBUILD); then
die 'Failed to get pacman repo'
fi
if [[ -z "${repo}" ]]; then
die 'Unknown repo, please specify --repo for new packages'
fi
fi
# TODO: REMOVE AFTER POC
if [[ ${repo} == community ]]; then
repo=extra
fi
if (( TESTING )); then
repo="${repo}-testing"
elif (( STAGING )); then
repo="${repo}-staging"
elif [[ $repo == core ]]; then
repo="${repo}-testing"
fi
msg "Releasing ${pkgbase} to ${repo}"
commitpkg "${repo}" "${MESSAGE}"
unset repo
popd >/dev/null
done
if (( DB_UPDATE )); then
# shellcheck disable=2119
pkgctl_db_update
fi
}

100
src/lib/repo.sh Normal file
View File

@@ -0,0 +1,100 @@
#!/hint/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_REPO_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_REPO_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
set -e
pkgctl_repo_usage() {
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [COMMAND] [OPTIONS]
Manage Git packaging repositories and helps with their configuration
according to distro specs.
Git author information and the used signing key is set up from
makepkg.conf read from any valid location like /etc or XDG_CONFIG_HOME.
The configure command can be used to synchronize the distro specs and
makepkg.conf settings for previously cloned repositories.
The unprivileged option can be used for cloning packaging repositories
without SSH access using read-only HTTPS.
COMMANDS
clone Clone a package repository
configure Configure a clone according to distro specs
create Create a new GitLab package repository
web Open the packaging repository's website
OPTIONS
-h, --help Show this help text
EXAMPLES
$ ${COMMAND} clone libfoo linux libbar
$ ${COMMAND} clone --maintainer mynickname
$ ${COMMAND} configure *
$ ${COMMAND} create libfoo
$ ${COMMAND} web linux
_EOF_
}
pkgctl_repo() {
if (( $# < 1 )); then
pkgctl_repo_usage
exit 0
fi
# option checking
while (( $# )); do
case $1 in
-h|--help)
pkgctl_repo_usage
exit 0
;;
clone)
_DEVTOOLS_COMMAND+=" $1"
shift
# shellcheck source=src/lib/repo/clone.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/clone.sh
pkgctl_repo_clone "$@"
exit 0
;;
configure)
_DEVTOOLS_COMMAND+=" $1"
shift
# shellcheck source=src/lib/repo/configure.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/configure.sh
pkgctl_repo_configure "$@"
exit 0
;;
create)
_DEVTOOLS_COMMAND+=" $1"
shift
# shellcheck source=src/lib/repo/create.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/create.sh
pkgctl_repo_create "$@"
exit 0
;;
web)
_DEVTOOLS_COMMAND+=" $1"
shift
# shellcheck source=src/lib/repo/web.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/web.sh
pkgctl_repo_web "$@"
exit 0
;;
-*)
die "invalid argument: %s" "$1"
;;
*)
die "invalid command: %s" "$1"
;;
esac
done
}

141
src/lib/repo/clone.sh Normal file
View File

@@ -0,0 +1,141 @@
#!/bin/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_REPO_CLONE_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_REPO_CLONE_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/api/gitlab.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
# shellcheck source=src/lib/repo/configure.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/configure.sh
source /usr/share/makepkg/util/message.sh
set -e
pkgctl_repo_clone_usage() {
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
Clone Git packaging repositories from the canonical namespace.
The configure command is subsequently invoked to synchronize the distro
specs and makepkg.conf settings. The unprivileged option can be used
for cloning packaging repositories without SSH access using read-only
HTTPS.
OPTIONS
-m, --maintainer=NAME Clone all packages of the named maintainer
--universe Clone all existing packages, useful for cache warming
-h, --help Show this help text
EXAMPLES
$ ${COMMAND} libfoo linux libbar
$ ${COMMAND} --maintainer mynickname
_EOF_
}
pkgctl_repo_clone() {
if (( $# < 1 )); then
pkgctl_repo_clone_usage
exit 0
fi
# options
local GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_SSH}
local CLONE_ALL=0
local MAINTAINER=
local CONFIGURE_OPTIONS=()
local pkgbases
# variables
local project_path
while (( $# )); do
case $1 in
-h|--help)
pkgctl_repo_clone_usage
exit 0
;;
-u|--unprivileged)
GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_HTTPS}
CONFIGURE_OPTIONS+=("$1")
shift
;;
-m|--maintainer)
(( $# <= 1 )) && die "missing argument for %s" "$1"
MAINTAINER="$2"
shift 2
;;
--maintainer=*)
MAINTAINER="${1#*=}"
shift
;;
--universe)
CLONE_ALL=1
shift
;;
--)
shift
break
;;
-*)
die "invalid argument: %s" "$1"
;;
*)
pkgbases=("$@")
break
;;
esac
done
# Query packages of a maintainer
if [[ -n ${MAINTAINER} ]]; then
stat_busy "Query packages"
max_pages=$(curl --silent --location --fail --retry 3 --retry-delay 3 "https://archlinux.org/packages/search/json/?sort=name&maintainer=${MAINTAINER}" | jq -r '.num_pages')
if [[ ! ${max_pages} =~ ([[:digit:]]) ]]; then
stat_done
warning "found no packages for maintainer ${MAINTAINER}"
exit 0
fi
mapfile -t pkgbases < <(for page in $(seq "${max_pages}"); do
curl --silent --location --fail --retry 3 --retry-delay 3 "https://archlinux.org/packages/search/json/?sort=name&maintainer=${MAINTAINER}&page=${page}" | jq -r '.results[].pkgbase'
stat_progress
done | sort --unique)
stat_done
fi
# Query all released packages
if (( CLONE_ALL )); then
stat_busy "Query all released packages"
max_pages=$(curl --silent --location --fail --retry 3 --retry-delay 3 "https://archlinux.org/packages/search/json/?sort=name" | jq -r '.num_pages')
if [[ ! ${max_pages} =~ ([[:digit:]]) ]]; then
stat_done
die "failed to query packages"
fi
mapfile -t pkgbases < <(for page in $(seq "${max_pages}"); do
curl --silent --location --fail --retry 3 --retry-delay 3 "https://archlinux.org/packages/search/json/?sort=name&page=${page}" | jq -r '.results[].pkgbase'
stat_progress
done | sort --unique)
stat_done
fi
for pkgbase in "${pkgbases[@]}"; do
if [[ ! -d ${pkgbase} ]]; then
msg "Cloning ${pkgbase} ..."
project_path=$(gitlab_project_name_to_path "${pkgbase}")
remote_url="${GIT_REPO_BASE_URL}/${project_path}.git"
git clone --origin origin "${remote_url}" "${pkgbase}"
else
warning "Skip cloning ${pkgbase}: Directory exists"
fi
pkgctl_repo_configure "${CONFIGURE_OPTIONS[@]}" "${pkgbase}"
done
}

223
src/lib/repo/configure.sh Normal file
View File

@@ -0,0 +1,223 @@
#!/bin/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_REPO_CONFIGURE_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_REPO_CONFIGURE_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/api/gitlab.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
source /usr/share/makepkg/util/config.sh
source /usr/share/makepkg/util/message.sh
set -e
pkgctl_repo_configure_usage() {
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [OPTIONS] [PATH]...
Configure Git packaging repositories according to distro specs and
makepkg.conf settings.
Git author information and the used signing key is set up from
makepkg.conf read from any valid location like /etc or XDG_CONFIG_HOME.
The remote protocol is automatically determined from the author email
address by choosing SSH for all official packager identities and
read-only HTTPS otherwise.
OPTIONS
-h, --help Show this help text
EXAMPLES
$ ${COMMAND} configure *
_EOF_
}
get_packager_name() {
local packager=$1
local packager_pattern="(.+) <(.+@.+)>"
local name
if [[ ! $packager =~ $packager_pattern ]]; then
return 1
fi
name=$(echo "${packager}"|sed -E "s/${packager_pattern}/\1/")
printf "%s" "${name}"
}
get_packager_email() {
local packager=$1
local packager_pattern="(.+) <(.+@.+)>"
local email
if [[ ! $packager =~ $packager_pattern ]]; then
return 1
fi
email=$(echo "${packager}"|sed -E "s/${packager_pattern}/\2/")
printf "%s" "${email}"
}
is_packager_name_valid() {
local packager_name=$1
if [[ -z ${packager_name} ]]; then
return 1
elif [[ ${packager_name} == "John Doe" ]]; then
return 1
elif [[ ${packager_name} == "Unknown Packager" ]]; then
return 1
fi
return 0
}
is_packager_email_official() {
local packager_email=$1
if [[ -z ${packager_email} ]]; then
return 1
elif [[ $packager_email =~ .+@archlinux.org ]]; then
return 0
fi
return 1
}
pkgctl_repo_configure() {
# options
local GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_HTTPS}
local official=0
local proto=https
local paths=()
# variables
local path realpath pkgbase remote_url project_path
local PACKAGER GPGKEY packager_name packager_email
while (( $# )); do
case $1 in
-h|--help)
pkgctl_repo_configure_usage
exit 0
;;
--)
shift
break
;;
-*)
die "invalid argument: %s" "$1"
;;
*)
paths=("$@")
break
;;
esac
done
# check if invoked without any path from within a packaging repo
if (( ${#paths[@]} == 0 )); then
if [[ -f PKGBUILD ]]; then
paths=(".")
else
pkgctl_repo_configure_usage
exit 1
fi
fi
# Load makepkg.conf variables to be available for packager identity
msg "Collecting packager identity from makepkg.conf"
# shellcheck disable=2119
load_makepkg_config
if [[ -n ${PACKAGER} ]]; then
if ! packager_name=$(get_packager_name "${PACKAGER}") || \
! packager_email=$(get_packager_email "${PACKAGER}"); then
die "invalid PACKAGER format '${PACKAGER}' in makepkg.conf"
fi
if ! is_packager_name_valid "${packager_name}"; then
die "invalid PACKAGER '${PACKAGER}' in makepkg.conf"
fi
if is_packager_email_official "${packager_email}"; then
official=1
proto=ssh
GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_SSH}
fi
fi
msg2 "name : ${packager_name:-${YELLOW}undefined${ALL_OFF}}"
msg2 "email : ${packager_email:-${YELLOW}undefined${ALL_OFF}}"
msg2 "gpg-key : ${GPGKEY:-${YELLOW}undefined${ALL_OFF}}"
if [[ ${proto} == ssh ]]; then
msg2 "protocol: ${GREEN}${proto}${ALL_OFF}"
else
msg2 "protocol: ${YELLOW}${proto}${ALL_OFF}"
fi
for path in "${paths[@]}"; do
if ! realpath=$(realpath -e "${path}"); then
error "No such directory: ${path}"
continue
fi
pkgbase=$(basename "${realpath}")
pkgbase=${pkgbase%.git}
msg "Configuring ${pkgbase}"
if [[ ! -d "${path}/.git" ]]; then
error "Not a Git repository: ${path}"
continue
fi
pushd "${path}" >/dev/null
project_path=$(gitlab_project_name_to_path "${pkgbase}")
remote_url="${GIT_REPO_BASE_URL}/${project_path}.git"
if ! git remote add origin "${remote_url}" &>/dev/null; then
git remote set-url origin "${remote_url}"
fi
# move the master branch to main
if [[ $(git symbolic-ref --short HEAD) == master ]]; then
git branch --move main
git config branch.main.merge refs/heads/main
fi
git config devtools.version "${GIT_REPO_SPEC_VERSION}"
git config pull.rebase true
git config branch.autoSetupRebase always
git config branch.main.remote origin
git config branch.main.rebase true
git config transfer.fsckobjects true
git config fetch.fsckobjects true
git config receive.fsckobjects true
# setup author identity
if [[ -n ${packager_name} ]]; then
git config user.name "${packager_name}"
git config user.email "${packager_email}"
fi
# force gpg for official packagers
if (( official )); then
git config commit.gpgsign true
fi
# set custom pgp key from makepkg.conf
if [[ -n $GPGKEY ]]; then
git config commit.gpgsign true
git config user.signingKey "${GPGKEY}"
fi
if ! git ls-remote origin &>/dev/null; then
warning "configured remote origin may not exist, run:"
msg2 "pkgctl repo create ${pkgbase}"
fi
popd >/dev/null
done
}

113
src/lib/repo/create.sh Normal file
View File

@@ -0,0 +1,113 @@
#!/bin/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_REPO_CREATE_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_REPO_CREATE_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/api/gitlab.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
# shellcheck source=src/lib/repo/clone.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/clone.sh
# shellcheck source=src/lib/repo/configure.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/configure.sh
set -e
pkgctl_repo_create_usage() {
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
Create a new Git packaging repository in the canonical GitLab namespace.
This command requires a valid GitLab API authentication. To setup a new
GitLab token or check the currently configured one please consult the
'auth' subcommand for further instructions.
If invoked without a parameter, try to create a packaging repository
based on the PKGBUILD from the current working directory and configure
the local repository afterwards.
OPTIONS
-c, --clone Clone the Git repository after creation
-h, --help Show this help text
EXAMPLES
$ ${COMMAND} libfoo
_EOF_
}
pkgctl_repo_create() {
# options
local pkgbases=()
local pkgbase
local clone=0
local configure=0
# variables
local path
while (( $# )); do
case $1 in
-h|--help)
pkgctl_repo_create_usage
exit 0
;;
-c|--clone)
clone=1
shift
;;
-*)
die "invalid argument: %s" "$1"
;;
*)
pkgbases=("$@")
break
;;
esac
done
# check if invoked without any path from within a packaging repo
if (( ${#pkgbases[@]} == 0 )); then
if [[ -f PKGBUILD ]]; then
if ! path=$(realpath -e .); then
die "failed to read path from current directory"
fi
pkgbases=("$(basename "${path}")")
clone=0
configure=1
else
pkgctl_repo_create_usage
exit 1
fi
fi
# create projects
for pkgbase in "${pkgbases[@]}"; do
if ! gitlab_api_create_project "${pkgbase}" >/dev/null; then
die "failed to create project: ${pkgbase}"
fi
msg_success "Successfully created ${pkgbase}"
if (( clone )); then
pkgctl_repo_clone "${pkgbase}"
elif (( configure )); then
pkgctl_repo_configure
fi
done
# some convenience hints if not in auto clone/configure mode
if (( ! clone )) && (( ! configure )); then
cat <<- _EOF_
For new clones:
$(msg2 "pkgctl repo clone ${pkgbases[*]}")
For existing clones:
$(msg2 "pkgctl repo configure ${pkgbases[*]}")
_EOF_
fi
}

83
src/lib/repo/web.sh Normal file
View File

@@ -0,0 +1,83 @@
#!/bin/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_REPO_WEB_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_REPO_WEB_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/api/gitlab.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
set -e
pkgctl_repo_web_usage() {
local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
cat <<- _EOF_
Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
Open the packaging repository's website via xdg-open. If called with
no arguments, open the package cloned in the current working directory.
OPTIONS
-h, --help Show this help text
EXAMPLES
$ ${COMMAND} web linux
_EOF_
}
pkgctl_repo_web() {
local pkgbases=()
local path giturl pkgbase
# option checking
while (( $# )); do
case $1 in
-h|--help)
pkgctl_repo_web_usage
exit 0
;;
--)
shift
break
;;
-*)
die "invalid argument: %s" "$1"
;;
*)
pkgbases=("$@")
break
;;
esac
done
# Check if web mode has xdg-open
if ! command -v xdg-open &>/dev/null; then
die "The web command requires 'xdg-open'"
fi
# Check if used without pkgnames in a packaging directory
if (( ! $# )); then
path=${PWD}
if [[ ! -d "${path}/.git" ]]; then
die "Not a Git repository: ${path}"
fi
giturl=$(git -C "${path}" remote get-url origin)
if [[ ${giturl} != *${GIT_PACKAGING_NAMESPACE}* ]]; then
die "Not a packaging repository: ${path}"
fi
pkgbase=$(basename "${giturl}")
pkgbase=${pkgbase%.git}
pkgbases=("${pkgbase}")
fi
for pkgbase in "${pkgbases[@]}"; do
xdg-open "${GIT_PACKAGING_URL_HTTPS}/${pkgbase}"
done
}

24
src/lib/util/git.sh Normal file
View File

@@ -0,0 +1,24 @@
#!/hint/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_UTIL_GIT_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_UTIL_GIT_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
git_diff_tree() {
local commit=$1
local path=$2
git \
--no-pager \
diff \
--color=never \
--color-moved=no \
--unified=0 \
--no-prefix \
--no-ext-diff \
"${commit}" \
-- "${path}"
}

52
src/lib/util/pacman.sh Normal file
View File

@@ -0,0 +1,52 @@
#!/hint/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_UTIL_PACMAN_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_UTIL_PACMAN_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
set -e
readonly _DEVTOOLS_PACMAN_CACHE_DIR=${XDG_CACHE_DIR:-$HOME/.cache}/devtools/pacman/db
readonly _DEVTOOLS_PACMAN_CONF_DIR=${_DEVTOOLS_LIBRARY_DIR}/pacman.conf.d
readonly _DEVTOOLS_MAKEPKG_CONF_DIR=${_DEVTOOLS_LIBRARY_DIR}/makepkg.conf.d
update_pacman_repo_cache() {
mkdir -p "${_DEVTOOLS_PACMAN_CACHE_DIR}"
msg "Updating pacman database cache"
lock 10 "${_DEVTOOLS_PACMAN_CACHE_DIR}.lock" "Locking pacman database cache"
fakeroot -- pacman --config "${_DEVTOOLS_PACMAN_CONF_DIR}/multilib.conf" \
--dbpath "${_DEVTOOLS_PACMAN_CACHE_DIR}" \
-Sy
lock_close 10
}
get_pacman_repo_from_pkgbuild() {
local path=${1:-PKGBUILD}
# shellcheck source=contrib/makepkg/PKGBUILD.proto
mapfile -t pkgnames < <(source "${path}"; printf "%s\n" "${pkgname[@]}")
if (( ${#pkgnames[@]} == 0 )); then
die 'Failed to get pkgname from %s' "${path}"
return
fi
slock 10 "${_DEVTOOLS_PACMAN_CACHE_DIR}.lock" "Locking pacman database cache"
mapfile -t repos < <(pacman --config "${_DEVTOOLS_PACMAN_CONF_DIR}/multilib.conf" \
--dbpath "${_DEVTOOLS_PACMAN_CACHE_DIR}" \
-S \
--print \
--print-format '%n %r' \
"${pkgnames[0]}" | grep -E "^${pkgnames[0]} " | awk '{print $2}'
)
lock_close 10
printf "%s" "${repos[0]}"
}

19
src/lib/util/util.sh Normal file
View File

@@ -0,0 +1,19 @@
#!/hint/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
[[ -z ${DEVTOOLS_INCLUDE_UTIL_UTIL_SH:-} ]] || return 0
DEVTOOLS_INCLUDE_UTIL_UTIL_SH=1
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
is_tty() {
if [ ! -t 1 ] || [ -p /dev/stdout ]; then
return 1
fi
if [[ $TERM == dumb ]]; then
return 1
fi
return 0
}

View File

@@ -5,28 +5,17 @@
# shellcheck disable=2034
_repos=(
staging
testing
core
extra
community-staging
community-testing
community
multilib-staging
multilib-testing
multilib
core core-staging core-testing
extra extra-staging extra-testing
multilib multilib-staging multilib-testing
gnome-unstable
kde-unstable
)
# shellcheck disable=2034
_build_repos=(
staging
testing
extra
multilib-staging
multilib-testing
multilib
extra staging testing
multilib multilib-staging multilib-testing
gnome-unstable
kde-unstable
)

View File

@@ -12,15 +12,14 @@ _arch=(
# shellcheck disable=2034
_tags=(
core-x86_64 core-any
core-staging-x86_64 core-staging-any
core-testing-x86_64 core-testing-any
extra-x86_64 extra-any
extra-staging-x86_64 extra-staging-any
extra-testing-x86_64 extra-testing-any
multilib-x86_64
staging-x86_64 staging-any
testing-x86_64 testing-any
multilib-testing-x86_64
multilib-staging-x86_64
community-x86_64 community-any
community-staging-x86_64 community-staging-any
community-testing-x86_64 community-testing-any
kde-unstable-x86_64 kde-unstable-any
gnome-unstable-x86_64 gnome-unstable-any
)

View File

@@ -2,8 +2,13 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
m4_include(lib/common.sh)
m4_include(lib/archroot.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/archroot.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/archroot.sh
source /usr/share/makepkg/util/config.sh

View File

@@ -6,8 +6,12 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
m4_include(lib/common.sh)
m4_include(lib/archroot.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/archroot.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/archroot.sh
source /usr/share/makepkg/util/config.sh
source /usr/share/makepkg/util/message.sh
@@ -93,7 +97,9 @@ get_makepkg_conf() {
return 1
fi
msg2 "using makepkg.conf from ${fname}"
bsdtar xOqf "${buildtool_file/file:\/\//}" "usr/share/devtools/makepkg-${arch}.conf" > "${makepkg_conf}"
if ! bsdtar xOqf "${buildtool_file/file:\/\//}" "usr/share/devtools/makepkg.conf.d/${arch}.conf" > "${makepkg_conf}"; then
bsdtar xOqf "${buildtool_file/file:\/\//}" "usr/share/devtools/makepkg-${arch}.conf" > "${makepkg_conf}"
fi
return 0
}
@@ -224,7 +230,7 @@ elif [[ "${BUILDTOOL}" = devtools ]] && get_makepkg_conf "${BUILDTOOL}-${BUILDTO
# fallback to current makepkg.conf
else
warning "Unknown buildtool (${BUILDTOOL}-${BUILDTOOLVER}), using fallback"
makepkg_conf=@pkgdatadir@/makepkg-${CARCH}.conf
makepkg_conf=@pkgdatadir@/makepkg.conf.d/${CARCH}.conf
fi
printf '%s\n' "${allpkgfiles[@]}" | mkarchroot -M "${makepkg_conf}" -U "${archroot_args[@]}" "${namespace}/root" - || exit 1

View File

@@ -2,8 +2,12 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
m4_include(lib/common.sh)
m4_include(lib/archroot.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/archroot.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/archroot.sh
# umask might have been changed in /etc/profile
# ensure that sane default is set again

100
src/pkgctl.in Normal file
View File

@@ -0,0 +1,100 @@
#!/bin/bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/config.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/config.sh
set -e
usage() {
local -r COMMAND=${BASH_SOURCE[0]##*/}
cat <<- _EOF_
Usage: ${COMMAND} [COMMAND] [OPTIONS]
Unified command-line frontend for devtools.
COMMANDS
auth Authenticate with services like GitLab
build Build packages inside a clean chroot
db Pacman database modification for packge update, move etc
diff Compare package files using different modes
release Release step to commit, tag and upload build artifacts
repo Manage Git packaging repositories and their configuration
OPTIONS
-h, --help Show this help text
_EOF_
}
if (( $# < 1 )); then
usage
exit 1
fi
export _DEVTOOLS_COMMAND='pkgctl'
load_devtools_config
# command checking
while (( $# )); do
case $1 in
-h|--help)
usage
exit 0
;;
build)
_DEVTOOLS_COMMAND+=" $1"
shift
# shellcheck source=src/lib/build/build.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/build/build.sh
pkgctl_build "$@"
exit 0
;;
repo)
_DEVTOOLS_COMMAND+=" $1"
shift
# shellcheck source=src/lib/repo.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo.sh
pkgctl_repo "$@"
exit 0
;;
auth)
_DEVTOOLS_COMMAND+=" $1"
shift
# shellcheck source=src/lib/auth.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/auth.sh
pkgctl_auth "$@"
exit 0
;;
db)
_DEVTOOLS_COMMAND+=" $1"
shift
# shellcheck source=src/lib/auth.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db.sh
pkgctl_db "$@"
exit 0
;;
diff)
_DEVTOOLS_COMMAND+=" $1"
shift
diffpkg "$@"
exit 0
;;
release)
_DEVTOOLS_COMMAND+=" $1"
shift
# shellcheck source=src/lib/repo.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/release.sh
pkgctl_release "$@"
exit 0
;;
*)
die "invalid command: %s" "$1"
;;
esac
done

View File

@@ -1,111 +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
m4_include(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'

View File

@@ -6,13 +6,17 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
m4_include(lib/common.sh)
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
# shellcheck source=src/lib/common.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
# shellcheck source=src/lib/valid-repos.sh
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh
# globals
fallback_mirror='https://geo.mirror.pkgbuild.com'
: ${SOCACHE_DIR:="${XDG_CACHE_HOME:-${HOME}/.cache}/sogrep"}
m4_include(lib/valid-repos.sh)
arches=('x86_64')
# options

12
test/bin/pkgctl Executable file
View File

@@ -0,0 +1,12 @@
#!/usr/bin/bash
set -e
root="$(dirname -- "$(readlink -f -- "$0")")/../.."
# always build everything so we use an up-to-date state
make -C "${root}" -j --no-print-directory --silent
# run pkgctl from the build directory
export PATH="${root}/build/bin:${PATH}"
export _DEVTOOLS_LIBRARY_DIR="${root}/build"
"${root}/build/bin/pkgctl" "$@"