Skip to contentSkip to conversation

meta-intel: kernel 3.0 PREFERRED_VERSION and SRCREV updates

PATCH New [email protected] 1 participant 3 messages Aug 21, 2011

lore
Share & tools
lore
#0 lore raw

cover meta-intel: kernel 3.0 PREFERRED_VERSION and SRCREV updates

From: Tom Zanussi <[email protected]>

This updates the PREFERRED_VERSION to use a broader wildcard, and updates the SRCREVs while we're at it.

The following changes since commit 5c41b9b6a245664543e6ddd440d10a0696caaf7b:
Darren Hart (1):
n450: decouple from meta-yocto atom-pc machine config

are available in the git repository at:

git://git.yoctoproject.org/meta-intel.git tzanussi/3.0-preferred-upate
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/log/?h=tzanussi/3.0-preferred-upate

Tom Zanussi (2):
meta-intel: change PREFERRED_VERSIONs
meta-intel: update SRCREVs

 meta-fishriver/conf/machine/fishriver.conf         |    3 ++-
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    4 ++--
 meta-fri2/conf/machine/fri2.conf                   |    2 +-
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    4 ++--
 meta-jasperforest/conf/machine/jasperforest.conf   |    4 ++--
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    4 ++--
 meta-sugarbay/conf/machine/sugarbay.conf           |    4 ++--
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    4 ++--
 8 files changed, 15 insertions(+), 14 deletions(-)
#1 lore raw

PATCH 1/2 meta-intel: change PREFERRED_VERSIONs

From: Tom Zanussi <[email protected]>

Change PREFERRED_VERSION_linux-yocto to a form that will pick up the new numbering scheme.

---
 meta-fishriver/conf/machine/fishriver.conf       |    3 ++-
 meta-fri2/conf/machine/fri2.conf                 |    2 +-
 meta-jasperforest/conf/machine/jasperforest.conf |    4 ++--
 meta-sugarbay/conf/machine/sugarbay.conf         |    4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)
meta-fishriver/conf/machine/fishriver.conf +2 -1
index 70dcc2f..0cee5d0 100644
@@ -12,7 +12,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 KERNEL_IMAGETYPE = "bzImage"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.0+git%"
+PREFERRED_VERSION_linux-yocto ?= "3.0%"
+
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
meta-fri2/conf/machine/fri2.conf +1 -1
index fea43a2..a871529 100644
@@ -12,7 +12,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 KERNEL_IMAGETYPE = "bzImage"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.0+git%"
+PREFERRED_VERSION_linux-yocto ?= "3.0%"
 
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
meta-jasperforest/conf/machine/jasperforest.conf +2 -2
index 6c44fe5..3013fe4 100644
@@ -12,9 +12,9 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 KERNEL_IMAGETYPE = "bzImage"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.0+git%"
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.0%"
 
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
meta-sugarbay/conf/machine/sugarbay.conf +2 -2
index a6f6ddf..ea8d98a 100644
@@ -12,9 +12,9 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 KERNEL_IMAGETYPE = "bzImage"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto = "3.0+git%"
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
+PREFERRED_VERSION_linux-yocto = "3.0%"
 
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 2/2 meta-intel: update SRCREVs

From: Tom Zanussi <[email protected]>

Update linux-yocto_3.0 kernel SRCREVS for fishriver, fri2, jasperforest, and sugarbay.

---
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    4 ++--
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    4 ++--
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    4 ++--
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
meta-fishriver/recipes-kernel/linux/linux-yocto_3.0.bbappend +2 -2
index 7e40fb1..1d1c0b6 100644
@@ -2,5 +2,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_fishriver = "fishriver"
 KMACHINE_fishriver  = "yocto/standard/fishriver"
 
-SRCREV_machine_pn-linux-yocto_fishriver ?= "5c13f6d2e5d49d3cddd57619efb0c615074f6aae"
-SRCREV_meta_pn-linux-yocto_fishriver ?= "9da70812ecddee0f7eeb11675f29497cb997275e"
+SRCREV_machine_pn-linux-yocto_fishriver ?= "5746120ee0afefd1e28400bea4b74f285bd5e59a"
+SRCREV_meta_pn-linux-yocto_fishriver ?= "d588bdafc0d9b4d2386144b7d76a1d379e2d16c0"
meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend +2 -2
index 98c056f..739e799 100644
@@ -2,5 +2,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2  = "yocto/standard/fri2"
 
-SRCREV_machine_pn-linux-yocto_fri2 ?= "9ebb9cf2527250fceee7ccd9c6d3e01c00724bf9"
-SRCREV_meta_pn-linux-yocto_fri2 ?= "9da70812ecddee0f7eeb11675f29497cb997275e"
+SRCREV_machine_pn-linux-yocto_fri2 ?= "493b09ef2c7124f977421a40955750743a5293d3"
+SRCREV_meta_pn-linux-yocto_fri2 ?= "d588bdafc0d9b4d2386144b7d76a1d379e2d16c0"
meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend +2 -2
index d351b37..715d30d 100644
@@ -4,5 +4,5 @@ COMPATIBLE_MACHINE_jasperforest = "jasperforest"
 
 KMACHINE_jasperforest  = "yocto/standard/common-pc-64/jasperforest"
 
-SRCREV_machine_pn-linux-yocto_jasperforest ?= "48f6aaacf668d06aa9aba82501f31b3eff08df8d"
-SRCREV_meta_pn-linux-yocto_jasperforest ?= "9da70812ecddee0f7eeb11675f29497cb997275e"
+SRCREV_machine_pn-linux-yocto_jasperforest ?= "bc7f933525ebc267cc8d9a66ce03626bbe14537b"
+SRCREV_meta_pn-linux-yocto_jasperforest ?= "d588bdafc0d9b4d2386144b7d76a1d379e2d16c0"
meta-sugarbay/recipes-kernel/linux/linux-yocto_3.0.bbappend +2 -2
index 52920f6..b8c2da3 100644
@@ -3,5 +3,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_sugarbay = "sugarbay"
 KMACHINE_sugarbay  = "yocto/standard/common-pc-64/sugarbay"
 
-SRCREV_machine_pn-linux-yocto_sugarbay ?= "b0430dab0b3af4a12fe057cecc63ce98f9419ce1"
-SRCREV_meta_pn-linux-yocto_sugarbay ?= "9da70812ecddee0f7eeb11675f29497cb997275e"
+SRCREV_machine_pn-linux-yocto_sugarbay ?= "6f4f262873ffe7d4bde8f974af1c62fbfc07f17f"
+SRCREV_meta_pn-linux-yocto_sugarbay ?= "d588bdafc0d9b4d2386144b7d76a1d379e2d16c0"
Signature · 1 line
1.7.0.4