diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-07 14:48:04 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-07 14:48:04 +0000 |
| commit | 57ff368a4edc93e609aa0798c310ff2eafea1b2c (patch) | |
| tree | 7b17ac20e55ffd7ccc9485340d11bae9caf2e0e5 | |
| parent | 28b4fc311065651c72d0d2b645a50c45ba97bcbc (diff) | |
| download | alpine-iso-57ff368a4edc93e609aa0798c310ff2eafea1b2c.tar.bz2 alpine-iso-57ff368a4edc93e609aa0798c310ff2eafea1b2c.tar.xz | |
arch fix and apk-tools-2.1 fixes
| -rwxr-xr-x | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -7,7 +7,8 @@ PROFILE ?= alpine BUILD_DATE := $(shell date +%y%m%d) ALPINE_RELEASE ?= $(BUILD_DATE) ALPINE_NAME ?= alpine-test -ALPINE_ARCH := $(shell uname -m) +ALPINE_ARCH ?= $(shell uname -m | sed 's/^i[0-9]/x/') + DESTDIR ?= $(shell pwd)/isotmp.$(PROFILE) MKCRAMFS = mkcramfs @@ -16,7 +17,7 @@ SUDO = sudo ISO ?= $(ALPINE_NAME)-$(ALPINE_RELEASE)-$(ALPINE_ARCH).iso ISO_LINK ?= $(ALPINE_NAME).iso ISO_DIR := $(DESTDIR)/isofs -ISO_PKGDIR := $(ISO_DIR)/apks +ISO_PKGDIR := $(ISO_DIR)/apks/$(ALPINE_ARCH) APKS ?= $(shell sed 's/\#.*//; s/\*/\\*/g' $(PROFILE).packages) @@ -244,6 +245,7 @@ ISO_REPOS_DIRSTAMP := $(DESTDIR)/stamp.isorepos ISOFS_DIRSTAMP := $(DESTDIR)/stamp.isofs $(ISO_REPOS_DIRSTAMP): $(ISO_PKGDIR)/APKINDEX.tar.gz + @touch $(ISO_PKGDIR)/../.boot_repository @touch $(ISO_PKGDIR)/.boot_repository @rm -f $(ISO_PKGDIR)/.SIGN.* @touch $@ |