mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-18 04:16:18 +02:00
Compare commits
6 Commits
272-check-
...
9fe010cf37
Author | SHA1 | Date | |
---|---|---|---|
![]() |
9fe010cf37 | ||
![]() |
3f0ebbc6d2 | ||
![]() |
fc56ebedf3 | ||
![]() |
01757e6904 | ||
![]() |
c5fe8ff3e6 | ||
![]() |
332ccc95ef |
@@ -150,6 +150,7 @@ _pkgctl_cmds=(
|
|||||||
db
|
db
|
||||||
diff
|
diff
|
||||||
issue
|
issue
|
||||||
|
license
|
||||||
release
|
release
|
||||||
repo
|
repo
|
||||||
search
|
search
|
||||||
|
@@ -80,7 +80,7 @@ check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAG
|
|||||||
makechrootpkg_args+=("${@:$OPTIND}")
|
makechrootpkg_args+=("${@:$OPTIND}")
|
||||||
|
|
||||||
# Automatically recreate the root chroot if a version mismatch is detected
|
# Automatically recreate the root chroot if a version mismatch is detected
|
||||||
CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot" 2>/dev/null)
|
CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot")
|
||||||
if [[ -f "${chroots}/${repo}-${arch}/root/.arch-chroot" ]] && [[ "$CURRENT_CHROOT_VERSION" != "$CHROOT_VERSION" ]]; then
|
if [[ -f "${chroots}/${repo}-${arch}/root/.arch-chroot" ]] && [[ "$CURRENT_CHROOT_VERSION" != "$CHROOT_VERSION" ]]; then
|
||||||
warning "Recreating chroot '%s' (%s) as it is not at version %s" "${chroots}/${repo}-${arch}/root" "$CURRENT_CHROOT_VERSION" "$CHROOT_VERSION"
|
warning "Recreating chroot '%s' (%s) as it is not at version %s" "${chroots}/${repo}-${arch}/root" "$CURRENT_CHROOT_VERSION" "$CHROOT_VERSION"
|
||||||
clean_first=true
|
clean_first=true
|
||||||
|
@@ -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"; then
|
if ! git ls-files --error-unmatch "$file" >/dev/null; then
|
||||||
die "%s is not under version control" "$file"
|
die "%s is not under version control" "$file"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@@ -124,6 +124,7 @@ pkgctl_build() {
|
|||||||
local RELEASE=0
|
local RELEASE=0
|
||||||
local DB_UPDATE=0
|
local DB_UPDATE=0
|
||||||
local INSTALL_TO_HOST=none
|
local INSTALL_TO_HOST=none
|
||||||
|
local UNSUPPORTED_ARCH=0
|
||||||
|
|
||||||
local REPO=
|
local REPO=
|
||||||
local PKGVER=
|
local PKGVER=
|
||||||
@@ -165,7 +166,8 @@ pkgctl_build() {
|
|||||||
BUILD_ARCH=("${DEVTOOLS_VALID_ARCHES[0]}")
|
BUILD_ARCH=("${DEVTOOLS_VALID_ARCHES[0]}")
|
||||||
elif ! in_array "${2}" "${BUILD_ARCH[@]}"; then
|
elif ! in_array "${2}" "${BUILD_ARCH[@]}"; then
|
||||||
if ! in_array "${2}" "${DEVTOOLS_VALID_ARCHES[@]}"; then
|
if ! in_array "${2}" "${DEVTOOLS_VALID_ARCHES[@]}"; then
|
||||||
die 'invalid architecture: %s' "${2}"
|
warning 'unsupported architecture: %s' "${2}"
|
||||||
|
UNSUPPORTED_ARCH=1
|
||||||
fi
|
fi
|
||||||
BUILD_ARCH+=("${2}")
|
BUILD_ARCH+=("${2}")
|
||||||
fi
|
fi
|
||||||
@@ -312,6 +314,9 @@ pkgctl_build() {
|
|||||||
|
|
||||||
# Update pacman cache for auto-detection
|
# Update pacman cache for auto-detection
|
||||||
if [[ -z ${REPO} ]]; then
|
if [[ -z ${REPO} ]]; then
|
||||||
|
if (( UNSUPPORTED_ARCH )); then
|
||||||
|
die "Unsupported architecture specified, cannot auto-detect repository"
|
||||||
|
fi
|
||||||
update_pacman_repo_cache multilib
|
update_pacman_repo_cache multilib
|
||||||
# Check valid repos if not resolved dynamically
|
# Check valid repos if not resolved dynamically
|
||||||
elif ! in_array "${REPO}" "${DEVTOOLS_VALID_REPOS[@]}"; then
|
elif ! in_array "${REPO}" "${DEVTOOLS_VALID_REPOS[@]}"; then
|
||||||
@@ -343,7 +348,7 @@ pkgctl_build() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# fail if an existing package specifies --repo
|
# fail if an existing package specifies --repo
|
||||||
if [[ -n "${repo}" ]] && [[ -n ${pkgrepo} ]]; then
|
if [[ -n "${repo}" ]] && [[ -n ${pkgrepo} ]] && (( ! UNSUPPORTED_ARCH )); then
|
||||||
# allow unstable to use --repo
|
# allow unstable to use --repo
|
||||||
if [[ ${pkgrepo} == *unstable ]]; then
|
if [[ ${pkgrepo} == *unstable ]]; then
|
||||||
repo=${pkgrepo}
|
repo=${pkgrepo}
|
||||||
|
@@ -188,10 +188,13 @@ path = [
|
|||||||
"README.md",
|
"README.md",
|
||||||
"keys/**",
|
"keys/**",
|
||||||
".SRCINFO",
|
".SRCINFO",
|
||||||
|
".gitignore",
|
||||||
".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