diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-10-03 01:54:33 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-08 23:47:14 +0000 |
commit | 0d390bfb5a46c290662038194b21d77a886be4b6 (patch) | |
tree | 31962041f8eb6c7bcfe43f01140b968b50634786 /meta/recipes-kernel/linux/linux-yocto_4.4.bb | |
parent | ca9d26a08dffeeeffee1447f462d4a2361397aa8 (diff) | |
download | poky-0d390bfb5a46c290662038194b21d77a886be4b6.tar.gz |
linux-yocto/4.1/4.4: remove innappropriate standard/base patches
Before standard/intel/* was created in the 4.1 and 4.4 kernel trees,
some patches were merged to standard/base to add features/support for
intel platforms.
While this isn't entirely bad, there have been some compile issues
reported in some configurations. Since we don't need these commits
on standard/base, we can relocate them to make standard/base upstream
clean.
This commit removes those patches from standard/base, and restores
then to the standard/intel/* branches.
(From OE-Core rev: 2c19e6378697141992c9bd7ff2bd4d57a4f9fe9b)
(From OE-Core rev: 3b7ad0bb67f6789ec038ea7df41274bae78e21a3)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto_4.4.bb')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.4.bb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb index 5cafa9166a..f2d07be2dc 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb | |||
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "standard/base" | 11 | KBRANCH_qemux86-64 ?= "standard/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "22a817dc851fac7ec9369c29b3a2803ec92781fb" | 14 | SRCREV_machine_qemuarm ?= "de294849e02680399a6dd03fedcc03a69e9a6a04" |
15 | SRCREV_machine_qemuarm64 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" | 15 | SRCREV_machine_qemuarm64 ?= "f4e52341c304e044dbe581a35aad6b930c9410d1" |
16 | SRCREV_machine_qemumips ?= "c1794372ab031297d1c4482d982e143386c247ea" | 16 | SRCREV_machine_qemumips ?= "a41dd187e7d42be65780f25997eb890ead6cc7d9" |
17 | SRCREV_machine_qemuppc ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" | 17 | SRCREV_machine_qemuppc ?= "f4e52341c304e044dbe581a35aad6b930c9410d1" |
18 | SRCREV_machine_qemux86 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" | 18 | SRCREV_machine_qemux86 ?= "f4e52341c304e044dbe581a35aad6b930c9410d1" |
19 | SRCREV_machine_qemux86-64 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" | 19 | SRCREV_machine_qemux86-64 ?= "f4e52341c304e044dbe581a35aad6b930c9410d1" |
20 | SRCREV_machine_qemumips64 ?= "ab08db0be1aec0daa5ac134fe1abcd6eba47b275" | 20 | SRCREV_machine_qemumips64 ?= "857685d23d1e8d8a8deb4198b139b95a5bb80825" |
21 | SRCREV_machine ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" | 21 | SRCREV_machine ?= "f4e52341c304e044dbe581a35aad6b930c9410d1" |
22 | SRCREV_meta ?= "170ed03a9d908e2abc8025cf9a62789ab15b3ece" | 22 | SRCREV_meta ?= "d9f20333c42e024d42d633b3da2458f2e0d9c52a" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" |