mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-14 10:26:18 +02:00
Compare commits
1 Commits
dd458f61c9
...
make-warni
Author | SHA1 | Date | |
---|---|---|---|
![]() |
287d2b4064 |
@@ -150,7 +150,6 @@ _pkgctl_cmds=(
|
|||||||
db
|
db
|
||||||
diff
|
diff
|
||||||
issue
|
issue
|
||||||
license
|
|
||||||
release
|
release
|
||||||
repo
|
repo
|
||||||
search
|
search
|
||||||
|
@@ -123,10 +123,9 @@ fi
|
|||||||
needsversioning=()
|
needsversioning=()
|
||||||
|
|
||||||
if [[ ! -e REUSE.toml || ! -e LICENSE || ! -d LICENSES ]]; then
|
if [[ ! -e REUSE.toml || ! -e LICENSE || ! -d LICENSES ]]; then
|
||||||
# TODO: Make this a hard failure in the future after packagers have had
|
error "package doesn't have proper licensing information, set it up using:"
|
||||||
# some time to add licenses to all packages.
|
|
||||||
warning "package doesn't have proper licensing information, set it up using:"
|
|
||||||
msg2 'pkgctl license setup'
|
msg2 'pkgctl license setup'
|
||||||
|
exit 1
|
||||||
else
|
else
|
||||||
pkgctl license check
|
pkgctl license check
|
||||||
needsversioning+=(REUSE.toml LICENSE LICENSES/*)
|
needsversioning+=(REUSE.toml LICENSE LICENSES/*)
|
||||||
@@ -155,7 +154,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
|
||||||
|
@@ -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",
|
||||||
|
@@ -20,7 +20,6 @@ shopt -s nullglob
|
|||||||
default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
|
default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
|
||||||
makepkg_args=("${default_makepkg_args[@]}")
|
makepkg_args=("${default_makepkg_args[@]}")
|
||||||
verifysource_args=()
|
verifysource_args=()
|
||||||
archnspawn_args=()
|
|
||||||
chrootdir=
|
chrootdir=
|
||||||
passeddir=
|
passeddir=
|
||||||
makepkg_user=
|
makepkg_user=
|
||||||
@@ -81,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 "-s Do not run setarch"
|
|
||||||
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'
|
||||||
@@ -152,7 +150,7 @@ install_packages() {
|
|||||||
pkgnames=("${install_pkgs[@]##*/}")
|
pkgnames=("${install_pkgs[@]##*/}")
|
||||||
|
|
||||||
cp -- "${install_pkgs[@]}" "$copydir/root/"
|
cp -- "${install_pkgs[@]}" "$copydir/root/"
|
||||||
arch-nspawn "${archnspawn_args[@]}" "$copydir" "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
|
arch-nspawn "$copydir" "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
|
||||||
pacman -U --noconfirm --ask=4 -- "${pkgnames[@]/#//root/}"
|
pacman -U --noconfirm --ask=4 -- "${pkgnames[@]/#//root/}"
|
||||||
ret=$?
|
ret=$?
|
||||||
rm -- "${pkgnames[@]/#/$copydir/root/}"
|
rm -- "${pkgnames[@]/#/$copydir/root/}"
|
||||||
@@ -295,7 +293,7 @@ move_products() {
|
|||||||
}
|
}
|
||||||
# }}}
|
# }}}
|
||||||
|
|
||||||
while getopts 'hcur:sI:l:nCTD: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") ;;
|
||||||
@@ -303,7 +301,6 @@ while getopts 'hcur:sI:l:nCTD:d:U:x:t:' arg; do
|
|||||||
t) bindmounts_tmpfs+=("--tmpfs=$OPTARG") ;;
|
t) bindmounts_tmpfs+=("--tmpfs=$OPTARG") ;;
|
||||||
u) update_first=1 ;;
|
u) update_first=1 ;;
|
||||||
r) passeddir="$OPTARG" ;;
|
r) passeddir="$OPTARG" ;;
|
||||||
s) archnspawn_args+=("-s") ;;
|
|
||||||
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) ;;
|
||||||
@@ -370,7 +367,7 @@ if [[ ! -d $copydir ]] || (( clean_first )); then
|
|||||||
sync_chroot "$chrootdir" "$copydir" "$copy"
|
sync_chroot "$chrootdir" "$copydir" "$copy"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
(( update_first )) && arch-nspawn "${archnspawn_args[@]}" "$copydir" \
|
(( update_first )) && arch-nspawn "$copydir" \
|
||||||
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
|
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
|
||||||
pacman -Syuu --noconfirm
|
pacman -Syuu --noconfirm
|
||||||
|
|
||||||
@@ -399,7 +396,7 @@ nspawn_build_args=(
|
|||||||
"${bindmounts_tmpfs[@]}"
|
"${bindmounts_tmpfs[@]}"
|
||||||
)
|
)
|
||||||
|
|
||||||
if arch-nspawn "${archnspawn_args[@]}" "$copydir" \
|
if arch-nspawn "$copydir" \
|
||||||
"${nspawn_build_args[@]}" \
|
"${nspawn_build_args[@]}" \
|
||||||
/chrootbuild "${makepkg_args[@]}"
|
/chrootbuild "${makepkg_args[@]}"
|
||||||
then
|
then
|
||||||
@@ -447,7 +444,7 @@ else
|
|||||||
for remotepkg in "${remotepkgs[@]}"; do
|
for remotepkg in "${remotepkgs[@]}"; do
|
||||||
if [[ $remotepkg != file://* ]]; then
|
if [[ $remotepkg != file://* ]]; then
|
||||||
msg2 "Downloading current versions"
|
msg2 "Downloading current versions"
|
||||||
arch-nspawn "${archnspawn_args[@]}" "$copydir" pacman --noconfirm -Swdd "${pkgnames[@]}"
|
arch-nspawn "$copydir" pacman --noconfirm -Swdd "${pkgnames[@]}"
|
||||||
mapfile -t remotepkgs < <(pacman --config "$copydir"/etc/pacman.conf \
|
mapfile -t remotepkgs < <(pacman --config "$copydir"/etc/pacman.conf \
|
||||||
--dbpath "$copydir"/var/lib/pacman \
|
--dbpath "$copydir"/var/lib/pacman \
|
||||||
-Sddp "${pkgnames[@]}")
|
-Sddp "${pkgnames[@]}")
|
||||||
|
Reference in New Issue
Block a user