mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-15 02:46:19 +02:00
Compare commits
1 Commits
fe42a31a70
...
make-warni
Author | SHA1 | Date | |
---|---|---|---|
![]() |
287d2b4064 |
@@ -196,7 +196,6 @@ _pkgctl_build_args=(
|
|||||||
--pkgrel
|
--pkgrel
|
||||||
--rebuild
|
--rebuild
|
||||||
--update-checksums
|
--update-checksums
|
||||||
--version-upgrade
|
|
||||||
-e --edit
|
-e --edit
|
||||||
|
|
||||||
-r --release
|
-r --release
|
||||||
|
@@ -59,7 +59,6 @@ _pkgctl_build_args=(
|
|||||||
'--pkgrel=[Set pkgrel to a given value]:pkgrel:'
|
'--pkgrel=[Set pkgrel to a given value]:pkgrel:'
|
||||||
'--rebuild[Increment the pkgrel variable]'
|
'--rebuild[Increment the pkgrel variable]'
|
||||||
'--update-checksums[Force computation and update of the checksums (disables auto-detection)]'
|
'--update-checksums[Force computation and update of the checksums (disables auto-detection)]'
|
||||||
'--version-upgrade[Adjust the PKGBUILD to match the latest upstream version (via pkgctl version upgrade)]'
|
|
||||||
'(-e --edit)'{-e,--edit}'[Edit the PKGBUILD before building]'
|
'(-e --edit)'{-e,--edit}'[Edit the PKGBUILD before building]'
|
||||||
'(-r --release)'{-r,--release}'[Automatically commit, tag and release after building]'
|
'(-r --release)'{-r,--release}'[Automatically commit, tag and release after building]'
|
||||||
'(-m --message)'{-m,--message}"[Use the given <msg> as the commit message]:message:"
|
'(-m --message)'{-m,--message}"[Use the given <msg> as the commit message]:message:"
|
||||||
|
@@ -84,9 +84,6 @@ PKGBUILD Options
|
|||||||
are either automatically updated when upgrading a package using `--pkgver`
|
are either automatically updated when upgrading a package using `--pkgver`
|
||||||
or should remain immutable during rebuilds.
|
or should remain immutable during rebuilds.
|
||||||
|
|
||||||
*--version-upgrade*::
|
|
||||||
Adjust the PKGBUILD to match the latest upstream version (via `pkgctl version upgrade`).
|
|
||||||
|
|
||||||
*-e, --edit*::
|
*-e, --edit*::
|
||||||
Edit the PKGBUILD before building
|
Edit the PKGBUILD before building
|
||||||
|
|
||||||
|
@@ -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
|
||||||
|
@@ -67,7 +67,6 @@ pkgctl_build_usage() {
|
|||||||
--pkgrel=PKGREL Set pkgrel to a given value
|
--pkgrel=PKGREL Set pkgrel to a given value
|
||||||
--rebuild Increment the current pkgrel variable
|
--rebuild Increment the current pkgrel variable
|
||||||
--update-checksums Force computation and update of the checksums (disables auto-detection)
|
--update-checksums Force computation and update of the checksums (disables auto-detection)
|
||||||
--version-upgrade Adjust the PKGBUILD to match the latest upstream version (via pkgctl version upgrade)
|
|
||||||
-e, --edit Edit the PKGBUILD before building
|
-e, --edit Edit the PKGBUILD before building
|
||||||
|
|
||||||
RELEASE OPTIONS
|
RELEASE OPTIONS
|
||||||
@@ -117,7 +116,6 @@ pkgctl_build() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
local UPDATE_CHECKSUMS=0
|
local UPDATE_CHECKSUMS=0
|
||||||
local VERSION_UPGRADE=0
|
|
||||||
local EDIT=0
|
local EDIT=0
|
||||||
local REBUILD=0
|
local REBUILD=0
|
||||||
local OFFLOAD=0
|
local OFFLOAD=0
|
||||||
@@ -189,10 +187,6 @@ pkgctl_build() {
|
|||||||
UPDATE_CHECKSUMS=1
|
UPDATE_CHECKSUMS=1
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
--version-upgrade)
|
|
||||||
VERSION_UPGRADE=1
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
--rebuild)
|
--rebuild)
|
||||||
# shellcheck source=src/lib/util/git.sh
|
# shellcheck source=src/lib/util/git.sh
|
||||||
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/git.sh
|
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/git.sh
|
||||||
@@ -458,13 +452,6 @@ pkgctl_build() {
|
|||||||
. ./PKGBUILD
|
. ./PKGBUILD
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# update PKGBUILD to the latest upstream version
|
|
||||||
if (( VERSION_UPGRADE )); then
|
|
||||||
if ! $(pkgctl_version_upgrade); then
|
|
||||||
die
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# execute build
|
# execute build
|
||||||
for arch in "${BUILD_ARCH[@]}"; do
|
for arch in "${BUILD_ARCH[@]}"; do
|
||||||
if [[ -n $arch ]]; then
|
if [[ -n $arch ]]; then
|
||||||
|
@@ -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",
|
||||||
|
Reference in New Issue
Block a user