Compare commits
69 Commits
custom-201
...
master
Author | SHA1 | Date |
---|---|---|
Levente Polyak | 90ba07d9be | |
Levente Polyak | 8c26438df8 | |
Christian Hesse | a49bcf2097 | |
Eli Schwartz | 0883f45b3a | |
Eli Schwartz | 99c2020d47 | |
Christian Hesse | 00f7a6a415 | |
bartoszek | 4f305aa316 | |
Levente Polyak | 09e169b741 | |
Jelle van der Waa | 360a7611a8 | |
Konstantin Gizdov | d507db9490 | |
Levente Polyak | aff81d34fd | |
Levente Polyak | 5b1123e11f | |
Levente Polyak | a0f79fcce0 | |
Eli Schwartz | 94b0413e13 | |
Eli Schwartz | e963b6da9e | |
Eli Schwartz | b2cbb8628e | |
Eli Schwartz | 6d273f79c3 | |
Eli Schwartz | 51842a1676 | |
Eli Schwartz | 53fe5c67a1 | |
Eli Schwartz | 21d9984acc | |
Levente Polyak | cb6484fe45 | |
Levente Polyak | bcb1b4a163 | |
Levente Polyak | 57fb44b976 | |
Levente Polyak | 9b4d8ae930 | |
Levente Polyak | 4c206ab549 | |
Eli Schwartz | 4c08847bfa | |
Levente Polyak | 74d7a70915 | |
Robin Broda | 5eacb475cd | |
Robin Broda | bcda211dd8 | |
Levente Polyak | d4546c59ce | |
Levente Polyak | d6866e0544 | |
Eli Schwartz | 8edad22616 | |
Levente Polyak | f20435643f | |
Levente Polyak | 8d99df602d | |
Levente Polyak | 4c803b9db8 | |
Levente Polyak | 104c5bc90e | |
Levente Polyak | cee28a1b13 | |
Levente Polyak | e0f82d3947 | |
Levente Polyak | 74313db9ee | |
Ivy Foster | 2c611d20bd | |
Eli Schwartz | ca4d348c86 | |
Eli Schwartz | 2fb1cc2dd2 | |
Eli Schwartz | bcba566405 | |
Eli Schwartz | f8f2f02028 | |
Eli Schwartz | 68f0bff172 | |
Eli Schwartz | f85a58a0a6 | |
Levente Polyak | 20eec484fa | |
Levente Polyak | 6fffbfbc8a | |
Eli Schwartz | 0017263379 | |
Eli Schwartz | 751093eff2 | |
Eli Schwartz | f43a86ee8a | |
Eli Schwartz | 0067176529 | |
Daniel M. Capella | 75d23eec94 | |
Daniel M. Capella | 6679c28625 | |
Levente Polyak | 2edee89b62 | |
Levente Polyak | 901581936a | |
jelle van der Waa | 29c6fa8537 | |
Levente Polyak | 74f65db396 | |
Levente Polyak | 64b7d99504 | |
Levente Polyak | f32a264796 | |
Levente Polyak | fd6e801cfb | |
Levente Polyak | a3868cf542 | |
Levente Polyak | 62a2f118ce | |
Levente Polyak | 723ad23b48 | |
Levente Polyak | 5dd90ef848 | |
Levente Polyak | 5246cb9aa5 | |
Levente Polyak | 144f896660 | |
Levente Polyak | bbcff883d5 | |
Eli Schwartz | 6e466ca654 |
|
@ -9,10 +9,14 @@ commitpkg
|
||||||
finddeps
|
finddeps
|
||||||
lddd
|
lddd
|
||||||
makechrootpkg
|
makechrootpkg
|
||||||
|
makerepropkg
|
||||||
mkarchroot
|
mkarchroot
|
||||||
|
offload-build
|
||||||
rebuildpkgs
|
rebuildpkgs
|
||||||
zsh_completion
|
zsh_completion
|
||||||
find-libdeps
|
find-libdeps
|
||||||
crossrepomove
|
crossrepomove
|
||||||
arch-nspawn
|
arch-nspawn
|
||||||
|
sogrep
|
||||||
doc/*.1
|
doc/*.1
|
||||||
|
doc/*.7
|
||||||
|
|
|
@ -4,7 +4,7 @@ sudo: required
|
||||||
services:
|
services:
|
||||||
- docker
|
- docker
|
||||||
|
|
||||||
arch:
|
archlinux:
|
||||||
packages:
|
packages:
|
||||||
- openssh
|
- openssh
|
||||||
- subversion
|
- subversion
|
||||||
|
|
37
Makefile
37
Makefile
|
@ -1,27 +1,28 @@
|
||||||
V=20190821
|
V=20210202
|
||||||
|
|
||||||
PREFIX = /usr/local
|
PREFIX = /usr/local
|
||||||
MANDIR = $(PREFIX)/share/man
|
MANDIR = $(PREFIX)/share/man
|
||||||
|
|
||||||
IN_PROGS = \
|
IN_PROGS = \
|
||||||
checkpkg \
|
|
||||||
commitpkg \
|
|
||||||
archco \
|
archco \
|
||||||
|
arch-nspawn \
|
||||||
archrelease \
|
archrelease \
|
||||||
archbuild \
|
archbuild \
|
||||||
lddd \
|
checkpkg \
|
||||||
finddeps \
|
commitpkg \
|
||||||
rebuildpkgs \
|
|
||||||
find-libdeps \
|
|
||||||
crossrepomove\
|
crossrepomove\
|
||||||
arch-nspawn \
|
finddeps \
|
||||||
|
find-libdeps \
|
||||||
|
lddd \
|
||||||
|
makerepropkg \
|
||||||
mkarchroot \
|
mkarchroot \
|
||||||
makechrootpkg
|
makechrootpkg \
|
||||||
|
offload-build \
|
||||||
|
rebuildpkgs \
|
||||||
|
sogrep
|
||||||
|
|
||||||
BINPROGS = \
|
BINPROGS = \
|
||||||
$(IN_PROGS) \
|
$(IN_PROGS)
|
||||||
offload-build \
|
|
||||||
sogrep
|
|
||||||
|
|
||||||
CONFIGFILES = \
|
CONFIGFILES = \
|
||||||
makepkg-x86_64.conf \
|
makepkg-x86_64.conf \
|
||||||
|
@ -71,9 +72,11 @@ MANS = \
|
||||||
doc/checkpkg.1 \
|
doc/checkpkg.1 \
|
||||||
doc/offload-build.1 \
|
doc/offload-build.1 \
|
||||||
doc/sogrep.1 \
|
doc/sogrep.1 \
|
||||||
|
doc/makerepropkg.1 \
|
||||||
doc/mkarchroot.1 \
|
doc/mkarchroot.1 \
|
||||||
doc/find-libdeps.1 \
|
doc/find-libdeps.1 \
|
||||||
doc/find-libprovides.1
|
doc/find-libprovides.1 \
|
||||||
|
doc/devtools.7
|
||||||
|
|
||||||
|
|
||||||
all: $(BINPROGS) bash_completion zsh_completion man
|
all: $(BINPROGS) bash_completion zsh_completion man
|
||||||
|
@ -128,6 +131,12 @@ uninstall:
|
||||||
rm -f $(DESTDIR)$(MANDIR)/man$${manfile##*.}/$${manfile#doc/}; \
|
rm -f $(DESTDIR)$(MANDIR)/man$${manfile##*.}/$${manfile#doc/}; \
|
||||||
done;
|
done;
|
||||||
|
|
||||||
|
TODAY=$(shell date +"%Y%m%d")
|
||||||
|
tag:
|
||||||
|
@sed -E "s|^V=[0-9]{8}|V=$(TODAY)|" -i Makefile
|
||||||
|
@git commit --gpg-sign --message "Version $(TODAY)" Makefile
|
||||||
|
@git tag --sign --message "Version $(TODAY)" $(TODAY)
|
||||||
|
|
||||||
dist:
|
dist:
|
||||||
git archive --format=tar --prefix=devtools-$(V)/ $(V) | gzip -9 > devtools-$(V).tar.gz
|
git archive --format=tar --prefix=devtools-$(V)/ $(V) | gzip -9 > devtools-$(V).tar.gz
|
||||||
gpg --detach-sign --use-agent devtools-$(V).tar.gz
|
gpg --detach-sign --use-agent devtools-$(V).tar.gz
|
||||||
|
@ -138,5 +147,5 @@ upload:
|
||||||
check: $(BINPROGS) bash_completion makepkg-x86_64.conf PKGBUILD.proto
|
check: $(BINPROGS) bash_completion makepkg-x86_64.conf PKGBUILD.proto
|
||||||
shellcheck $^
|
shellcheck $^
|
||||||
|
|
||||||
.PHONY: all clean install uninstall dist upload check
|
.PHONY: all clean install uninstall dist upload check tag
|
||||||
.DELETE_ON_ERROR:
|
.DELETE_ON_ERROR:
|
||||||
|
|
|
@ -20,6 +20,7 @@ umask 0022
|
||||||
working_dir=''
|
working_dir=''
|
||||||
|
|
||||||
files=()
|
files=()
|
||||||
|
mount_args=()
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]"
|
echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]"
|
||||||
|
@ -65,40 +66,37 @@ fi
|
||||||
# shellcheck disable=2016
|
# shellcheck disable=2016
|
||||||
host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#'))
|
host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#'))
|
||||||
|
|
||||||
while read -r line; do
|
for host_mirror in "${host_mirrors[@]}"; do
|
||||||
mapfile -t lines < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" \
|
if [[ $host_mirror == *file://* ]]; then
|
||||||
--repo $line Server | sed -r 's#(.*/)[^/]+/os/.+#\1$repo/os/$arch#')
|
host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
|
||||||
if [[ ${lines[0]} != ${host_mirrors[0]} ]]; then
|
for m in "$host_mirror"/pool/*/; do
|
||||||
for line in "${lines[@]}"; do
|
in_array "$m" "${cache_dirs[@]}" || cache_dirs+=("$m")
|
||||||
if [[ $line = file://* ]]; then
|
|
||||||
line=${line#file://}
|
|
||||||
in_array "$line" "${cache_dirs[@]}" || cache_dirs+=("$line")
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
done < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)
|
done
|
||||||
|
|
||||||
# {{{ functions
|
while read -r line; do
|
||||||
build_mount_args() {
|
mapfile -t lines < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" \
|
||||||
declare -g mount_args=()
|
--repo $line Server | sed -r 's#(.*/)[^/]+/os/.+#\1#')
|
||||||
|
for line in "${lines[@]}"; do
|
||||||
for host_mirror in "${host_mirrors[@]}"; do
|
if [[ $line = file://* ]]; then
|
||||||
if [[ $host_mirror == *file://* ]]; then
|
line=${line#file://}
|
||||||
host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
|
in_array "$line" "${cache_dirs[@]}" || cache_dirs+=("$line")
|
||||||
mount_args+=("--bind-ro=${host_mirror_path//:/\\:}")
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
done < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)
|
||||||
|
|
||||||
mount_args+=("--bind=${cache_dirs[0]//:/\\:}")
|
mount_args+=("--bind=${cache_dirs[0]//:/\\:}")
|
||||||
|
|
||||||
for cache_dir in "${cache_dirs[@]:1}"; do
|
for cache_dir in "${cache_dirs[@]:1}"; do
|
||||||
mount_args+=("--bind-ro=${cache_dir//:/\\:}")
|
mount_args+=("--bind-ro=${cache_dir//:/\\:}")
|
||||||
done
|
done
|
||||||
}
|
|
||||||
|
|
||||||
|
# {{{ functions
|
||||||
copy_hostconf () {
|
copy_hostconf () {
|
||||||
unshare --fork --pid gpg --homedir "$working_dir"/etc/pacman.d/gnupg/ --no-permission-warning --quiet --batch --import --import-options import-local-sigs "$(pacman-conf GpgDir)"/pubring.gpg >/dev/null 2>&1
|
unshare --fork --pid gpg --homedir "$working_dir"/etc/pacman.d/gnupg/ --no-permission-warning --quiet --batch --import --import-options import-local-sigs "$(pacman-conf GpgDir)"/pubring.gpg >/dev/null 2>&1
|
||||||
pacman-key --gpgdir "$working_dir"/etc/pacman.d/gnupg/ --import-trustdb "$(pacman-conf GpgDir)" >/dev/null 2>&1
|
pacman-key --gpgdir "$working_dir"/etc/pacman.d/gnupg/ --import-trustdb "$(pacman-conf GpgDir)" >/dev/null 2>&1
|
||||||
|
|
||||||
printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
|
printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
|
||||||
|
|
||||||
[[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf"
|
[[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf"
|
||||||
|
@ -123,7 +121,6 @@ elif [[ $(cat "$working_dir/.arch-chroot") != "$CHROOT_VERSION" ]]; then
|
||||||
die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION"
|
die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
build_mount_args
|
|
||||||
copy_hostconf
|
copy_hostconf
|
||||||
|
|
||||||
eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
|
eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
|
||||||
|
|
|
@ -5,7 +5,7 @@ m4_include(lib/common.sh)
|
||||||
m4_include(lib/archroot.sh)
|
m4_include(lib/archroot.sh)
|
||||||
|
|
||||||
base_packages=(base-devel)
|
base_packages=(base-devel)
|
||||||
makechrootpkg_args=(-c -n)
|
makechrootpkg_args=(-c -n -C)
|
||||||
|
|
||||||
cmd="${0##*/}"
|
cmd="${0##*/}"
|
||||||
if [[ "${cmd%%-*}" == 'multilib' ]]; then
|
if [[ "${cmd%%-*}" == 'multilib' ]]; then
|
||||||
|
@ -68,7 +68,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
|
||||||
lock_close 9
|
lock_close 9
|
||||||
|
|
||||||
rm -rf --one-file-system "${chroots}/${repo}-${arch}"
|
rm -rf --one-file-system "${chroots}/${repo}-${arch}"
|
||||||
mkdir -m755 -p "${chroots}/${repo}-${arch}"
|
(umask 0022; mkdir -p "${chroots}/${repo}-${arch}")
|
||||||
setarch "${arch}" mkarchroot \
|
setarch "${arch}" mkarchroot \
|
||||||
-C "${pacman_config}" \
|
-C "${pacman_config}" \
|
||||||
-M "${makepkg_config}" \
|
-M "${makepkg_config}" \
|
||||||
|
|
57
checkpkg.in
57
checkpkg.in
|
@ -22,6 +22,53 @@ elif [[ -r "$HOME/.makepkg.conf" ]]; then
|
||||||
source "$HOME/.makepkg.conf"
|
source "$HOME/.makepkg.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
usage() {
|
||||||
|
cat <<- _EOF_
|
||||||
|
Usage: ${BASH_SOURCE[0]##*/} [OPTIONS]
|
||||||
|
|
||||||
|
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 list of .so files provided by each version of the
|
||||||
|
package and outputs if there are soname differences for the new package.
|
||||||
|
A directory is also created using mktemp with files containing a file
|
||||||
|
list for both packages and a library list for both packages.
|
||||||
|
|
||||||
|
OPTIONS
|
||||||
|
-r, --rmdir Remove the temporary directory
|
||||||
|
-w, --warn Print a warning in case of differences
|
||||||
|
-h, --help Show this help text
|
||||||
|
_EOF_
|
||||||
|
}
|
||||||
|
|
||||||
|
RMDIR=0
|
||||||
|
WARN=0
|
||||||
|
|
||||||
|
OPT_SHORT='rwh'
|
||||||
|
OPT_LONG=('rmdir' 'warn' 'help')
|
||||||
|
if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
set -- "${OPTRET[@]}"
|
||||||
|
|
||||||
|
while :; do
|
||||||
|
case $1 in
|
||||||
|
-r|--rmdir)
|
||||||
|
RMDIR=1
|
||||||
|
;;
|
||||||
|
-w|--warn)
|
||||||
|
WARN=1
|
||||||
|
;;
|
||||||
|
-h|--help)
|
||||||
|
usage
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
--)
|
||||||
|
shift; break
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
|
||||||
if [[ ! -f PKGBUILD ]]; then
|
if [[ ! -f PKGBUILD ]]; then
|
||||||
die 'This must be run in the directory of a built package.'
|
die 'This must be run in the directory of a built package.'
|
||||||
fi
|
fi
|
||||||
|
@ -33,6 +80,7 @@ if [[ ${arch[0]} == 'any' ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
STARTDIR=$(pwd)
|
STARTDIR=$(pwd)
|
||||||
|
(( RMDIR )) && trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
|
||||||
TEMPDIR=$(mktemp -d --tmpdir checkpkg-script.XXXX)
|
TEMPDIR=$(mktemp -d --tmpdir checkpkg-script.XXXX)
|
||||||
|
|
||||||
for _pkgname in "${pkgname[@]}"; do
|
for _pkgname in "${pkgname[@]}"; do
|
||||||
|
@ -47,8 +95,10 @@ for _pkgname in "${pkgname[@]}"; do
|
||||||
|
|
||||||
if (( $# )); then
|
if (( $# )); then
|
||||||
case $1 in
|
case $1 in
|
||||||
|
*://*)
|
||||||
|
pkgurl=$1 ;;
|
||||||
/*|*/*)
|
/*|*/*)
|
||||||
pkgurl=file://$(readlink -m "$1") ;;
|
pkgurl=$(readlink -m "$1") ;;
|
||||||
*.pkg.tar*)
|
*.pkg.tar*)
|
||||||
pkgurl=$1 ;;
|
pkgurl=$1 ;;
|
||||||
'')
|
'')
|
||||||
|
@ -85,11 +135,12 @@ for _pkgname in "${pkgname[@]}"; do
|
||||||
find-libprovides "$TEMPDIR/$oldpkg" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname-old"
|
find-libprovides "$TEMPDIR/$oldpkg" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname-old"
|
||||||
find-libprovides "$pkgfile" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname"
|
find-libprovides "$pkgfile" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname"
|
||||||
if ! diff_output="$(sdiff -s "$TEMPDIR/libraries-$_pkgname-old" "$TEMPDIR/libraries-$_pkgname")"; then
|
if ! diff_output="$(sdiff -s "$TEMPDIR/libraries-$_pkgname-old" "$TEMPDIR/libraries-$_pkgname")"; then
|
||||||
msg "Sonames differ in $_pkgname!"
|
message="Sonames differ in $_pkgname!"
|
||||||
|
(( WARN )) && warning "$message" || msg "$message"
|
||||||
echo "$diff_output"
|
echo "$diff_output"
|
||||||
else
|
else
|
||||||
msg "No soname differences for %s." "$_pkgname"
|
msg "No soname differences for %s." "$_pkgname"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
msg "Files saved to %s" "$TEMPDIR"
|
(( RMDIR )) || msg "Files saved to %s" "$TEMPDIR"
|
||||||
|
|
17
commitpkg.in
17
commitpkg.in
|
@ -83,7 +83,7 @@ while getopts ':l:a:s:f' flag; do
|
||||||
done
|
done
|
||||||
shift $(( OPTIND - 1 ))
|
shift $(( OPTIND - 1 ))
|
||||||
|
|
||||||
# check packages have the packager field set
|
# check packages for validity
|
||||||
for _arch in "${arch[@]}"; do
|
for _arch in "${arch[@]}"; do
|
||||||
if [[ -n $commit_arch && ${_arch} != "$commit_arch" ]]; then
|
if [[ -n $commit_arch && ${_arch} != "$commit_arch" ]]; then
|
||||||
continue
|
continue
|
||||||
|
@ -91,10 +91,15 @@ for _arch in "${arch[@]}"; do
|
||||||
for _pkgname in "${pkgname[@]}"; do
|
for _pkgname in "${pkgname[@]}"; do
|
||||||
fullver=$(get_full_version "$_pkgname")
|
fullver=$(get_full_version "$_pkgname")
|
||||||
|
|
||||||
if pkgfile=$(find_cached_package "$_pkgname" "$_arch" "$fullver"); then
|
if pkgfile=$(find_cached_package "$_pkgname" "$fullver" "$_arch"); then
|
||||||
if grep -q "packager = Unknown Packager" <(bsdtar -xOqf "$pkgfile" .PKGINFO); then
|
if grep -q "packager = Unknown Packager" <(bsdtar -xOqf "$pkgfile" .PKGINFO); then
|
||||||
die "PACKAGER was not set when building package"
|
die "PACKAGER was not set when building package"
|
||||||
fi
|
fi
|
||||||
|
hashsum=sha256sum
|
||||||
|
pkgbuild_hash=$(awk -v"hashsum=$hashsum" -F' = ' '$1 == "pkgbuild_"hashsum {print $2}' <(bsdtar -xOqf "$pkgfile" .BUILDINFO))
|
||||||
|
if [[ "$pkgbuild_hash" != "$($hashsum PKGBUILD|cut -d' ' -f1)" ]]; then
|
||||||
|
die "PKGBUILD $hashsum mismatch: expected $pkgbuild_hash"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
@ -104,10 +109,10 @@ if [[ -z $server ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n $(svn status -q) ]]; then
|
if [[ -n $(svn status -q) ]]; then
|
||||||
msgtemplate="upgpkg: $pkgbase $(get_full_version)"$'\n\n'
|
msgtemplate="upgpkg: $pkgbase $(get_full_version)"
|
||||||
if [[ -n $1 ]]; then
|
if [[ -n $1 ]]; then
|
||||||
stat_busy 'Committing changes to trunk'
|
stat_busy 'Committing changes to trunk'
|
||||||
svn commit -q -m "${msgtemplate}${1}" || die
|
svn commit -q -m "${msgtemplate}: ${1}" || die
|
||||||
stat_done
|
stat_done
|
||||||
else
|
else
|
||||||
msgfile="$(mktemp)"
|
msgfile="$(mktemp)"
|
||||||
|
@ -157,8 +162,8 @@ for _arch in "${arch[@]}"; do
|
||||||
fi
|
fi
|
||||||
gpg --detach-sign --use-agent --no-armor "${SIGNWITHKEY[@]}" "${pkgfile}" || die
|
gpg --detach-sign --use-agent --no-armor "${SIGNWITHKEY[@]}" "${pkgfile}" || die
|
||||||
fi
|
fi
|
||||||
if ! gpg --verify "$sigfile" >/dev/null 2>&1; then
|
if ! gpg --verify "$sigfile" "$pkgfile" >/dev/null 2>&1; then
|
||||||
die "Signature %s.sig is incorrect!" "$pkgfile"
|
die "Signature %s is incorrect!" "$sigfile"
|
||||||
fi
|
fi
|
||||||
uploads+=("$sigfile")
|
uploads+=("$sigfile")
|
||||||
done
|
done
|
||||||
|
|
|
@ -19,6 +19,19 @@ outputs if there are soname differences for the new package. A directory is
|
||||||
also created using mktemp with files containing a file list for both packages
|
also created using mktemp with files containing a file list for both packages
|
||||||
and a library list for both packages.
|
and a library list for both packages.
|
||||||
|
|
||||||
|
Options
|
||||||
|
-------
|
||||||
|
|
||||||
|
*-r, --rmdir*::
|
||||||
|
Remove the temporary directory created to contain the file and library list
|
||||||
|
of both packages.
|
||||||
|
|
||||||
|
*-w, --warn*::
|
||||||
|
Print a warning instead of a regular message in case of soname differences.
|
||||||
|
|
||||||
|
*-h, --help*::
|
||||||
|
Show a help text
|
||||||
|
|
||||||
See Also
|
See Also
|
||||||
--------
|
--------
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,46 @@
|
||||||
|
devtools(7)
|
||||||
|
===========
|
||||||
|
|
||||||
|
Name
|
||||||
|
----
|
||||||
|
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', 'extra2community')
|
||||||
|
|
||||||
|
Programs
|
||||||
|
--------
|
||||||
|
The list below gives a short overview; see the respective documentation
|
||||||
|
for details.
|
||||||
|
|
||||||
|
linkman:checkpkg[1]
|
||||||
|
Compare the current build pakcage with the repository version
|
||||||
|
|
||||||
|
linkman:find-libdeps[1]
|
||||||
|
Find soname dependencies for a package
|
||||||
|
|
||||||
|
linkman:find-libprovides[1]
|
||||||
|
Find soname's which are provided by a package
|
||||||
|
|
||||||
|
linkman:lddd[1]
|
||||||
|
Find broken library links on your system
|
||||||
|
|
||||||
|
linkman:makerepropkg[1]
|
||||||
|
Rebuild a package to see if it is reproducible
|
||||||
|
|
||||||
|
linkman:mkarchroot[1]
|
||||||
|
Creates an arch chroot in a specified location with a specified set of
|
||||||
|
packages
|
||||||
|
|
||||||
|
linkman:offload-build[1]
|
||||||
|
Build a PKGBUILD on a remote server using makechrootpkg
|
||||||
|
|
||||||
|
linkman:sogrep[1]
|
||||||
|
Find packages using a linked to a given shared library
|
||||||
|
|
||||||
|
include::footer.asciidoc[]
|
|
@ -0,0 +1,54 @@
|
||||||
|
makerepropkg(1)
|
||||||
|
================
|
||||||
|
|
||||||
|
Name
|
||||||
|
----
|
||||||
|
makerepropkg - Rebuild a package to see if it is reproducible
|
||||||
|
|
||||||
|
Synopsis
|
||||||
|
--------
|
||||||
|
makerepropkg [OPTIONS] [<package_file|pkgname>...]
|
||||||
|
|
||||||
|
Description
|
||||||
|
-----------
|
||||||
|
|
||||||
|
Given the path to a built pacman package(s), attempt to rebuild it using the
|
||||||
|
PKGBUILD in the current directory. The package will be built in an environment
|
||||||
|
as closely matching the environment of the initial package as possible, by
|
||||||
|
building up a chroot to match the information exposed in the package's
|
||||||
|
linkman:BUILDINFO[5] manifest. On success, the resulting package will be
|
||||||
|
compared to the input package, and makerepropkg will report whether the
|
||||||
|
artifacts are identical.
|
||||||
|
|
||||||
|
When given multiple packages, additional package files are assumed to be split
|
||||||
|
packages and will be treated as additional artifacts to compare during the
|
||||||
|
verification step.
|
||||||
|
|
||||||
|
A valid target(s) for pacman -S can be specified instead, and makerepropkg will
|
||||||
|
download it to the cache if needed. This is mostly useful to specify which
|
||||||
|
repository to retrieve from. If no positional arguments are specified, the
|
||||||
|
targets will be sourced from the PKGBUILD.
|
||||||
|
|
||||||
|
In either case, the package name will be converted to a filename from the
|
||||||
|
cache, and makerepropkg will proceed as though this filename was initially
|
||||||
|
specified.
|
||||||
|
|
||||||
|
This implements a verifier for pacman/libalpm packages in accordance with the
|
||||||
|
link:https://reproducible-builds.org/[Reproducible Builds] project.
|
||||||
|
|
||||||
|
Options
|
||||||
|
-------
|
||||||
|
|
||||||
|
*-d*::
|
||||||
|
If packages are not reproducible, compare them using diffoscope.
|
||||||
|
|
||||||
|
*-c*::
|
||||||
|
Set the pacman cache directory.
|
||||||
|
|
||||||
|
*-M* <file>::
|
||||||
|
Location of a makepkg config file.
|
||||||
|
|
||||||
|
*-h*::
|
||||||
|
Show this usage message
|
||||||
|
|
||||||
|
include::footer.asciidoc[]
|
|
@ -20,6 +20,9 @@ en_US.UTF-8 and de_DE.UTF-8 locale and a generated machine-id.
|
||||||
Options
|
Options
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
*-U*::
|
||||||
|
Use 'pacman -U' to install packages.
|
||||||
|
|
||||||
*-C* <file>::
|
*-C* <file>::
|
||||||
Location of a pacman config file.
|
Location of a pacman config file.
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ Options
|
||||||
architecture officially supported by Arch Linux.
|
architecture officially supported by Arch Linux.
|
||||||
|
|
||||||
*-s, --server* <hostname>::
|
*-s, --server* <hostname>::
|
||||||
Offload to a specific build server. The default is dragon.archlinux.org
|
Offload to a specific build server. The default is build.archlinux.org
|
||||||
which is used as part of the build toolchain for the official Arch Linux
|
which is used as part of the build toolchain for the official Arch Linux
|
||||||
repos.
|
repos.
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ export LANG=C
|
||||||
shopt -s extglob
|
shopt -s extglob
|
||||||
|
|
||||||
# check if messages are to be printed using color
|
# check if messages are to be printed using color
|
||||||
if [[ -t 2 ]]; then
|
if [[ -t 2 && "$TERM" != dumb ]]; then
|
||||||
colorize
|
colorize
|
||||||
else
|
else
|
||||||
# shellcheck disable=2034
|
# shellcheck disable=2034
|
||||||
|
@ -142,7 +142,7 @@ find_cached_package() {
|
||||||
for dir in "${searchdirs[@]}"; do
|
for dir in "${searchdirs[@]}"; do
|
||||||
[[ -d $dir ]] || continue
|
[[ -d $dir ]] || continue
|
||||||
|
|
||||||
for pkg in "$dir"/*.pkg.tar?(.?z); do
|
for pkg in "$dir"/*.pkg.tar?(.!(sig|*.*)); do
|
||||||
[[ -f $pkg ]] || continue
|
[[ -f $pkg ]] || continue
|
||||||
|
|
||||||
# avoid adding duplicates of the same inode
|
# avoid adding duplicates of the same inode
|
||||||
|
@ -152,7 +152,7 @@ find_cached_package() {
|
||||||
|
|
||||||
# split apart package filename into parts
|
# split apart package filename into parts
|
||||||
pkgbasename=${pkg##*/}
|
pkgbasename=${pkg##*/}
|
||||||
pkgbasename=${pkgbasename%.pkg.tar?(.?z)}
|
pkgbasename=${pkgbasename%.pkg.tar*}
|
||||||
|
|
||||||
arch=${pkgbasename##*-}
|
arch=${pkgbasename##*-}
|
||||||
pkgbasename=${pkgbasename%-"$arch"}
|
pkgbasename=${pkgbasename%-"$arch"}
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
#!/hint/bash
|
||||||
|
# License: Unspecified
|
||||||
|
:
|
||||||
|
|
||||||
|
# shellcheck disable=2034
|
||||||
|
_repos=(
|
||||||
|
staging
|
||||||
|
testing
|
||||||
|
core
|
||||||
|
extra
|
||||||
|
community-staging
|
||||||
|
community-testing
|
||||||
|
community
|
||||||
|
multilib-staging
|
||||||
|
multilib-testing
|
||||||
|
multilib
|
||||||
|
gnome-unstable
|
||||||
|
kde-unstable
|
||||||
|
)
|
||||||
|
|
||||||
|
# shellcheck disable=2034
|
||||||
|
_build_repos=(
|
||||||
|
staging
|
||||||
|
testing
|
||||||
|
extra
|
||||||
|
multilib-staging
|
||||||
|
multilib-testing
|
||||||
|
multilib
|
||||||
|
gnome-unstable
|
||||||
|
kde-unstable
|
||||||
|
)
|
|
@ -13,6 +13,8 @@
|
||||||
m4_include(lib/common.sh)
|
m4_include(lib/common.sh)
|
||||||
m4_include(lib/archroot.sh)
|
m4_include(lib/archroot.sh)
|
||||||
|
|
||||||
|
source /usr/share/makepkg/util/config.sh
|
||||||
|
|
||||||
shopt -s nullglob
|
shopt -s nullglob
|
||||||
|
|
||||||
default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
|
default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
|
||||||
|
@ -28,6 +30,7 @@ keepbuilddir=0
|
||||||
update_first=0
|
update_first=0
|
||||||
clean_first=0
|
clean_first=0
|
||||||
run_namcap=0
|
run_namcap=0
|
||||||
|
run_checkpkg=0
|
||||||
temp_chroot=0
|
temp_chroot=0
|
||||||
|
|
||||||
bindmounts_ro=()
|
bindmounts_ro=()
|
||||||
|
@ -72,32 +75,13 @@ usage() {
|
||||||
echo ' Useful for maintaining multiple copies'
|
echo ' Useful for maintaining multiple copies'
|
||||||
echo " Default: $copy"
|
echo " Default: $copy"
|
||||||
echo '-n Run namcap on the package'
|
echo '-n Run namcap on the package'
|
||||||
|
echo '-C Run checkpkg on the package'
|
||||||
echo '-T Build in a temporary directory'
|
echo '-T Build in a temporary directory'
|
||||||
echo '-U Run makepkg as a specified user'
|
echo '-U Run makepkg as a specified user'
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
# {{{ functions
|
# {{{ functions
|
||||||
# Usage: load_vars $makepkg_conf
|
|
||||||
# Globals:
|
|
||||||
# - SRCDEST
|
|
||||||
# - SRCPKGDEST
|
|
||||||
# - PKGDEST
|
|
||||||
# - LOGDEST
|
|
||||||
# - MAKEFLAGS
|
|
||||||
# - PACKAGER
|
|
||||||
load_vars() {
|
|
||||||
local makepkg_conf="$1" var
|
|
||||||
|
|
||||||
[[ -f $makepkg_conf ]] || return 1
|
|
||||||
|
|
||||||
for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER; do
|
|
||||||
[[ -z ${!var:-} ]] && eval "$(source "$makepkg_conf"; printf "%s='%s'" "$var" "${!var}")"
|
|
||||||
done
|
|
||||||
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
# Usage: sync_chroot $chrootdir $copydir [$copy]
|
# Usage: sync_chroot $chrootdir $copydir [$copy]
|
||||||
sync_chroot() {
|
sync_chroot() {
|
||||||
local chrootdir=$1
|
local chrootdir=$1
|
||||||
|
@ -232,15 +216,8 @@ _chrootbuild() {
|
||||||
sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
|
sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
|
||||||
ret=$?
|
ret=$?
|
||||||
case $ret in
|
case $ret in
|
||||||
0)
|
0|14)
|
||||||
return 0;;
|
return 0;;
|
||||||
14)
|
|
||||||
# whitelist "The package failed to install." but only if there are multiple split packages
|
|
||||||
# in which case they might be conflicting
|
|
||||||
local pkgfiles=(/pkgdest/*.pkg.tar.xz)
|
|
||||||
(( ${#pkgfiles[@]} > 1))
|
|
||||||
return $?;;
|
|
||||||
|
|
||||||
*)
|
*)
|
||||||
return $ret;;
|
return $ret;;
|
||||||
esac
|
esac
|
||||||
|
@ -265,6 +242,15 @@ download_sources() {
|
||||||
die "Could not download sources."
|
die "Could not download sources."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
move_logfiles() {
|
||||||
|
local l
|
||||||
|
for l in "$copydir"/logdest/*; do
|
||||||
|
[[ $l == */logpipe.* ]] && continue
|
||||||
|
chown "$src_owner" "$l"
|
||||||
|
mv "$l" "$LOGDEST"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
move_products() {
|
move_products() {
|
||||||
local pkgfile
|
local pkgfile
|
||||||
for pkgfile in "$copydir"/pkgdest/*; do
|
for pkgfile in "$copydir"/pkgdest/*; do
|
||||||
|
@ -277,12 +263,7 @@ move_products() {
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
local l
|
move_logfiles
|
||||||
for l in "$copydir"/logdest/*; do
|
|
||||||
[[ $l == */logpipe.* ]] && continue
|
|
||||||
chown "$src_owner" "$l"
|
|
||||||
mv "$l" "$LOGDEST"
|
|
||||||
done
|
|
||||||
|
|
||||||
for s in "$copydir"/srcpkgdest/*; do
|
for s in "$copydir"/srcpkgdest/*; do
|
||||||
chown "$src_owner" "$s"
|
chown "$src_owner" "$s"
|
||||||
|
@ -296,7 +277,7 @@ move_products() {
|
||||||
}
|
}
|
||||||
# }}}
|
# }}}
|
||||||
|
|
||||||
while getopts 'hcur:I:l:nTD:d:U:' arg; do
|
while getopts 'hcur:I:l:nCTD:d:U:' arg; do
|
||||||
case "$arg" in
|
case "$arg" in
|
||||||
c) clean_first=1 ;;
|
c) clean_first=1 ;;
|
||||||
D) bindmounts_ro+=("--bind-ro=$OPTARG") ;;
|
D) bindmounts_ro+=("--bind-ro=$OPTARG") ;;
|
||||||
|
@ -306,6 +287,7 @@ while getopts 'hcur:I:l:nTD:d:U:' arg; do
|
||||||
I) install_pkgs+=("$OPTARG") ;;
|
I) install_pkgs+=("$OPTARG") ;;
|
||||||
l) copy="$OPTARG" ;;
|
l) copy="$OPTARG" ;;
|
||||||
n) run_namcap=1; makepkg_args+=(--install) ;;
|
n) run_namcap=1; makepkg_args+=(--install) ;;
|
||||||
|
C) run_checkpkg=1 ;;
|
||||||
T) temp_chroot=1; copy+="-$$" ;;
|
T) temp_chroot=1; copy+="-$$" ;;
|
||||||
U) makepkg_user="$OPTARG" ;;
|
U) makepkg_user="$OPTARG" ;;
|
||||||
h|*) usage ;;
|
h|*) usage ;;
|
||||||
|
@ -342,16 +324,12 @@ for arg in "${@:$OPTIND}"; do
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
if [[ -n $SUDO_USER ]]; then
|
|
||||||
eval "USER_HOME=~$SUDO_USER"
|
|
||||||
else
|
|
||||||
USER_HOME=$HOME
|
|
||||||
fi
|
|
||||||
|
|
||||||
umask 0022
|
umask 0022
|
||||||
|
|
||||||
load_vars "${XDG_CONFIG_HOME:-$USER_HOME/.config}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
|
ORIG_HOME=$HOME
|
||||||
load_vars /etc/makepkg.conf
|
IFS=: read -r _ _ _ _ _ HOME _ < <(getent passwd "${SUDO_USER:-$USER}")
|
||||||
|
load_makepkg_config
|
||||||
|
HOME=$ORIG_HOME
|
||||||
|
|
||||||
# Use PKGBUILD directory if these don't exist
|
# Use PKGBUILD directory if these don't exist
|
||||||
[[ -d $PKGDEST ]] || PKGDEST=$PWD
|
[[ -d $PKGDEST ]] || PKGDEST=$PWD
|
||||||
|
@ -392,9 +370,11 @@ if arch-nspawn "$copydir" \
|
||||||
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
|
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
|
||||||
/chrootbuild "${makepkg_args[@]}"
|
/chrootbuild "${makepkg_args[@]}"
|
||||||
then
|
then
|
||||||
|
mapfile -t pkgnames < <(sudo -u "$makepkg_user" bash -c 'source PKGBUILD; printf "%s\n" "${pkgname[@]}"')
|
||||||
move_products
|
move_products
|
||||||
else
|
else
|
||||||
(( ret += 1 ))
|
(( ret += 1 ))
|
||||||
|
move_logfiles
|
||||||
fi
|
fi
|
||||||
|
|
||||||
(( temp_chroot )) && delete_chroot "$copydir" "$copy"
|
(( temp_chroot )) && delete_chroot "$copydir" "$copy"
|
||||||
|
@ -406,5 +386,32 @@ if (( ret != 0 )); then
|
||||||
die "Build failed, check %s/build" "$copydir"
|
die "Build failed, check %s/build" "$copydir"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
if (( run_checkpkg )); then
|
||||||
|
msg "Running checkpkg"
|
||||||
|
|
||||||
|
mapfile -t remotepkgs < <(pacman --config "$copydir"/etc/pacman.conf \
|
||||||
|
--dbpath "$copydir"/var/lib/pacman \
|
||||||
|
-Sddp "${pkgnames[@]}")
|
||||||
|
|
||||||
|
if ! wait $!; then
|
||||||
|
warning "Skipped checkpkg due to missing repo packages"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# download package files if any non-local location exists
|
||||||
|
for remotepkg in "${remotepkgs[@]}"; do
|
||||||
|
if [[ $remotepkg != file://* ]]; then
|
||||||
|
msg2 "Downloading current versions"
|
||||||
|
arch-nspawn "$copydir" pacman --noconfirm -Swdd "${pkgnames[@]}"
|
||||||
|
mapfile -t remotepkgs < <(pacman --config "$copydir"/etc/pacman.conf \
|
||||||
|
--dbpath "$copydir"/var/lib/pacman \
|
||||||
|
-Sddp "${pkgnames[@]}")
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
msg2 "Checking packages"
|
||||||
|
sudo -u "$makepkg_user" checkpkg --rmdir --warn "${remotepkgs[@]/#file:\/\//}"
|
||||||
|
fi
|
||||||
true
|
true
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -15,7 +15,7 @@ DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
|
||||||
'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
|
'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
|
||||||
'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
|
'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
|
||||||
'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
|
'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
|
||||||
'rsync::/usr/bin/rsync --no-motd -z %u %o'
|
'rsync::/usr/bin/rsync --no-motd -zz %u %o'
|
||||||
'scp::/usr/bin/scp -C %u %o')
|
'scp::/usr/bin/scp -C %u %o')
|
||||||
|
|
||||||
# Other common tools:
|
# Other common tools:
|
||||||
|
@ -132,18 +132,18 @@ DBGSRCDIR="/usr/src/debug"
|
||||||
COMPRESSGZ=(gzip -c -f -n)
|
COMPRESSGZ=(gzip -c -f -n)
|
||||||
COMPRESSBZ2=(bzip2 -c -f)
|
COMPRESSBZ2=(bzip2 -c -f)
|
||||||
COMPRESSXZ=(xz -c -z -)
|
COMPRESSXZ=(xz -c -z -)
|
||||||
|
COMPRESSZST=(zstd -c -T0 --ultra -20 -)
|
||||||
COMPRESSLRZ=(lrzip -q)
|
COMPRESSLRZ=(lrzip -q)
|
||||||
COMPRESSLZO=(lzop -q)
|
COMPRESSLZO=(lzop -q)
|
||||||
COMPRESSZ=(compress -c -f)
|
COMPRESSZ=(compress -c -f)
|
||||||
|
COMPRESSLZ4=(lz4 -q)
|
||||||
|
COMPRESSLZ=(lzip -c -f)
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
# EXTENSION DEFAULTS
|
# EXTENSION DEFAULTS
|
||||||
#########################################################################
|
#########################################################################
|
||||||
#
|
#
|
||||||
# WARNING: Do NOT modify these variables unless you know what you are
|
PKGEXT='.pkg.tar.zst'
|
||||||
# doing.
|
|
||||||
#
|
|
||||||
PKGEXT='.pkg.tar.xz'
|
|
||||||
SRCEXT='.src.tar.gz'
|
SRCEXT='.src.tar.gz'
|
||||||
|
|
||||||
# vim: set ft=sh ts=2 sw=2 et:
|
# vim: set ft=sh ts=2 sw=2 et:
|
||||||
|
|
|
@ -0,0 +1,239 @@
|
||||||
|
#!/bin/bash
|
||||||
|
# makerepropkg - rebuild a package to see if it is reproducible
|
||||||
|
#
|
||||||
|
# Copyright (c) 2019 by Eli Schwartz <eschwartz@archlinux.org>
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
m4_include(lib/common.sh)
|
||||||
|
m4_include(lib/archroot.sh)
|
||||||
|
|
||||||
|
source /usr/share/makepkg/util/config.sh
|
||||||
|
source /usr/share/makepkg/util/message.sh
|
||||||
|
|
||||||
|
declare -A buildinfo
|
||||||
|
declare -a buildenv buildopts installed installpkgs
|
||||||
|
|
||||||
|
archiveurl='https://archive.archlinux.org/packages'
|
||||||
|
buildroot=/var/lib/archbuild/reproducible
|
||||||
|
chroot=testenv
|
||||||
|
diffoscope=0
|
||||||
|
|
||||||
|
parse_buildinfo() {
|
||||||
|
local line var val
|
||||||
|
|
||||||
|
while read -r line; do
|
||||||
|
var="${line%% = *}"
|
||||||
|
val="${line#* = }"
|
||||||
|
case ${var} in
|
||||||
|
buildenv)
|
||||||
|
buildenv+=("${val}")
|
||||||
|
;;
|
||||||
|
options)
|
||||||
|
buildopts+=("${val}")
|
||||||
|
;;
|
||||||
|
installed)
|
||||||
|
installed+=("${val}")
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
buildinfo["${var}"]="${val}"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
get_pkgfile() {
|
||||||
|
local cdir=${cache_dirs[0]}
|
||||||
|
local pkgfilebase=${1}
|
||||||
|
local mode=${2}
|
||||||
|
local pkgname=${pkgfilebase%-*-*-*}
|
||||||
|
local pkgfile ext
|
||||||
|
|
||||||
|
# try without downloading
|
||||||
|
if [[ ${mode} != localonly ]] && get_pkgfile "${pkgfilebase}" localonly; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
for ext in .zst .xz ''; do
|
||||||
|
pkgfile=${pkgfilebase}.pkg.tar${ext}
|
||||||
|
|
||||||
|
for c in "${cache_dirs[@]}"; do
|
||||||
|
if [[ -f ${c}/${pkgfile} ]]; then
|
||||||
|
cdir=${c}
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
for f in "${pkgfile}" "${pkgfile}.sig"; do
|
||||||
|
if [[ ! -f "${cdir}/${f}" ]]; then
|
||||||
|
if [[ ${mode} = localonly ]]; then
|
||||||
|
continue 2
|
||||||
|
fi
|
||||||
|
msg2 "retrieving '%s'..." "${f}" >&2
|
||||||
|
curl -Llf -# -o "${cdir}/${f}" "${archiveurl}/${pkgname:0:1}/${pkgname}/${f}" || continue 2
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
printf '%s\n' "file://${cdir}/${pkgfile}"
|
||||||
|
return 0
|
||||||
|
done
|
||||||
|
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
usage() {
|
||||||
|
cat << __EOF__
|
||||||
|
usage: ${BASH_SOURCE[0]##*/} [options] <package_file>
|
||||||
|
|
||||||
|
Run this script in a PKGBUILD dir to build a package inside a
|
||||||
|
clean chroot while attempting to reproduce it. The package file
|
||||||
|
will be used to derive metadata needed for reproducing the
|
||||||
|
package, including the .PKGINFO as well as the buildinfo.
|
||||||
|
|
||||||
|
For more details see https://reproducible-builds.org/
|
||||||
|
|
||||||
|
OPTIONS
|
||||||
|
-d Run diffoscope if the package is unreproducible
|
||||||
|
-c <dir> Set pacman cache
|
||||||
|
-M <file> Location of a makepkg config file
|
||||||
|
-h Show this usage message
|
||||||
|
__EOF__
|
||||||
|
}
|
||||||
|
|
||||||
|
while getopts 'dM:c:h' arg; do
|
||||||
|
case "$arg" in
|
||||||
|
d) diffoscope=1 ;;
|
||||||
|
M) archroot_args+=(-M "$OPTARG") ;;
|
||||||
|
c) cache_dirs+=("$OPTARG") ;;
|
||||||
|
h) usage; exit 0 ;;
|
||||||
|
*|?) usage; exit 1 ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
shift $((OPTIND - 1))
|
||||||
|
|
||||||
|
check_root
|
||||||
|
|
||||||
|
[[ -f PKGBUILD ]] || { error "No PKGBUILD in current directory."; exit 1; }
|
||||||
|
|
||||||
|
# without arguments, get list of packages from PKGBUILD
|
||||||
|
if [[ -z $1 ]]; then
|
||||||
|
mapfile -t pkgnames < <(source PKGBUILD; pacman -Sddp --print-format '%r/%n' "${pkgname[@]}")
|
||||||
|
wait $! || {
|
||||||
|
error "No package file specified and failed to retrieve package names from './PKGBUILD'."
|
||||||
|
plain "Try '${BASH_SOURCE[0]##*/} -h' for more information." >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
msg "Reproducing all pkgnames listed in ./PKGBUILD"
|
||||||
|
set -- "${pkgnames[@]}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# check each package to see if it's a file, and if not, try to download it
|
||||||
|
# using pacman -Sw, and get the filename from there
|
||||||
|
splitpkgs=()
|
||||||
|
for p in "$@"; do
|
||||||
|
if [[ -f ${p} ]]; then
|
||||||
|
splitpkgs+=("${p}")
|
||||||
|
else
|
||||||
|
pkgfile_remote=$(pacman -Sddp "${p}" 2>/dev/null) || { error "package name '%s' not in repos" "${p}"; exit 1; }
|
||||||
|
pkgfile=${pkgfile_remote#file://}
|
||||||
|
if [[ ! -f ${pkgfile} ]]; then
|
||||||
|
msg "Downloading package '%s' into pacman's cache" "${pkgfile}"
|
||||||
|
sudo pacman -Swdd --noconfirm --logfile /dev/null "${p}" || exit 1
|
||||||
|
pkgfile_remote=$(pacman -Sddp "${p}" 2>/dev/null)
|
||||||
|
pkgfile="${pkgfile_remote#file://}"
|
||||||
|
fi
|
||||||
|
splitpkgs+=("${pkgfile}")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
for f in "${splitpkgs[@]}"; do
|
||||||
|
if ! bsdtar -tqf "${f}" .BUILDINFO >/dev/null 2>&1; then
|
||||||
|
error "file is not a valid pacman package: '%s'" "${f}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if (( ${#cache_dirs[@]} == 0 )); then
|
||||||
|
mapfile -t cache_dirs < <(pacman-conf CacheDir)
|
||||||
|
fi
|
||||||
|
|
||||||
|
ORIG_HOME=${HOME}
|
||||||
|
IFS=: read -r _ _ _ _ _ HOME _ < <(getent passwd "${SUDO_USER:-$USER}")
|
||||||
|
load_makepkg_config
|
||||||
|
HOME=${ORIG_HOME}
|
||||||
|
[[ -d ${SRCDEST} ]] || SRCDEST=${PWD}
|
||||||
|
|
||||||
|
parse_buildinfo < <(bsdtar -xOqf "${splitpkgs[0]}" .BUILDINFO)
|
||||||
|
export SOURCE_DATE_EPOCH="${buildinfo[builddate]}"
|
||||||
|
PACKAGER="${buildinfo[packager]}"
|
||||||
|
BUILDDIR="${buildinfo[builddir]}"
|
||||||
|
PKGEXT=${splitpkgs[0]#${splitpkgs[0]%.pkg.tar*}}
|
||||||
|
|
||||||
|
# nuke and restore reproducible testenv
|
||||||
|
for copy in "${buildroot}"/*/; do
|
||||||
|
[[ -d ${copy} ]] || continue
|
||||||
|
subvolume_delete_recursive "${copy}"
|
||||||
|
done
|
||||||
|
rm -rf --one-file-system "${buildroot}"
|
||||||
|
(umask 0022; mkdir -p "${buildroot}")
|
||||||
|
|
||||||
|
for fname in "${installed[@]}"; do
|
||||||
|
if ! allpkgfiles+=("$(get_pkgfile "${fname}")"); then
|
||||||
|
error "failed to retrieve ${fname}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
printf '%s\n' "${allpkgfiles[@]}" | mkarchroot -M @pkgdatadir@/makepkg-x86_64.conf -U "${archroot_args[@]}" "${buildroot}"/root - || exit 1
|
||||||
|
|
||||||
|
# use makechrootpkg to prep the build directory
|
||||||
|
makechrootpkg -r "${buildroot}" -l "${chroot}" -- --packagelist || exit 1
|
||||||
|
|
||||||
|
# set detected makepkg.conf options
|
||||||
|
{
|
||||||
|
for var in PACKAGER BUILDDIR PKGEXT; do
|
||||||
|
printf '%s=%s\n' "${var}" "${!var@Q}"
|
||||||
|
done
|
||||||
|
printf 'OPTIONS=(%s)\n' "${buildopts[*]@Q}"
|
||||||
|
printf 'BUILDENV=(%s)\n' "${buildenv[*]@Q}"
|
||||||
|
} >> "${buildroot}/${chroot}"/etc/makepkg.conf >> "${buildroot}/${chroot}"/etc/makepkg.conf
|
||||||
|
install -d -o "${SUDO_UID:-$UID}" -g "$(id -g "${SUDO_UID:-$UID}")" "${buildroot}/${chroot}/${BUILDDIR}"
|
||||||
|
|
||||||
|
# kick off the build
|
||||||
|
arch-nspawn "${buildroot}/${chroot}" \
|
||||||
|
--bind="${PWD}:/startdir" \
|
||||||
|
--bind="${SRCDEST}:/srcdest" \
|
||||||
|
/chrootbuild -C --noconfirm --log --holdver --skipinteg
|
||||||
|
ret=$?
|
||||||
|
|
||||||
|
if (( ${ret} == 0 )); then
|
||||||
|
msg2 "built succeeded! built packages can be found in ${buildroot}/${chroot}/pkgdest"
|
||||||
|
msg "comparing artifacts..."
|
||||||
|
|
||||||
|
for pkgfile in "${splitpkgs[@]}"; do
|
||||||
|
comparefiles=("${pkgfile}" "${buildroot}/${chroot}/pkgdest/${pkgfile##*/}")
|
||||||
|
if cmp -s "${comparefiles[@]}"; then
|
||||||
|
msg2 "Package '%s' successfully reproduced!" "${pkgfile}"
|
||||||
|
else
|
||||||
|
ret=1
|
||||||
|
warning "Package '%s' is not reproducible. :(" "${pkgfile}"
|
||||||
|
sha256sum "${comparefiles[@]}"
|
||||||
|
if (( diffoscope )); then
|
||||||
|
diffoscope "${comparefiles[@]}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
# return failure from chrootbuild, or the reproducibility status
|
||||||
|
exit ${ret}
|
|
@ -18,6 +18,7 @@ m4_include(lib/archroot.sh)
|
||||||
umask 0022
|
umask 0022
|
||||||
|
|
||||||
working_dir=''
|
working_dir=''
|
||||||
|
umode=''
|
||||||
|
|
||||||
files=()
|
files=()
|
||||||
nspawn_args=()
|
nspawn_args=()
|
||||||
|
@ -25,6 +26,7 @@ nspawn_args=()
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage: ${0##*/} [options] working-dir package-list..."
|
echo "Usage: ${0##*/} [options] working-dir package-list..."
|
||||||
echo ' options:'
|
echo ' options:'
|
||||||
|
echo ' -U Use pacman -U to install packages'
|
||||||
echo ' -C <file> Location of a pacman config file'
|
echo ' -C <file> Location of a pacman config file'
|
||||||
echo ' -M <file> Location of a makepkg config file'
|
echo ' -M <file> Location of a makepkg config file'
|
||||||
echo ' -c <dir> Set pacman cache'
|
echo ' -c <dir> Set pacman cache'
|
||||||
|
@ -34,8 +36,9 @@ usage() {
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
while getopts 'hC:M:c:f:s' arg; do
|
while getopts 'hUC:M:c:f:s' arg; do
|
||||||
case "$arg" in
|
case "$arg" in
|
||||||
|
U) umode=U ;;
|
||||||
C) pac_conf="$OPTARG" ;;
|
C) pac_conf="$OPTARG" ;;
|
||||||
M) makepkg_conf="$OPTARG" ;;
|
M) makepkg_conf="$OPTARG" ;;
|
||||||
c) cache_dirs+=("$OPTARG") ;;
|
c) cache_dirs+=("$OPTARG") ;;
|
||||||
|
@ -44,8 +47,10 @@ while getopts 'hC:M:c:f:s' arg; do
|
||||||
h|?) usage ;;
|
h|?) usage ;;
|
||||||
*) error "invalid argument '%s'" "$arg"; usage ;;
|
*) error "invalid argument '%s'" "$arg"; usage ;;
|
||||||
esac
|
esac
|
||||||
nspawn_args+=("-$arg")
|
if [[ $arg != U ]]; then
|
||||||
[[ -v OPTARG ]] && nspawn_args+=("$OPTARG")
|
nspawn_args+=("-$arg")
|
||||||
|
[[ -v OPTARG ]] && nspawn_args+=("$OPTARG")
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
shift $((OPTIND - 1))
|
shift $((OPTIND - 1))
|
||||||
|
|
||||||
|
@ -85,7 +90,7 @@ for file in "${files[@]}"; do
|
||||||
cp "$file" "$working_dir$file"
|
cp "$file" "$working_dir$file"
|
||||||
done
|
done
|
||||||
|
|
||||||
pacstrap -Mcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
|
pacstrap -${umode}Mcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
|
||||||
"${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
|
"${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
|
||||||
|
|
||||||
printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
|
printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
|
||||||
|
|
|
@ -18,11 +18,13 @@
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
source /usr/share/makepkg/util/config.sh
|
||||||
|
|
||||||
|
|
||||||
# global defaults suitable for use by Arch staff
|
# global defaults suitable for use by Arch staff
|
||||||
repo=extra
|
repo=extra
|
||||||
arch=x86_64
|
arch=x86_64
|
||||||
server=dragon.archlinux.org
|
server=build.archlinux.org
|
||||||
|
|
||||||
die() { printf "error: $1\n" "${@:2}"; exit 1; }
|
die() { printf "error: $1\n" "${@:2}"; exit 1; }
|
||||||
|
|
||||||
|
@ -72,25 +74,34 @@ while (( $# )); do
|
||||||
done
|
done
|
||||||
|
|
||||||
# multilib must be handled specially
|
# multilib must be handled specially
|
||||||
|
archbuild_arch="${arch}"
|
||||||
if [[ $repo = multilib* ]]; then
|
if [[ $repo = multilib* ]]; then
|
||||||
arch=
|
archbuild_arch=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
archbuild_cmd=("${repo}${arch:+-$arch}-build" "$@")
|
archbuild_cmd=("${repo}${archbuild_arch:+-$archbuild_arch}-build" "$@")
|
||||||
|
|
||||||
trap 'rm -rf $SRCPKGDEST' EXIT
|
trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
|
||||||
|
|
||||||
|
# Load makepkg.conf variables to be available
|
||||||
|
load_makepkg_config
|
||||||
|
|
||||||
# Use a source-only tarball as an intermediate to transfer files. This
|
# Use a source-only tarball as an intermediate to transfer files. This
|
||||||
# guarantees the checksums are okay, and guarantees that all needed files are
|
# guarantees the checksums are okay, and guarantees that all needed files are
|
||||||
# transferred, including local sources, install scripts, and changelogs.
|
# transferred, including local sources, install scripts, and changelogs.
|
||||||
export SRCPKGDEST=$(mktemp -d)
|
export TEMPDIR=$(mktemp -d --tmpdir offload-build.XXXXXXXXXX)
|
||||||
|
export SRCPKGDEST=${TEMPDIR}
|
||||||
makepkg --source || die "unable to make source package"
|
makepkg --source || die "unable to make source package"
|
||||||
|
|
||||||
|
# Temporary cosmetic workaround makepkg if SRCDEST is set somewhere else
|
||||||
|
# but an empty src dir is created in PWD. Remove once fixed in makepkg.
|
||||||
|
rmdir --ignore-fail-on-non-empty src 2>/dev/null || true
|
||||||
|
|
||||||
mapfile -t files < <(
|
mapfile -t files < <(
|
||||||
# This is sort of bash golfing but it allows running a mildly complex
|
# This is sort of bash golfing but it allows running a mildly complex
|
||||||
# command over ssh with a single connection.
|
# command over ssh with a single connection.
|
||||||
# shellcheck disable=SC2145
|
# shellcheck disable=SC2145
|
||||||
cat "$SRCPKGDEST"/*.src.tar.gz |
|
cat "$SRCPKGDEST"/*"$SRCEXT" |
|
||||||
ssh $server '
|
ssh $server '
|
||||||
temp="${XDG_CACHE_HOME:-$HOME/.cache}/offload-build" &&
|
temp="${XDG_CACHE_HOME:-$HOME/.cache}/offload-build" &&
|
||||||
mkdir -p "$temp" &&
|
mkdir -p "$temp" &&
|
||||||
|
@ -102,7 +113,21 @@ mapfile -t files < <(
|
||||||
printf "%s\n" "" "-> build complete" &&
|
printf "%s\n" "" "-> build complete" &&
|
||||||
printf "\t%s\n" "$temp"/*
|
printf "\t%s\n" "$temp"/*
|
||||||
} >&2 &&
|
} >&2 &&
|
||||||
makepkg --packagelist
|
makepkg_user_config="${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" &&
|
||||||
|
makepkg_config="/usr/share/devtools/makepkg-'"${arch}"'.conf" &&
|
||||||
|
if [[ -f /usr/share/devtools/makepkg-'"${repo}"'-'"${arch}"'.conf ]]; then
|
||||||
|
makepkg_config="/usr/share/devtools/makepkg-'"${repo}"'-'"${arch}"'.conf"
|
||||||
|
fi &&
|
||||||
|
makepkg --config <(cat "${makepkg_user_config}" "${makepkg_config}" 2>/dev/null) --packagelist &&
|
||||||
|
printf "%s\n" "${temp}/PKGBUILD"
|
||||||
')
|
')
|
||||||
|
|
||||||
(( ${#files[@]} )) && printf '%s\n' '' '-> copying files...' && scp "${files[@]/#/$server:}" .
|
|
||||||
|
if (( ${#files[@]} )); then
|
||||||
|
printf '%s\n' '' '-> copying files...'
|
||||||
|
scp "${files[@]/#/$server:}" "${TEMPDIR}/"
|
||||||
|
mv "${TEMPDIR}"/*.pkg.tar* "${PKGDEST:-${PWD}}/"
|
||||||
|
mv "${TEMPDIR}/PKGBUILD" "${PWD}/"
|
||||||
|
else
|
||||||
|
exit 1
|
||||||
|
fi
|
|
@ -16,10 +16,9 @@
|
||||||
#GPGDir = /etc/pacman.d/gnupg/
|
#GPGDir = /etc/pacman.d/gnupg/
|
||||||
#HookDir = /etc/pacman.d/hooks/
|
#HookDir = /etc/pacman.d/hooks/
|
||||||
HoldPkg = pacman glibc
|
HoldPkg = pacman glibc
|
||||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
|
||||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||||
#CleanMethod = KeepInstalled
|
#CleanMethod = KeepInstalled
|
||||||
#UseDelta = 0.7
|
|
||||||
Architecture = auto
|
Architecture = auto
|
||||||
|
|
||||||
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
||||||
|
@ -90,4 +89,3 @@ Include = /etc/pacman.d/mirrorlist
|
||||||
#[custom]
|
#[custom]
|
||||||
#SigLevel = Optional TrustAll
|
#SigLevel = Optional TrustAll
|
||||||
#Server = file:///home/custompkgs
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
|
|
|
@ -16,10 +16,9 @@
|
||||||
#GPGDir = /etc/pacman.d/gnupg/
|
#GPGDir = /etc/pacman.d/gnupg/
|
||||||
#HookDir = /etc/pacman.d/hooks/
|
#HookDir = /etc/pacman.d/hooks/
|
||||||
HoldPkg = pacman glibc
|
HoldPkg = pacman glibc
|
||||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
|
||||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||||
#CleanMethod = KeepInstalled
|
#CleanMethod = KeepInstalled
|
||||||
#UseDelta = 0.7
|
|
||||||
Architecture = auto
|
Architecture = auto
|
||||||
|
|
||||||
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
||||||
|
@ -99,4 +98,3 @@ Include = /etc/pacman.d/mirrorlist
|
||||||
#[custom]
|
#[custom]
|
||||||
#SigLevel = Optional TrustAll
|
#SigLevel = Optional TrustAll
|
||||||
#Server = file:///home/custompkgs
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
|
|
|
@ -16,10 +16,9 @@
|
||||||
#GPGDir = /etc/pacman.d/gnupg/
|
#GPGDir = /etc/pacman.d/gnupg/
|
||||||
#HookDir = /etc/pacman.d/hooks/
|
#HookDir = /etc/pacman.d/hooks/
|
||||||
HoldPkg = pacman glibc
|
HoldPkg = pacman glibc
|
||||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
|
||||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||||
#CleanMethod = KeepInstalled
|
#CleanMethod = KeepInstalled
|
||||||
#UseDelta = 0.7
|
|
||||||
Architecture = auto
|
Architecture = auto
|
||||||
|
|
||||||
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
||||||
|
@ -93,4 +92,3 @@ Include = /etc/pacman.d/mirrorlist
|
||||||
#[custom]
|
#[custom]
|
||||||
#SigLevel = Optional TrustAll
|
#SigLevel = Optional TrustAll
|
||||||
#Server = file:///home/custompkgs
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
|
|
|
@ -16,10 +16,9 @@
|
||||||
#GPGDir = /etc/pacman.d/gnupg/
|
#GPGDir = /etc/pacman.d/gnupg/
|
||||||
#HookDir = /etc/pacman.d/hooks/
|
#HookDir = /etc/pacman.d/hooks/
|
||||||
HoldPkg = pacman glibc
|
HoldPkg = pacman glibc
|
||||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
|
||||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||||
#CleanMethod = KeepInstalled
|
#CleanMethod = KeepInstalled
|
||||||
#UseDelta = 0.7
|
|
||||||
Architecture = auto
|
Architecture = auto
|
||||||
|
|
||||||
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
||||||
|
@ -107,4 +106,3 @@ Include = /etc/pacman.d/mirrorlist
|
||||||
#[custom]
|
#[custom]
|
||||||
#SigLevel = Optional TrustAll
|
#SigLevel = Optional TrustAll
|
||||||
#Server = file:///home/custompkgs
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
|
|
|
@ -16,10 +16,9 @@
|
||||||
#GPGDir = /etc/pacman.d/gnupg/
|
#GPGDir = /etc/pacman.d/gnupg/
|
||||||
#HookDir = /etc/pacman.d/hooks/
|
#HookDir = /etc/pacman.d/hooks/
|
||||||
HoldPkg = pacman glibc
|
HoldPkg = pacman glibc
|
||||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
|
||||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||||
#CleanMethod = KeepInstalled
|
#CleanMethod = KeepInstalled
|
||||||
#UseDelta = 0.7
|
|
||||||
Architecture = auto
|
Architecture = auto
|
||||||
|
|
||||||
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
||||||
|
@ -98,4 +97,3 @@ Include = /etc/pacman.d/mirrorlist
|
||||||
#[custom]
|
#[custom]
|
||||||
#SigLevel = Optional TrustAll
|
#SigLevel = Optional TrustAll
|
||||||
#Server = file:///home/custompkgs
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
|
|
|
@ -16,10 +16,9 @@
|
||||||
#GPGDir = /etc/pacman.d/gnupg/
|
#GPGDir = /etc/pacman.d/gnupg/
|
||||||
#HookDir = /etc/pacman.d/hooks/
|
#HookDir = /etc/pacman.d/hooks/
|
||||||
HoldPkg = pacman glibc
|
HoldPkg = pacman glibc
|
||||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
|
||||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||||
#CleanMethod = KeepInstalled
|
#CleanMethod = KeepInstalled
|
||||||
#UseDelta = 0.7
|
|
||||||
Architecture = auto
|
Architecture = auto
|
||||||
|
|
||||||
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
||||||
|
@ -99,4 +98,3 @@ Include = /etc/pacman.d/mirrorlist
|
||||||
#[custom]
|
#[custom]
|
||||||
#SigLevel = Optional TrustAll
|
#SigLevel = Optional TrustAll
|
||||||
#Server = file:///home/custompkgs
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
|
|
|
@ -16,10 +16,9 @@
|
||||||
#GPGDir = /etc/pacman.d/gnupg/
|
#GPGDir = /etc/pacman.d/gnupg/
|
||||||
#HookDir = /etc/pacman.d/hooks/
|
#HookDir = /etc/pacman.d/hooks/
|
||||||
HoldPkg = pacman glibc
|
HoldPkg = pacman glibc
|
||||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
|
||||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||||
#CleanMethod = KeepInstalled
|
#CleanMethod = KeepInstalled
|
||||||
#UseDelta = 0.7
|
|
||||||
Architecture = auto
|
Architecture = auto
|
||||||
|
|
||||||
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
||||||
|
@ -96,4 +95,3 @@ Include = /etc/pacman.d/mirrorlist
|
||||||
#[custom]
|
#[custom]
|
||||||
#SigLevel = Optional TrustAll
|
#SigLevel = Optional TrustAll
|
||||||
#Server = file:///home/custompkgs
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
|
|
|
@ -16,10 +16,9 @@
|
||||||
#GPGDir = /etc/pacman.d/gnupg/
|
#GPGDir = /etc/pacman.d/gnupg/
|
||||||
#HookDir = /etc/pacman.d/hooks/
|
#HookDir = /etc/pacman.d/hooks/
|
||||||
HoldPkg = pacman glibc
|
HoldPkg = pacman glibc
|
||||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
|
||||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||||
#CleanMethod = KeepInstalled
|
#CleanMethod = KeepInstalled
|
||||||
#UseDelta = 0.7
|
|
||||||
Architecture = auto
|
Architecture = auto
|
||||||
|
|
||||||
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
||||||
|
@ -90,4 +89,3 @@ Include = /etc/pacman.d/mirrorlist
|
||||||
#[custom]
|
#[custom]
|
||||||
#SigLevel = Optional TrustAll
|
#SigLevel = Optional TrustAll
|
||||||
#Server = file:///home/custompkgs
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
|
|
|
@ -21,10 +21,8 @@
|
||||||
# globals
|
# globals
|
||||||
: ${SOLINKS_MIRROR:="https://mirror.pkgbuild.com"}
|
: ${SOLINKS_MIRROR:="https://mirror.pkgbuild.com"}
|
||||||
: ${SOCACHE_DIR:="${XDG_CACHE_HOME:-${HOME}/.cache}/sogrep"}
|
: ${SOCACHE_DIR:="${XDG_CACHE_HOME:-${HOME}/.cache}/sogrep"}
|
||||||
repos=('staging' 'testing' 'core' 'extra'
|
|
||||||
'community-staging' 'community-testing' 'community'
|
m4_include(lib/valid-repos.sh)
|
||||||
'multilib-staging' 'multilib-testing' 'multilib'
|
|
||||||
'gnome-unstable' 'kde-unstable')
|
|
||||||
arches=('x86_64')
|
arches=('x86_64')
|
||||||
|
|
||||||
# options
|
# options
|
||||||
|
@ -39,20 +37,20 @@ recache() {
|
||||||
|
|
||||||
(( VERBOSE )) && verbosity=--progress-bar
|
(( VERBOSE )) && verbosity=--progress-bar
|
||||||
|
|
||||||
for repo in "${repos[@]}"; do
|
for repo in "${_repos[@]}"; do
|
||||||
for arch in "${arches[@]}"; do
|
for arch in "${arches[@]}"; do
|
||||||
rm -rf "${SOCACHE_DIR}/${arch}/${repo}"
|
rm -rf "${SOCACHE_DIR}/${arch}/${repo}"
|
||||||
mkdir -p "${SOCACHE_DIR}/${arch}/${repo}"
|
mkdir -p "${SOCACHE_DIR}/${arch}/${repo}"
|
||||||
curl "$verbosity" "${SOLINKS_MIRROR}/${repo}/os/${arch}/${repo}.links.tar.gz" | bsdtar -xf - -C "${SOCACHE_DIR}/${arch}/${repo}"
|
curl -L "$verbosity" "${SOLINKS_MIRROR}/${repo}/os/${arch}/${repo}.links.tar.gz" | bsdtar -xf - -C "${SOCACHE_DIR}/${arch}/${repo}"
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
search() {
|
search() {
|
||||||
local repo=$1 arch lib=$2 srepos=("${repos[@]}")
|
local repo=$1 arch lib=$2 srepos=("${_repos[@]}")
|
||||||
|
|
||||||
if [[ $repo != all ]]; then
|
if [[ $repo != all ]]; then
|
||||||
if ! in_array "${repo}" "${repos[@]}"; then
|
if ! in_array "${repo}" "${_repos[@]}"; then
|
||||||
echo "${BASH_SOURCE[0]##*/}: unrecognized repo '$repo'"
|
echo "${BASH_SOURCE[0]##*/}: unrecognized repo '$repo'"
|
||||||
echo "Try '${BASH_SOURCE[0]##*/} --help' for more information."
|
echo "Try '${BASH_SOURCE[0]##*/} --help' for more information."
|
||||||
exit 1
|
exit 1
|
|
@ -1,11 +1,15 @@
|
||||||
#compdef archbuild archco arch-nspawn archrelease commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco
|
#compdef archbuild archco arch-nspawn archrelease commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco checkpkg sogrep offload-build makerepropkg
|
||||||
# License: Unspecified
|
# License: Unspecified
|
||||||
|
|
||||||
m4_include(lib/valid-tags.sh)
|
m4_include(lib/valid-tags.sh)
|
||||||
|
m4_include(lib/valid-repos.sh)
|
||||||
|
|
||||||
|
_binary_arch=${_arch[*]:0:-1}
|
||||||
|
|
||||||
_archbuild_args=(
|
_archbuild_args=(
|
||||||
'-c[Recreate the chroot before building]'
|
'-c[Recreate the chroot before building]'
|
||||||
'-r[Create chroots in this directory]:base_dir:_files -/'
|
'-r[Create chroots in this directory]:base_dir:_files -/'
|
||||||
|
'-h[Display usage]'
|
||||||
)
|
)
|
||||||
|
|
||||||
_archco_args=(
|
_archco_args=(
|
||||||
|
@ -13,19 +17,25 @@ _archco_args=(
|
||||||
)
|
)
|
||||||
|
|
||||||
_arch_nspawn_args=(
|
_arch_nspawn_args=(
|
||||||
'-C[Location of a pacman config file]:pacman_config:_files'
|
'-C[Location of a pacman config file]:pacman_config:_files -g "*.conf(.)"'
|
||||||
'-M[Location of a makepkg config file]:makepkg_config:_files'
|
'-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
|
||||||
'-c[Set pacman cache]:pacman_cache:_files -/'
|
'-c[Set pacman cache]:pacman_cache:_files -/'
|
||||||
|
'-f[Copy file from the host to the chroot]:copy_file:_files'
|
||||||
|
'-s[Do not run setarch]'
|
||||||
'-h[Display usage]'
|
'-h[Display usage]'
|
||||||
|
'1:chroot_dir:_files -/'
|
||||||
)
|
)
|
||||||
|
|
||||||
_archrelease_args=(
|
_archrelease_args=(
|
||||||
|
'-f[Force release without checks]'
|
||||||
"*:arch:($_tags[*])"
|
"*:arch:($_tags[*])"
|
||||||
)
|
)
|
||||||
|
|
||||||
_commitpkg_args=(
|
_commitpkg_args=(
|
||||||
"-a[Release to a specific architecture only]:arch:($_arch[*])"
|
'-f[Force release without checks]'
|
||||||
|
'-s[Target repo server]'
|
||||||
'-l[Set bandwidth limit]:limit'
|
'-l[Set bandwidth limit]:limit'
|
||||||
|
"-a[Release to a specific architecture only]:arch:($_arch[*])"
|
||||||
'1:commit_msg'
|
'1:commit_msg'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -34,19 +44,27 @@ _finddeps_args=(
|
||||||
)
|
)
|
||||||
|
|
||||||
_makechrootpkg_args=(
|
_makechrootpkg_args=(
|
||||||
'-I[Install a package into the working copy]:target:_files -g "*.pkg.tar.*(.)"'
|
|
||||||
'-c[Clean the chroot before building]'
|
|
||||||
'-h[Display usage]'
|
'-h[Display usage]'
|
||||||
'-l[The directory to use as the working copy]:copy_dir:_files -/'
|
'-c[Clean the chroot before building]'
|
||||||
'-r[The chroot dir to use]:chroot_dir:_files -/'
|
'-d[Bind directory into build chroot as read-write]:bind_dir_rw:_files -/'
|
||||||
|
'-D[Bind directory into build chroot as read-only]:bind_dir_ro:_files -/'
|
||||||
'-u[Update the working copy of the chroot before building]'
|
'-u[Update the working copy of the chroot before building]'
|
||||||
|
'-r[The chroot dir to use]:chroot_dir:_files -/'
|
||||||
|
'-I[Install a package into the working copy]:target:_files -g "*.pkg.tar.*(.)"'
|
||||||
|
'-l[The directory to use as the working copy]:copy_dir:_files -/'
|
||||||
|
'-n[Run namcap on the package]'
|
||||||
|
'-T[Build in a temporary directory]'
|
||||||
|
'-U[Run makepkg as a specified user]:makepkg_user'
|
||||||
)
|
)
|
||||||
|
|
||||||
_mkarchroot_args=(
|
_mkarchroot_args=(
|
||||||
'-C[Location of a pacman config file]:pacman_config:_files'
|
'-U[Install a package into the working copy]:target:_files -g "*.pkg.tar.*(.)"'
|
||||||
'-M[Location of a makepkg config file]:makepkg_config:_files'
|
'-C[Location of a pacman config file]:pacman_config:_files -g "*.conf(.)"'
|
||||||
|
'-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
|
||||||
'-c[Set pacman cache]:pacman_cache:_files -/'
|
'-c[Set pacman cache]:pacman_cache:_files -/'
|
||||||
'-h[Display usage]'
|
'-h[Display usage]'
|
||||||
|
'1:working_dir:_files -/'
|
||||||
|
'*:packages:_devtools_completions_all_packages'
|
||||||
)
|
)
|
||||||
|
|
||||||
_rebuildpkgs_args=(
|
_rebuildpkgs_args=(
|
||||||
|
@ -54,6 +72,35 @@ _rebuildpkgs_args=(
|
||||||
'*:packages:_devtools_completions_all_packages'
|
'*: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]'
|
||||||
|
'(-h --help)'{-h,--help}'[Display usage]'
|
||||||
|
)
|
||||||
|
|
||||||
|
_sogrep_args=(
|
||||||
|
'(-v --verbose)'{-v,--verbose}'[Show matched links in addition to pkgname]'
|
||||||
|
'(-r --refresh)'{-r,--refresh}'[Refresh the links databases]'
|
||||||
|
'(-h --help)'{-h,--help}'[Display usage]'
|
||||||
|
'1:repo:(all $_repos[*])'
|
||||||
|
'2:libname'
|
||||||
|
)
|
||||||
|
|
||||||
|
_offload_build_args=(
|
||||||
|
'(-r --repo)'{-r,--repo}'[Build against a specific repository]:repo:($_build_repos[*])'
|
||||||
|
'(-a --arch)'{-a,--arch}'[Build against a specific architecture]:arch:(${_binary_arch[*]})'
|
||||||
|
'(-s --server)'{-s,--server}'[Offload to a specific Build server]:server:'
|
||||||
|
'(-h --help)'{-h,--help}'[Display usage]'
|
||||||
|
)
|
||||||
|
|
||||||
|
_makerepropkg_args=(
|
||||||
|
'-d[Run diffoscope if the package is unreproducible]'
|
||||||
|
'-c[Set pacman cache]:pacman_cache:_files -/'
|
||||||
|
'-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
|
||||||
|
'-h[Display usage]'
|
||||||
|
'*:working_dir:_files -g "*.pkg.tar.*(.)"'
|
||||||
|
)
|
||||||
|
|
||||||
_devtools_completions_all_packages() {
|
_devtools_completions_all_packages() {
|
||||||
typeset -U packages
|
typeset -U packages
|
||||||
packages=($(_call_program packages pacman -Sql))
|
packages=($(_call_program packages pacman -Sql))
|
||||||
|
|
Loading…
Reference in New Issue