Compare commits
10 Commits
custom-202
...
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 |
|
@ -19,3 +19,4 @@ crossrepomove
|
||||||
arch-nspawn
|
arch-nspawn
|
||||||
sogrep
|
sogrep
|
||||||
doc/*.1
|
doc/*.1
|
||||||
|
doc/*.7
|
||||||
|
|
5
Makefile
5
Makefile
|
@ -1,4 +1,4 @@
|
||||||
V=20200407
|
V=20210202
|
||||||
|
|
||||||
PREFIX = /usr/local
|
PREFIX = /usr/local
|
||||||
MANDIR = $(PREFIX)/share/man
|
MANDIR = $(PREFIX)/share/man
|
||||||
|
@ -75,7 +75,8 @@ MANS = \
|
||||||
doc/makerepropkg.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
|
||||||
|
|
|
@ -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[]
|
|
@ -7,7 +7,7 @@ makerepropkg - Rebuild a package to see if it is reproducible
|
||||||
|
|
||||||
Synopsis
|
Synopsis
|
||||||
--------
|
--------
|
||||||
makerepropkg [OPTIONS] <package_file>...
|
makerepropkg [OPTIONS] [<package_file|pkgname>...]
|
||||||
|
|
||||||
Description
|
Description
|
||||||
-----------
|
-----------
|
||||||
|
@ -24,6 +24,15 @@ When given multiple packages, additional package files are assumed to be split
|
||||||
packages and will be treated as additional artifacts to compare during the
|
packages and will be treated as additional artifacts to compare during the
|
||||||
verification step.
|
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
|
This implements a verifier for pacman/libalpm packages in accordance with the
|
||||||
link:https://reproducible-builds.org/[Reproducible Builds] project.
|
link:https://reproducible-builds.org/[Reproducible Builds] project.
|
||||||
|
|
||||||
|
|
|
@ -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.
|
||||||
|
|
||||||
|
|
|
@ -242,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
|
||||||
|
@ -254,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"
|
||||||
|
@ -370,6 +374,7 @@ then
|
||||||
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"
|
||||||
|
|
|
@ -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:
|
||||||
|
|
|
@ -57,9 +57,15 @@ parse_buildinfo() {
|
||||||
get_pkgfile() {
|
get_pkgfile() {
|
||||||
local cdir=${cache_dirs[0]}
|
local cdir=${cache_dirs[0]}
|
||||||
local pkgfilebase=${1}
|
local pkgfilebase=${1}
|
||||||
|
local mode=${2}
|
||||||
local pkgname=${pkgfilebase%-*-*-*}
|
local pkgname=${pkgfilebase%-*-*-*}
|
||||||
local pkgfile ext
|
local pkgfile ext
|
||||||
|
|
||||||
|
# try without downloading
|
||||||
|
if [[ ${mode} != localonly ]] && get_pkgfile "${pkgfilebase}" localonly; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
for ext in .zst .xz ''; do
|
for ext in .zst .xz ''; do
|
||||||
pkgfile=${pkgfilebase}.pkg.tar${ext}
|
pkgfile=${pkgfilebase}.pkg.tar${ext}
|
||||||
|
|
||||||
|
@ -72,6 +78,9 @@ get_pkgfile() {
|
||||||
|
|
||||||
for f in "${pkgfile}" "${pkgfile}.sig"; do
|
for f in "${pkgfile}" "${pkgfile}.sig"; do
|
||||||
if [[ ! -f "${cdir}/${f}" ]]; then
|
if [[ ! -f "${cdir}/${f}" ]]; then
|
||||||
|
if [[ ${mode} = localonly ]]; then
|
||||||
|
continue 2
|
||||||
|
fi
|
||||||
msg2 "retrieving '%s'..." "${f}" >&2
|
msg2 "retrieving '%s'..." "${f}" >&2
|
||||||
curl -Llf -# -o "${cdir}/${f}" "${archiveurl}/${pkgname:0:1}/${pkgname}/${f}" || continue 2
|
curl -Llf -# -o "${cdir}/${f}" "${archiveurl}/${pkgname:0:1}/${pkgname}/${f}" || continue 2
|
||||||
fi
|
fi
|
||||||
|
@ -115,20 +124,46 @@ shift $((OPTIND - 1))
|
||||||
|
|
||||||
check_root
|
check_root
|
||||||
|
|
||||||
if [[ -n $1 ]]; then
|
[[ -f PKGBUILD ]] || { error "No PKGBUILD in current directory."; exit 1; }
|
||||||
pkgfile="$1"
|
|
||||||
splitpkgs=("$@")
|
# without arguments, get list of packages from PKGBUILD
|
||||||
for f in "${splitpkgs[@]}"; do
|
if [[ -z $1 ]]; then
|
||||||
if ! bsdtar -tqf "${f}" .BUILDINFO >/dev/null 2>&1; then
|
mapfile -t pkgnames < <(source PKGBUILD; pacman -Sddp --print-format '%r/%n' "${pkgname[@]}")
|
||||||
error "file is not a valid pacman package: '%s'" "${f}"
|
wait $! || {
|
||||||
exit 1
|
error "No package file specified and failed to retrieve package names from './PKGBUILD'."
|
||||||
fi
|
plain "Try '${BASH_SOURCE[0]##*/} -h' for more information." >&2
|
||||||
done
|
exit 1
|
||||||
else
|
}
|
||||||
error "no package file specified. Try '${BASH_SOURCE[0]##*/} -h' for more information. "
|
msg "Reproducing all pkgnames listed in ./PKGBUILD"
|
||||||
exit 1
|
set -- "${pkgnames[@]}"
|
||||||
fi
|
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
|
if (( ${#cache_dirs[@]} == 0 )); then
|
||||||
mapfile -t cache_dirs < <(pacman-conf CacheDir)
|
mapfile -t cache_dirs < <(pacman-conf CacheDir)
|
||||||
fi
|
fi
|
||||||
|
@ -139,11 +174,11 @@ load_makepkg_config
|
||||||
HOME=${ORIG_HOME}
|
HOME=${ORIG_HOME}
|
||||||
[[ -d ${SRCDEST} ]] || SRCDEST=${PWD}
|
[[ -d ${SRCDEST} ]] || SRCDEST=${PWD}
|
||||||
|
|
||||||
parse_buildinfo < <(bsdtar -xOqf "${pkgfile}" .BUILDINFO)
|
parse_buildinfo < <(bsdtar -xOqf "${splitpkgs[0]}" .BUILDINFO)
|
||||||
export SOURCE_DATE_EPOCH="${buildinfo[builddate]}"
|
export SOURCE_DATE_EPOCH="${buildinfo[builddate]}"
|
||||||
PACKAGER="${buildinfo[packager]}"
|
PACKAGER="${buildinfo[packager]}"
|
||||||
BUILDDIR="${buildinfo[builddir]}"
|
BUILDDIR="${buildinfo[builddir]}"
|
||||||
PKGEXT=${pkgfile#${pkgfile%.pkg.tar*}}
|
PKGEXT=${splitpkgs[0]#${splitpkgs[0]%.pkg.tar*}}
|
||||||
|
|
||||||
# nuke and restore reproducible testenv
|
# nuke and restore reproducible testenv
|
||||||
for copy in "${buildroot}"/*/; do
|
for copy in "${buildroot}"/*/; do
|
||||||
|
|
|
@ -24,7 +24,7 @@ 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; }
|
||||||
|
|
||||||
|
@ -83,6 +83,9 @@ archbuild_cmd=("${repo}${archbuild_arch:+-$archbuild_arch}-build" "$@")
|
||||||
|
|
||||||
trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
|
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.
|
||||||
|
@ -98,7 +101,7 @@ 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" &&
|
||||||
|
@ -122,7 +125,6 @@ mapfile -t files < <(
|
||||||
|
|
||||||
if (( ${#files[@]} )); then
|
if (( ${#files[@]} )); then
|
||||||
printf '%s\n' '' '-> copying files...'
|
printf '%s\n' '' '-> copying files...'
|
||||||
load_makepkg_config
|
|
||||||
scp "${files[@]/#/$server:}" "${TEMPDIR}/"
|
scp "${files[@]/#/$server:}" "${TEMPDIR}/"
|
||||||
mv "${TEMPDIR}"/*.pkg.tar* "${PKGDEST:-${PWD}}/"
|
mv "${TEMPDIR}"/*.pkg.tar* "${PKGDEST:-${PWD}}/"
|
||||||
mv "${TEMPDIR}/PKGBUILD" "${PWD}/"
|
mv "${TEMPDIR}/PKGBUILD" "${PWD}/"
|
||||||
|
|
Loading…
Reference in New Issue