diff options
| author | Cedric Schieli <cschieli@gmail.com> | 2010-04-12 16:59:33 +0000 |
|---|---|---|
| committer | Cedric Schieli <cschieli@gmail.com> | 2010-04-15 10:32:22 +0000 |
| commit | 3ff787340a83615c166a72fc5099c9fc73e996ad (patch) | |
| tree | 6ea93ea7b299d76a838ef7e7c11a3168e8f830b9 | |
| parent | d5e741c1acf17f510c16539fc6c49ee3421eb109 (diff) | |
| download | alpine-iso-3ff787340a83615c166a72fc5099c9fc73e996ad.tar.bz2 alpine-iso-3ff787340a83615c166a72fc5099c9fc73e996ad.tar.xz | |
Makefile: use APK_KEYS to override keyring location
| -rwxr-xr-x | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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)) |