summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2009-01-08 22:11:33 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2009-01-08 22:11:33 +0000
commit104356d26bccbb115bde5a4ad9041f3ad93fb64d (patch)
tree937771fa14c6b6e712560f63571daaa787f1b66c
parent9dd66ff7e94a774e76429045bb727477a98d986e (diff)
downloadbuildroot-novena-104356d26bccbb115bde5a4ad9041f3ad93fb64d.tar.gz
buildroot-novena-104356d26bccbb115bde5a4ad9041f3ad93fb64d.zip
Do not add PATCH_VERSION to PORTAGE_VERSION if patch is not applied, time to upgarde to 2.1.6?
-rw-r--r--package/portage/portage.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/package/portage/portage.mk b/package/portage/portage.mk
index 1b86707de..ec1452e60 100644
--- a/package/portage/portage.mk
+++ b/package/portage/portage.mk
@@ -5,8 +5,11 @@
#############################################################
PORTAGE_BASE_VERSION:=2.1.4
PORTAGE_DOWNLOAD_VERSION:=$(PORTAGE_BASE_VERSION)
-PORTAGE_PATCH_VERSION:=.4
PORTAGE_PATCH_APPLY:=n
+PORTAGE_PATCH_VERSION:=.4
+ifeq ($(PORTAGE_PATCH_APPLY),n)
+PORTAGE_PATCH_VERSION:=
+endif
PORTAGE_VERSION:=$(PORTAGE_BASE_VERSION)$(PORTAGE_PATCH_VERSION)
PORTAGE_PATCH:=portage-$(PORTAGE_VERSION).patch.bz2