Skip to content

Commit 55674c2

Browse files
hgy59ymartin59
authored andcommitted
add apollolake kernel for lirc (plus other 6.1 kernels) (SynoCommunity#3099)
* add arch name to downloaded kernel source to get distinct names bugfix: handle PKG_DIST_FILE in spksrc.kernel-modules.mk (and native-cc) * add bc to Dockerfile to build 4.4.x kernels * use general arch variables to avoid changes for future archs add ARM8_ARCHS to support hi3535 * kernel source added for newer archs update ppc853x kernel source digests removed 885f281 kernel source (outdated version without existing toolchain) * update digest of qoriq kernel source 5.2 * add apollolake-6.1 kernel source to build lirc * update fallback to lirc 0.8.7 for archs with kernel < 2.6.36 use list of archs with old kernel to avoid changes with future archs fix for armada370, armadaxp, bromolow, cedarview, evansport (having kernel 2.6.32) * fix lirc arch evaluation need include of spksrc.common.mk for .._ARCHES definitions only PPC_ARCHES and 88f6281 have 2.6.32 or older kernels (for all TC versions)
1 parent 3dee4db commit 55674c2

File tree

30 files changed

+217
-28
lines changed

30 files changed

+217
-28
lines changed

Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ RUN dpkg --add-architecture i386
99
# Install required packages
1010
RUN apt-get update && \
1111
apt-get install -y automake \
12+
bc \
1213
bison \
1314
build-essential \
1415
check \
@@ -36,6 +37,7 @@ RUN apt-get update && \
3637
lzip \
3738
mercurial \
3839
ncurses-dev \
40+
php5 \
3941
pkg-config \
4042
python3 \
4143
subversion \

cross/lirc-0.8.7/digests

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
lirc-0.8.7.tar.bz2 SHA1 d964f4b2e1f0cbc8ac8384b585a32384eebc25fe
2+
lirc-0.8.7.tar.bz2 SHA256 e431454f266c4ddc209c3cc84fc506cac6092eb5124b4f3dcc215c8584ea7a39
3+
lirc-0.8.7.tar.bz2 MD5 fb1dcddbc8ca3d03c7f3a2d40cf28b71

cross/lirc-0.9.0/digests

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
lirc-0.9.0.tar.bz2 SHA1 8456bf7101d4f2d31d61c5073357a4981b458581
2+
lirc-0.9.0.tar.bz2 SHA256 6323afae6ad498d4369675f77ec3dbb680fe661bea586aa296e67f2e2daba4ff
3+
lirc-0.9.0.tar.bz2 MD5 b232aef26f23fe33ea8305d276637086

kernel/syno-88f5281-3.1/Makefile

-17
This file was deleted.

kernel/syno-88f5281-3.1/digests

-3
This file was deleted.

kernel/syno-apollolake-6.1/Makefile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ARCH ?= apollolake
2+
TCVERSION ?= 6.1
3+
PKG_NAME = apollolake
4+
PKG_BRANCH = 15152
5+
PKG_ARCH = $(PKG_NAME)
6+
PKG_EXT = txz
7+
PKG_DIST_NAME = linux-4.4.x.$(PKG_EXT)
8+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch/$(PKG_ARCH)-source
9+
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_DIST_NAME)
10+
PKG_EXTRACT = linux-4.4.x
11+
SYNO_CONFIG = synoconfigs/$(ARCH)
12+
BASE_ARCH = x86_64
13+
14+
HOMEPAGE = http://www.synology.com/
15+
16+
include ../../mk/spksrc.kernel-modules.mk

kernel/syno-apollolake-6.1/digests

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
apollolake-linux-4.4.x.txz SHA1 d86de6e33ade6d6abcf60bb95e961f7a4cb6ef8b
2+
apollolake-linux-4.4.x.txz SHA256 77fcd8628e9b435031f773eef392d1a06f72331403edd08e630415799e578a25
3+
apollolake-linux-4.4.x.txz MD5 24489c7b34e7e621aae477c56e0e115a

kernel/syno-armada370-6.1/Makefile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ARCH ?= armada370
2+
TCVERSION ?= 6.1
3+
PKG_NAME = armada370
4+
PKG_BRANCH = 15152
5+
PKG_ARCH = $(PKG_NAME)
6+
PKG_EXT = txz
7+
PKG_DIST_NAME = linux-3.x.$(PKG_EXT)
8+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch/$(PKG_ARCH)-source
9+
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_DIST_NAME)
10+
PKG_EXTRACT = linux-3.x
11+
SYNO_CONFIG = synoconfigs/$(ARCH)
12+
BASE_ARCH = arm
13+
14+
HOMEPAGE = http://www.synology.com/
15+
16+
include ../../mk/spksrc.kernel-modules.mk

kernel/syno-armada370-6.1/digests

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
armada370-linux-3.x.txz SHA1 d9fd1fe0b43c94b9b97043cd0e0b6817df28fb2d
2+
armada370-linux-3.x.txz SHA256 3467e639a7fa8a4dd3ed8b678b1b6b8e4367ff14b141c6e1195643b807db4b43
3+
armada370-linux-3.x.txz MD5 763fb17ed51739d662a60a6a51e981af

kernel/syno-braswell-6.1/Makefile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ARCH ?= braswell
2+
TCVERSION ?= 6.1
3+
PKG_NAME = braswell
4+
PKG_BRANCH = 15152
5+
PKG_ARCH = $(PKG_NAME)
6+
PKG_EXT = txz
7+
PKG_DIST_NAME = linux-3.10.x.$(PKG_EXT)
8+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch/$(PKG_ARCH)-source
9+
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_DIST_NAME)
10+
PKG_EXTRACT = linux-3.10.x
11+
SYNO_CONFIG = synoconfigs/$(ARCH)
12+
BASE_ARCH = x86
13+
14+
HOMEPAGE = http://www.synology.com/
15+
16+
include ../../mk/spksrc.kernel-modules.mk

kernel/syno-braswell-6.1/digests

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
braswell-linux-3.10.x.txz SHA1 7c089d6a2d5f239d5606aa3ba5d47e7549bbff4a
2+
braswell-linux-3.10.x.txz SHA256 6186eae900deb77e6707e86e87db103573f02fe07d36563b3f0446e3415b004a
3+
braswell-linux-3.10.x.txz MD5 250cc758875e7ea061aff5d17a86a1ca

kernel/syno-broadwell-6.1/Makefile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ARCH ?= broadwell
2+
TCVERSION ?= 6.1
3+
PKG_NAME = broadwell
4+
PKG_BRANCH = 15152
5+
PKG_ARCH = $(PKG_NAME)
6+
PKG_EXT = txz
7+
PKG_DIST_NAME = linux-3.10.x.$(PKG_EXT)
8+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch/$(PKG_ARCH)-source
9+
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_DIST_NAME)
10+
PKG_EXTRACT = linux-3.10.x
11+
SYNO_CONFIG = synoconfigs/$(ARCH)
12+
BASE_ARCH = x86
13+
14+
HOMEPAGE = http://www.synology.com/
15+
16+
include ../../mk/spksrc.kernel-modules.mk

kernel/syno-broadwell-6.1/digests

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
broadwell-linux-3.10.x.txz SHA1 af27f9103ae3b2758eeb5eeb9ccced5089fa3e38
2+
broadwell-linux-3.10.x.txz SHA256 b9df746e6b792d901662befa1d1d959b4c950e1f1f452c3e7f5e0a5c5b6c4218
3+
broadwell-linux-3.10.x.txz MD5 910b8b0e0e2765f7e7ece476d61b24a3

kernel/syno-denverton-6.1/Makefile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ARCH ?= denverton
2+
TCVERSION ?= 6.1
3+
PKG_NAME = denverton
4+
PKG_BRANCH = 15152
5+
PKG_ARCH = $(PKG_NAME)
6+
PKG_EXT = txz
7+
PKG_DIST_NAME = linux-4.4.x.$(PKG_EXT)
8+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch/$(PKG_ARCH)-source
9+
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_DIST_NAME)
10+
PKG_EXTRACT = linux-4.4.x
11+
SYNO_CONFIG = synoconfigs/$(ARCH)
12+
BASE_ARCH = x86
13+
14+
HOMEPAGE = http://www.synology.com/
15+
16+
include ../../mk/spksrc.kernel-modules.mk

kernel/syno-denverton-6.1/digests

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
denverton-linux-4.4.x.txz SHA1 6d62f45bdf9ebd1a9135176d75268caaa1d2e2a4
2+
denverton-linux-4.4.x.txz SHA256 eac76fce63547724c32528f94cd339236a530081ea2faa9dd7b4a4f4862ab1c0
3+
denverton-linux-4.4.x.txz MD5 01da9373533a2161e84bafa0d60e1746

kernel/syno-dockerx64-6.1/Makefile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ARCH ?= dockerx64
2+
TCVERSION ?= 6.1
3+
PKG_NAME = dockerx64
4+
PKG_BRANCH = 15152
5+
PKG_ARCH = $(PKG_NAME)
6+
PKG_EXT = txz
7+
PKG_DIST_NAME = linux-3.10.x.$(PKG_EXT)
8+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch/$(PKG_ARCH)-source
9+
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_DIST_NAME)
10+
PKG_EXTRACT = linux-3.10.x
11+
SYNO_CONFIG = synoconfigs/$(ARCH)
12+
BASE_ARCH = x86
13+
14+
HOMEPAGE = http://www.synology.com/
15+
16+
include ../../mk/spksrc.kernel-modules.mk

kernel/syno-dockerx64-6.1/digests

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dockerx64-linux-3.10.x.txz SHA1 b4a7e4bb4f1df58f3834ea10d0464d40e6c91259
2+
dockerx64-linux-3.10.x.txz SHA256 6a94e91e99d7c8dc568fc26e3f4a27ced31c578db071ad47151351d99bbd7a72
3+
dockerx64-linux-3.10.x.txz MD5 45fdb4b955ac7e38589ad93cd89813ce

kernel/syno-grantley-6.1/Makefile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ARCH ?= grantley
2+
TCVERSION ?= 6.1
3+
PKG_NAME = grantley
4+
PKG_BRANCH = 15152
5+
PKG_ARCH = $(PKG_NAME)
6+
PKG_EXT = txz
7+
PKG_DIST_NAME = linux-3.10.x.$(PKG_EXT)
8+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch/$(PKG_ARCH)-source
9+
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_DIST_NAME)
10+
PKG_EXTRACT = linux-3.10.x
11+
SYNO_CONFIG = synoconfigs/$(ARCH)
12+
BASE_ARCH = x86
13+
14+
HOMEPAGE = http://www.synology.com/
15+
16+
include ../../mk/spksrc.kernel-modules.mk

kernel/syno-grantley-6.1/digests

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
grantley-linux-3.10.x.txz SHA1 39dafdfad385dc1ca6d27bc5506a4c748227a6fc
2+
grantley-linux-3.10.x.txz SHA256 221a4b67faeeb3ce2db9938ad9c17ddc4ac02053f9e783e83ec04ee4461f5235
3+
grantley-linux-3.10.x.txz MD5 08ec4604a94e08782a4bbe9c16c3952e

kernel/syno-hi3535-6.1/Makefile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ARCH ?= hi3535
2+
TCVERSION ?= 6.1
3+
PKG_NAME = hi3535
4+
PKG_BRANCH = 15152
5+
PKG_ARCH = $(PKG_NAME)
6+
PKG_EXT = txz
7+
PKG_DIST_NAME = linux-3.4.x.$(PKG_EXT)
8+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch/$(PKG_ARCH)-source
9+
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_DIST_NAME)
10+
PKG_EXTRACT = linux-3.4.x
11+
SYNO_CONFIG = synoconfigs/$(ARCH)
12+
BASE_ARCH = arm
13+
14+
HOMEPAGE = http://www.synology.com/
15+
16+
include ../../mk/spksrc.kernel-modules.mk

kernel/syno-hi3535-6.1/digests

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
rtd1296-linux-4.4.x.txz SHA1 d9401c27ac6c2c9484dc4d30134ae775194815a3
2+
rtd1296-linux-4.4.x.txz SHA256 2d029b422f012f226ad3f6cbd8c9795ff319d6d4cf81307daf7a2fd3cecb1dce
3+
rtd1296-linux-4.4.x.txz MD5 1a7fab20fb263a3918ee0562ea43be90

kernel/syno-monaco-6.1/Makefile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ARCH ?= monaco
2+
TCVERSION ?= 6.1
3+
PKG_NAME = monaco
4+
PKG_BRANCH = 15152
5+
PKG_ARCH = $(PKG_NAME)
6+
PKG_EXT = txz
7+
PKG_DIST_NAME = linux-3.10.x-bsp.$(PKG_EXT)
8+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch/$(PKG_ARCH)-source
9+
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_DIST_NAME)
10+
PKG_EXTRACT = linux-3.10.x-bsp
11+
SYNO_CONFIG = synoconfigs/$(ARCH)
12+
BASE_ARCH = arm
13+
14+
HOMEPAGE = http://www.synology.com/
15+
16+
include ../../mk/spksrc.kernel-modules.mk

kernel/syno-monaco-6.1/digests

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
monaco-linux-3.10.x-bsp.txz SHA1 800777a24caae6a2f2904b570a40ac5e2151995e
2+
monaco-linux-3.10.x-bsp.txz SHA256 0ff4b3ec1913aee959b70a1ba545961ebe07d002a67a1af83f56bc819e3508ff
3+
monaco-linux-3.10.x-bsp.txz MD5 24d7e0d0ff7a5df4bec6900c9fba4941

kernel/syno-ppc853x-5.2/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
853x-source.txz SHA1 bb5720e10fedb904639a580623233016c527dddc
2-
853x-source.txz SHA256 ffa8bb523dd05cc7897ef099f96eb97328924e27d44da88b9d4ea042fd170a32
3-
853x-source.txz MD5 00bf3f3dcd18ba9835914184f452d093
1+
853x-source.txz SHA1 b81b44876c2d9471d7bde3bd59114f90b2cd918e
2+
853x-source.txz SHA256 4d2910f0e4d9a859457588b01f5f7decc0b982a84c767410b41766653eee51a5
3+
853x-source.txz MD5 97a518c45e12052d901c279acb4d4373

kernel/syno-qoriq-5.2/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
qoriq-source.txz SHA1 c4c777585b99b2cd8e1e8899c19122f42491d532
2-
qoriq-source.txz SHA256 861ad8e72b8a3873a2264add758eea6ec940649b050e251ff062e5a055429064
3-
qoriq-source.txz MD5 a69a189bd553014c4cd3dfaafaac7763
1+
qoriq-source.txz SHA1 ef4cc6c9916707fc4cc22ecfb25d356bc5d01913
2+
qoriq-source.txz SHA256 64d4a9a5faa72ceabbd5686e892387349390b9df8927b72b6751b869917340be
3+
qoriq-source.txz MD5 1876813cf31f529644543026868a929a

kernel/syno-rtd1296-6.1/Makefile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ARCH ?= rtd1296
2+
TCVERSION ?= 6.1
3+
PKG_NAME = rtd1296
4+
PKG_BRANCH = 15152
5+
PKG_ARCH = $(PKG_NAME)
6+
PKG_EXT = txz
7+
PKG_DIST_NAME = linux-4.4.x.$(PKG_EXT)
8+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch/$(PKG_ARCH)-source
9+
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_DIST_NAME)
10+
PKG_EXTRACT = linux-4.4.x
11+
SYNO_CONFIG = synoconfigs/$(ARCH)
12+
BASE_ARCH = arm64
13+
14+
HOMEPAGE = http://www.synology.com/
15+
16+
include ../../mk/spksrc.kernel-modules.mk

kernel/syno-rtd1296-6.1/digests

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
rtd1296-linux-4.4.x.txz SHA1 d9401c27ac6c2c9484dc4d30134ae775194815a3
2+
rtd1296-linux-4.4.x.txz SHA256 2d029b422f012f226ad3f6cbd8c9795ff319d6d4cf81307daf7a2fd3cecb1dce
3+
rtd1296-linux-4.4.x.txz MD5 1a7fab20fb263a3918ee0562ea43be90

mk/spksrc.kernel-modules.mk

+4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ include ../../mk/spksrc.directories.mk
99
URLS = $(PKG_DIST_SITE)/$(PKG_DIST_NAME)
1010
NAME = $(PKG_NAME)
1111
COOKIE_PREFIX = $(PKG_NAME)-
12+
ifneq ($(PKG_DIST_FILE),)
13+
DIST_FILE = $(DISTRIB_DIR)/$(PKG_DIST_FILE)
14+
else
1215
DIST_FILE = $(DISTRIB_DIR)/$(PKG_DIST_NAME)
16+
endif
1317
DIST_EXT = $(PKG_EXT)
1418
DISTRIB_DIR = $(KERNELS_DIR)/$(PKG_BRANCH)
1519
COMPILE_TARGET = kernel_module_compile_target

mk/spksrc.native-cc.mk

+4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ WORK_DIR := $(PWD)/work-native
99
URLS = $(PKG_DIST_SITE)/$(PKG_DIST_NAME)
1010
NAME = native-$(PKG_NAME)
1111
COOKIE_PREFIX = $(PKG_NAME)-
12+
ifneq ($(PKG_DIST_FILE),)
13+
DIST_FILE = $(DISTRIB_DIR)/$(PKG_DIST_FILE)
14+
else
1215
DIST_FILE = $(DISTRIB_DIR)/$(PKG_DIST_NAME)
16+
endif
1317
DIST_EXT = $(PKG_EXT)
1418

1519
#####

spk/lirc/Makefile

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ LIRC_SUPPORTED_DRIVERS =
88

99
# Abort for ARCHs that won't compile LIRC cleanly
1010
ifneq ($(findstring $(ARCH),powerpc 88f5281),)
11-
$(error Sorry, this package does not support the $(ARCH) architecture.)
11+
$(error Sorry, this package does not support the $(ARCH) architecture)
1212
endif
1313

14+
# include definition of PPC_ARCHES...
15+
include ../../mk/spksrc.common.mk
16+
1417
# Use older LIRC build for ARCHs with kernel < 2.6.36
15-
ifneq ($(findstring $(ARCH),alpine armada370 armada375 armada38x armadaxp avoton braswell bromolow cedarview evansport x64 x86),$(ARCH))
18+
ifneq ($(findstring $(ARCH),88f6281 $(PPC_ARCHES)),)
1619
SPK_VERS = 0.8.7
1720
LIRC_SUPPORTED_DRIVERS = mceusb uirt uirt2
1821
endif

0 commit comments

Comments
 (0)