diff options
| author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-08-31 13:16:32 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-08-31 13:16:32 +0200 |
| commit | 6beaca84dcedc3f43074874faf9b5139751ba10d (patch) | |
| tree | dc385bc7d51458184a9375be4aea8eb7bf2d5a8e /mk | |
| parent | 376a0c383c9228bab500f01f4f1211d61269b06d (diff) | |
prefix VERSION symbols, otherwise they will get into kernel .config
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/kernel-ver.mk | 20 | ||||
| -rw-r--r-- | mk/linux.mk | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/mk/build.mk b/mk/build.mk index 058a7e8f1..63c61eaf9 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -120,7 +120,7 @@ POSTCONFIG= -@\ touch .rebuild.dropbear .rebuild.openssh;\ rebuild=1;\ fi; \ - if [ "$$(grep ^ADK_KERNEL_VERSION .config|md5sum)" != "$$(grep ^ADK_KERNEL_VERSION .config.old|md5sum)" ];then \ + if [ "$$(grep ^ADK_TARGET_KERNEL_VERSION .config|md5sum)" != "$$(grep ^ADK_TARGET_KERNEL_VERSION .config.old|md5sum)" ];then \ cleandir=1;\ rebuild=1;\ fi; \ diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 4f25f325b..ae661a335 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -10,54 +10,54 @@ # KERNEL_RELEASE: OpenADK internal versioning # KERNEL_VERSION: final kernel version how we want to identify a specific kernel -ifeq ($(ADK_KERNEL_VERSION_GIT),y) -KERNEL_FILE_VER:= $(ADK_KERNEL_HASH) +ifeq ($(ADK_TARGET_KERNEL_VERSION_GIT),y) +KERNEL_FILE_VER:= $(ADK_TARGET_KERNEL_HASH) KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) endif -ifeq ($(ADK_KERNEL_VERSION_4_1_6),y) +ifeq ($(ADK_TARGET_KERNEL_VERSION_4_1_6),y) KERNEL_FILE_VER:= 4.1.6 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= 912d6ec42dce8c1139ffee7523abb1a048fec1ae5b83a8f95d0ce6d34a3b99fe endif -ifeq ($(ADK_KERNEL_VERSION_3_18_16),y) +ifeq ($(ADK_TARGET_KERNEL_VERSION_3_18_16),y) KERNEL_FILE_VER:= 3.18.16 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= d98e8dc54cdb0d0cdf42533413f4079c983899a5dbd5a46c4c62ea5715184530 endif -ifeq ($(ADK_KERNEL_VERSION_3_14_45),y) +ifeq ($(ADK_TARGET_KERNEL_VERSION_3_14_45),y) KERNEL_FILE_VER:= 3.14.45 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= 8c745b47b3ae0631b2e59423dc255dccbc64d599f9183b390b442dd500e5cb49 endif -ifeq ($(ADK_KERNEL_VERSION_3_12_44),y) +ifeq ($(ADK_TARGET_KERNEL_VERSION_3_12_44),y) KERNEL_FILE_VER:= 3.12.44 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= 08a64346a8dcb7e938b2a8a34fc94ac0207b8e2ab5884e761458c6151359de15 endif -ifeq ($(ADK_KERNEL_VERSION_3_10_81),y) +ifeq ($(ADK_TARGET_KERNEL_VERSION_3_10_81),y) KERNEL_FILE_VER:= 3.10.81 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= cf8e4c6e67783aa65ab52eda043054945f4d0da0cf739ad90841f4e4354fea43 endif -ifeq ($(ADK_KERNEL_VERSION_3_4_108),y) +ifeq ($(ADK_TARGET_KERNEL_VERSION_3_4_108),y) KERNEL_FILE_VER:= 3.4.108 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= 55c65bc82a6168625ffc8145a644515e77047684f30f7382456948619763be75 endif -ifeq ($(ADK_KERNEL_VERSION_3_2_69),y) +ifeq ($(ADK_TARGET_KERNEL_VERSION_3_2_69),y) KERNEL_FILE_VER:= 3.2.69 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= a331bf981114f0959a543c47210dd455c47971017d3ee74fa72d14bb8754473b endif -ifeq ($(ADK_KERNEL_VERSION_2_6_32_67),y) +ifeq ($(ADK_TARGET_KERNEL_VERSION_2_6_32_67),y) KERNEL_FILE_VER:= 2.6.32.67 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) diff --git a/mk/linux.mk b/mk/linux.mk index 9ac7d824d..543f194ba 100644 --- a/mk/linux.mk +++ b/mk/linux.mk @@ -3,9 +3,9 @@ PKG_NAME:= linux PKG_RELEASE:= $(KERNEL_RELEASE) -ifeq ($(ADK_KERNEL_VERSION_GIT),y) -PKG_VERSION:= $(ADK_KERNEL_HASH) -PKG_SITES:= $(ADK_KERNEL_REPO) +ifeq ($(ADK_TARGET_KERNEL_VERSION_GIT),y) +PKG_VERSION:= $(ADK_TARGET_KERNEL_HASH) +PKG_SITES:= $(ADK_TARGET_KERNEL_REPO) else PKG_VERSION:= $(KERNEL_FILE_VER) PKG_HASH:= $(KERNEL_HASH) |