From 3ff787340a83615c166a72fc5099c9fc73e996ad Mon Sep 17 00:00:00 2001 From: Cedric Schieli Date: Mon, 12 Apr 2010 16:59:33 +0000 Subject: Makefile: use APK_KEYS to override keyring location --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 151ea89..83f7306 100755 --- a/Makefile +++ b/Makefile @@ -20,7 +20,8 @@ ISO_PKGDIR := $(ISO_DIR)/apks APKS ?= $(shell sed 's/\#.*//; s/\*/\\*/g' $(PROFILE).packages) -APK_OPTS := $(addprefix --repository ,$(APK_REPOS)) --keys-dir /etc/apk/keys +APK_KEYS ?= /etc/apk/keys +APK_OPTS := $(addprefix --repository ,$(APK_REPOS)) --keys-dir $(APK_KEYS) find_apk_ver = $(shell apk search $(APK_OPTS) $(1) | sort | uniq) find_apk_file = $(addsuffix .apk,$(call find_apk_ver,$(1))) @@ -167,7 +168,7 @@ $(INITFS_DIRSTAMP): apk fetch $(APK_OPTS) --stdout $$i \ | tar -C $(INITFS_DIR) -zx || exit 1; \ done - @cp -r /etc/apk/keys $(INITFS_DIR)/etc/apk/ || true + @cp -r $(APK_KEYS) $(INITFS_DIR)/etc/apk/ || true @touch $@ #$(INITFS): $(shell mkinitfs -F "$(INITFS_FEATURES)" -l $(KERNEL)) -- cgit v1.2.3