diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-03-06 13:11:15 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-08 10:39:33 -0800 |
commit | a7c9bc7020ab4c62fa60eb23257f07734b2582b0 (patch) | |
tree | fbf4bb8b242d8a56cd4be118545423a0db046a5d | |
parent | 3a8cce8b5c224710660802fba2bc0bbc97cf7385 (diff) | |
download | poky-a7c9bc7020ab4c62fa60eb23257f07734b2582b0.tar.gz |
linux-yocto: aufs and systemtap
Integrating a configuration change for systemtap:
features/systemtap/systemtap.cfg: enable CONFIG_KERNEL_DEBUG
And porting the aufs warning fix to 4.14 and 4.15:
aufs: fix compile warning
(From OE-Core rev: db2a8c827332c0837d029e99b210036218f8f9dc)
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-rt_4.12.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.12.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.14.bb | 18 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.15.bb | 2 |
9 files changed, 19 insertions, 19 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb index d6ffcc86a5..3f2a1ef7af 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "27c21aed67a28d08b13c5cc1fe4287b2cf389ede" | 14 | SRCREV_machine ?= "27c21aed67a28d08b13c5cc1fe4287b2cf389ede" |
15 | SRCREV_meta ?= "6d6037cc054350140df49c309e155f5a7b48f480" | 15 | SRCREV_meta ?= "5a06598524482b43b9e502bf02c1f4fd5c2e598b" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb index 7d2812fafe..fd003e4d2b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "6c699ea6debe70c60d41d9df23f558ffea2de7cb" | 14 | SRCREV_machine ?= "4832801a14130645d2251a368cba79d937a775ab" |
15 | SRCREV_meta ?= "426c8aa4862f95e84ec163b942b92726d3ef978f" | 15 | SRCREV_meta ?= "54b3e9b768651ca15bf65ae1c72dfe6d957285f0" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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.14;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb index a4dd17d1cb..3858992703 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "3247d5a26cab529bd4acc137c119bcdf71c3d5ae" | 14 | SRCREV_machine ?= "3247d5a26cab529bd4acc137c119bcdf71c3d5ae" |
15 | SRCREV_meta ?= "03267fd15a97748105bfec2866820a8c1512fe70" | 15 | SRCREV_meta ?= "40cef533a17de9d7a1de9b6e3578ac9125486a4a" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb index 860b68cda6..2ecb1cd70d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb | |||
@@ -10,7 +10,7 @@ KMETA = "kernel-meta" | |||
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "073873cb152cf254d229d548c3bdcc57460a4ff0" | 12 | SRCREV_machine ?= "073873cb152cf254d229d548c3bdcc57460a4ff0" |
13 | SRCREV_meta ?= "6d6037cc054350140df49c309e155f5a7b48f480" | 13 | SRCREV_meta ?= "5a06598524482b43b9e502bf02c1f4fd5c2e598b" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb index ae9e769136..1ccbf6283e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.14.24" | |||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "fccf7693fe5dd00d7b6d391b7405b5d58eb959f2" | 12 | SRCREV_machine ?= "09828ddd8d8c91b2d68afdcd8eb99a48e0253582" |
13 | SRCREV_meta ?= "426c8aa4862f95e84ec163b942b92726d3ef978f" | 13 | SRCREV_meta ?= "54b3e9b768651ca15bf65ae1c72dfe6d957285f0" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
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 858a318f3d..0c0abf38f2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb | |||
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0" | |||
19 | SRCREV_machine_qemux86-64 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0" | 19 | SRCREV_machine_qemux86-64 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0" |
20 | SRCREV_machine_qemumips64 ?= "f9a3a72209bde080e4ecb4fbe7a0f99954643131" | 20 | SRCREV_machine_qemumips64 ?= "f9a3a72209bde080e4ecb4fbe7a0f99954643131" |
21 | SRCREV_machine ?= "3247d5a26cab529bd4acc137c119bcdf71c3d5ae" | 21 | SRCREV_machine ?= "3247d5a26cab529bd4acc137c119bcdf71c3d5ae" |
22 | SRCREV_meta ?= "03267fd15a97748105bfec2866820a8c1512fe70" | 22 | SRCREV_meta ?= "40cef533a17de9d7a1de9b6e3578ac9125486a4a" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_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}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb index e1ec88bdc9..0a6b2b883e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.12.bb | |||
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "073873cb152cf254d229d548c3bdcc57460a4ff0" | |||
19 | SRCREV_machine_qemux86-64 ?= "073873cb152cf254d229d548c3bdcc57460a4ff0" | 19 | SRCREV_machine_qemux86-64 ?= "073873cb152cf254d229d548c3bdcc57460a4ff0" |
20 | SRCREV_machine_qemumips64 ?= "d25e0aa3f09dff2b8b908c7764c3c5244134d1a4" | 20 | SRCREV_machine_qemumips64 ?= "d25e0aa3f09dff2b8b908c7764c3c5244134d1a4" |
21 | SRCREV_machine ?= "073873cb152cf254d229d548c3bdcc57460a4ff0" | 21 | SRCREV_machine ?= "073873cb152cf254d229d548c3bdcc57460a4ff0" |
22 | SRCREV_meta ?= "6d6037cc054350140df49c309e155f5a7b48f480" | 22 | SRCREV_meta ?= "5a06598524482b43b9e502bf02c1f4fd5c2e598b" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/meta/recipes-kernel/linux/linux-yocto_4.14.bb index df998ade6a..a714e39751 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.14.bb | |||
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v4.14/standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "v4.14/standard/base" | 11 | KBRANCH_qemux86-64 ?= "v4.14/standard/base" |
12 | KBRANCH_qemumips64 ?= "v4.14/standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "v4.14/standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "833523192da4c50dfbae5a06d9fcc578e091daf4" | 14 | SRCREV_machine_qemuarm ?= "bb61314e5c67a13c7da2217e434dfb20053a0203" |
15 | SRCREV_machine_qemuarm64 ?= "dda8175b9f7ba47d308dd80c2a53e3c7e996d2dd" | 15 | SRCREV_machine_qemuarm64 ?= "eb7faf5b9bfe94ac2cb8e6a28e18fb39a8b720a7" |
16 | SRCREV_machine_qemumips ?= "43e496c5172a6f1035ecc98e2fac9c5874cefcc1" | 16 | SRCREV_machine_qemumips ?= "4bcebcabb514ba8f9b3f8f487f3595a5c2b5860f" |
17 | SRCREV_machine_qemuppc ?= "4507887bfd1ba5b3a337e71315fb8cad3be6670f" | 17 | SRCREV_machine_qemuppc ?= "3913c9c8dad1a3fef93d3d5721146ebe15dcc4d3" |
18 | SRCREV_machine_qemux86 ?= "e8410925ef1cdc57f4f367761e94863193014033" | 18 | SRCREV_machine_qemux86 ?= "edc90f45a716ffe8e16cebaaf3b5db070af0280a" |
19 | SRCREV_machine_qemux86-64 ?= "e8410925ef1cdc57f4f367761e94863193014033" | 19 | SRCREV_machine_qemux86-64 ?= "edc90f45a716ffe8e16cebaaf3b5db070af0280a" |
20 | SRCREV_machine_qemumips64 ?= "b2df75031185b81757c61e95142e0472314c8389" | 20 | SRCREV_machine_qemumips64 ?= "6d7fbdbb7e466be645c34eed7bb2b532a9431a85" |
21 | SRCREV_machine ?= "e8410925ef1cdc57f4f367761e94863193014033" | 21 | SRCREV_machine ?= "edc90f45a716ffe8e16cebaaf3b5db070af0280a" |
22 | SRCREV_meta ?= "426c8aa4862f95e84ec163b942b92726d3ef978f" | 22 | SRCREV_meta ?= "54b3e9b768651ca15bf65ae1c72dfe6d957285f0" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_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.14;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.15.bb b/meta/recipes-kernel/linux/linux-yocto_4.15.bb index ebbdfcb3b0..50be40d9e9 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.15.bb | |||
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "3247d5a26cab529bd4acc137c119bcdf71c3d5ae" | |||
19 | SRCREV_machine_qemux86-64 ?= "3247d5a26cab529bd4acc137c119bcdf71c3d5ae" | 19 | SRCREV_machine_qemux86-64 ?= "3247d5a26cab529bd4acc137c119bcdf71c3d5ae" |
20 | SRCREV_machine_qemumips64 ?= "38face5dfd94733484822f392f9469fed18cca7e" | 20 | SRCREV_machine_qemumips64 ?= "38face5dfd94733484822f392f9469fed18cca7e" |
21 | SRCREV_machine ?= "3247d5a26cab529bd4acc137c119bcdf71c3d5ae" | 21 | SRCREV_machine ?= "3247d5a26cab529bd4acc137c119bcdf71c3d5ae" |
22 | SRCREV_meta ?= "03267fd15a97748105bfec2866820a8c1512fe70" | 22 | SRCREV_meta ?= "40cef533a17de9d7a1de9b6e3578ac9125486a4a" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_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}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" |