diff options
Diffstat (limited to 'meta-crownbay')
| -rw-r--r-- | meta-crownbay/conf/machine/crownbay-noemgd.conf | 6 | ||||
| -rw-r--r-- | meta-crownbay/conf/machine/crownbay.conf | 6 | ||||
| -rw-r--r-- | meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend (renamed from meta-crownbay/recipes-kernel/linux/linux-wrs_git.bbappend) | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf index 535cf55e..0cf7d66f 100644 --- a/meta-crownbay/conf/machine/crownbay-noemgd.conf +++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf | |||
| @@ -16,7 +16,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ | |||
| 16 | 16 | ||
| 17 | KERNEL_IMAGETYPE = "bzImage" | 17 | KERNEL_IMAGETYPE = "bzImage" |
| 18 | 18 | ||
| 19 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-wrs" | 19 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-stable" |
| 20 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" | 20 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" |
| 21 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" | 21 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" |
| 22 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" | 22 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" |
| @@ -41,5 +41,5 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz" | |||
| 41 | GLIBC_ADDONS = "nptl" | 41 | GLIBC_ADDONS = "nptl" |
| 42 | GLIBC_EXTRA_OECONF = "--with-tls" | 42 | GLIBC_EXTRA_OECONF = "--with-tls" |
| 43 | 43 | ||
| 44 | SRCREV_machine_pn-linux-wrs_crownbay-noemgd = "f0afe10edaed24575eb115ad69c366fc24ea9380" | 44 | SRCREV_machine_pn-linux-yocto-stable_crownbay-noemgd ?= "f0afe10edaed24575eb115ad69c366fc24ea9380" |
| 45 | SRCREV_meta_pn-linux-wrs = "2f315f96f26a93d22fe0fc524de629e7c46b8469" | 45 | SRCREV_meta_pn-linux-yocto-stable_crownbay-noemgd ?= "2f315f96f26a93d22fe0fc524de629e7c46b8469" |
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index de59bc05..959d4c7b 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf | |||
| @@ -16,7 +16,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ | |||
| 16 | 16 | ||
| 17 | KERNEL_IMAGETYPE = "bzImage" | 17 | KERNEL_IMAGETYPE = "bzImage" |
| 18 | 18 | ||
| 19 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-wrs" | 19 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-stable" |
| 20 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" | 20 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" |
| 21 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" | 21 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" |
| 22 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-emgd" | 22 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-emgd" |
| @@ -45,5 +45,5 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz" | |||
| 45 | GLIBC_ADDONS = "nptl" | 45 | GLIBC_ADDONS = "nptl" |
| 46 | GLIBC_EXTRA_OECONF = "--with-tls" | 46 | GLIBC_EXTRA_OECONF = "--with-tls" |
| 47 | 47 | ||
| 48 | SRCREV_machine_pn-linux-wrs_crownbay = "f0afe10edaed24575eb115ad69c366fc24ea9380" | 48 | SRCREV_machine_pn-linux-yocto-stable_crownbay ?= "f0afe10edaed24575eb115ad69c366fc24ea9380" |
| 49 | SRCREV_meta_pn-linux-wrs = "2f315f96f26a93d22fe0fc524de629e7c46b8469" | 49 | SRCREV_meta_pn-linux-yocto-stable_crownbay ?= "2f315f96f26a93d22fe0fc524de629e7c46b8469" |
diff --git a/meta-crownbay/recipes-kernel/linux/linux-wrs_git.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend index aebe789a..4136536f 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-wrs_git.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | FILESEXTRAPATHS := "${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS := "${THISDIR}/${PN}" |
| 2 | 2 | ||
| 3 | COMPATIBLE_MACHINE_crownbay = "crownbay" | 3 | COMPATIBLE_MACHINE_crownbay = "crownbay" |
| 4 | WRMACHINE_crownbay = "crownbay" | 4 | KMACHINE_crownbay = "crownbay" |
| 5 | 5 | ||
| 6 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" | 6 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" |
| 7 | WRMACHINE_crownbay-noemgd = "crownbay" | 7 | KMACHINE_crownbay-noemgd = "crownbay" |