abuild, alpine.mk: use --repository instead of --repo
This commit is contained in:
parent
40ad19a1d0
commit
d8907beacb
|
@ -734,7 +734,7 @@ builddeps() {
|
|||
|
||||
uninstall_after=".makedepends-$pkgname $uninstall_after"
|
||||
if [ -n "$install_deps" ] && [ -z "$recursive" ]; then
|
||||
$SUDO apk add --repo "$apkcache" \
|
||||
$SUDO apk add --repository "$apkcache" \
|
||||
--virtual .makedepends-$pkgname $deps \
|
||||
&& return 0
|
||||
fi
|
||||
|
@ -743,7 +743,7 @@ builddeps() {
|
|||
|
||||
# find dependencies that are installed but missing in repo.
|
||||
for i in $deps; do
|
||||
local m=$(apk search --repo "$apkcache" ${i%[<>=]*})
|
||||
local m=$(apk search --repository "$apkcache" ${i%[<>=]*})
|
||||
if [ -z "$m" ]; then
|
||||
missing="$missing $i"
|
||||
fi
|
||||
|
@ -756,7 +756,7 @@ builddeps() {
|
|||
msg "Entering $dir"
|
||||
cd "$dir" && $0 -k -r apkcache || return 1
|
||||
done
|
||||
$SUDO apk add -u --repo "$apkcache" \
|
||||
$SUDO apk add -u --repository "$apkcache" \
|
||||
--virtual .makedepends-$pkgname $deps
|
||||
}
|
||||
|
||||
|
@ -906,7 +906,7 @@ newaport() {
|
|||
|
||||
installdeps() {
|
||||
local deps i
|
||||
sudo apk add --repo "$apkcache" --virtual .makedepends-$pkgname \
|
||||
sudo apk add --repository "$apkcache" --virtual .makedepends-$pkgname \
|
||||
$makedepends
|
||||
}
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ ISO_LINK ?= $(ALPINE_NAME).iso
|
|||
ISO_DIR := $(DESTDIR)/isofs
|
||||
ISO_PKGDIR := $(ISO_DIR)/apks
|
||||
|
||||
APK_OPTS := $(addprefix --repo ,$(APK_REPOS))
|
||||
APK_OPTS := $(addprefix --repository ,$(APK_REPOS))
|
||||
|
||||
find_apk_ver = $(shell apk search $(APK_OPTS) $(1) | sort | uniq)
|
||||
find_apk_file = $(addsuffix .apk,$(call find_apk_ver,$(1)))
|
||||
|
|
Loading…
Reference in New Issue