mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-13 18:06:19 +02:00
Compare commits
1 Commits
fa29e73a17
...
feat/licen
Author | SHA1 | Date | |
---|---|---|---|
![]() |
7a64d33b88 |
@@ -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
|
||||||
|
@@ -55,7 +55,6 @@ pkgctl_build_usage() {
|
|||||||
-o, --offload Build on a remote server and transfer artifacts afterwards
|
-o, --offload Build on a remote server and transfer artifacts afterwards
|
||||||
-c, --clean Recreate the chroot before building
|
-c, --clean Recreate the chroot before building
|
||||||
--inspect WHEN Spawn an interactive shell to inspect the chroot (never, always, failure)
|
--inspect WHEN Spawn an interactive shell to inspect the chroot (never, always, failure)
|
||||||
--offline MODE Run a part of the build process offline (build, check)
|
|
||||||
-w, --worker SLOT Name of the worker slot, useful for concurrent builds (disables automatic names)
|
-w, --worker SLOT Name of the worker slot, useful for concurrent builds (disables automatic names)
|
||||||
--nocheck Do not run the check() function in the PKGBUILD
|
--nocheck Do not run the check() function in the PKGBUILD
|
||||||
|
|
||||||
@@ -199,10 +198,6 @@ pkgctl_build() {
|
|||||||
EDIT=1
|
EDIT=1
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
--offline)
|
|
||||||
MAKECHROOT_OPTIONS+=("-o" "$2")
|
|
||||||
shift 2
|
|
||||||
;;
|
|
||||||
-o|--offload)
|
-o|--offload)
|
||||||
OFFLOAD=1
|
OFFLOAD=1
|
||||||
shift
|
shift
|
||||||
|
@@ -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",
|
||||||
|
@@ -40,8 +40,6 @@ bindmounts_ro=()
|
|||||||
bindmounts_rw=()
|
bindmounts_rw=()
|
||||||
bindmounts_tmpfs=()
|
bindmounts_tmpfs=()
|
||||||
|
|
||||||
offline_options=()
|
|
||||||
|
|
||||||
copy=$USER
|
copy=$USER
|
||||||
[[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
|
[[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
|
||||||
[[ -z "$copy" || $copy = root ]] && copy=copy
|
[[ -z "$copy" || $copy = root ]] && copy=copy
|
||||||
@@ -82,7 +80,6 @@ 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 '-o Run given step offline'
|
|
||||||
echo '-C Run checkpkg 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'
|
||||||
@@ -206,7 +203,6 @@ EOF
|
|||||||
declare -p SOURCE_DATE_EPOCH 2>/dev/null || true
|
declare -p SOURCE_DATE_EPOCH 2>/dev/null || true
|
||||||
declare -p BUILDTOOL 2>/dev/null
|
declare -p BUILDTOOL 2>/dev/null
|
||||||
declare -p BUILDTOOLVER 2>/dev/null
|
declare -p BUILDTOOLVER 2>/dev/null
|
||||||
declare -p offline_options
|
|
||||||
printf '_chrootbuild "$@" || exit\n'
|
printf '_chrootbuild "$@" || exit\n'
|
||||||
|
|
||||||
if (( run_namcap )); then
|
if (( run_namcap )); then
|
||||||
@@ -226,52 +222,14 @@ _chrootbuild() {
|
|||||||
# shellcheck source=/dev/null
|
# shellcheck source=/dev/null
|
||||||
. /etc/profile
|
. /etc/profile
|
||||||
|
|
||||||
# for in_array
|
|
||||||
. /usr/share/makepkg/util.sh
|
|
||||||
|
|
||||||
# Beware, there are some stupid arbitrary rules on how you can
|
# Beware, there are some stupid arbitrary rules on how you can
|
||||||
# use "$" in arguments to commands with "sudo -i". ${foo} or
|
# use "$" in arguments to commands with "sudo -i". ${foo} or
|
||||||
# ${1} is OK, but $foo or $1 isn't.
|
# ${1} is OK, but $foo or $1 isn't.
|
||||||
# https://bugzilla.sudo.ws/show_bug.cgi?id=765
|
# https://bugzilla.sudo.ws/show_bug.cgi?id=765
|
||||||
|
|
||||||
# Run prepare
|
|
||||||
sudo --preserve-env=SOURCE_DATE_EPOCH \
|
sudo --preserve-env=SOURCE_DATE_EPOCH \
|
||||||
--preserve-env=BUILDTOOL \
|
--preserve-env=BUILDTOOL \
|
||||||
--preserve-env=BUILDTOOLVER \
|
--preserve-env=BUILDTOOLVER \
|
||||||
-iu builduser bash -c 'cd /startdir; makepkg --nobuild "$@"' -bash "$@"
|
-iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
|
||||||
|
|
||||||
if in_array "build" "${offline_options[@]}"; then
|
|
||||||
msg "building offline"
|
|
||||||
# Build offline
|
|
||||||
unshare -n -- sudo --preserve-env=SOURCE_DATE_EPOCH \
|
|
||||||
--preserve-env=BUILDTOOL \
|
|
||||||
--preserve-env=BUILDTOOLVER \
|
|
||||||
-iu builduser \
|
|
||||||
bash -c 'cd /startdir; makepkg --noprepare --noextract --nocheck "$@"' -bash "$@"
|
|
||||||
else
|
|
||||||
sudo --preserve-env=SOURCE_DATE_EPOCH \
|
|
||||||
--preserve-env=BUILDTOOL \
|
|
||||||
--preserve-env=BUILDTOOLVER \
|
|
||||||
-iu builduser \
|
|
||||||
bash -c 'cd /startdir; makepkg --noprepare --noextract --nocheck "$@"' -bash "$@"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if in_array "check" "${offline_options[@]}"; then
|
|
||||||
msg "check offline"
|
|
||||||
# Run tests online
|
|
||||||
unshare -n -- sudo --preserve-env=SOURCE_DATE_EPOCH \
|
|
||||||
--preserve-env=BUILDTOOL \
|
|
||||||
--preserve-env=BUILDTOOLVER \
|
|
||||||
-iu builduser \
|
|
||||||
bash -c 'cd /startdir; makepkg --noprepare --noextract --nobuild "$@"' -bash "$@"
|
|
||||||
else
|
|
||||||
sudo --preserve-env=SOURCE_DATE_EPOCH \
|
|
||||||
--preserve-env=BUILDTOOL \
|
|
||||||
--preserve-env=BUILDTOOLVER \
|
|
||||||
-iu builduser \
|
|
||||||
bash -c 'cd /startdir; makepkg --noprepare --noextract --nobuild "$@"' -bash "$@"
|
|
||||||
fi
|
|
||||||
|
|
||||||
ret=$?
|
ret=$?
|
||||||
case $ret in
|
case $ret in
|
||||||
0|14)
|
0|14)
|
||||||
@@ -335,7 +293,7 @@ move_products() {
|
|||||||
}
|
}
|
||||||
# }}}
|
# }}}
|
||||||
|
|
||||||
while getopts 'hcur:I:l:nCTD:o:d:U:x:t:' 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") ;;
|
||||||
@@ -346,7 +304,6 @@ while getopts 'hcur:I:l:nCTD:o:d:U:x:t:' 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) ;;
|
||||||
o) offline_options+=("$OPTARG") ;;
|
|
||||||
C) run_checkpkg=1 ;;
|
C) run_checkpkg=1 ;;
|
||||||
T) temp_chroot=1; copy+="-$$" ;;
|
T) temp_chroot=1; copy+="-$$" ;;
|
||||||
U) makepkg_user="$OPTARG" ;;
|
U) makepkg_user="$OPTARG" ;;
|
||||||
|
Reference in New Issue
Block a user