summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-04-09 11:16:06 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-13 16:58:06 +0100
commita7265ef9d60836768e9c0764e78447d92981416e (patch)
treebfc4991d5543e74ffd79d2e66f5a228414360482
parent7425a5d813e964144981801be5fc0067269ddd6b (diff)
downloadpoky-a7265ef9d60836768e9c0764e78447d92981416e.tar.gz
linux-yocto-tiny/4.14: fix recipe name
I guess not many people are building linux-yocto-tiny for v4.15, given that I managed to mangle the name of the recipe when I introduced it. [YOCTO #12640] (From OE-Core rev: 6c1ddbbb0eb9c86646fcb99520e4747cfcd2b418) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.15.b25
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb50
2 files changed, 14 insertions, 61 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.b b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.b
deleted file mode 100644
index 7a6696c71a..0000000000
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.b
+++ /dev/null
@@ -1,25 +0,0 @@
1KBRANCH ?= "v4.15/standard/tiny/common-pc"
2LINUX_KERNEL_TYPE = "tiny"
3KCONFIG_MODE = "--allnoconfig"
4
5require recipes-kernel/linux/linux-yocto.inc
6
7LINUX_VERSION ?= "4.15"
8
9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2"
11
12SRCREV_machine ?= "f7a6d45fff853173bfbf61706aeffcd1d1e99467"
13SRCREV_meta ?= "ef2f5d9a0ac1c5ac60e76b18b0bb3393be450336"
14
15PV = "${LINUX_VERSION}+git${SRCPV}"
16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}"
19
20COMPATIBLE_MACHINE = "qemux86|qemux86-64"
21
22# Functionality flags
23KERNEL_FEATURES = ""
24
25KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb
index 6cddb7ecfc..9054f18621 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb
@@ -1,47 +1,25 @@
1KBRANCH ?= "v4.15/standard/base" 1KBRANCH ?= "v4.15/standard/tiny/common-pc"
2LINUX_KERNEL_TYPE = "tiny"
3KCONFIG_MODE = "--allnoconfig"
2 4
3require recipes-kernel/linux/linux-yocto.inc 5require recipes-kernel/linux/linux-yocto.inc
4 6
5# board specific branches
6KBRANCH_qemuarm ?= "v4.15/standard/arm-versatile-926ejs"
7KBRANCH_qemuarm64 ?= "v4.15/standard/qemuarm64"
8KBRANCH_qemumips ?= "v4.15/standard/mti-malta32"
9KBRANCH_qemuppc ?= "v4.15/standard/qemuppc"
10KBRANCH_qemux86 ?= "v4.15/standard/base"
11KBRANCH_qemux86-64 ?= "v4.15/standard/base"
12KBRANCH_qemumips64 ?= "v4.15/standard/mti-malta64"
13
14SRCREV_machine_qemuarm ?= "5fdc3d579c5f50fbaaa5faecae79e20b73810346"
15SRCREV_machine_qemuarm64 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0"
16SRCREV_machine_qemumips ?= "5afbe5a7e271f1c115a7c77bea4a71356c6f2792"
17SRCREV_machine_qemuppc ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0"
18SRCREV_machine_qemux86 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0"
19SRCREV_machine_qemux86-64 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0"
20SRCREV_machine_qemumips64 ?= "f9a3a72209bde080e4ecb4fbe7a0f99954643131"
21SRCREV_machine ?= "f73fd8783a3e7529902366ba75aafb81c19ec3c9"
22SRCREV_meta ?= "6918258c9e46ad8471210354159eb42f127c7374"
23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}"
26
27LINUX_VERSION ?= "4.15.13" 7LINUX_VERSION ?= "4.15.13"
28 8
29DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
30DEPENDS += "openssl-native util-linux-native"
31
32PV = "${LINUX_VERSION}+git${SRCPV}"
33
34KMETA = "kernel-meta" 9KMETA = "kernel-meta"
35KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
36 11
37KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" 12SRCREV_machine ?= "f73fd8783a3e7529902366ba75aafb81c19ec3c9"
13SRCREV_meta ?= "939d935b0c992c6f1e51a7a1c9e4fbe6ef3c3174"
14
15PV = "${LINUX_VERSION}+git${SRCPV}"
38 16
39COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}"
19
20COMPATIBLE_MACHINE = "qemux86|qemux86-64"
40 21
41# Functionality flags 22# Functionality flags
42KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" 23KERNEL_FEATURES = ""
43KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" 24
44KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" 25KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
45KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
46KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
47KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"