mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-14 18:36:18 +02:00
Compare commits
1 Commits
64790b4fb6
...
make-warni
Author | SHA1 | Date | |
---|---|---|---|
![]() |
287d2b4064 |
@@ -150,7 +150,6 @@ _pkgctl_cmds=(
|
||||
db
|
||||
diff
|
||||
issue
|
||||
license
|
||||
release
|
||||
repo
|
||||
search
|
||||
|
@@ -79,9 +79,6 @@ Options
|
||||
*-x* <when>::
|
||||
Inspect chroot after build, possible modes are 'never' (default), 'always' or 'failure'
|
||||
|
||||
*-s* <args>::
|
||||
Additional systemd-nspawn args (comma-separated) for the arch-nspawn build phase
|
||||
|
||||
See Also
|
||||
--------
|
||||
|
||||
|
@@ -123,10 +123,9 @@ fi
|
||||
needsversioning=()
|
||||
|
||||
if [[ ! -e REUSE.toml || ! -e LICENSE || ! -d LICENSES ]]; then
|
||||
# TODO: Make this a hard failure in the future after packagers have had
|
||||
# some time to add licenses to all packages.
|
||||
warning "package doesn't have proper licensing information, set it up using:"
|
||||
error "package doesn't have proper licensing information, set it up using:"
|
||||
msg2 'pkgctl license setup'
|
||||
exit 1
|
||||
else
|
||||
pkgctl license check
|
||||
needsversioning+=(REUSE.toml LICENSE LICENSES/*)
|
||||
@@ -155,7 +154,7 @@ if (( ${#needsversioning[*]} )); then
|
||||
if [[ ! -f "${file}" ]]; then
|
||||
continue
|
||||
fi
|
||||
if ! git ls-files --error-unmatch "$file" >/dev/null; then
|
||||
if ! git ls-files --error-unmatch "$file"; then
|
||||
die "%s is not under version control" "$file"
|
||||
fi
|
||||
done
|
||||
|
@@ -188,13 +188,10 @@ path = [
|
||||
"README.md",
|
||||
"keys/**",
|
||||
".SRCINFO",
|
||||
".gitignore",
|
||||
".nvchecker.toml",
|
||||
"*.install",
|
||||
"*.sysusers",
|
||||
"*sysusers.conf",
|
||||
"*.tmpfiles",
|
||||
"*tmpfiles.conf",
|
||||
"*.logrotate",
|
||||
"*.pam",
|
||||
"*.service",
|
||||
|
@@ -39,7 +39,6 @@ inspect=never
|
||||
bindmounts_ro=()
|
||||
bindmounts_rw=()
|
||||
bindmounts_tmpfs=()
|
||||
nspawn_add_args=()
|
||||
|
||||
copy=$USER
|
||||
[[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
|
||||
@@ -85,8 +84,6 @@ usage() {
|
||||
echo '-T Build in a temporary directory'
|
||||
echo '-U Run makepkg as a specified user'
|
||||
echo '-x <when> Inspect chroot after build (never, always, failure)'
|
||||
echo '-s <args> Additional systemd-nspawn args (comma-separated) for'
|
||||
echo ' the arch-nspawn build phase'
|
||||
exit 1
|
||||
}
|
||||
|
||||
@@ -296,7 +293,7 @@ move_products() {
|
||||
}
|
||||
# }}}
|
||||
|
||||
while getopts 'hcur:I:l:nCTD:d:U:x:t:s:' arg; do
|
||||
while getopts 'hcur:I:l:nCTD:d:U:x:t:' arg; do
|
||||
case "$arg" in
|
||||
c) clean_first=1 ;;
|
||||
D) bindmounts_ro+=("--bind-ro=$OPTARG") ;;
|
||||
@@ -311,7 +308,6 @@ while getopts 'hcur:I:l:nCTD:d:U:x:t:s:' arg; do
|
||||
T) temp_chroot=1; copy+="-$$" ;;
|
||||
U) makepkg_user="$OPTARG" ;;
|
||||
x) inspect="$OPTARG" ;;
|
||||
s) IFS=, read -ra nspawn_add_args <<< "$OPTARG" ;;
|
||||
h|*) usage ;;
|
||||
esac
|
||||
done
|
||||
@@ -398,7 +394,6 @@ nspawn_build_args=(
|
||||
"${bindmounts_ro[@]}"
|
||||
"${bindmounts_rw[@]}"
|
||||
"${bindmounts_tmpfs[@]}"
|
||||
"${nspawn_add_args[@]}"
|
||||
)
|
||||
|
||||
if arch-nspawn "$copydir" \
|
||||
|
Reference in New Issue
Block a user