diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2011-09-10 00:04:58 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-15 11:23:57 +0100 |
| commit | 420a5455abb352adf01e32cf7cc1989eae788ebe (patch) | |
| tree | f31c04ab02aa8aebede36fa8d3bfdbf9c755e587 | |
| parent | 1080d52f578ca03a48569c638ea72f53bdaf4cc7 (diff) | |
| download | poky-420a5455abb352adf01e32cf7cc1989eae788ebe.tar.gz | |
linux-yocto: split e100 and e1000 support
Merging the following meta changes:
12574e5 meta: create seperate feature for 10/100 LAN support
c8b37bf meta: Remove 10/100 LAN support.
(From OE-Core rev: 4ab79c8e02f9fe7a02c56019d5b169ad4f0e3aec)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb index ebf60546c3..36717d6bb3 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | |||
| @@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt" | |||
| 16 | 16 | ||
| 17 | SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3" | 17 | SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3" |
| 18 | SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af" | 18 | SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af" |
| 19 | SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7" | 19 | SRCREV_meta ?= "12574e5a77597f6938315ef82d18fc5e229fb79c" |
| 20 | 20 | ||
| 21 | PR = "r1" | 21 | PR = "r1" |
| 22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb index b2965582bc..4b1bdb241d 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb | |||
| @@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "eccd57eaa4c2b580b9adbbc39e19ecbff56779ae" | |||
| 18 | SRCREV_machine_qemux86 ?= "72671808fdbe69a9fe03fd8f094e7c59da04a28c" | 18 | SRCREV_machine_qemux86 ?= "72671808fdbe69a9fe03fd8f094e7c59da04a28c" |
| 19 | SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1" | 19 | SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1" |
| 20 | SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e" | 20 | SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e" |
| 21 | SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7" | 21 | SRCREV_meta ?= "12574e5a77597f6938315ef82d18fc5e229fb79c" |
| 22 | 22 | ||
| 23 | PR = "r2" | 23 | PR = "r2" |
| 24 | PV = "${LINUX_VERSION}+git${SRCPV}" | 24 | PV = "${LINUX_VERSION}+git${SRCPV}" |