Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10b4ac90 authored by Jessica Wagantall's avatar Jessica Wagantall
Browse files

version: Set version string to 12.1.1 to reflect security update 

CYNGNOS-3177
Update security patch for 2016-08-01

Change-Id: Iaa1d8d9efef067030b0d37803381827d2a4ac0c8
parent 59d10679

config/common.mk

+14 −6
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/common 


PRODUCT_VERSION_MAJOR = 12

PRODUCT_VERSION_MINOR = 1

PRODUCT_VERSION_MAINTENANCE = 0-RC0

PRODUCT_VERSION_MAINTENANCE = 1



# Set CM_BUILDTYPE from the env RELEASE_TYPE, for jenkins compat
@@ -284,16 +284,20 @@ ifeq ($(CM_BUILDTYPE), RELEASE) 
        CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)

    else

        ifeq ($(TARGET_BUILD_VARIANT),user)

            ifeq ($(PRODUCT_VERSION_MAINTENANCE),0)

                CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD)

            else

                CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD)

            endif

        else

            CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)

        endif

    endif

else

    ifeq ($(PRODUCT_VERSION_MINOR),0)

        CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD)

    else

    ifeq ($(PRODUCT_VERSION_MAINTENANCE),0)

        CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD)

    else

        CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD)

    endif

endif
@@ -321,7 +325,11 @@ ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey) 
    else

      TARGET_VENDOR_RELEASE_BUILD_ID := $(TARGET_VENDOR_RELEASE_BUILD_ID)

    endif

    CM_DISPLAY_VERSION=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)

    ifeq ($(PRODUCT_VERSION_MAINTENANCE),0)

        CM_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD)

    else

        CM_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD)

    endif

  endif

endif

endif