mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-14 10:26:18 +02:00
Compare commits
1 Commits
8bdb066542
...
mr-origin-
Author | SHA1 | Date | |
---|---|---|---|
![]() |
ef6da62956 |
@@ -79,9 +79,6 @@ Options
|
|||||||
*-x* <when>::
|
*-x* <when>::
|
||||||
Inspect chroot after build, possible modes are 'never' (default), 'always' or 'failure'
|
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
|
See Also
|
||||||
--------
|
--------
|
||||||
|
|
||||||
|
@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
|
|||||||
if [[ ! -f "${file}" ]]; then
|
if [[ ! -f "${file}" ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
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"
|
die "%s is not under version control" "$file"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@@ -94,19 +94,19 @@ pkgctl_license_check() {
|
|||||||
pushd "${path}" >/dev/null
|
pushd "${path}" >/dev/null
|
||||||
|
|
||||||
if [[ ! -f PKGBUILD ]]; then
|
if [[ ! -f PKGBUILD ]]; then
|
||||||
msg_error "${BOLD}${pkgbase}:${ALL_OFF} no PKGBUILD found"
|
msg_error "${BOLD}${path}:${ALL_OFF} no PKGBUILD found"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# reset common PKGBUILD variables
|
if [[ ! -f .SRCINFO ]]; then
|
||||||
unset pkgbase
|
msg_error "${BOLD}${path}:${ALL_OFF} no .SRCINFO found"
|
||||||
|
return 1
|
||||||
# shellcheck source=contrib/makepkg/PKGBUILD.proto
|
fi
|
||||||
if ! . ./PKGBUILD; then
|
|
||||||
msg_error "${BOLD}${pkgbase}:${ALL_OFF} failed to source PKGBUILD"
|
if ! pkgbase=$(grep --max-count=1 --extended-regexp "pkgbase = (.+)" .SRCINFO | awk '{print $3}'); then
|
||||||
|
msg_error "${BOLD}${path}:${ALL_OFF} pkgbase not found in .SRCINFO"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
pkgbase=${pkgbase:-$pkgname}
|
|
||||||
|
|
||||||
if [[ ! -e LICENSE ]]; then
|
if [[ ! -e LICENSE ]]; then
|
||||||
msg_error "${BOLD}${pkgbase}:${ALL_OFF} is missing the LICENSE file"
|
msg_error "${BOLD}${pkgbase}:${ALL_OFF} is missing the LICENSE file"
|
||||||
|
@@ -191,9 +191,7 @@ path = [
|
|||||||
".nvchecker.toml",
|
".nvchecker.toml",
|
||||||
"*.install",
|
"*.install",
|
||||||
"*.sysusers",
|
"*.sysusers",
|
||||||
"*sysusers.conf",
|
|
||||||
"*.tmpfiles",
|
"*.tmpfiles",
|
||||||
"*tmpfiles.conf",
|
|
||||||
"*.logrotate",
|
"*.logrotate",
|
||||||
"*.pam",
|
"*.pam",
|
||||||
"*.service",
|
"*.service",
|
||||||
|
@@ -39,7 +39,6 @@ inspect=never
|
|||||||
bindmounts_ro=()
|
bindmounts_ro=()
|
||||||
bindmounts_rw=()
|
bindmounts_rw=()
|
||||||
bindmounts_tmpfs=()
|
bindmounts_tmpfs=()
|
||||||
nspawn_add_args=()
|
|
||||||
|
|
||||||
copy=$USER
|
copy=$USER
|
||||||
[[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
|
[[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
|
||||||
@@ -85,8 +84,6 @@ usage() {
|
|||||||
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'
|
||||||
echo '-x <when> Inspect chroot after build (never, always, failure)'
|
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
|
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
|
case "$arg" in
|
||||||
c) clean_first=1 ;;
|
c) clean_first=1 ;;
|
||||||
D) bindmounts_ro+=("--bind-ro=$OPTARG") ;;
|
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+="-$$" ;;
|
T) temp_chroot=1; copy+="-$$" ;;
|
||||||
U) makepkg_user="$OPTARG" ;;
|
U) makepkg_user="$OPTARG" ;;
|
||||||
x) inspect="$OPTARG" ;;
|
x) inspect="$OPTARG" ;;
|
||||||
s) IFS=, read -ra nspawn_add_args <<< "$OPTARG" ;;
|
|
||||||
h|*) usage ;;
|
h|*) usage ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
@@ -398,7 +394,6 @@ nspawn_build_args=(
|
|||||||
"${bindmounts_ro[@]}"
|
"${bindmounts_ro[@]}"
|
||||||
"${bindmounts_rw[@]}"
|
"${bindmounts_rw[@]}"
|
||||||
"${bindmounts_tmpfs[@]}"
|
"${bindmounts_tmpfs[@]}"
|
||||||
"${nspawn_add_args[@]}"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if arch-nspawn "$copydir" \
|
if arch-nspawn "$copydir" \
|
||||||
|
Reference in New Issue
Block a user