Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple TCs #1276

Merged
merged 7 commits into from Nov 22, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions Makefile
@@ -1,6 +1,6 @@

SUPPORTED_TCS = $(notdir $(wildcard toolchains/syno-*))
SUPPORTED_ARCHS = $(notdir $(subst -,/,$(SUPPORTED_TCS)))
SUPPORTED_ARCHS = $(notdir $(subst syno-,/,$(SUPPORTED_TCS)))
SUPPORTED_SPKS = $(patsubst spk/%/Makefile,%,$(wildcard spk/*/Makefile))


Expand Down Expand Up @@ -70,9 +70,13 @@ toolchain-%:
kernel-%:
-@cd kernel/syno-$*/ && MAKEFLAGS= $(MAKE)

setup: local.mk
setup: local.mk dsm-4.3

local.mk:
@echo "Creating local configuration \"local.mk\"..."
@echo "PUBLISH_URL=https://api.synocommunity.com/" > $@
@echo "PUBLISH_API_KEY=" >> $@

dsm-%:
@echo "Setting default toolchain version to DSM-$*"
@echo "DEFAULT_TC=$*" >> local.mk
@@ -1,4 +1,5 @@
ARCH ?= 88f5281
TCVERSION ?= 3.1
PKG_NAME = synogpl
PKG_BRANCH = 1628
PKG_ARCH = 5281
Expand Down
@@ -1,2 +1,3 @@
synogpl-1628-5281.tbz SHA1 8bd5c1ccca3360ef257b0f1b741b8bed7e3f1ba0
synogpl-1628-5281.tbz SHA256 ee53c65dc30e7ae002652671c1a8da07ef65cb9b7e18da2b802cbde2276984b6
synogpl-1628-5281.tbz MD5 e412cd4c8c473eb28a08d1e148d2a728
@@ -1,4 +1,5 @@
ARCH ?= 88f6281
TCVERSION ?= 4.3
PKG_NAME = synogpl
PKG_BRANCH = 3776
PKG_ARCH = 6281
Expand Down
File renamed without changes.
15 changes: 15 additions & 0 deletions kernel/syno-88f6281-5.0/Makefile
@@ -0,0 +1,15 @@
ARCH ?= 88f6281
TCVERSION ?= 5.0
PKG_NAME = synogpl
PKG_BRANCH = 4458
PKG_ARCH = 6281
PKG_EXT = tbz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
PKG_EXTRACT = source/linux-2.6.32
SYNO_CONFIG = synoconfigs/$(ARCH)
BASE_ARCH = arm

HOMEPAGE = http://www.synology.com/

include ../../mk/spksrc.kernel-modules.mk
3 changes: 3 additions & 0 deletions kernel/syno-88f6281-5.0/digests
@@ -0,0 +1,3 @@
synogpl-4458-6281.tbz SHA1 e181690ffbd068895bc2b9dc5fa379f3fe042be7
synogpl-4458-6281.tbz SHA256 7b9ddbb4de991e787f3faa858988c65017fdbeab7666251e8d1be63aac8c8fae
synogpl-4458-6281.tbz MD5 eb2e74bd84483e545024df965f31974f
@@ -1,4 +1,5 @@
ARCH ?= armada370
TCVERSION ?= 4.3
PKG_NAME = synogpl
PKG_BRANCH = 3776
PKG_ARCH = $(ARCH)
Expand Down
File renamed without changes.
15 changes: 15 additions & 0 deletions kernel/syno-armada370-5.0/Makefile
@@ -0,0 +1,15 @@
ARCH ?= armada370
TCVERSION ?= 5.0
PKG_NAME = synogpl
PKG_BRANCH = 4458
PKG_ARCH = $(ARCH)
PKG_EXT = tbz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
PKG_EXTRACT = source/linux-3.x
SYNO_CONFIG = synoconfigs/$(ARCH)
BASE_ARCH = arm

HOMEPAGE = http://www.synology.com/

include ../../mk/spksrc.kernel-modules.mk
3 changes: 3 additions & 0 deletions kernel/syno-armada370-5.0/digests
@@ -0,0 +1,3 @@
synogpl-4458-armada370.tbz SHA1 2295dfb759c3c74bfdf1c556f420bb91c16cd1f5
synogpl-4458-armada370.tbz SHA256 4df2426a7e3f2087a3faaf4ec7d00667c24cedb37c7b6670293154558c763e30
synogpl-4458-armada370.tbz MD5 fa70e218718092e4edb03483cfedcae7
@@ -1,4 +1,5 @@
ARCH ?= armadaxp
TCVERSION ?= 4.3
PKG_NAME = synogpl
PKG_BRANCH = 3776
PKG_ARCH = $(ARCH)
Expand Down
File renamed without changes.
15 changes: 15 additions & 0 deletions kernel/syno-armadaxp-5.0/Makefile
@@ -0,0 +1,15 @@
ARCH ?= armadaxp
TCVERSION ?= 5.0
PKG_NAME = synogpl
PKG_BRANCH = 4458
PKG_ARCH = $(ARCH)
PKG_EXT = tbz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
PKG_EXTRACT = source/linux-3.x
SYNO_CONFIG = synoconfigs/$(ARCH)
BASE_ARCH = arm

HOMEPAGE = http://www.synology.com/

include ../../mk/spksrc.kernel-modules.mk
3 changes: 3 additions & 0 deletions kernel/syno-armadaxp-5.0/digests
@@ -0,0 +1,3 @@
synogpl-4458-armadaxp.tbz SHA1 25bf7516e61e51774b026d857f172f6591d97533
synogpl-4458-armadaxp.tbz SHA256 1f84c3808d0f3cb94e6bac130762429ac8ca124e0265798231cb57e332e1d8c9
synogpl-4458-armadaxp.tbz MD5 a186c69bc588c3f53f84769219b2728e
@@ -1,4 +1,5 @@
ARCH ?= bromolow
TCVERSION ?= 4.3
PKG_NAME = synogpl
PKG_BRANCH = 3776
PKG_ARCH = $(ARCH)
Expand Down
File renamed without changes.
15 changes: 15 additions & 0 deletions kernel/syno-bromolow-5.0/Makefile
@@ -0,0 +1,15 @@
ARCH ?= bromolow
TCVERSION ?= 5.0
PKG_NAME = synogpl
PKG_BRANCH = 4458
PKG_ARCH = $(ARCH)
PKG_EXT = tbz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
PKG_EXTRACT = source/linux-3.x
SYNO_CONFIG = synoconfigs/$(ARCH)
BASE_ARCH = x86

HOMEPAGE = http://www.synology.com/

include ../../mk/spksrc.kernel-modules.mk
3 changes: 3 additions & 0 deletions kernel/syno-bromolow-5.0/digests
@@ -0,0 +1,3 @@
synogpl-4458-bromolow.tbz SHA1 8e84182d7aa7516103a0b89331907ecb696e4ca9
synogpl-4458-bromolow.tbz SHA256 e503129d9716322e2a3c3f7040419e95d200e869e02faf9287b5c7524e88ec29
synogpl-4458-bromolow.tbz MD5 cc0254ef17b0f7f16e69d7e3c72a2c6c
@@ -1,4 +1,5 @@
ARCH ?= cedarview
TCVERSION ?= 4.3
PKG_NAME = synogpl
PKG_BRANCH = 3776
PKG_ARCH = $(ARCH)
Expand Down
File renamed without changes.
15 changes: 15 additions & 0 deletions kernel/syno-cedarview-5.0/Makefile
@@ -0,0 +1,15 @@
ARCH ?= cedarview
TCVERSION ?= 5.0
PKG_NAME = synogpl
PKG_BRANCH = 4458
PKG_ARCH = $(ARCH)
PKG_EXT = tbz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
PKG_EXTRACT = source/linux-3.x
SYNO_CONFIG = synoconfigs/$(ARCH)
BASE_ARCH = x86

HOMEPAGE = http://www.synology.com/

include ../../mk/spksrc.kernel-modules.mk
3 changes: 3 additions & 0 deletions kernel/syno-cedarview-5.0/digests
@@ -0,0 +1,3 @@
synogpl-4458-cedarview.tbz SHA1 7b1486498e1399982b283642054a6554318d80d4
synogpl-4458-cedarview.tbz SHA256 721445c9c532e87727c1b3f4946c95b3d055308577bd499b541834188734f5fb
synogpl-4458-cedarview.tbz MD5 b24b81337acc3e60644e745d67a8c9cf
15 changes: 15 additions & 0 deletions kernel/syno-comcerto2k-5.0/Makefile
@@ -0,0 +1,15 @@
ARCH ?= comcerto2k
TCVERSION ?= 5.0
PKG_NAME = synogpl
PKG_BRANCH = 4458
PKG_ARCH = $(ARCH)
PKG_EXT = tbz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
PKG_EXTRACT = source/linux-3.x
SYNO_CONFIG = synoconfigs/$(ARCH)
BASE_ARCH = comcerto2k

HOMEPAGE = http://www.synology.com/

include ../../mk/spksrc.kernel-modules.mk
3 changes: 3 additions & 0 deletions kernel/syno-comcerto2k-5.0/digests
@@ -0,0 +1,3 @@
synogpl-4458-comcerto2k.tbz SHA1 b49ad893102fdbbe336b80b3ecbe185ec341a785
synogpl-4458-comcerto2k.tbz SHA256 82682eead441272fe9b501198fdb167d873ae3032109f4ada80b5f1a245b06ce
synogpl-4458-comcerto2k.tbz MD5 d1a4a486e07a5f2caf9fb83c8f950534
@@ -1,4 +1,5 @@
ARCH ?= evansport
TCVERSION ?= 4.3
PKG_NAME = synogpl
PKG_BRANCH = 3776
PKG_ARCH = $(ARCH)
Expand Down
File renamed without changes.
15 changes: 15 additions & 0 deletions kernel/syno-evansport-5.0/Makefile
@@ -0,0 +1,15 @@
ARCH ?= evansport
TCVERSION ?= 5.0
PKG_NAME = synogpl
PKG_BRANCH = 4458
PKG_ARCH = $(ARCH)
PKG_EXT = tbz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
PKG_EXTRACT = source/linux-3.x
SYNO_CONFIG = synoconfigs/$(ARCH)
BASE_ARCH = x86

HOMEPAGE = http://www.synology.com/

include ../../mk/spksrc.kernel-modules.mk
3 changes: 3 additions & 0 deletions kernel/syno-evansport-5.0/digests
@@ -0,0 +1,3 @@
synogpl-4458-evansport.tbz SHA1 4c0932fd723dc06e914790180691fe29fa9152dc
synogpl-4458-evansport.tbz SHA256 c8ef8f88be05f1fa29d584add7e44fb188f30d9ecfdba9e919955c9805238088
synogpl-4458-evansport.tbz MD5 ec399e8b7b0592bdc6703a8cf74a7074
@@ -1,4 +1,5 @@
ARCH ?= powerpc
TCVERSION ?= 4.0
PKG_NAME = synogpl
PKG_BRANCH = 2198
PKG_ARCH = ppc
Expand Down
File renamed without changes.
@@ -1,4 +1,5 @@
ARCH ?= ppc824x
TCVERSION ?= 4.2
PKG_NAME = synogpl
PKG_BRANCH = 2636
PKG_ARCH = 824x
Expand Down
File renamed without changes.
@@ -1,4 +1,5 @@
ARCH ?= ppc853x
TCVERSION ?= 4.3
PKG_NAME = synogpl
PKG_BRANCH = 3776
PKG_ARCH = 853x
Expand Down
File renamed without changes.
22 changes: 22 additions & 0 deletions kernel/syno-ppc853x-5.0/Makefile
@@ -0,0 +1,22 @@
ARCH ?= ppc853x
TCVERSION ?= 5.0
PKG_NAME = synogpl
PKG_BRANCH = 4458
PKG_ARCH = 853x
PKG_EXT = tbz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
PKG_EXTRACT = source/linux-2.6.32
SYNO_CONFIG = synoconfigs/ppc8533
BASE_ARCH = powerpc

HOMEPAGE = http://www.synology.com/

PRE_COMPILE_TARGET = kernel_ppc_premake

include ../../mk/spksrc.kernel-modules.mk

.PHONY: kernel_ppc_premake

kernel_ppc_premake:
$(RUN) $(MAKE) LDFLAGS="" arch/powerpc/lib/crtsavres.o
3 changes: 3 additions & 0 deletions kernel/syno-ppc853x-5.0/digests
@@ -0,0 +1,3 @@
synogpl-4458-853x.tbz SHA1 d153f712b70e9dde78a2b900446c914700d37a28
synogpl-4458-853x.tbz SHA256 95a790692385b41ae35c4063e70ec3e7b19a0fffdaf0d75a6123022c74d6133f
synogpl-4458-853x.tbz MD5 d4b9f7ce823d289a1c5c59350d86b6a2
@@ -1,4 +1,5 @@
ARCH ?= ppc854x
TCVERSION ?= 4.0
PKG_NAME = synogpl
PKG_BRANCH = 2198
PKG_ARCH = 854x
Expand Down
File renamed without changes.
@@ -1,4 +1,5 @@
ARCH ?= qoriq
TCVERSION ?= 4.3
PKG_NAME = synogpl
PKG_BRANCH = 3776
PKG_ARCH = $(ARCH)
Expand Down
File renamed without changes.
22 changes: 22 additions & 0 deletions kernel/syno-qoriq-5.0/Makefile
@@ -0,0 +1,22 @@
ARCH ?= qoriq
TCVERSION ?= 5.0
PKG_NAME = synogpl
PKG_BRANCH = 4458
PKG_ARCH = $(ARCH)
PKG_EXT = tbz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
PKG_EXTRACT = source/linux-2.6.32
SYNO_CONFIG = synoconfigs/ppcQorIQ
BASE_ARCH = powerpc

HOMEPAGE = http://www.synology.com/

PRE_COMPILE_TARGET = kernel_ppc_premake

include ../../mk/spksrc.kernel-modules.mk

.PHONY: kernel_ppc_premake

kernel_ppc_premake:
$(RUN) $(MAKE) LDFLAGS="" arch/powerpc/lib/crtsavres.o
3 changes: 3 additions & 0 deletions kernel/syno-qoriq-5.0/digests
@@ -0,0 +1,3 @@
synogpl-4458-qoriq.tbz SHA1 d7a914975b4dc6f0f9d6c59a9d3d0d14aeff4552
synogpl-4458-qoriq.tbz SHA256 e0cfb81ffdf7a4741970412dfb7c9ea1d39a8c5adf5cb0bdda0fc8d305491b1d
synogpl-4458-qoriq.tbz MD5 bed6052a1a76a462c4fb6c3e910fee49
15 changes: 15 additions & 0 deletions kernel/syno-x64-5.0/Makefile
@@ -0,0 +1,15 @@
ARCH ?= x64
TCVERSION ?= 5.0
PKG_NAME = synogpl
PKG_BRANCH = 4458
PKG_ARCH = $(ARCH)
PKG_EXT = tbz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
PKG_EXTRACT = source/linux-3.x
SYNO_CONFIG = synoconfigs/x86_64
BASE_ARCH = x86

HOMEPAGE = http://www.synology.com/

include ../../mk/spksrc.kernel-modules.mk
3 changes: 3 additions & 0 deletions kernel/syno-x64-5.0/digests
@@ -0,0 +1,3 @@
synogpl-4458-x64.tbz SHA1 28b95467afe1e77fb8e3a7182fb2f1930c2414f7
synogpl-4458-x64.tbz SHA256 9707327fdb1a233d46b9071fe2e84c8a5c31be6faf829d0bbc8645927f8911e6
synogpl-4458-x64.tbz MD5 ad2eb7cf35c1189d32a4d0785eb8c858
2 changes: 1 addition & 1 deletion kernel/syno-x86/Makefile → kernel/syno-x86-4.3/Makefile
@@ -1,5 +1,5 @@
ARCH ?= x86

TCVERSION ?= 4.3
PKG_NAME = synogpl
PKG_BRANCH = 3776
PKG_ARCH = x64
Expand Down
File renamed without changes.
15 changes: 15 additions & 0 deletions kernel/syno-x86-5.0/Makefile
@@ -0,0 +1,15 @@
ARCH ?= x86
TCVERSION ?= 5.0
PKG_NAME = synogpl
PKG_BRANCH = 4458
PKG_ARCH = x64
PKG_EXT = tbz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
PKG_EXTRACT = source/linux-3.x
SYNO_CONFIG = synoconfigs/x86_64
BASE_ARCH = x86

HOMEPAGE = http://www.synology.com/

include ../../mk/spksrc.kernel-modules.mk
3 changes: 3 additions & 0 deletions kernel/syno-x86-5.0/digests
@@ -0,0 +1,3 @@
synogpl-4458-x64.tbz SHA1 28b95467afe1e77fb8e3a7182fb2f1930c2414f7
synogpl-4458-x64.tbz SHA256 9707327fdb1a233d46b9071fe2e84c8a5c31be6faf829d0bbc8645927f8911e6
synogpl-4458-x64.tbz MD5 ad2eb7cf35c1189d32a4d0785eb8c858
26 changes: 21 additions & 5 deletions mk/spksrc.cross-cc.mk
Expand Up @@ -14,10 +14,16 @@ endif
DIST_EXT = $(PKG_EXT)

ifneq ($(ARCH),)
ARCH_SUFFIX = -$(ARCH)
ARCH_SUFFIX = -$(ARCH)-$(TCVERSION)
TC = syno$(ARCH_SUFFIX)
endif

ifneq ($(REQ_KERNEL),)
ifeq ($(ARCH),x64)
$(error x64 arch cannot be used when REQ_KERNEL is set )
endif
endif

#####

include ../../mk/spksrc.cross-env.mk
Expand Down Expand Up @@ -65,11 +71,20 @@ smart-clean:
clean:
rm -fr work work-*

all: install
# Compare optional Makefile REQUIRED_DSM to provided TCVERSION. If REQ_DSM is lower than TCVERSION, exit
checkversion:
ifneq ($(REQUIRED_DSM),)
ifneq ($(REQUIRED_DSM),$(firstword $(sort $(TCVERSION) $(REQUIRED_DSM))))
@$(MSG) "Stop: Toolchain $(TCVERSION) is lower than required version in Makefile $(REQUIRED_DSM) "
@exit 1
endif
endif

all: checkversion install


SUPPORTED_TCS = $(notdir $(wildcard ../../toolchains/syno-*))
SUPPORTED_ARCHS = $(notdir $(subst -,/,$(SUPPORTED_TCS)))
SUPPORTED_ARCHS = $(notdir $(subst syno-,/,$(SUPPORTED_TCS)))

.PHONY: $(DIGESTS_FILE)
$(DIGESTS_FILE):
Expand Down Expand Up @@ -99,5 +114,6 @@ dependency-tree:
all-archs: $(addprefix arch-,$(SUPPORTED_ARCHS))

arch-%:
@$(MSG) Building package for arch $(subst arch-,,$@)
-@MAKEFLAGS= $(MAKE) ARCH=$(subst arch-,,$@)
@$(MSG) Building package for arch $*
-@MAKEFLAGS= $(MAKE) ARCH=$(basename $(subst -,.,$(basename $(subst .,,$*)))) TCVERSION=$(if $(findstring $*,$(basename $(subst -,.,$(basename $(subst .,,$*))))),$(DEFAULT_TC),$(notdir $(subst -,/,$*)))

2 changes: 1 addition & 1 deletion mk/spksrc.depend.mk
Expand Up @@ -32,7 +32,7 @@ endif
ifeq ($(strip $(REQ_KERNEL)),)
KERNEL_DEPEND =
else
KERNEL_DEPEND = kernel/syno-$(ARCH)
KERNEL_DEPEND = kernel/syno-$(ARCH)-$(TCVERSION)
endif

depend_msg_target:
Expand Down