diff options
-rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/mpc8315e-rdb.conf | 4 | ||||
-rw-r--r-- | meta/conf/machine/routerstationpro.conf | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_git.bb | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index a41ca39404..6b9809192d 100644 --- a/meta/conf/distro/include/poky-default-revisions.inc +++ b/meta/conf/distro/include/poky-default-revisions.inc | |||
@@ -102,7 +102,7 @@ SRCREV_machine_pn-linux-yocto_qemux86 ?= "a9d833fda90e2f1257888a97e092135610b5f2 | |||
102 | SRCREV_machine_pn-linux-yocto_qemux86-64 ?= "a9d833fda90e2f1257888a97e092135610b5f259" | 102 | SRCREV_machine_pn-linux-yocto_qemux86-64 ?= "a9d833fda90e2f1257888a97e092135610b5f259" |
103 | SRCREV_machine_pn-linux-yocto_emenlow ?= "a9d833fda90e2f1257888a97e092135610b5f259" | 103 | SRCREV_machine_pn-linux-yocto_emenlow ?= "a9d833fda90e2f1257888a97e092135610b5f259" |
104 | SRCREV_machine_pn-linux-yocto_atom-pc ?= "a9d833fda90e2f1257888a97e092135610b5f259" | 104 | SRCREV_machine_pn-linux-yocto_atom-pc ?= "a9d833fda90e2f1257888a97e092135610b5f259" |
105 | SRCREV_machine_pn-linux-yocto_routerstationpro ?= "9d24b148fc23a2c8fab0a6add18500453b375d54" | 105 | SRCREV_machine_pn-linux-yocto_routerstationpro ?= "219a5f9dc6e5beced36184e141f80b2df61ae32f" |
106 | SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "3f01b98238c2ff7913ce9f68f9db5ae9538717bc" | 106 | SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "3f01b98238c2ff7913ce9f68f9db5ae9538717bc" |
107 | SRCREV_machine_pn-linux-yocto_beagleboard ?= "a9d833fda90e2f1257888a97e092135610b5f259" | 107 | SRCREV_machine_pn-linux-yocto_beagleboard ?= "a9d833fda90e2f1257888a97e092135610b5f259" |
108 | SRCREV_meta_pn-linux-yocto ?= "7102097a25c7658e0f4d4dc71844e0ff6c446b25" | 108 | SRCREV_meta_pn-linux-yocto ?= "7102097a25c7658e0f4d4dc71844e0ff6c446b25" |
diff --git a/meta/conf/machine/mpc8315e-rdb.conf b/meta/conf/machine/mpc8315e-rdb.conf index 919a95d9ef..e3f9d2319d 100644 --- a/meta/conf/machine/mpc8315e-rdb.conf +++ b/meta/conf/machine/mpc8315e-rdb.conf | |||
@@ -12,5 +12,5 @@ SERIAL_CONSOLE = "115200 ttyS0" | |||
12 | 12 | ||
13 | MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" | 13 | MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" |
14 | 14 | ||
15 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-stable" | 15 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" |
16 | #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" | 16 | PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" |
diff --git a/meta/conf/machine/routerstationpro.conf b/meta/conf/machine/routerstationpro.conf index 4f1bbbb2c7..9e5036d86c 100644 --- a/meta/conf/machine/routerstationpro.conf +++ b/meta/conf/machine/routerstationpro.conf | |||
@@ -12,8 +12,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 \ | |||
12 | KERNEL_IMAGETYPE = "vmlinux" | 12 | KERNEL_IMAGETYPE = "vmlinux" |
13 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" | 13 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" |
14 | 14 | ||
15 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-stable" | 15 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" |
16 | #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" | 16 | PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" |
17 | 17 | ||
18 | SERIAL_CONSOLE = "115200 ttyS0" | 18 | SERIAL_CONSOLE = "115200 ttyS0" |
19 | 19 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb index 06836f78bd..21023da54b 100644 --- a/meta/recipes-kernel/linux/linux-yocto_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto_git.bb | |||
@@ -20,7 +20,7 @@ SRCREV_FORMAT = "meta_machine" | |||
20 | SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ | 20 | SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ |
21 | git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;noclone=1;branch=meta;name=meta" | 21 | git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;noclone=1;branch=meta;name=meta" |
22 | 22 | ||
23 | COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" | 23 | COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|mpc8315e-rdb|routerstationpro)" |
24 | 24 | ||
25 | # Functionality flags | 25 | # Functionality flags |
26 | KERNEL_REVISION_CHECKING ?= "t" | 26 | KERNEL_REVISION_CHECKING ?= "t" |