summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-12-03 15:21:09 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-12-03 15:21:09 +0000
commit452737c04475421a54098b08428c0c776e567cc3 (patch)
tree410b5f8e762ecdf2b0aef03a3612404f11641c64
parent9376c0aee355e6a737280f20e812c11e0117b0b9 (diff)
downloadalpine-iso-452737c04475421a54098b08428c0c776e567cc3.tar.bz2
alpine-iso-452737c04475421a54098b08428c0c776e567cc3.tar.xz
minor fix for make edge target
We want create the 'current' file if does not exist
-rwxr-xr-xMakefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 57aec51..ccc592b 100755
--- a/Makefile
+++ b/Makefile
@@ -296,7 +296,7 @@ $(ISO_SHA1): $(ISO)
#
# .pkgdiff
#
-previous := $(shell cat previous)
+previous := $(shell cat previous 2>/dev/null)
release_diff := $(previous)-$(ALPINE_RELEASE)
PREV_ISO := $(ALPINE_NAME)-$(previous)-$(ALPINE_ARCH).iso
@@ -352,7 +352,11 @@ sha1: $(ISO_SHA1)
release: $(ISO_SHA1) $(xdelta) $(pkgdiff)
profiles ?= alpine alpine-mini alpine-vserver
-current := $(shell cat current)
+current = $(shell cat current 2>/dev/null)
+
+current:
+ @test -n "$(ALPINE_RELEASE)"
+ @echo $(ALPINE_RELEASE) > $@
all-release: current previous $(addsuffix .conf.mk, $(profiles))
@echo "*"
@@ -367,7 +371,7 @@ all-release: current previous $(addsuffix .conf.mk, $(profiles))
PROFILE=$$i release || break; \
done
-edge:
+edge: current
@fakeroot $(MAKE) PROFILE=alpine-edge sha1
vserver: