[OE-core] [PATCH 1/3] package_rpm: add architecture info in rpm spec file

[Dongxiao Xu]

For supporting multilib, architecture information is needed in package
require/provide/suggest/recommend fields.

Use DEFAULTTUNE value as the postfix.

For all arch recipe, it requires all arch recipe with no postfix,
but provides all possible multilib archs.

For example, qemu-config:

Requires: rsync
Requires: update-rc.d
Requires: task-core-nfs-server
Requires: distcc
Requires: oprofileui-server
Requires: dbus-x11
Requires: bash
Provides: qemu-config.x86
Provides: qemu-config.x86-64

For other recipe like zlib:

Requires: libc6.x86-64 = 2.13
Provides: zlib.x86-64

[YOCTO #1457]

Signed-off-by: Dongxiao Xu dongxiao...@intel.com
---
 meta/classes/multilib.bbclass|1 +
 meta/classes/package_rpm.bbclass |   36 
 2 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 583d76b..76c86b2 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -23,6 +23,7 @@ python multilib_virtclass_handler () {
 e.data.setVar(PN, variant + - + e.data.getVar(PN, False))
 e.data.setVar(SHLIBSDIR_virtclass-multilib- + variant 
,e.data.getVar(SHLIBSDIR, False) + / + variant)
 e.data.setVar(TARGET_VENDOR_virtclass-multilib- + variant, 
e.data.getVar(TARGET_VENDOR, False) + ml + variant)
+e.data.setVar(SAVED_DEFAULTTUNE, e.data.getVar(DEFAULTTUNE, True))
 e.data.setVar(OVERRIDES, e.data.getVar(OVERRIDES, False) + override)
 }
 
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 9ef1acd..ea0a079 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -350,6 +350,7 @@ package_install_internal_rpm () {
 python write_specfile () {
import textwrap
import oe.packagedata
+   import re
 
# We need a simple way to remove the MLPREFIX from the package name,
# and dependency information...
@@ -498,6 +499,8 @@ python write_specfile () {
 
splitname= strip_multilib(pkgname, d)
 
+   defaulttune = bb.data.getVar('DEFAULTTUNE', localdata, True)
+
splitsummary = (bb.data.getVar('SUMMARY', localdata, True) or 
bb.data.getVar('DESCRIPTION', localdata, True) or .)
splitversion = (bb.data.getVar('PKGV', localdata, True) or 
).replace('-', '+')
splitrelease = (bb.data.getVar('PKGR', localdata, True) or )
@@ -528,6 +531,39 @@ python write_specfile () {
if pkg == d.getVar(PN, True):
splitrprovides = splitrprovides +   + 
(d.getVar('ALTERNATIVE_LINK', True) or '') +   + 
(d.getVar('ALTERNATIVE_LINKS', True) or '')
 
+   package_arch = bb.data.getVar('PACKAGE_ARCH', localdata, True)
+
+   splitrprovides = splitrprovides +   + splitname + . + 
defaulttune
+   if package_arch != all:
+   pattern = '\([^()]*\)'
+   prog = re.compile(pattern)
+
+   str_list = [splitrdepends, splitrrecommends, 
splitrsuggests]
+   for e in range(len(str_list)):
+   brackets = prog.findall(str_list[e])
+   for i in range(len(brackets)):
+   str_list[e] = 
str_list[e].replace(brackets[i], #BRACKETS+str(i)+#)
+   tmp = 
+   for i in str_list[e].split():
+   if i.startswith(#BRACKETS):
+   tmp +=   + str(i)
+   continue
+   tmp +=   + str(i) + . + defaulttune
+   str_list[e] = tmp
+   for i in range(len(brackets)):
+   str_list[e] = 
str_list[e].replace(#BRACKETS+str(i)+#, brackets[i])
+
+   [splitrdepends, splitrrecommends, splitrsuggests] = 
str_list
+   else:
+   variants = (bb.data.getVar(MULTILIB_VARIANTS, 
localdata, True) or ).split()
+   for variant in variants:
+   tune = 
bb.data.getVar(DEFAULTTUNE_virtclass-multilib- + variant, localdata, True) or 

+   if tune:
+   splitrprovides = splitrprovides +   + 
splitname + . + tune
+   tune = bb.data.getVar(SAVED_DEFAULTTUNE, localdata, 
True) or 
+   if tune:
+   splitrprovides = splitrprovides +   + 
splitname + . + tune
+
# Gather special src/first package data
if srcname == splitname:
srcrdepends= splitrdepends
-- 
1.7.1


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org

[OE-core] [PATCH 2/3] rootfs_rpm: Use specific MACHINE_ARCH for multilib recipes

[Dongxiao Xu]

Currently MACHINE_ARCH deploy folder is unique in multilib system, thus
a lib32 version of rpm package will override a normal rpm package if its
PACKAGE_ARCH is ${MACHINE_ARCH}.

Take netbase as an example, which the PACKAGE_ARCH = MACHINE_ARCH. Both
the normal version of netbase package and the lib32 version are named as
netbase-4.45-r1.qemux86_64.rpm putting in tmp/deploy/rpm/qemux86-64
directory, so we need to differentiate them.

Here we define spedific MACHINE_virtclass-multilib-lib(xx) to override
the default MACHINE value, thus got different MACHINE_ARCH to fix this
issue.

Signed-off-by: Dongxiao Xu dongxiao...@intel.com
---
 meta/classes/rootfs_rpm.bbclass |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 135ca75..56c1a85 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -218,6 +218,9 @@ python () {
 default_tune = localdata.getVar(DEFAULTTUNE_virtclass-multilib- 
+ eext[1], False)
 if default_tune:
 localdata.setVar(DEFAULTTUNE, default_tune)
+machine = localdata.getVar(MACHINE_virtclass-multilib- + 
eext[1], False)
+if machine:
+localdata.setVar(MACHINE, machine)
 ml_package_archs += localdata.getVar(PACKAGE_ARCHS, True) or 
 #bb.note(ML_PACKAGE_ARCHS %s %s %s % (eext[1], 
localdata.getVar(PACKAGE_ARCHS, True) or (none), overrides))
 bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d)
-- 
1.7.1


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 0/3][RFC v2] rpm: multilib related fixes

[Dongxiao Xu]

Hi Richard and Mark,

This is the second version of RFC to fix multilib related issue to RPM, 
includes:

1) Add architecture information in RPM spec file to fix bug 1457.
2) Define override for MACHINE to avoid confliction with normal recipe in 
deploy folder.
3) Add MULTILIB_IMAGE_INSTALL in the package installation list.

We have another patch related with local.conf.sample.extended, which will be 
sent to p...@yoctoproject.org.

Change from v1:
1) we define MACHINE override for multilib instead of add MLPREFIX in front of 
MACHINE_ARCH.


The following changes since commit 8df322abfd3fa8c460fd73c83c1ef0b5e419dc11:

  core-image-minimal: Add missing POKY_EXTRA_IMAGE variable (2011-09-14 
01:27:08 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib dxu4/ml2
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/ml2

Dongxiao Xu (3):
  package_rpm: add architecture info in rpm spec file
  rootfs_rpm: Use specific MACHINE_ARCH for multilib recipes
  multilib: install MULTILIB_IMAGE_INSTALL

 meta/classes/multilib.bbclass|1 +
 meta/classes/package_rpm.bbclass |   78 +++---
 meta/classes/rootfs_rpm.bbclass  |7 +++
 3 files changed, 72 insertions(+), 14 deletions(-)


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] pango: use qemu to generate pango.modules during rootfs construction

[Phil Blundell]

On Tue, 2011-09-13 at 15:33 -0300, Otavio Salvador wrote:
 On Tue, Sep 13, 2011 at 14:25, Phil Blundell ph...@gnu.org wrote:
  Do you know how long it's likely to be before this release is complete
  and the tree is re-opened for development?  I'm a bit unclear what the
  process is for that.
 
 Maybe we ought to use a 'next' branch for it?

If master is going to be closed for a long time (weeks/months) then yes,
that seems like a good idea.  If we're only talking about a few days
then it's probably not worth the effort.

p.



___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [RFC] Suggestion of minor change to patch submission policy re: long descriptions in commit headers

[Phil Blundell]

On Tue, 2011-09-13 at 17:46 -0700, Joshua Lock wrote:
 Whilst I intend to rectify the latter I'd like to propose we change the
 former such that the defect information is at the end of the commit
 message.
 
 I believe this is more suitable for the project because the defect
 information and its relevance should be summarised in the long
 description, and therefore the defect id and link to the defect tracker
 are supplemental information for interested readers.
 
 IMHO this supplementary nature should lead us to request submitters
 provide defect information after the long description.

Agreed, I think this would be something of an improvement (and indeed,
from a look at the git log it appears that some submitters are already
doing this).  Although it isn't a very big deal, I do find it slightly
irritating to have the first line of the long checkin message be
something that is essentially noise.

Possibly even better would be to think up a way to encode the defect
information, in some machine-readable form, as part of the
pseudo-header.  That would make it straightforward for folks who care
particularly about the defect information for (say) yocto to filter it
into some more prominent location.

p.



___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] qt4: update to latest version 4.7.4

[Koen Kooi]

Op 12 sep. 2011, om 12:34 heeft Paul Eggleton het volgende geschreven:

 On Sunday 11 September 2011 18:33:35 Eric Bénard wrote:
 - 4.7.4 was release on the 1st of september, the changelog is available
 here :
 http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/chang
 es-4.7.4 and mostly contains bug fix.
 
 Signed-off-by: Eric Bénard e...@eukrea.com
 ---
 .../conf/distro/include/distro_tracking_fields.inc |   32
 ++-- meta/recipes-qt/qt4/{qt-4.7.3.inc = qt-4.7.4.inc} | 
  4 +-
 .../0001-Added-Openembedded-crossarch-option.patch |0
 

[..]

 rename to meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
 
 Thanks Eric, tested OK.
 
 Acked-by: Paul Eggleton paul.eggle...@linux.intel.com

Saul, Richard,

Could you please give us an heads-up when this is going in, since it needs 
matching commits to meta-oe and meta-angstrom as well to keep the .bbappends 
working. If we don't succeed in merging the bbappend changes into oe-core we 
should consider breaking the 'git mv oldrecipe newrecipe' into an add and 
delete spaced a day apart.

regards,

Koen
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 2/2] initramfs-live-install: add a version for use with grub2

[Otavio Salvador]

On Wed, Sep 14, 2011 at 02:39, Tom Zanussi tom.zanu...@intel.com wrote:
 grub2 uses a completely different set of install steps.  These are
 contained in a 2.0 version of init-install.sh, which is tied to grub2
 (1.98) and a 2.0 version of the initramfs-live-install recipe.

Please avoid Poky, OE-Core and like while interacting with user since
this will force people to fork the script. Try to avoid branding as
possible.

-- 
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 0/2] Add new recipes for grub2

[Otavio Salvador]

On Wed, Sep 14, 2011 at 02:39, Tom Zanussi tom.zanu...@intel.com wrote:
/ A future patch will factor out the common parts of init_install_2.0.sh
 with init_install 1.0 - this initial patchset essentially just fixes
 what's necessary for YOCTO bug #1428 in order to get things working again.

Wouldn't be better to drop 1.0 completely?

-- 
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 0/3] Small fixes for xserver-xf86 inc files

[Otavio Salvador]

The following changes since commit 8df322abfd3fa8c460fd73c83c1ef0b5e419dc11:

  core-image-minimal: Add missing POKY_EXTRA_IMAGE variable (2011-09-14 
01:27:08 +0100)

are available in the git repository at:
  git://github.com/OSSystems/oe-core master
  https://github.com/OSSystems/oe-core/tree/master

Otavio Salvador (3):
  xserver-xf86-common.inc: use ${datadir} instead of /usr/share
  xserver-xf86-dri-lite.inc: use ${datadir} instead of /usr/share
  xserver-xf86-lite.inc: use ${datadir} instead of /usr/share

 .../xorg-xserver/xserver-xf86-common.inc   |2 +-
 .../xorg-xserver/xserver-xf86-dri-lite.inc |2 +-
 .../xorg-xserver/xserver-xf86-lite.inc |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

-- 
1.7.2.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/3] xserver-xf86-lite.inc: use ${datadir} instead of /usr/share

[Otavio Salvador]

Signed-off-by: Otavio Salvador ota...@ossystems.com.br
---
 .../xorg-xserver/xserver-xf86-lite.inc |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
index 7150a2a..5447058 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
@@ -29,6 +29,6 @@ EXTRA_OECONF += --disable-static \
  --disable-glx \
  --sysconfdir=/etc/X11 \
  --localstatedir=/var \
- --with-fontdir=/usr/share/fonts/X11 \
+ --with-fontdir=${datadir}/fonts/X11 \
  --with-xkb-output=/var/lib/xkb \
  ac_cv_file__usr_share_sgml_X11_defs_ent=no
-- 
1.7.2.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] Problem with new image-prelink

[Mark Hatle]

On 9/13/11 8:33 PM, James Limbouris wrote:
 -Original Message-
 From: openembedded-core-boun...@lists.openembedded.org
 [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
 Mark Hatle
 Sent: Wednesday, 14 September 2011 8:52 AM
 To: openembedded-core@lists.openembedded.org
 Subject: Re: [OE-core] Problem with new image-prelink

 Please try the new version of the prelinker.  I just sent a pull request for 
 it,
 but there was a missing typecast on a printf.  This was causing problems on
 various systems, and likely could be causing the issue that you observed on
 ARM
 as well.

 I did build the latest version for the ARM target, and successfully ran it 
 there
 under QEMU.

 --Mark
 
 Thanks Mark - all working, on host and target.

Does this also resolve the initial issue you found, QT failing to work after
prelinking?

If not, I'd like to open a new defect on it and see if we can figure out the
cause still...

--Mark

 James
 
 ___
 Openembedded-core mailing list
 Openembedded-core@lists.openembedded.org
 http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/3] package_rpm: add architecture info in rpm spec file

[Mark Hatle]

On 9/13/11 8:03 PM, Xu, Dongxiao wrote:
 Hi Mark,
 

...trimming the thread a bit...

 This patch is incorrect.  Architectural information should not be
 in the dependencies within RPM packages.

 RPM is expected to find the proper version of a package to install
 based on the existing dependency information.  I'm in the process
 of investigating why certain items are not found properly.


 Let me take another case as an example during my debugging to this issue.
 
 Thinking that you have built out an base qemux86-64 image, and several lib32 
 multilib packages. Due to the wrong selection when doing RPM, we have several 
 packages (like libgtk), which need x86-64 version installed, however they are 
 replace by 32bit packages. The do_rootfs process succeeded, but when booting 
 the image, some Xserver programs fail to find /usr/lib64/libgtk.so, because 
 in the system only /usr/lib/libgtk.so is installed, which caused the X start 
 failure.

That is a completely different issue.  If applications need the 64-bit libraries
and the 32-bit ones are fulfilling the dependencies, then we have a dependency
mismatch.  Libraries should contain dependency information (within RPM) that
properly describe the ELF ABI as an artifact of the dependency generation.  This
is a defect we should be able to resolve in the package_rpm.bbclass.

I'll attempt to look into it today, unless someone beats me to it.


 There are different strategies we can use to deal with these situations.

 1) Resolve the base non-multilib system first, then augment it with the
 multilib components.  This results in a base system + alternative packages.

 2) Resolve the system as whole, including multilibs, and use the policy
 components to determine the best match.  (best match may not be working
 right
 today)  This results in a system based purely on dependency matches.

 Either way, our current implementation doesn't quite match either of them.
 We're closer to the second version of the implementation today

 If the base system approach is what we want, vs the pure dependency based
 system, then we will need to change the way the dependencies are being
 resolved and the ordering of the resolution in the packages_rpm.bbclass (or
 rootfs_rpm.bbclass).  Basically:

 *) take the list of dependencies and filter out any multilibs, and only scan 
 them
 against the base archs.

 *) add to that resolution any multilib components that had been filtered out
 and scan against the all archs.

 

 *) install as we do today
 
 I ever tried the second approach to fix the problem, however it failed.
 
 I split the installation into two parts as you mentioned, first part is to 
 install the base arch packages, and it does succeed. The second part is to 
 install resolution to multilib components, when calculating the dependency, 
 we will find package xxx is already installed error will be detected again 
 by the justdb installation. I think there are wrong RPM dependency when 
 installing lib32 multilib packages. showed as follows:
 
 Processing locale-base-en-us...
 Processing locale-base-en-gb...
 Processing task-core-boot...
 Processing task-core-apps-console...
 Processing task-core-ssh-dropbear...
 Processing task-core-apps-x11-pimlico...
 Processing task-core-x11-sato...
 Processing zypper...
 Processing task-core-x11-base...
 Processing task-core-apps-x11-games...
 Processing task-core-apps-x11-core...
 Processing task-base-extended...
 Processing rpm...
 Manifest: 
 /distro/dongxiao/build-ml6/tmp/work/qemux86_64-poky-linux/core-image-sato-1.0-r0/rootfs/install/install.manifest
 Preparing...##
 libc6   ##
 update-rc.d-dbg ##
 gst-meta-audio  ##
 pciutils-ids##
 ...
 ...
 Processing lib32-connman-gnome...
 Processing lib32-task-base-3g...
 Processing lib32-task-base-wifi...
 Processing lib32-task-base-bluetooth...
 Manifest: 
 /distro/dongxiao/build-ml6/tmp/work/qemux86_64-poky-linux/core-image-sato-1.0-r0/rootfs/install/install_multilib.manifest
 Preparing...##
 error: Install/Erase problems:
 package libc6-2.13-r14+svnr14157.x86_64 is already installed
 package update-rc.d-dbg-0.7-r4.all is already installed
 package gst-meta-audio-0.10-r10.x86_64 is already installed
 package pciutils-ids-3.1.7-r2.x86_64 is already installed
 package udev-extraconf-0.0-r1.x86_64 is already installed
 ...

This is a bit strange.  It should have detected from the resolution code that
the item was already installed and doesn't need to be re-installed -- unless the
above ELF types are causing this issue as well as the one described above.

--Mark

Re: [OE-core] [PATCH 2/3] rpm: add multilib prefix for archs under deploy/rpm

[Mark Hatle]

On 9/13/11 9:56 PM, Xu, Dongxiao wrote:
 Hi Mark,
 
 -Original Message-
 From: openembedded-core-boun...@lists.openembedded.org
 [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
 Mark Hatle
 Sent: Tuesday, September 13, 2011 11:24 PM
 To: openembedded-core@lists.openembedded.org
 Subject: Re: [OE-core] [PATCH 2/3] rpm: add multilib prefix for archs under
 deploy/rpm

 On 9/12/11 9:39 PM, Xu, Dongxiao wrote:
 Hi Mark,

 -Original Message-
 From: openembedded-core-boun...@lists.openembedded.org
 [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf
 Of Mark Hatle
 Sent: Tuesday, September 13, 2011 1:23 AM
 To: openembedded-core@lists.openembedded.org
 Subject: Re: [OE-core] [PATCH 2/3] rpm: add multilib prefix for archs
 under deploy/rpm

 On 9/12/11 10:07 AM, Xu, Dongxiao wrote:
 Hi Mark,

 -Original Message-
 From: openembedded-core-boun...@lists.openembedded.org
 [mailto:openembedded-core-boun...@lists.openembedded.org] On
 Behalf
 Of Mark Hatle
 Sent: Monday, September 12, 2011 10:56 PM
 To: openembedded-core@lists.openembedded.org
 Subject: Re: [OE-core] [PATCH 2/3] rpm: add multilib prefix for
 archs under deploy/rpm

 On 9/12/11 3:34 AM, Dongxiao Xu wrote:
 Currently MACHINE_ARCH deploy folder is unique in multilib system,
 thus a lib32 version of rpm package will override a normal rpm
 package if its PACKAGE_ARCH is ${MACHINE_ARCH}.

 Define different deploy folder for multilib architectures to avoid
 the confliction.

 I'm not sure I understand here.  Within the deployment directory is
 a set of directories for each RPM architecture.  Are you saying
 that we can get two packages that have different contents but the
 same RPM
 architecture?


 Yes, for example the netbase recipe, which the PACKAGE_ARCH =
 MACHINE_ARCH.
 Both the normal version of netbase package and the lib32 version are
 named as netbase-4.45-r1.qemux86_64.rpm putting in
 tmp/deploy/rpm/qemux86-64 directory, so we need to differentiate them.

 Wow, that is very broken.  I think part of the problem is that the
 arch is used to signify not only ABI (and optimizations), but also machine
 type in this case.

 What we really need is an additional architecture type that handles
 machine specific packages for each multilib type.  I'm really not
 sure what they would be called or how it would work though.

 Anyone have suggestions for naming and processing of these?  (I'm
 almost tempted to say machine_lib)

 In the weekend I had a talk with Richard and he suggested on adding
 MLPREFIX to MACHINE_ARCH to differentiate them.
 Otherwise user need to define a new value for
 MACHINE_virtclass-multilib-lib32?

 I can't think of a better solution for this right now.  Note, that if the 
 MLPREFIX
 is added to the MACHINE_ARCH, a corresponding change to Zypper will be
 needed as well.
 
 I tried this approach by defining 
 'MACHINE_virtclass-multilib-lib32=qemux86' in local.conf, and it works. 
 Therefore we will have qemux86, qemux86-64, x86, x86-64, and all 
 architectures under tmp/deploy/rpm folder. 
 
 Does zypper work with this approach?

This should work, we just need to ensure that zypper/libzypp are paying
attention to the MACHINE... type(s) as well.  There is a small chunk of code
within the libzypp recipe that generates a table of available/compatible
architectures.  This is what will need to be updated.

(I do think the MACHINE_virtclass change you made is likely the best approach
right now.)

--Mark

 Thanks,
 Dongxiao
 

 --Mark

 Thanks,
 Dongxiao


 --Mark

 Thanks,
 Dongxiao

 Can you give me an example of what is going wrong?

 --Mark

 Signed-off-by: Dongxiao Xu dongxiao...@intel.com
 ---
  meta/classes/multilib.bbclass   |5 +
  meta/classes/rootfs_rpm.bbclass |4 +++-
  2 files changed, 8 insertions(+), 1 deletions(-)

 diff --git a/meta/classes/multilib.bbclass
 b/meta/classes/multilib.bbclass index 76c86b2..6ace1fe 100644
 --- a/meta/classes/multilib.bbclass
 +++ b/meta/classes/multilib.bbclass
 @@ -77,4 +77,9 @@ python __anonymous () {
  multilib_map_variable(PACKAGES_DYNAMIC, variant, d)
  multilib_map_variable(PACKAGE_INSTALL, variant, d)
  multilib_map_variable(INITSCRIPT_PACKAGES, variant, d)
 +
 +package_arch = d.getVar(PACKAGE_ARCH, True)
 +machine_arch = d.getVar(MACHINE_ARCH, True)
 +if package_arch == machine_arch:
 +d.setVar(PACKAGE_ARCH, variant + _ + package_arch)
  }
 diff --git a/meta/classes/rootfs_rpm.bbclass
 b/meta/classes/rootfs_rpm.bbclass index 135ca75..7936d77 100644
 --- a/meta/classes/rootfs_rpm.bbclass
 +++ b/meta/classes/rootfs_rpm.bbclass
 @@ -218,7 +218,9 @@ python () {
  default_tune =
 localdata.getVar(DEFAULTTUNE_virtclass-multilib- + eext[1],
 False)
  if default_tune:
  localdata.setVar(DEFAULTTUNE, default_tune)
 -ml_package_archs +=
 localdata.getVar(PACKAGE_ARCHS,
 True) or 
 +localdata.setVar(MACHINE_ARCH, eext[1] + _ +
 

Re: [OE-core] [PATCH 1/3] package_rpm: add architecture info in rpm spec file

[Mark Hatle]

I still don't think this is what we want.  Let me look into the library issues
that you mentioned in the other thread and I'll see if we can deal with it that 
way.

(Note, we may need to use something like this in non-RPM cases.. but I'm not
sure about that either.)

--Mark

On 9/14/11 1:08 AM, Dongxiao Xu wrote:
 For supporting multilib, architecture information is needed in package
 require/provide/suggest/recommend fields.
 
 Use DEFAULTTUNE value as the postfix.
 
 For all arch recipe, it requires all arch recipe with no postfix,
 but provides all possible multilib archs.
 
 For example, qemu-config:
 
 Requires: rsync
 Requires: update-rc.d
 Requires: task-core-nfs-server
 Requires: distcc
 Requires: oprofileui-server
 Requires: dbus-x11
 Requires: bash
 Provides: qemu-config.x86
 Provides: qemu-config.x86-64
 
 For other recipe like zlib:
 
 Requires: libc6.x86-64 = 2.13
 Provides: zlib.x86-64
 
 [YOCTO #1457]
 
 Signed-off-by: Dongxiao Xu dongxiao...@intel.com
 ---
  meta/classes/multilib.bbclass|1 +
  meta/classes/package_rpm.bbclass |   36 
  2 files changed, 37 insertions(+), 0 deletions(-)
 
 diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
 index 583d76b..76c86b2 100644
 --- a/meta/classes/multilib.bbclass
 +++ b/meta/classes/multilib.bbclass
 @@ -23,6 +23,7 @@ python multilib_virtclass_handler () {
  e.data.setVar(PN, variant + - + e.data.getVar(PN, False))
  e.data.setVar(SHLIBSDIR_virtclass-multilib- + variant 
 ,e.data.getVar(SHLIBSDIR, False) + / + variant)
  e.data.setVar(TARGET_VENDOR_virtclass-multilib- + variant, 
 e.data.getVar(TARGET_VENDOR, False) + ml + variant)
 +e.data.setVar(SAVED_DEFAULTTUNE, e.data.getVar(DEFAULTTUNE, True))
  e.data.setVar(OVERRIDES, e.data.getVar(OVERRIDES, False) + override)
  }
  
 diff --git a/meta/classes/package_rpm.bbclass 
 b/meta/classes/package_rpm.bbclass
 index 9ef1acd..ea0a079 100644
 --- a/meta/classes/package_rpm.bbclass
 +++ b/meta/classes/package_rpm.bbclass
 @@ -350,6 +350,7 @@ package_install_internal_rpm () {
  python write_specfile () {
   import textwrap
   import oe.packagedata
 + import re
  
   # We need a simple way to remove the MLPREFIX from the package name,
   # and dependency information...
 @@ -498,6 +499,8 @@ python write_specfile () {
  
   splitname= strip_multilib(pkgname, d)
  
 + defaulttune = bb.data.getVar('DEFAULTTUNE', localdata, True)
 +
   splitsummary = (bb.data.getVar('SUMMARY', localdata, True) or 
 bb.data.getVar('DESCRIPTION', localdata, True) or .)
   splitversion = (bb.data.getVar('PKGV', localdata, True) or 
 ).replace('-', '+')
   splitrelease = (bb.data.getVar('PKGR', localdata, True) or )
 @@ -528,6 +531,39 @@ python write_specfile () {
   if pkg == d.getVar(PN, True):
   splitrprovides = splitrprovides +   + 
 (d.getVar('ALTERNATIVE_LINK', True) or '') +   + 
 (d.getVar('ALTERNATIVE_LINKS', True) or '')
  
 + package_arch = bb.data.getVar('PACKAGE_ARCH', localdata, True)
 +
 + splitrprovides = splitrprovides +   + splitname + . + 
 defaulttune
 + if package_arch != all:
 + pattern = '\([^()]*\)'
 + prog = re.compile(pattern)
 +
 + str_list = [splitrdepends, splitrrecommends, 
 splitrsuggests]
 + for e in range(len(str_list)):
 + brackets = prog.findall(str_list[e])
 + for i in range(len(brackets)):
 + str_list[e] = 
 str_list[e].replace(brackets[i], #BRACKETS+str(i)+#)
 + tmp = 
 + for i in str_list[e].split():
 + if i.startswith(#BRACKETS):
 + tmp +=   + str(i)
 + continue
 + tmp +=   + str(i) + . + defaulttune
 + str_list[e] = tmp
 + for i in range(len(brackets)):
 + str_list[e] = 
 str_list[e].replace(#BRACKETS+str(i)+#, brackets[i])
 +
 + [splitrdepends, splitrrecommends, splitrsuggests] = 
 str_list
 + else:
 + variants = (bb.data.getVar(MULTILIB_VARIANTS, 
 localdata, True) or ).split()
 + for variant in variants:
 + tune = 
 bb.data.getVar(DEFAULTTUNE_virtclass-multilib- + variant, localdata, True) 
 or 
 + if tune:
 + splitrprovides = splitrprovides +   + 
 splitname + . + tune
 + tune = bb.data.getVar(SAVED_DEFAULTTUNE, localdata, 
 True) or 
 + if tune:
 + 

Re: [OE-core] [PATCH 2/3] rootfs_rpm: Use specific MACHINE_ARCH for multilib recipes

[Mark Hatle]

This looks fine.  The do_archgen() function within the libzypp_git.bb will need
to be updated to look for the multilib machine type as well.

--Mark

On 9/14/11 1:08 AM, Dongxiao Xu wrote:
 Currently MACHINE_ARCH deploy folder is unique in multilib system, thus
 a lib32 version of rpm package will override a normal rpm package if its
 PACKAGE_ARCH is ${MACHINE_ARCH}.
 
 Take netbase as an example, which the PACKAGE_ARCH = MACHINE_ARCH. Both
 the normal version of netbase package and the lib32 version are named as
 netbase-4.45-r1.qemux86_64.rpm putting in tmp/deploy/rpm/qemux86-64
 directory, so we need to differentiate them.
 
 Here we define spedific MACHINE_virtclass-multilib-lib(xx) to override
 the default MACHINE value, thus got different MACHINE_ARCH to fix this
 issue.
 
 Signed-off-by: Dongxiao Xu dongxiao...@intel.com
 ---
  meta/classes/rootfs_rpm.bbclass |3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)
 
 diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
 index 135ca75..56c1a85 100644
 --- a/meta/classes/rootfs_rpm.bbclass
 +++ b/meta/classes/rootfs_rpm.bbclass
 @@ -218,6 +218,9 @@ python () {
  default_tune = 
 localdata.getVar(DEFAULTTUNE_virtclass-multilib- + eext[1], False)
  if default_tune:
  localdata.setVar(DEFAULTTUNE, default_tune)
 +machine = localdata.getVar(MACHINE_virtclass-multilib- + 
 eext[1], False)
 +if machine:
 +localdata.setVar(MACHINE, machine)
  ml_package_archs += localdata.getVar(PACKAGE_ARCHS, True) or 
  #bb.note(ML_PACKAGE_ARCHS %s %s %s % (eext[1], 
 localdata.getVar(PACKAGE_ARCHS, True) or (none), overrides))
  bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d)


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 0/1] a new patch to bug 1070

[Dexuan Cui]

The following changes since commit 372fffc4e289f88388de55665b1c5d766b956b37:

  dpkg: fix pkg_postinst_dpkg, don't supply {bindir}/update-alternatives 
(2011-09-13 21:08:37 +0800)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib dcui/deb
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/deb

Dexuan Cui (1):
  package_deb.bbclass, populate_sdk_deb.bbclass: fix
meta-toolchain-gmae build

 meta/classes/package_deb.bbclass  |   10 --
 meta/classes/populate_sdk_deb.bbclass |6 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

-- 
1.7.6


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] qt4: update to latest version 4.7.4

[Otavio Salvador]

On Wed, Sep 14, 2011 at 10:09, Eric Bénard e...@eukrea.com wrote:
 I sent patches to update meta-oe, meta-angstrom  meta-intel : did you get
 them ?

The md5sum of the tarball doesn't match. GNUtoo is aware of the issue.

Please hold the patch merging until a new patchset is send with the
fixes md5sum hashes.

Cheers,

-- 
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 2/2] initramfs-live-install: add a version for use with grub2

[Tom Zanussi]

On Wed, 2011-09-14 at 05:29 -0700, Otavio Salvador wrote:
 On Wed, Sep 14, 2011 at 02:39, Tom Zanussi tom.zanu...@intel.com wrote:
  grub2 uses a completely different set of install steps.  These are
  contained in a 2.0 version of init-install.sh, which is tied to grub2
  (1.98) and a 2.0 version of the initramfs-live-install recipe.
 
 Please avoid Poky, OE-Core and like while interacting with user since
 this will force people to fork the script. Try to avoid branding as
 possible.
 

Yeah, I thought I had caught all those - will remove in the new
patchset.

Thanks,

Tom


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 0/2] Add new recipes for grub2

[Tom Zanussi]

On Wed, 2011-09-14 at 05:30 -0700, Otavio Salvador wrote:
 On Wed, Sep 14, 2011 at 02:39, Tom Zanussi tom.zanu...@intel.com wrote:
 / A future patch will factor out the common parts of init_install_2.0.sh
  with init_install 1.0 - this initial patchset essentially just fixes
  what's necessary for YOCTO bug #1428 in order to get things working again.
 
 Wouldn't be better to drop 1.0 completely?
 

You're right, and the original did do that essentially - on second
thought it was much simpler - I'll resubmit something like that...

Thanks,

Tom


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 0/2] Add new recipes for grub2

[Otavio Salvador]

On Wed, Sep 14, 2011 at 12:45, Tom Zanussi tom.zanu...@intel.com wrote:
 On Wed, 2011-09-14 at 05:30 -0700, Otavio Salvador wrote:
 On Wed, Sep 14, 2011 at 02:39, Tom Zanussi tom.zanu...@intel.com wrote:
 / A future patch will factor out the common parts of init_install_2.0.sh
  with init_install 1.0 - this initial patchset essentially just fixes
  what's necessary for YOCTO bug #1428 in order to get things working again.

 Wouldn't be better to drop 1.0 completely?


 You're right, and the original did do that essentially - on second
 thought it was much simpler - I'll resubmit something like that...

I prefer to have 1.0 dropped since it avoids duplicated maintainence
work and support. Besides, since this is gonna be a base of newer
Yocto we ought to ensure that the layers do get their bsp updated
(even thought I think the only user of it is meta-intel at this
moment).

Nice that you agree with it.

-- 
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 0/2] Add new recipes for grub2

[Tom Zanussi]

On Wed, 2011-09-14 at 08:55 -0700, Otavio Salvador wrote:
 On Wed, Sep 14, 2011 at 12:45, Tom Zanussi tom.zanu...@intel.com wrote:
  On Wed, 2011-09-14 at 05:30 -0700, Otavio Salvador wrote:
  On Wed, Sep 14, 2011 at 02:39, Tom Zanussi tom.zanu...@intel.com wrote:
  / A future patch will factor out the common parts of init_install_2.0.sh
   with init_install 1.0 - this initial patchset essentially just fixes
   what's necessary for YOCTO bug #1428 in order to get things working 
   again.
 
  Wouldn't be better to drop 1.0 completely?
 
 
  You're right, and the original did do that essentially - on second
  thought it was much simpler - I'll resubmit something like that...
 
 I prefer to have 1.0 dropped since it avoids duplicated maintainence
 work and support. Besides, since this is gonna be a base of newer
 Yocto we ought to ensure that the layers do get their bsp updated
 (even thought I think the only user of it is meta-intel at this
 moment).
 

Well, my new version handles both grub 0.97 and grub2.  We need to keep
grub 0.97 around because grub2 is GPLv3.

Tom

 Nice that you agree with it.
 



___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 0/2] Add new recipes for grub2

[Otavio Salvador]

On Wed, Sep 14, 2011 at 13:01, Tom Zanussi tom.zanu...@intel.com wrote:
 Well, my new version handles both grub 0.97 and grub2.  We need to keep
 grub 0.97 around because grub2 is GPLv3.

Sure; fully agree on that but we can get rid of two different scripts
and avoid duplicated maintainence work :-)

-- 
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 0/2] Add new recipes for grub2

[Tom Zanussi]

On Wed, 2011-09-14 at 09:05 -0700, Otavio Salvador wrote:
 On Wed, Sep 14, 2011 at 13:01, Tom Zanussi tom.zanu...@intel.com wrote:
  Well, my new version handles both grub 0.97 and grub2.  We need to keep
  grub 0.97 around because grub2 is GPLv3.
 
 Sure; fully agree on that but we can get rid of two different scripts
 and avoid duplicated maintainence work :-)
 

Definitely - my new patch does that - I'll post it in a few minutes...

Tom


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] initramfs-live-install: add support for grub2

[Tom Zanussi]

grub2 needs a different set of install steps from grub 0.97.  This
adds them to init-install.sh and adds an install-time check that
determines which version is being used and which steps to use
depending on the version of grub selected.

Signed-off-by: Tom Zanussi tom.zanu...@intel.com
---
 .../initrdscripts/files/init-install.sh|   31 
 .../initrdscripts/initramfs-live-install_1.0.bb|8 ++---
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh 
b/meta/recipes-core/initrdscripts/files/init-install.sh
index 5e6b81c..dceb2a4 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2008 Intel
+# Copyright (C) 2011 Intel
 #
 # install.sh [device_name] [rootfs_name] [video_mode] [vga_mode]
 #
@@ -126,6 +126,7 @@ mkswap $swap
 
 mkdir /ssd
 mkdir /rootmnt
+mkdir /bootmnt
 
 mount $rootfs /ssd
 mount -o rw,loop,noatime,nodiratime /media/$1/$2 /rootmnt
@@ -142,6 +143,16 @@ if [ -d /ssd/etc/ ] ; then
 fi
 fi
 
+if [ -f /ssd/etc/grub.d/40_custom ] ; then
+echo Preparing custom grub2 menu...
+sed -i s@__ROOTFS__@$rootfs@g /ssd/etc/grub.d/40_custom
+sed -i s/__VIDEO_MODE__/$3/g /ssd/etc/grub.d/40_custom
+sed -i s/__VGA_MODE__/$4/g /ssd/etc/grub.d/40_custom
+mount $bootfs /bootmnt
+cp /ssd/etc/grub.d/40_custom /bootmnt/40_custom
+umount /bootmnt
+fi
+
 umount /ssd
 umount /rootmnt
 
@@ -151,11 +162,19 @@ grub-install --root-directory=/ssd /dev/${device}
 
 echo (hd0) /dev/${device}  /ssd/boot/grub/device.map
 
-echo default 0  /ssd/boot/grub/menu.lst
-echo timeout 30  /ssd/boot/grub/menu.lst
-echo title Live Boot/Install-Image  /ssd/boot/grub/menu.lst
-echo root  (hd0,0)  /ssd/boot/grub/menu.lst
-echo kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet  
/ssd/boot/grub/menu.lst
+if [ -f /ssd/40_custom ] ; then
+mv /ssd/40_custom /ssd/boot/grub/grub.cfg
+sed -i /#/d /ssd/boot/grub/grub.cfg
+sed -i /exec tail/d /ssd/boot/grub/grub.cfg
+chmod 0444 /ssd/boot/grub/grub.cfg
+else
+echo Preparing custom grub menu...
+echo default 0  /ssd/boot/grub/menu.lst
+echo timeout 30  /ssd/boot/grub/menu.lst
+echo title Live Boot/Install-Image  /ssd/boot/grub/menu.lst
+echo root  (hd0,0)  /ssd/boot/grub/menu.lst
+echo kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet  
/ssd/boot/grub/menu.lst
+fi
 
 cp /media/$1/vmlinuz /ssd/boot/
 
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb 
b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
index 0eeabf1..619b16c 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
@@ -1,9 +1,9 @@
-DESCRIPTION = A live image init script
+DESCRIPTION = A live image init script for grub
 LICENSE = MIT
 LIC_FILES_CHKSUM = 
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
 SRC_URI = file://init-install.sh
 
-PR = r4
+PR = r5
 
 RDEPENDS=grub parted e2fsprogs-mke2fs
 
@@ -19,6 +19,4 @@ INHIBIT_DEFAULT_DEPS = 1
 
 FILES_${PN} =  /install.sh 
 
-# Alternatives to grub need adding for other arch support
-# consistent with grub 0.97
-COMPATIBLE_HOST = i.86.*-linux
+COMPATIBLE_HOST = (i.86|x86_64).*-linux
-- 
1.7.0.4




___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 0/2] Add new recipes for grub2 [v2]

[Tom Zanussi]

This patchset adds a new recipe for grub2 and an accompanying
changes to initramfs-live-install.

It's been preliminarily boot-tested with the meta-intel BSPs emenlow,
and the legacy version (grub-0.97) was also tested with emenlow.

v2 changes:

Suggestions from Otavio Salvator to remove any distro-specific text
and avoid duplicate scripts.

Tom Zanussi (2):
  grub2: new recipe
  initramfs-live-install: add support for grub2

 meta/recipes-bsp/grub/grub-1.99/40_custom  |9 
 .../grub/grub-1.99/grub-install.in.patch   |   13 ++
 meta/recipes-bsp/grub/grub_1.99.bb |   44 
 .../initrdscripts/files/init-install.sh|   31 +++---
 .../initrdscripts/initramfs-live-install_1.0.bb|8 +--
 5 files changed, 94 insertions(+), 11 deletions(-)
 create mode 100755 meta/recipes-bsp/grub/grub-1.99/40_custom
 create mode 100644 meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
 create mode 100644 meta/recipes-bsp/grub/grub_1.99.bb




___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2] grub2: new recipe

[Tom Zanussi]

This adds the grub-1.98 from meta-intel while upgrading it to 1.99.

Signed-off-by: Tom Zanussi tom.zanu...@intel.com
---
 meta/recipes-bsp/grub/grub-1.99/40_custom  |9 
 .../grub/grub-1.99/grub-install.in.patch   |   13 ++
 meta/recipes-bsp/grub/grub_1.99.bb |   44 
 3 files changed, 66 insertions(+), 0 deletions(-)
 create mode 100755 meta/recipes-bsp/grub/grub-1.99/40_custom
 create mode 100644 meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
 create mode 100644 meta/recipes-bsp/grub/grub_1.99.bb

diff --git a/meta/recipes-bsp/grub/grub-1.99/40_custom 
b/meta/recipes-bsp/grub/grub-1.99/40_custom
new file mode 100755
index 000..0d80854
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-1.99/40_custom
@@ -0,0 +1,9 @@
+#!/bin/sh
+exec tail -n +3 $0
+# This file provides an easy way to add custom menu entries.  Simply type the
+# menu entries you want to add after this comment.  Be careful not to change
+# the 'exec tail' line above.
+menuentry Linux {
+set root=(hd0,1)
+linux /boot/vmlinuz root=__ROOTFS__ rw __VIDEO_MODE__ __VGA_MODE__ quiet
+}
diff --git a/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch 
b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
new file mode 100644
index 000..1848c45
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
@@ -0,0 +1,13 @@
+Index: grub-1.99/util/grub-install.in
+===
+--- grub-1.99.orig/util/grub-install.in2011-09-09 22:37:20.093906679 
-0500
 grub-1.99/util/grub-install.in 2011-09-09 22:37:30.854737882 -0500
+@@ -510,7 +510,7 @@
+ 
+ if [ x${devabstraction_module} = x ] ; then
+ if [ x${install_device} != x ]; then
+-  if echo ${install_device} | grep -qx (.*) ; then
++  if echo ${install_device} | grep -q (.*) ; then
+ install_drive=${install_device}
+   else
+ install_drive=`$grub_probe --device-map=${device_map} 
--target=drive --device ${install_device}` || exit 1
diff --git a/meta/recipes-bsp/grub/grub_1.99.bb 
b/meta/recipes-bsp/grub/grub_1.99.bb
new file mode 100644
index 000..d9df573
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub_1.99.bb
@@ -0,0 +1,44 @@
+SUMMARY = GRUB2 is the next-generation GRand Unified Bootloader
+
+DESCRIPTION = GRUB2 is the next generaion of a GPLed bootloader \
+intended to unify bootloading across x86 operating systems. In \
+addition to loading the Linux kernel, it implements the Multiboot \
+standard, which allows for flexible loading of multiple boot images.
+
+HOMEPAGE = http://www.gnu.org/software/grub/;
+SECTION = bootloaders
+PRIORITY = optional
+
+LICENSE = GPLv3
+LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504
+
+RDEPENDS = diffutils freetype
+PR = r0
+
+SRC_URI = ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
+  file://grub-install.in.patch;apply=yes \
+  file://40_custom
+
+inherit autotools
+inherit gettext
+
+EXTRA_OECONF = --with-platform=pc --disable-grub-mkfont 
--target=${TARGET_ARCH} --program-prefix=
+
+do_configure() {
+oe_runconf
+}
+
+python __anonymous () {
+import re
+host = bb.data.getVar('HOST_SYS', d, 1)
+if not re.match('x86.64.*-linux', host) and not re.match('i.86.*-linux', 
host):
+raise bb.parse.SkipPackage(incompatible with host %s % host)
+}
+
+do_install_append () {
+install -m 0755 ${WORKDIR}/40_custom ${D}${sysconfdir}/grub.d/40_custom
+}
+
+FILES_${PN}-doc = ${datadir}
+FILES_${PN} = /usr /etc
+
-- 
1.7.0.4




___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/1] cmake-native: fix symbol not found error on old distros

[nitin . a . kamble]

From: Nitin A Kamble nitin.a.kam...@intel.com

more information in the patch file

This also adds dependency on the build system to have libstdc++-static
package being installed.

Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com
---
 meta/recipes-devtools/cmake/cmake-native_2.8.5.bb  |4 ++-
 .../cmake/fix_for_running_on_older_distros.diff|   26 
 2 files changed, 29 insertions(+), 1 deletions(-)
 create mode 100644 
meta/recipes-devtools/cmake/cmake/fix_for_running_on_older_distros.diff

diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.5.bb 
b/meta/recipes-devtools/cmake/cmake-native_2.8.5.bb
index 3fe0c2e..4cd12f0 100644
--- a/meta/recipes-devtools/cmake/cmake-native_2.8.5.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_2.8.5.bb
@@ -1,7 +1,9 @@
 require cmake.inc
 inherit native
 
-PR = ${INC_PR}.1
+PR = ${INC_PR}.2
+
+SRC_URI += file://fix_for_running_on_older_distros.diff
 
 SRC_URI[md5sum] = 3c5d32cec0f4c2dc45f4c2e84f4a20c5
 SRC_URI[sha256sum] = 
5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91
diff --git 
a/meta/recipes-devtools/cmake/cmake/fix_for_running_on_older_distros.diff 
b/meta/recipes-devtools/cmake/cmake/fix_for_running_on_older_distros.diff
new file mode 100644
index 000..9a46f2e
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/fix_for_running_on_older_distros.diff
@@ -0,0 +1,26 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Fixes bug: [YOCTO #1459]
+
+When sstate files are shared from newer distro machine to older distro 
machine, 
+the binaries can fail to run due to missing newer symbols from the newer 
+libraries as seen bellow:
+
+  U _ZNSt15_List_node_base7_M_hookEPS_@@GLIBCXX_3.4.14
+  U _ZNSt15_List_node_base9_M_unhookEv@@GLIBCXX_3.4.14
+
+This patch makes libstdc++ linking static. so the build system need to have 
libstdc++-static package installed before building cmake.
+
+Date: 2011/09/09
+Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com
+diff -rup 1/CompileFlags.cmake 3/CompileFlags.cmake
+--- 1/CompileFlags.cmake   2011-09-09 06:02:22.404136990 -0700
 3/CompileFlags.cmake   2011-09-09 06:02:27.869137440 -0700
+@@ -10,6 +10,7 @@
+ # See the License for more information.
+ #=
+ 
++SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -static-libstdc++)
+ #-
+ # set some special flags for different compilers
+ #
-- 
1.7.6


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 0/1] bug-fix for bug #1459

[nitin . a . kamble]

From: Nitin A Kamble nitin.a.kam...@intel.com


The reported issue gets fixed by the accompanying commit.

If the cmake is built on fedora 15 it also gets one extra symbol 
memcpy@@GLIBC_2.14. I tried various ways to get rid of this symbol from 
resulting binaries, but I could not get rid of it completely, Hence I did 
not add pieces of the patch to avoid that symbol. Still the memcpy symbol issue 
was not reported on the original bug, and for now the autobuilder should be 
happy 
with this commit.

The following changes since commit ce66e2c6bd117d1a40b547b10b376524f9276d16:

  core-image-minimal: Add missing POKY_EXTRA_IMAGE variable (2011-09-14 
01:29:30 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib nitin/misc
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc

Nitin A Kamble (1):
  cmake-native: fix symbol not found error on old distros

 meta/recipes-devtools/cmake/cmake-native_2.8.5.bb  |4 ++-
 .../cmake/fix_for_running_on_older_distros.diff|   26 
 2 files changed, 29 insertions(+), 1 deletions(-)
 create mode 100644 
meta/recipes-devtools/cmake/cmake/fix_for_running_on_older_distros.diff

-- 
1.7.6


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/1] task-core: split into task-core-console and task-core-x11

[Paul Eggleton]

Since tasks are referred to almost exclusively via RDEPENDS, and bitbake
will build an entire task recipe when only one of its task packages are
actually needed, building a console-only image that uses
task-core-apps-console (or less directly, has apps-console in its
IMAGE_FEATURES) will cause a build of a whole list of X11 applications
that aren't needed. Splitting the task-core recipe into X11 and console
portions prevents this issue.

Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com
---
 .../conf/distro/include/distro_tracking_fields.inc |   10 +--
 meta/conf/multilib.conf|3 +-
 meta/recipes-core/tasks/task-core-console.bb   |   28 
 .../tasks/{task-core.bb = task-core-x11.bb}   |   15 +-
 4 files changed, 39 insertions(+), 17 deletions(-)
 create mode 100644 meta/recipes-core/tasks/task-core-console.bb
 rename meta/recipes-sato/tasks/{task-core.bb = task-core-x11.bb} (82%)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc 
b/meta/conf/distro/include/distro_tracking_fields.inc
index 6f1a462..1a1e110 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -2459,9 +2459,13 @@ RECIPE_LATEST_VERSION_pn-core-image-sato-sdk = 1.0
 RECIPE_MAINTAINER_pn-core-image-sato-sdk = Dongxiao Xu 
dongxiao...@intel.com
 DISTRO_PN_ALIAS_pn-core-image-sdk = OE-Core
 
-RECIPE_STATUS_pn-task-core = green
-RECIPE_LATEST_VERSION_pn-task-core = 1.0
-RECIPE_MAINTAINER_pn-task-core = Dongxiao Xu dongxiao...@intel.com
+RECIPE_STATUS_pn-task-core-console = green
+RECIPE_LATEST_VERSION_pn-task-core-console = 1.0
+RECIPE_MAINTAINER_pn-task-core-console = Dongxiao Xu dongxiao...@intel.com
+
+RECIPE_STATUS_pn-task-core-x11 = green
+RECIPE_LATEST_VERSION_pn-task-core-x11 = 1.0
+RECIPE_MAINTAINER_pn-task-core-x11 = Dongxiao Xu dongxiao...@intel.com
 
 RECIPE_STATUS_pn-task-core-basic = green
 RECIPE_LATEST_VERSION_pn-task-core-basic = 1.0
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 16db375..3133bf1 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -368,12 +368,13 @@ BBCLASSEXTEND_append_pn-task-base =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-apps-x11-pimlico =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-basic =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-boot =  ${MULTILIBS}
+BBCLASSEXTEND_append_pn-task-core-console =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-lsb =  ${MULTILIBS}
-BBCLASSEXTEND_append_pn-task-core =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-nfs =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-ssh-dropbear =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-ssh-openssh =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-tools =  ${MULTILIBS}
+BBCLASSEXTEND_append_pn-task-core-x11 =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-x11-sato =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-tasks =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-tcf-agent =  ${MULTILIBS}
diff --git a/meta/recipes-core/tasks/task-core-console.bb 
b/meta/recipes-core/tasks/task-core-console.bb
new file mode 100644
index 000..3c839c9
--- /dev/null
+++ b/meta/recipes-core/tasks/task-core-console.bb
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2007-2008 OpenedHand Ltd.
+#
+
+DESCRIPTION = Tasks for core console applications
+LICENSE = MIT
+LIC_FILES_CHKSUM = 
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
+PR = r35
+
+PACKAGES = \
+task-core-apps-console \
+task-core-apps-console-dbg \
+task-core-apps-console-dev \
+
+
+PACKAGE_ARCH = ${MACHINE_ARCH}
+
+ALLOW_EMPTY = 1
+
+SPLASH ?= psplash
+
+RDEPENDS_task-core-apps-console = \
+avahi-daemon \
+dbus \
+portmap \
+${SPLASH}
+
diff --git a/meta/recipes-sato/tasks/task-core.bb 
b/meta/recipes-sato/tasks/task-core-x11.bb
similarity index 82%
rename from meta/recipes-sato/tasks/task-core.bb
rename to meta/recipes-sato/tasks/task-core-x11.bb
index a595ad7..112a499 100644
--- a/meta/recipes-sato/tasks/task-core.bb
+++ b/meta/recipes-sato/tasks/task-core-x11.bb
@@ -2,16 +2,13 @@
 # Copyright (C) 2007-2008 OpenedHand Ltd.
 #
 
-DESCRIPTION = Tasks for OpenedHand Poky
+DESCRIPTION = Tasks for core X11 applications
 LICENSE = MIT
 LIC_FILES_CHKSUM = 
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
 
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
-PR = r34
+PR = r35
 
 PACKAGES = \
-task-core-apps-console \
-task-core-apps-console-dbg \
-task-core-apps-console-dev \
 task-core-apps-x11-core \
 task-core-apps-x11-core-dbg \
 task-core-apps-x11-core-dev \
@@ -29,18 +26,10 @@ XSERVER ?= xserver-kdrive-fbdev
 
 ALLOW_EMPTY = 1
 
-SPLASH ?= psplash
-
 # pcmanfm doesn't work on mips/powerpc
 FILEMANAGER ?= pcmanfm
 FILEMANAGER_mips ?= 
 

[OE-core] [PATCH 0/1] Split task-core to reduce build time

[Paul Eggleton]

This patch makes a significant reduction in the build time for
console-only images that use task-core-apps-console (from ~4000 down to
~2700 in my tests) by avoiding building X11 applications unnecessarily.

The following changes since commit 8df322abfd3fa8c460fd73c83c1ef0b5e419dc11:

  core-image-minimal: Add missing POKY_EXTRA_IMAGE variable (2011-09-14 
01:27:08 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib paule/task-core-split
  
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/task-core-split

Paul Eggleton (1):
  task-core: split into task-core-console and task-core-x11

 .../conf/distro/include/distro_tracking_fields.inc |   10 +--
 meta/conf/multilib.conf|3 +-
 meta/recipes-core/tasks/task-core-console.bb   |   28 
 .../tasks/{task-core.bb = task-core-x11.bb}   |   15 +-
 4 files changed, 39 insertions(+), 17 deletions(-)
 create mode 100644 meta/recipes-core/tasks/task-core-console.bb
 rename meta/recipes-sato/tasks/{task-core.bb = task-core-x11.bb} (82%)

-- 
1.7.4.1


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 0/1] Update to latest prelinker -- fix arm and x86 issues

[Saul Wold]

On Tue, 2011-09-13 at 19:52 -0500, Mark Hatle wrote:
 This fixes yocto bugzilla bug 1473.  It addresses an issue where a typecast
 wasn't being specified and the compiler was doing the wrong thing in a 
 printf.
 
 The symbols of the previous failure were, on a 32-bit IA32 host, targeting
 either a 32-bit IA32 target or ARM target the results of a prelinked image
 may not work properly.
 
Mark,

There is still a problem with the prelinker, it seems to clobber text in
X11 on qemux86, we get a build that has square blocks for text.

Sau!

 The following changes since commit 3be290aac4da885fe5bc31797c4a689196c63b7a:
 
   libzypp: move package-manger to it own package (2011-09-13 16:19:30 -0700)
 
 are available in the git repository at:
   git://git.pokylinux.org/poky-contrib mhatle/prelink
   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/prelink
 
 Mark Hatle (1):
   Uprev to latest version of prelink_git, fixing TLS issues
 
  meta/recipes-devtools/prelink/prelink_git.bb |4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
 



___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] qt4: update to latest version 4.7.4

[Koen Kooi]

Op 14 sep 2011, om 15:09 heeft Eric Bénard het volgende geschreven:


Hi,

Le 14/09/2011 13:11, Koen Kooi a écrit :


Could you please give us an heads-up when this is going in, since  
it needs matching commits to meta-oe and meta-angstrom as well to  
keep the .bbappends working. If we don't succeed in merging the  
bbappend changes into oe-core we should consider breaking the 'git  
mv oldrecipe newrecipe' into an add and delete spaced a day apart.


I sent patches to update meta-oe, meta-angstrom  meta-intel : did  
you get them ?


I did, hence my request for a heads-up :)


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 2/2] initramfs-live-install: add support for grub2

[Otavio Salvador]

On Wed, Sep 14, 2011 at 13:12, Tom Zanussi tom.zanu...@intel.com wrote:
...
 --- a/meta/recipes-core/initrdscripts/files/init-install.sh
 +++ b/meta/recipes-core/initrdscripts/files/init-install.sh
 @@ -1,6 +1,6 @@
  #!/bin/sh -e
  #
 -# Copyright (C) 2008 Intel
 +# Copyright (C) 2011 Intel

This ought to be 2008, 2011 or 2008-2011.

Besides that, ack.

-- 
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/2] grub2: new recipe

[Otavio Salvador]

On Wed, Sep 14, 2011 at 13:12, Tom Zanussi tom.zanu...@intel.com wrote:
...
  .../grub/grub-1.99/grub-install.in.patch           |   13 ++
...

This needs header addition to be OK for merging.

-- 
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/1] cmake-native: fix symbol not found error on old distros

[Otavio Salvador]

On Wed, Sep 14, 2011 at 07:13,  nitin.a.kam...@intel.com wrote:
 From: Nitin A Kamble nitin.a.kam...@intel.com

 more information in the patch file

Please put the information on the commit log since people shouldn't
need to look into the patch file to gather it.
...
 +++ b/meta/recipes-devtools/cmake/cmake/fix_for_running_on_older_distros.diff
 @@ -0,0 +1,26 @@
 +Upstream-Status: Inappropriate [embedded specific]
 +
 +Fixes bug: [YOCTO #1459]
 +
 +When sstate files are shared from newer distro machine to older distro 
 machine,
 +the binaries can fail to run due to missing newer symbols from the newer
 +libraries as seen bellow:
 +
 +      U _ZNSt15_List_node_base7_M_hookEPS_@@GLIBCXX_3.4.14
 +      U _ZNSt15_List_node_base9_M_unhookEv@@GLIBCXX_3.4.14
 +
 +This patch makes libstdc++ linking static. so the build system need to have 
 libstdc++-static package installed before building cmake.
 +
 +Date: 2011/09/09
 +Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com
 +diff -rup 1/CompileFlags.cmake 3/CompileFlags.cmake
...

The header is not following the policy; More at
http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Headers_and_Commit_Messages

-- 
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 0/1] Update to latest prelinker -- fix arm and x86 issues

[Zhang, Jessica]

Bug 1482 filed for it.

- Jessica

-Original Message-
From: openembedded-core-boun...@lists.openembedded.org 
[mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Saul Wold
Sent: Wednesday, September 14, 2011 10:04 AM
To: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH 0/1] Update to latest prelinker -- fix arm and 
x86 issues

On Tue, 2011-09-13 at 19:52 -0500, Mark Hatle wrote:
 This fixes yocto bugzilla bug 1473.  It addresses an issue where a typecast
 wasn't being specified and the compiler was doing the wrong thing in a
 printf.

 The symbols of the previous failure were, on a 32-bit IA32 host, targeting
 either a 32-bit IA32 target or ARM target the results of a prelinked image
 may not work properly.

Mark,

There is still a problem with the prelinker, it seems to clobber text in
X11 on qemux86, we get a build that has square blocks for text.

Sau!

 The following changes since commit 3be290aac4da885fe5bc31797c4a689196c63b7a:

   libzypp: move package-manger to it own package (2011-09-13 16:19:30 -0700)

 are available in the git repository at:
   git://git.pokylinux.org/poky-contrib mhatle/prelink
   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/prelink

 Mark Hatle (1):
   Uprev to latest version of prelink_git, fixing TLS issues

  meta/recipes-devtools/prelink/prelink_git.bb |4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)




___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 0/1] Split task-core to reduce build time

[Paul Eggleton]

Oops, missed something... ignore this, v2 on its way.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 0/2] Add new recipes for grub2 [v3]

[Tom Zanussi]

This patchset adds a new recipe for grub2 and an accompanying
changes to initramfs-live-install.

It's been preliminarily boot-tested with the meta-intel BSPs emenlow,
and the legacy version (grub-0.97) was also tested with emenlow.

v3 changes:

Suggestions from Otavio Salvador to update copyright and add a patch
header.

v2 changes:

Suggestions from Otavio Salvador to remove any distro-specific text
and avoid duplicate scripts.

Tom Zanussi (2):
  grub2: new recipe
  initramfs-live-install: add support for grub2

 meta/recipes-bsp/grub/grub-1.99/40_custom  |9 
 .../grub/grub-1.99/grub-install.in.patch   |   15 +++
 meta/recipes-bsp/grub/grub_1.99.bb |   44 
 .../initrdscripts/files/init-install.sh|   31 +++---
 .../initrdscripts/initramfs-live-install_1.0.bb|8 +--
 5 files changed, 96 insertions(+), 11 deletions(-)
 create mode 100755 meta/recipes-bsp/grub/grub-1.99/40_custom
 create mode 100644 meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
 create mode 100644 meta/recipes-bsp/grub/grub_1.99.bb




___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] initramfs-live-install: add support for grub2

[Tom Zanussi]

grub2 needs a different set of install steps from grub 0.97.  This
adds them to init-install.sh and adds an install-time check that
determines which version is being used and which steps to use
depending on the version of grub selected.

Signed-off-by: Tom Zanussi tom.zanu...@intel.com
---
 .../initrdscripts/files/init-install.sh|   31 
 .../initrdscripts/initramfs-live-install_1.0.bb|8 ++---
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh 
b/meta/recipes-core/initrdscripts/files/init-install.sh
index 5e6b81c..fb6cea8 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2008 Intel
+# Copyright (C) 2008-2011 Intel
 #
 # install.sh [device_name] [rootfs_name] [video_mode] [vga_mode]
 #
@@ -126,6 +126,7 @@ mkswap $swap
 
 mkdir /ssd
 mkdir /rootmnt
+mkdir /bootmnt
 
 mount $rootfs /ssd
 mount -o rw,loop,noatime,nodiratime /media/$1/$2 /rootmnt
@@ -142,6 +143,16 @@ if [ -d /ssd/etc/ ] ; then
 fi
 fi
 
+if [ -f /ssd/etc/grub.d/40_custom ] ; then
+echo Preparing custom grub2 menu...
+sed -i s@__ROOTFS__@$rootfs@g /ssd/etc/grub.d/40_custom
+sed -i s/__VIDEO_MODE__/$3/g /ssd/etc/grub.d/40_custom
+sed -i s/__VGA_MODE__/$4/g /ssd/etc/grub.d/40_custom
+mount $bootfs /bootmnt
+cp /ssd/etc/grub.d/40_custom /bootmnt/40_custom
+umount /bootmnt
+fi
+
 umount /ssd
 umount /rootmnt
 
@@ -151,11 +162,19 @@ grub-install --root-directory=/ssd /dev/${device}
 
 echo (hd0) /dev/${device}  /ssd/boot/grub/device.map
 
-echo default 0  /ssd/boot/grub/menu.lst
-echo timeout 30  /ssd/boot/grub/menu.lst
-echo title Live Boot/Install-Image  /ssd/boot/grub/menu.lst
-echo root  (hd0,0)  /ssd/boot/grub/menu.lst
-echo kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet  
/ssd/boot/grub/menu.lst
+if [ -f /ssd/40_custom ] ; then
+mv /ssd/40_custom /ssd/boot/grub/grub.cfg
+sed -i /#/d /ssd/boot/grub/grub.cfg
+sed -i /exec tail/d /ssd/boot/grub/grub.cfg
+chmod 0444 /ssd/boot/grub/grub.cfg
+else
+echo Preparing custom grub menu...
+echo default 0  /ssd/boot/grub/menu.lst
+echo timeout 30  /ssd/boot/grub/menu.lst
+echo title Live Boot/Install-Image  /ssd/boot/grub/menu.lst
+echo root  (hd0,0)  /ssd/boot/grub/menu.lst
+echo kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet  
/ssd/boot/grub/menu.lst
+fi
 
 cp /media/$1/vmlinuz /ssd/boot/
 
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb 
b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
index 0eeabf1..619b16c 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
@@ -1,9 +1,9 @@
-DESCRIPTION = A live image init script
+DESCRIPTION = A live image init script for grub
 LICENSE = MIT
 LIC_FILES_CHKSUM = 
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
 SRC_URI = file://init-install.sh
 
-PR = r4
+PR = r5
 
 RDEPENDS=grub parted e2fsprogs-mke2fs
 
@@ -19,6 +19,4 @@ INHIBIT_DEFAULT_DEPS = 1
 
 FILES_${PN} =  /install.sh 
 
-# Alternatives to grub need adding for other arch support
-# consistent with grub 0.97
-COMPATIBLE_HOST = i.86.*-linux
+COMPATIBLE_HOST = (i.86|x86_64).*-linux
-- 
1.7.0.4




___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/2] grub2: new recipe

[Otavio Salvador]

On Wed, Sep 14, 2011 at 15:01, Tom Zanussi tom.zanu...@intel.com wrote:
 +++ b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
 @@ -0,0 +1,15 @@
 +Upstream-Status: Inappropriate [embedded specific]
 +
 +Index: grub-1.99/util/grub-install.in
 +===

I am sorry by be boring but this doesn't explain *why* the patch is
need. I see you change grep to not use -x option but why this is
required?

-- 
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 2/2] initramfs-live-install: add support for grub2

[Otavio Salvador]

On Wed, Sep 14, 2011 at 15:01, Tom Zanussi tom.zanu...@intel.com wrote:
 grub2 needs a different set of install steps from grub 0.97.  This
 adds them to init-install.sh and adds an install-time check that
 determines which version is being used and which steps to use
 depending on the version of grub selected.

 Signed-off-by: Tom Zanussi tom.zanu...@intel.com

Acked-by: Otavio Salvador ota...@ossystems.com.br

-- 
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/3] linux-yocto: split e100 and e1000 support

[Bruce Ashfield]

Merging the following meta changes:

12574e5 meta: create seperate feature for 10/100 LAN support
c8b37bf meta: Remove 10/100 LAN support.

Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |2 +-
 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 ebf6054..36717d6 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
 
 SRCREV_machine ?= 0b805cce57f61a244eb3b8fce460b14f1be442b3
 SRCREV_machine_qemuppc ?= 48207085609f2b73a54e3c1ef4139894eef627af
-SRCREV_meta ?= 3c9ebeed2598b74798a0c9247ef7c385e0cd96a7
+SRCREV_meta ?= 12574e5a77597f6938315ef82d18fc5e229fb79c
 
 PR = r1
 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 b296558..4b1bdb2 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
 SRCREV_machine_qemux86 ?= 72671808fdbe69a9fe03fd8f094e7c59da04a28c
 SRCREV_machine_qemux86-64 ?= 2b2d0954a6fd12b4bb7f02f019bc62633c8060a1
 SRCREV_machine ?= 6b2c7d65b844e686eae7d5cccb9b638887afe28e
-SRCREV_meta ?= 3c9ebeed2598b74798a0c9247ef7c385e0cd96a7
+SRCREV_meta ?= 12574e5a77597f6938315ef82d18fc5e229fb79c
 
 PR = r2
 PV = ${LINUX_VERSION}+git${SRCPV}
-- 
1.7.4.1


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/3] linux-yocto: move common tasks to a common location

[Bruce Ashfield]

During the initial development of the linux-yocto recipes there were
several additional tasks that needed to be run in any inheriting
recipe. At that time, they didn't seem to fire if they were in the
include file versus the recipes themselves. As it turns out, these
tasks do work fine if placed in the linux-yocto.inc file, and the
rest of the recipes can be simplified as a result.

Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com
---
 meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb |8 +---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb|8 +---
 meta/recipes-kernel/linux/linux-yocto.inc  |5 +
 meta/recipes-kernel/linux/linux-yocto_2.6.37.bb|   13 +
 meta/recipes-kernel/linux/linux-yocto_3.0.bb   |8 +---
 5 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb 
b/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
index 0ca53ae..d92a902 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
@@ -17,9 +17,8 @@ SRCREV_machine_qemux86-64 = 
3c84c45ad3c3592f9c7ff4076de9bee417cd322e
 SRCREV_machine = 439602eb6acd53d9beb8493710310214fc7bd749
 SRCREV_meta = e1f85a470934a0cf6abde5d95533e74501822c6b
 
-PR = r2
+PR = r3
 PV = ${LINUX_VERSION}+git${SRCPV}
-SRCREV_FORMAT = meta_machine
 
 COMPATIBLE_MACHINE = (qemux86|qemux86-64)
 
@@ -34,11 +33,6 @@ python __anonymous () {
 SRC_URI = 
git://git.yoctoproject.org/linux-yocto-2.6.34.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta
 
 # Functionality flags
-KERNEL_REVISION_CHECKING ?= t
 KERNEL_FEATURES=features/netfilter
 
-# extra tasks
-addtask kernel_link_vmlinux after do_compile before do_install
-addtask validate_branches before do_patch after do_kernel_checkout
-
 require recipes-kernel/linux/linux-tools.inc
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 b296ef4..ebf6054 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -18,9 +18,8 @@ SRCREV_machine ?= 0b805cce57f61a244eb3b8fce460b14f1be442b3
 SRCREV_machine_qemuppc ?= 48207085609f2b73a54e3c1ef4139894eef627af
 SRCREV_meta ?= 3c9ebeed2598b74798a0c9247ef7c385e0cd96a7
 
-PR = r0
+PR = r1
 PV = ${LINUX_VERSION}+git${SRCPV}
-SRCREV_FORMAT = meta_machine
 
 SRC_URI = 
git://git.yoctoproject.org/linux-yocto-3.0.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta
 
@@ -35,9 +34,4 @@ KERNEL_FEATURES_append= features/taskstats
 KERNEL_FEATURES_append_qemux86= cfg/sound
 KERNEL_FEATURES_append_qemux86-64= cfg/sound
 
-# extra tasks
-addtask kernel_link_vmlinux after do_compile before do_install
-addtask validate_branches before do_patch after do_kernel_checkout
-addtask kernel_configcheck after do_configure before do_compile
-
 require recipes-kernel/linux/linux-tools.inc
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc 
b/meta/recipes-kernel/linux/linux-yocto.inc
index 11b77ce..09433fa 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -34,3 +34,8 @@ do_install_append(){
rm -rf ${STAGING_KERNEL_DIR}/${KMETA}
fi
 }
+
+# extra tasks
+addtask kernel_link_vmlinux after do_compile before do_install
+addtask validate_branches before do_patch after do_kernel_checkout
+addtask kernel_configcheck after do_configure before do_compile
diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb 
b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
index 4199137..34e563c 100644
--- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
@@ -9,10 +9,8 @@ KMACHINE_qemumips = yocto/standard/mti-malta32-be
 KMACHINE_qemuarm  = yocto/standard/arm-versatile-926ejs
 
 KBRANCH = ${KMACHINE}
-KMETA = meta
 
 LINUX_VERSION ?= 2.6.37
-LINUX_VERSION_EXTENSION ?= -yocto-${LINUX_KERNEL_TYPE}
 
 SRCREV_machine_qemuarm = b3e53a090eaa23aa82e64fa0a563a93a2b4dbb5d
 SRCREV_machine_qemumips = 91f2eb4a3b447476b36aac8e6e198d08c98e0680
@@ -22,26 +20,17 @@ SRCREV_machine_qemux86-64 = 
af2bfbe5f757361b5b027a24d67a93bfdfaaf33c
 SRCREV_machine = 4ae8f8605c81c39b959948e23f7123294a5dfb3f
 SRCREV_meta = aeea99683c7283f1f3320bf2ee7085ee252d4e7e
 
-PR = r20
+PR = r21
 PV = ${LINUX_VERSION}+git${SRCPV}
-SRCREV_FORMAT = meta_machine
 
 SRC_URI = 
git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta
 
 COMPATIBLE_MACHINE = (qemuarm|qemux86|qemuppc|qemumips|qemux86-64)
 
 # Functionality flags
-KERNEL_REVISION_CHECKING ?= t
 KERNEL_FEATURES=features/netfilter
 KERNEL_FEATURES_append= features/taskstats
 KERNEL_FEATURES_append_qemux86= cfg/sound
 KERNEL_FEATURES_append_qemux86-64= cfg/sound
 
-YOCTO_KERNEL_META_DATA=t
-
-# extra tasks
-addtask kernel_link_vmlinux after do_compile before do_install
-addtask 

[OE-core] [PATCH 0/3] linux-yocto: consolidated pull request

[Bruce Ashfield]

Richard/Saul,

Here's a series of changes I've had locally since last week. The
two kernel only ones are simple enough.

  - a configuration split to clean our x86 BSPs
  - a build fix for rt

The net result of the cleanup is zero, since the configs are the
same, so there's no reason not to do it.

I've also had the refactored linux-yocto tasks around for a bit,
they were brought up while reviewing some 1.1 documentation, and
indeed, simplifying the amount of variables required in a linux-yocto
based recipe was a 1.1 goal. The result here is also zero, since we
are just not resetting things needlessly. I've been building with
this for a while, but if you'd rather sit on this until the imminent
spin is done, I won't object.

The following changes since commit ce66e2c6bd117d1a40b547b10b376524f9276d16:

  core-image-minimal: Add missing POKY_EXTRA_IMAGE variable (2011-09-14 
01:29:30 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib zedd/kernel
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (3):
  linux-yocto: move common tasks to a common location
  linux-yocto: split e100 and e1000 support
  linux-yocto-rt: correct 3.0.3-3.0.4 mismerge for, stop_machine.c

 meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb |8 +---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb|   14 --
 meta/recipes-kernel/linux/linux-yocto.inc  |5 +
 meta/recipes-kernel/linux/linux-yocto_2.6.37.bb|   13 +
 meta/recipes-kernel/linux/linux-yocto_3.0.bb   |   10 ++
 5 files changed, 13 insertions(+), 37 deletions(-)

-- 
1.7.4.1


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/3] linux-yocto-rt: correct 3.0.3-3.0.4 mismerge for, stop_machine.c

[Bruce Ashfield]

Merging the following commit for the -rt machines:

[
preempt-rt/base: correct 3.0.3-3.0.4 mismerge for, stop_machine.c

Commit 0b805cce57f61a244eb3b8fce460b14f1be442b3 dropped a change making
stop_cpus_mutex non-static, resulting in a build failure for 3.0.4-rt
kernels.

Restore the move to non-static from commit
6857336c7fddaf460a13adc0c395698fcf9423ff.

Reported-by: Kishore Bodke kishore.k.bo...@intel.com
Signed-off-by: Darren Hart dvh...@linux.intel.com
]

Signed-off-by: Darren Hart dvh...@linux.intel.com
Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |4 ++--
 1 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 36717d6..b3bb4ac 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -14,8 +14,8 @@ KBRANCH_qemuppc = yocto/standard/preempt-rt/qemu-ppc32
 LINUX_VERSION ?= 3.0.4
 LINUX_KERNEL_TYPE = preempt-rt
 
-SRCREV_machine ?= 0b805cce57f61a244eb3b8fce460b14f1be442b3
-SRCREV_machine_qemuppc ?= 48207085609f2b73a54e3c1ef4139894eef627af
+SRCREV_machine ?= 0936e13cc65d816f1759e2322c5e3fc82a5037f3
+SRCREV_machine_qemuppc ?= 0936e13cc65d816f1759e2322c5e3fc82a5037f3
 SRCREV_meta ?= 12574e5a77597f6938315ef82d18fc5e229fb79c
 
 PR = r1
-- 
1.7.4.1


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/2] grub2: new recipe

[Saul Wold]

On Wed, 2011-09-14 at 13:01 -0500, Tom Zanussi wrote:
 This adds the grub-1.98 from meta-intel while upgrading it to 1.99.
 
 Signed-off-by: Tom Zanussi tom.zanu...@intel.com
 ---
  meta/recipes-bsp/grub/grub-1.99/40_custom  |9 
  .../grub/grub-1.99/grub-install.in.patch   |   15 +++
  meta/recipes-bsp/grub/grub_1.99.bb |   44 
 
  3 files changed, 68 insertions(+), 0 deletions(-)
  create mode 100755 meta/recipes-bsp/grub/grub-1.99/40_custom
  create mode 100644 meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
  create mode 100644 meta/recipes-bsp/grub/grub_1.99.bb
 
 diff --git a/meta/recipes-bsp/grub/grub-1.99/40_custom 
 b/meta/recipes-bsp/grub/grub-1.99/40_custom
 new file mode 100755
 index 000..0d80854
 --- /dev/null
 +++ b/meta/recipes-bsp/grub/grub-1.99/40_custom
 @@ -0,0 +1,9 @@
 +#!/bin/sh
 +exec tail -n +3 $0
 +# This file provides an easy way to add custom menu entries.  Simply type the
 +# menu entries you want to add after this comment.  Be careful not to change
 +# the 'exec tail' line above.
 +menuentry Linux {
 +set root=(hd0,1)
 +linux /boot/vmlinuz root=__ROOTFS__ rw __VIDEO_MODE__ __VGA_MODE__ quiet
 +}
 diff --git a/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch 
 b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
 new file mode 100644
 index 000..6f6fa30
 --- /dev/null
 +++ b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
 @@ -0,0 +1,15 @@
 +Upstream-Status: Inappropriate [embedded specific]
 +
Partiall header, sorry Tom, you need a signed-off-by also!

Sau!

 +Index: grub-1.99/util/grub-install.in
 +===
 +--- grub-1.99.orig/util/grub-install.in  2011-09-09 22:37:20.093906679 
 -0500
  grub-1.99/util/grub-install.in   2011-09-09 22:37:30.854737882 -0500
 +@@ -510,7 +510,7 @@
 + 
 + if [ x${devabstraction_module} = x ] ; then
 + if [ x${install_device} != x ]; then
 +-  if echo ${install_device} | grep -qx (.*) ; then
 ++  if echo ${install_device} | grep -q (.*) ; then
 + install_drive=${install_device}
 +   else
 + install_drive=`$grub_probe --device-map=${device_map} 
 --target=drive --device ${install_device}` || exit 1
 diff --git a/meta/recipes-bsp/grub/grub_1.99.bb 
 b/meta/recipes-bsp/grub/grub_1.99.bb
 new file mode 100644
 index 000..d9df573
 --- /dev/null
 +++ b/meta/recipes-bsp/grub/grub_1.99.bb
 @@ -0,0 +1,44 @@
 +SUMMARY = GRUB2 is the next-generation GRand Unified Bootloader
 +
 +DESCRIPTION = GRUB2 is the next generaion of a GPLed bootloader \
 +intended to unify bootloading across x86 operating systems. In \
 +addition to loading the Linux kernel, it implements the Multiboot \
 +standard, which allows for flexible loading of multiple boot images.
 +
 +HOMEPAGE = http://www.gnu.org/software/grub/;
 +SECTION = bootloaders
 +PRIORITY = optional
 +
 +LICENSE = GPLv3
 +LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504
 +
 +RDEPENDS = diffutils freetype
 +PR = r0
 +
 +SRC_URI = ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
 +  file://grub-install.in.patch;apply=yes \
 +  file://40_custom
 +
 +inherit autotools
 +inherit gettext
 +
 +EXTRA_OECONF = --with-platform=pc --disable-grub-mkfont 
 --target=${TARGET_ARCH} --program-prefix=
 +
 +do_configure() {
 +oe_runconf
 +}
 +
 +python __anonymous () {
 +import re
 +host = bb.data.getVar('HOST_SYS', d, 1)
 +if not re.match('x86.64.*-linux', host) and not re.match('i.86.*-linux', 
 host):
 +raise bb.parse.SkipPackage(incompatible with host %s % host)
 +}
 +
 +do_install_append () {
 +install -m 0755 ${WORKDIR}/40_custom ${D}${sysconfdir}/grub.d/40_custom
 +}
 +
 +FILES_${PN}-doc = ${datadir}
 +FILES_${PN} = /usr /etc
 +



___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 0/1] Split task-core to reduce build time v2

[Paul Eggleton]

This patch makes a significant reduction in the build time for
console-only images that use task-core-apps-console (from ~4000 down to
~2700 in my tests) by avoiding building X11 applications unnecessarily. 

Since v1, add bug reference and update copyright notices.

The following changes since commit 8df322abfd3fa8c460fd73c83c1ef0b5e419dc11:

  core-image-minimal: Add missing POKY_EXTRA_IMAGE variable (2011-09-14 
01:27:08 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib paule/task-core-split
  
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/task-core-split

Paul Eggleton (1):
  task-core: split into task-core-console and task-core-x11

 .../conf/distro/include/distro_tracking_fields.inc |   10 +--
 meta/conf/multilib.conf|3 +-
 meta/recipes-core/tasks/task-core-console.bb   |   28 
 .../tasks/{task-core.bb = task-core-x11.bb}   |   17 ++--
 4 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 meta/recipes-core/tasks/task-core-console.bb
 rename meta/recipes-sato/tasks/{task-core.bb = task-core-x11.bb} (79%)

-- 
1.7.4.1


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/1] task-core: split into task-core-console and task-core-x11

[Paul Eggleton]

[YOCTO #1481]

Since tasks are referred to almost exclusively via RDEPENDS, and bitbake
will build an entire task recipe when only one of its task packages are
actually needed, building a console-only image that uses
task-core-apps-console (or less directly, has apps-console in its
IMAGE_FEATURES) will cause a build of a whole list of X11 applications
that aren't needed. Splitting the task-core recipe into X11 and console
portions prevents this issue.

Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com
---
 .../conf/distro/include/distro_tracking_fields.inc |   10 +--
 meta/conf/multilib.conf|3 +-
 meta/recipes-core/tasks/task-core-console.bb   |   28 
 .../tasks/{task-core.bb = task-core-x11.bb}   |   17 ++--
 4 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 meta/recipes-core/tasks/task-core-console.bb
 rename meta/recipes-sato/tasks/{task-core.bb = task-core-x11.bb} (79%)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc 
b/meta/conf/distro/include/distro_tracking_fields.inc
index 6f1a462..1a1e110 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -2459,9 +2459,13 @@ RECIPE_LATEST_VERSION_pn-core-image-sato-sdk = 1.0
 RECIPE_MAINTAINER_pn-core-image-sato-sdk = Dongxiao Xu 
dongxiao...@intel.com
 DISTRO_PN_ALIAS_pn-core-image-sdk = OE-Core
 
-RECIPE_STATUS_pn-task-core = green
-RECIPE_LATEST_VERSION_pn-task-core = 1.0
-RECIPE_MAINTAINER_pn-task-core = Dongxiao Xu dongxiao...@intel.com
+RECIPE_STATUS_pn-task-core-console = green
+RECIPE_LATEST_VERSION_pn-task-core-console = 1.0
+RECIPE_MAINTAINER_pn-task-core-console = Dongxiao Xu dongxiao...@intel.com
+
+RECIPE_STATUS_pn-task-core-x11 = green
+RECIPE_LATEST_VERSION_pn-task-core-x11 = 1.0
+RECIPE_MAINTAINER_pn-task-core-x11 = Dongxiao Xu dongxiao...@intel.com
 
 RECIPE_STATUS_pn-task-core-basic = green
 RECIPE_LATEST_VERSION_pn-task-core-basic = 1.0
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 16db375..3133bf1 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -368,12 +368,13 @@ BBCLASSEXTEND_append_pn-task-base =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-apps-x11-pimlico =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-basic =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-boot =  ${MULTILIBS}
+BBCLASSEXTEND_append_pn-task-core-console =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-lsb =  ${MULTILIBS}
-BBCLASSEXTEND_append_pn-task-core =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-nfs =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-ssh-dropbear =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-ssh-openssh =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-tools =  ${MULTILIBS}
+BBCLASSEXTEND_append_pn-task-core-x11 =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-x11-sato =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-tasks =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-tcf-agent =  ${MULTILIBS}
diff --git a/meta/recipes-core/tasks/task-core-console.bb 
b/meta/recipes-core/tasks/task-core-console.bb
new file mode 100644
index 000..cb22732
--- /dev/null
+++ b/meta/recipes-core/tasks/task-core-console.bb
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2011 Intel Corporation
+#
+
+DESCRIPTION = Tasks for core console applications
+LICENSE = MIT
+LIC_FILES_CHKSUM = 
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
+PR = r35
+
+PACKAGES = \
+task-core-apps-console \
+task-core-apps-console-dbg \
+task-core-apps-console-dev \
+
+
+PACKAGE_ARCH = ${MACHINE_ARCH}
+
+ALLOW_EMPTY = 1
+
+SPLASH ?= psplash
+
+RDEPENDS_task-core-apps-console = \
+avahi-daemon \
+dbus \
+portmap \
+${SPLASH}
+
diff --git a/meta/recipes-sato/tasks/task-core.bb 
b/meta/recipes-sato/tasks/task-core-x11.bb
similarity index 79%
rename from meta/recipes-sato/tasks/task-core.bb
rename to meta/recipes-sato/tasks/task-core-x11.bb
index a595ad7..26d550a 100644
--- a/meta/recipes-sato/tasks/task-core.bb
+++ b/meta/recipes-sato/tasks/task-core-x11.bb
@@ -1,17 +1,14 @@
 #
-# Copyright (C) 2007-2008 OpenedHand Ltd.
+# Copyright (C) 2011 Intel Corporation
 #
 
-DESCRIPTION = Tasks for OpenedHand Poky
+DESCRIPTION = Tasks for core X11 applications
 LICENSE = MIT
 LIC_FILES_CHKSUM = 
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
 
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
-PR = r34
+PR = r35
 
 PACKAGES = \
-task-core-apps-console \
-task-core-apps-console-dbg \
-task-core-apps-console-dev \
 task-core-apps-x11-core \
 task-core-apps-x11-core-dbg \
 task-core-apps-x11-core-dev \
@@ -29,18 +26,10 @@ XSERVER ?= xserver-kdrive-fbdev
 
 ALLOW_EMPTY = 1
 
-SPLASH ?= psplash
-
 # pcmanfm doesn't work on mips/powerpc
 FILEMANAGER ?= 

[OE-core] [PATCH 1/2] grub2: new recipe

[Tom Zanussi]

This adds the grub-1.98 from meta-intel while upgrading it to 1.99.

Signed-off-by: Tom Zanussi tom.zanu...@intel.com
---
 meta/recipes-bsp/grub/grub-1.99/40_custom  |9 
 .../grub/grub-1.99/grub-install.in.patch   |   20 +
 meta/recipes-bsp/grub/grub_1.99.bb |   44 
 3 files changed, 73 insertions(+), 0 deletions(-)
 create mode 100755 meta/recipes-bsp/grub/grub-1.99/40_custom
 create mode 100644 meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
 create mode 100644 meta/recipes-bsp/grub/grub_1.99.bb

diff --git a/meta/recipes-bsp/grub/grub-1.99/40_custom 
b/meta/recipes-bsp/grub/grub-1.99/40_custom
new file mode 100755
index 000..0d80854
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-1.99/40_custom
@@ -0,0 +1,9 @@
+#!/bin/sh
+exec tail -n +3 $0
+# This file provides an easy way to add custom menu entries.  Simply type the
+# menu entries you want to add after this comment.  Be careful not to change
+# the 'exec tail' line above.
+menuentry Linux {
+set root=(hd0,1)
+linux /boot/vmlinuz root=__ROOTFS__ rw __VIDEO_MODE__ __VGA_MODE__ quiet
+}
diff --git a/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch 
b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
new file mode 100644
index 000..326951d
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
@@ -0,0 +1,20 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Our use of grub-install doesn't require the -x option, so we should be
+be able make use of grep versions that don't support it.
+
+Signed-off-by: Tom Zanussi tom.zanu...@intel.com
+
+Index: grub-1.99/util/grub-install.in
+===
+--- grub-1.99.orig/util/grub-install.in2011-09-09 22:37:20.093906679 
-0500
 grub-1.99/util/grub-install.in 2011-09-09 22:37:30.854737882 -0500
+@@ -510,7 +510,7 @@
+ 
+ if [ x${devabstraction_module} = x ] ; then
+ if [ x${install_device} != x ]; then
+-  if echo ${install_device} | grep -qx (.*) ; then
++  if echo ${install_device} | grep -q (.*) ; then
+ install_drive=${install_device}
+   else
+ install_drive=`$grub_probe --device-map=${device_map} 
--target=drive --device ${install_device}` || exit 1
diff --git a/meta/recipes-bsp/grub/grub_1.99.bb 
b/meta/recipes-bsp/grub/grub_1.99.bb
new file mode 100644
index 000..d9df573
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub_1.99.bb
@@ -0,0 +1,44 @@
+SUMMARY = GRUB2 is the next-generation GRand Unified Bootloader
+
+DESCRIPTION = GRUB2 is the next generaion of a GPLed bootloader \
+intended to unify bootloading across x86 operating systems. In \
+addition to loading the Linux kernel, it implements the Multiboot \
+standard, which allows for flexible loading of multiple boot images.
+
+HOMEPAGE = http://www.gnu.org/software/grub/;
+SECTION = bootloaders
+PRIORITY = optional
+
+LICENSE = GPLv3
+LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504
+
+RDEPENDS = diffutils freetype
+PR = r0
+
+SRC_URI = ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
+  file://grub-install.in.patch;apply=yes \
+  file://40_custom
+
+inherit autotools
+inherit gettext
+
+EXTRA_OECONF = --with-platform=pc --disable-grub-mkfont 
--target=${TARGET_ARCH} --program-prefix=
+
+do_configure() {
+oe_runconf
+}
+
+python __anonymous () {
+import re
+host = bb.data.getVar('HOST_SYS', d, 1)
+if not re.match('x86.64.*-linux', host) and not re.match('i.86.*-linux', 
host):
+raise bb.parse.SkipPackage(incompatible with host %s % host)
+}
+
+do_install_append () {
+install -m 0755 ${WORKDIR}/40_custom ${D}${sysconfdir}/grub.d/40_custom
+}
+
+FILES_${PN}-doc = ${datadir}
+FILES_${PN} = /usr /etc
+
-- 
1.7.0.4




___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] initramfs-live-install: add support for grub2

[Tom Zanussi]

grub2 needs a different set of install steps from grub 0.97.  This
adds them to init-install.sh and adds an install-time check that
determines which version is being used and which steps to use
depending on the version of grub selected.

Signed-off-by: Tom Zanussi tom.zanu...@intel.com
---
 .../initrdscripts/files/init-install.sh|   31 
 .../initrdscripts/initramfs-live-install_1.0.bb|8 ++---
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh 
b/meta/recipes-core/initrdscripts/files/init-install.sh
index 5e6b81c..fb6cea8 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2008 Intel
+# Copyright (C) 2008-2011 Intel
 #
 # install.sh [device_name] [rootfs_name] [video_mode] [vga_mode]
 #
@@ -126,6 +126,7 @@ mkswap $swap
 
 mkdir /ssd
 mkdir /rootmnt
+mkdir /bootmnt
 
 mount $rootfs /ssd
 mount -o rw,loop,noatime,nodiratime /media/$1/$2 /rootmnt
@@ -142,6 +143,16 @@ if [ -d /ssd/etc/ ] ; then
 fi
 fi
 
+if [ -f /ssd/etc/grub.d/40_custom ] ; then
+echo Preparing custom grub2 menu...
+sed -i s@__ROOTFS__@$rootfs@g /ssd/etc/grub.d/40_custom
+sed -i s/__VIDEO_MODE__/$3/g /ssd/etc/grub.d/40_custom
+sed -i s/__VGA_MODE__/$4/g /ssd/etc/grub.d/40_custom
+mount $bootfs /bootmnt
+cp /ssd/etc/grub.d/40_custom /bootmnt/40_custom
+umount /bootmnt
+fi
+
 umount /ssd
 umount /rootmnt
 
@@ -151,11 +162,19 @@ grub-install --root-directory=/ssd /dev/${device}
 
 echo (hd0) /dev/${device}  /ssd/boot/grub/device.map
 
-echo default 0  /ssd/boot/grub/menu.lst
-echo timeout 30  /ssd/boot/grub/menu.lst
-echo title Live Boot/Install-Image  /ssd/boot/grub/menu.lst
-echo root  (hd0,0)  /ssd/boot/grub/menu.lst
-echo kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet  
/ssd/boot/grub/menu.lst
+if [ -f /ssd/40_custom ] ; then
+mv /ssd/40_custom /ssd/boot/grub/grub.cfg
+sed -i /#/d /ssd/boot/grub/grub.cfg
+sed -i /exec tail/d /ssd/boot/grub/grub.cfg
+chmod 0444 /ssd/boot/grub/grub.cfg
+else
+echo Preparing custom grub menu...
+echo default 0  /ssd/boot/grub/menu.lst
+echo timeout 30  /ssd/boot/grub/menu.lst
+echo title Live Boot/Install-Image  /ssd/boot/grub/menu.lst
+echo root  (hd0,0)  /ssd/boot/grub/menu.lst
+echo kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet  
/ssd/boot/grub/menu.lst
+fi
 
 cp /media/$1/vmlinuz /ssd/boot/
 
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb 
b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
index 0eeabf1..619b16c 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
@@ -1,9 +1,9 @@
-DESCRIPTION = A live image init script
+DESCRIPTION = A live image init script for grub
 LICENSE = MIT
 LIC_FILES_CHKSUM = 
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
 SRC_URI = file://init-install.sh
 
-PR = r4
+PR = r5
 
 RDEPENDS=grub parted e2fsprogs-mke2fs
 
@@ -19,6 +19,4 @@ INHIBIT_DEFAULT_DEPS = 1
 
 FILES_${PN} =  /install.sh 
 
-# Alternatives to grub need adding for other arch support
-# consistent with grub 0.97
-COMPATIBLE_HOST = i.86.*-linux
+COMPATIBLE_HOST = (i.86|x86_64).*-linux
-- 
1.7.0.4




___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 0/2] Add new recipes for grub2 [v4]

[Tom Zanussi]

This patchset adds a new recipe for grub2 and an accompanying
changes to initramfs-live-install.

It's been preliminarily boot-tested with the meta-intel BSPs emenlow,
and the legacy version (grub-0.97) was also tested with emenlow.

v4 changes:

Suggestions from Otavio Salvador and Saul Wold to add more info to
the patch header.

v3 changes:

Suggestions from Otavio Salvador to update copyright and add a patch
header.

v2 changes:

Suggestions from Otavio Salvador to remove any distro-specific text
and avoid duplicate scripts.


Tom Zanussi (2):
  grub2: new recipe
  initramfs-live-install: add support for grub2

 meta/recipes-bsp/grub/grub-1.99/40_custom  |9 
 .../grub/grub-1.99/grub-install.in.patch   |   20 +
 meta/recipes-bsp/grub/grub_1.99.bb |   44 
 .../initrdscripts/files/init-install.sh|   31 +++---
 .../initrdscripts/initramfs-live-install_1.0.bb|8 +--
 5 files changed, 101 insertions(+), 11 deletions(-)
 create mode 100755 meta/recipes-bsp/grub/grub-1.99/40_custom
 create mode 100644 meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
 create mode 100644 meta/recipes-bsp/grub/grub_1.99.bb




___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/2] grub2: new recipe

[Otavio Salvador]

On Wed, Sep 14, 2011 at 15:44, Tom Zanussi tom.zanu...@intel.com wrote:
 This adds the grub-1.98 from meta-intel while upgrading it to 1.99.

 Signed-off-by: Tom Zanussi tom.zanu...@intel.com

Acked-by: Otavio Salvador ota...@ossystems.com.br

-- 
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 0/2] Add new recipes for grub2 [v4]

[Otavio Salvador]

On Wed, Sep 14, 2011 at 15:44, Tom Zanussi tom.zanu...@intel.com wrote:
 This patchset adds a new recipe for grub2 and an accompanying
 changes to initramfs-live-install.

 It's been preliminarily boot-tested with the meta-intel BSPs emenlow,
 and the legacy version (grub-0.97) was also tested with emenlow.
...

Acked-by: Otavio Salvador ota...@ossystems.com.br

-- 
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 2/2] initramfs-live-install: add support for grub2

[Otavio Salvador]

On Wed, Sep 14, 2011 at 15:44, Tom Zanussi tom.zanu...@intel.com wrote:
 grub2 needs a different set of install steps from grub 0.97.  This
 adds them to init-install.sh and adds an install-time check that
 determines which version is being used and which steps to use
 depending on the version of grub selected.

 Signed-off-by: Tom Zanussi tom.zanu...@intel.com

Acked-by: Otavio Salvador ota...@ossystems.com.br

-- 
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 0/2] Add new recipes for grub2 [v4]

[Tom Zanussi]

On Wed, 2011-09-14 at 11:49 -0700, Otavio Salvador wrote:
 On Wed, Sep 14, 2011 at 15:44, Tom Zanussi tom.zanu...@intel.com wrote:
  This patchset adds a new recipe for grub2 and an accompanying
  changes to initramfs-live-install.
 
  It's been preliminarily boot-tested with the meta-intel BSPs emenlow,
  and the legacy version (grub-0.97) was also tested with emenlow.
 ...
 
 Acked-by: Otavio Salvador ota...@ossystems.com.br
 

Thanks for taking the time to review and ack these...

Tom


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 0/2] Add new recipes for grub2 [v4]

[Otavio Salvador]

On Wed, Sep 14, 2011 at 15:50, Tom Zanussi tom.zanu...@intel.com wrote:
 Thanks for taking the time to review and ack these...

You're welcome.

I am sorry by being so boring ;-)

Thanks by accepting the suggestions :-D

-- 
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] Problem with new image-prelink

[James Limbouris]

 -Original Message-
 From: openembedded-core-boun...@lists.openembedded.org
 [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
 Mark Hatle
 Sent: Wednesday, 14 September 2011 10:30 PM
 To: openembedded-core@lists.openembedded.org
 Subject: Re: [OE-core] Problem with new image-prelink
 
 On 9/13/11 8:33 PM, James Limbouris wrote:
  -Original Message-
  From: openembedded-core-boun...@lists.openembedded.org
  [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf
 Of
  Mark Hatle
  Sent: Wednesday, 14 September 2011 8:52 AM
  To: openembedded-core@lists.openembedded.org
  Subject: Re: [OE-core] Problem with new image-prelink
 
  Please try the new version of the prelinker.  I just sent a pull request 
  for it,
  but there was a missing typecast on a printf.  This was causing problems on
  various systems, and likely could be causing the issue that you observed on
  ARM
  as well.
 
  I did build the latest version for the ARM target, and successfully ran it 
  there
  under QEMU.
 
  --Mark
 
  Thanks Mark - all working, on host and target.
 
 Does this also resolve the initial issue you found, QT failing to work after
 prelinking?
 
 If not, I'd like to open a new defect on it and see if we can figure out the
 cause still...
 
 --Mark

Yes, the Qt app is running as well.

Thanks,
James

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RC2 PULL 03/13] qt4: add blacklist-diginotar-certs patch

[Saul Wold]

From: Eric Bénard e...@eukrea.com

- this patch comes from Nokia and blacklist all DigiNotar intermediates
and root certificates, more details are available here :
http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/

Signed-off-by: Eric Bénard e...@eukrea.com
---
 .../qt4/files/blacklist-diginotar-certs.diff   |   95 
 meta/recipes-qt/qt4/qt-4.7.3.inc   |1 +
 meta/recipes-qt/qt4/qt4-embedded.inc   |2 +-
 meta/recipes-qt/qt4/qt4-native.inc |2 +-
 meta/recipes-qt/qt4/qt4-native_4.7.3.bb|2 +
 meta/recipes-qt/qt4/qt4-tools-nativesdk.inc|2 +-
 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb   |2 +
 meta/recipes-qt/qt4/qt4-x11-free.inc   |2 +-
 8 files changed, 104 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff

diff --git a/meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff 
b/meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
new file mode 100644
index 000..4d88ae2
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
@@ -0,0 +1,95 @@
+http://labs.qt.nokia.com/2011/09/02/what-the-diginotar-security-breach-means-for-qt-users/
+http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/
+
+Original Author:Nokia
+Upstream-Status: Integrated in upcoming versions
+
+diff --git a/src/network/ssl/qsslcertificate.cpp 
b/src/network/ssl/qsslcertificate.cpp
+index 328c5c2..1ae98f4 100644
+--- a/src/network/ssl/qsslcertificate.cpp
 b/src/network/ssl/qsslcertificate.cpp
+@@ -803,22 +803,47 @@ QListQSslCertificate 
QSslCertificatePrivate::certificatesFromDer(const QByteAr
+ // These certificates are known to be fraudulent and were created during the 
comodo
+ // compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
+ static const char *certificate_blacklist[] = {
+-04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e,
+-f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06,
+-d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3,
+-39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29,
+-3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71,
+-e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47,
+-92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43,
+-b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0,
+-d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0,
++04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e, mail.google.com, // 
Comodo
++f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06, www.google.com, // 
Comodo
++d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3, login.yahoo.com, // 
Comodo
++39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29, login.yahoo.com, // 
Comodo
++3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71, login.yahoo.com, // 
Comodo
++e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47, login.skype.com, // 
Comodo
++92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43, addons.mozilla.org, 
// Comodo
++b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0, login.live.com, // 
Comodo
++d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0, global trustee, // 
Comodo
++
++05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56, *.google.com, // 
leaf certificate issued by DigiNotar
++0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c, DigiNotar Root CA, 
// DigiNotar root
++f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49, DigiNotar Services 
CA, // DigiNotar intermediate signed by DigiNotar Root
++36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38, DigiNotar Services 
1024 CA, // DigiNotar intermediate signed by DigiNotar Root
++0a:82:bd:1e:14:4e:88:14:d7:5b:1a:55:27:be:bf:3e, DigiNotar Root CA 
G2, // other DigiNotar Root CA
++a4:b6:ce:e3:2e:d3:35:46:26:3c:b3:55:3a:a8:92:21, CertiID Enterprise 
Certificate Authority, // DigiNotar intermediate signed by DigiNotar Root CA 
G2
++5b:d5:60:9c:64:17:68:cf:21:0e:35:fd:fb:05:ad:41, DigiNotar Qualified 
CA, // DigiNotar intermediate signed by DigiNotar Root
++
++1184640176,  DigiNotar Services 
1024 CA, // DigiNotar intermediate cross-signed by Entrust
++12525,   DigiNotar Cyber CA, 
// DigiNotar intermediate cross-signed by CyberTrust
++12505,   DigiNotar Cyber CA, 
// DigiNotar intermediate cross-signed by CyberTrust
++12515,   DigiNotar Cyber CA, 
// DigiNotar intermediate cross-signed by CyberTrust
++20015536,DigiNotar PKIoverheid 
CA Overheid en Bedrijven, // DigiNotar intermediate cross-signed by the Dutch 
government
++20001983,DigiNotar PKIoverheid 
CA Organisatie - G2, // DigiNotar intermediate cross-signed by the Dutch 
government
++

[OE-core] [RC2 PULL 07/13] linux-yocto: split e100 and e1000 support

[Saul Wold]

From: Bruce Ashfield bruce.ashfi...@windriver.com

Merging the following meta changes:

12574e5 meta: create seperate feature for 10/100 LAN support
c8b37bf meta: Remove 10/100 LAN support.

Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |2 +-
 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 ebf6054..36717d6 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
 
 SRCREV_machine ?= 0b805cce57f61a244eb3b8fce460b14f1be442b3
 SRCREV_machine_qemuppc ?= 48207085609f2b73a54e3c1ef4139894eef627af
-SRCREV_meta ?= 3c9ebeed2598b74798a0c9247ef7c385e0cd96a7
+SRCREV_meta ?= 12574e5a77597f6938315ef82d18fc5e229fb79c
 
 PR = r1
 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 b296558..4b1bdb2 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
 SRCREV_machine_qemux86 ?= 72671808fdbe69a9fe03fd8f094e7c59da04a28c
 SRCREV_machine_qemux86-64 ?= 2b2d0954a6fd12b4bb7f02f019bc62633c8060a1
 SRCREV_machine ?= 6b2c7d65b844e686eae7d5cccb9b638887afe28e
-SRCREV_meta ?= 3c9ebeed2598b74798a0c9247ef7c385e0cd96a7
+SRCREV_meta ?= 12574e5a77597f6938315ef82d18fc5e229fb79c
 
 PR = r2
 PV = ${LINUX_VERSION}+git${SRCPV}
-- 
1.7.6


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RC2 PULL 00/13] Prelinker, Kernel and distro tracking

[Saul Wold]

Richard,

Please pull this first before pulling any other changes, so that 
we can tag / branch this for RC2.

These changes are all reviewed.  There is a kernel update, deb packaging
fix, prelinker and distro tracking updates.

I also included Paul's core-console change, Tom's Grub2 move and 
the blacklisting of diginotar certs.

This is what was built on the Autobuilder for RC2 with no failures in
the build.

Thanks
Sau!


The following changes since commit 8df322abfd3fa8c460fd73c83c1ef0b5e419dc11:

  core-image-minimal: Add missing POKY_EXTRA_IMAGE variable (2011-09-14 
01:27:08 +0100)

are available in the git repository at:
  git://git.yoctoproject.org/poky-contrib sgw/stage
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/stage

Bruce Ashfield (3):
  linux-yocto: move common tasks to a common location
  linux-yocto: split e100 and e1000 support
  linux-yocto-rt: correct 3.0.3-3.0.4 mismerge for, stop_machine.c

Dexuan Cui (1):
  package_deb.bbclass, populate_sdk_deb.bbclass: fix
meta-toolchain-gmae build

Dongxiao Xu (1):
  distro_tracking: update package alias

Eric Bénard (1):
  qt4: add blacklist-diginotar-certs patch

Mark Hatle (1):
  Uprev to latest version of prelink_git, fixing TLS issues

Paul Eggleton (1):
  task-core: split into task-core-console and task-core-x11

Saul Wold (1):
  task-core-sdk: change task-core - task-core-console

Tom Zanussi (2):
  initramfs-live-install: add support for grub2
  grub2: new recipe

Yu Ke (1):
  distro_tracking_field: add distro checking field

Zhai Edwin (1):
  distro-tracking: Update alias

 meta/classes/package_deb.bbclass   |   10 +--
 meta/classes/populate_sdk_deb.bbclass  |6 +-
 .../conf/distro/include/distro_tracking_fields.inc |   63 +++--
 meta/conf/multilib.conf|3 +-
 meta/recipes-bsp/grub/grub-1.99/40_custom  |9 ++
 .../grub/grub-1.99/grub-install.in.patch   |   20 
 meta/recipes-bsp/grub/grub_1.99.bb |   44 +
 .../initrdscripts/files/init-install.sh|   31 +--
 .../initrdscripts/initramfs-live-install_1.0.bb|8 +-
 meta/recipes-core/tasks/task-core-console.bb   |   28 ++
 meta/recipes-core/tasks/task-core-sdk.bb   |2 +-
 meta/recipes-devtools/prelink/prelink_git.bb   |4 +-
 meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb |8 +--
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb|   14 +--
 meta/recipes-kernel/linux/linux-yocto.inc  |5 +
 meta/recipes-kernel/linux/linux-yocto_2.6.37.bb|   13 +---
 meta/recipes-kernel/linux/linux-yocto_3.0.bb   |   10 +--
 .../qt4/files/blacklist-diginotar-certs.diff   |   95 
 meta/recipes-qt/qt4/qt-4.7.3.inc   |1 +
 meta/recipes-qt/qt4/qt4-embedded.inc   |2 +-
 meta/recipes-qt/qt4/qt4-native.inc |2 +-
 meta/recipes-qt/qt4/qt4-native_4.7.3.bb|2 +
 meta/recipes-qt/qt4/qt4-tools-nativesdk.inc|2 +-
 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb   |2 +
 meta/recipes-qt/qt4/qt4-x11-free.inc   |2 +-
 .../tasks/{task-core.bb = task-core-x11.bb}   |   17 +---
 26 files changed, 317 insertions(+), 86 deletions(-)
 create mode 100755 meta/recipes-bsp/grub/grub-1.99/40_custom
 create mode 100644 meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
 create mode 100644 meta/recipes-bsp/grub/grub_1.99.bb
 create mode 100644 meta/recipes-core/tasks/task-core-console.bb
 create mode 100644 meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
 rename meta/recipes-sato/tasks/{task-core.bb = task-core-x11.bb} (79%)

-- 
1.7.6


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RC2 PULL 08/13] linux-yocto-rt: correct 3.0.3-3.0.4 mismerge for, stop_machine.c

[Saul Wold]

From: Bruce Ashfield bruce.ashfi...@windriver.com

Merging the following commit for the -rt machines:

[
preempt-rt/base: correct 3.0.3-3.0.4 mismerge for, stop_machine.c

Commit 0b805cce57f61a244eb3b8fce460b14f1be442b3 dropped a change making
stop_cpus_mutex non-static, resulting in a build failure for 3.0.4-rt
kernels.

Restore the move to non-static from commit
6857336c7fddaf460a13adc0c395698fcf9423ff.

Reported-by: Kishore Bodke kishore.k.bo...@intel.com
Signed-off-by: Darren Hart dvh...@linux.intel.com
]

Signed-off-by: Darren Hart dvh...@linux.intel.com
Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |4 ++--
 1 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 36717d6..b3bb4ac 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -14,8 +14,8 @@ KBRANCH_qemuppc = yocto/standard/preempt-rt/qemu-ppc32
 LINUX_VERSION ?= 3.0.4
 LINUX_KERNEL_TYPE = preempt-rt
 
-SRCREV_machine ?= 0b805cce57f61a244eb3b8fce460b14f1be442b3
-SRCREV_machine_qemuppc ?= 48207085609f2b73a54e3c1ef4139894eef627af
+SRCREV_machine ?= 0936e13cc65d816f1759e2322c5e3fc82a5037f3
+SRCREV_machine_qemuppc ?= 0936e13cc65d816f1759e2322c5e3fc82a5037f3
 SRCREV_meta ?= 12574e5a77597f6938315ef82d18fc5e229fb79c
 
 PR = r1
-- 
1.7.6


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RC2 PULL 02/13] package_deb.bbclass, populate_sdk_deb.bbclass: fix meta-toolchain-gmae build

[Saul Wold]

From: Dexuan Cui dexuan@intel.com

[YOCTO #1070]

Currently with deb packaging, we have 2 issues when running
bitbake meta-toolchain-gmae.

1) when MACHINE=qemux86, SDKMACHINE=i686, INSTALL_BASEARCH_DEB is i686,
too. This causes the following ERROR:
| E: Couldn't find package task-sdk-host-nativesdk
NOTE: package meta-toolchain-gmae-1.0-r6: task do_populate_sdk: Failed

This is becasue: due to the DPKG_ARCH mapping, we create such a deb package
tmp/deploy/deb/i686-nativesdk/task-sdk-host-nativesdk_1.0-r10_i386.deb; dpkg
can't recoginze the package. We need to map INSTALL_BASEARCH_DEB in the same
way.

2) when MACHINE=qemux86, SDKMACHINE=x86_64, INSTALL_BASEARCH_DEB is
x86_64, too.
We get such an ERROR:
| E: Couldn't find package task-cross-canadian-i586
NOTE: package meta-toolchain-gmae-1.0-r6: task do_populate_sdk: Failed

This is because: dpkg can't recognize the generated package
tmp/deploy/deb/x86_64-nativesdk/task-cross-canadian-i586_1.0-r0_i386.deb
Here the i386 suffix is incorrect and should be x86_64 -- the i386
comes from the line
DPKG_ARCH_i586 ?= i386 in package_deb.bbclass.
However, for canadian package, actually here the overriding of DPKG (from
x86-64 to i386) should not happen -- it accidently happens just because
TARGET_ARCH exists in OVERRIDES. We can move the overriding logic to the
anonymous python function to work this around.

Signed-off-by: Lianhao Lu lianhao...@intel.com
Signed-off-by: Dexuan Cui dexuan@intel.com
---
 meta/classes/package_deb.bbclass  |   10 --
 meta/classes/populate_sdk_deb.bbclass |6 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 87e20da..5a32047 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -6,13 +6,7 @@ inherit package
 
 IMAGE_PKGTYPE ?= deb
 
-# Map TARGET_ARCH to Debian's ideas about architectures
 DPKG_ARCH ?= ${TARGET_ARCH} 
-DPKG_ARCH_x86 ?= i386
-DPKG_ARCH_i486 ?= i386
-DPKG_ARCH_i586 ?= i386
-DPKG_ARCH_i686 ?= i386
-DPKG_ARCH_pentium ?= i386
 
 PKGWRITEDIRDEB = ${WORKDIR}/deploy-debs
 
@@ -418,6 +412,10 @@ python () {
 bb.data.setVarFlag('do_package_write_deb', 'depends',  .join(deps), 
d)
 bb.data.setVarFlag('do_package_write_deb', 'fakeroot', 1, d)
 bb.data.setVarFlag('do_package_write_deb_setscene', 'fakeroot', 1, d)
+
+# Map TARGET_ARCH to Debian's ideas about architectures
+if bb.data.getVar('DPKG_ARCH', d, True) in [x86, i486, i586, i686, 
pentium]:
+bb.data.setVar('DPKG_ARCH', 'i386', d)
 }
 
 python do_package_write_deb () {
diff --git a/meta/classes/populate_sdk_deb.bbclass 
b/meta/classes/populate_sdk_deb.bbclass
index 40516b8..2cff69e 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -2,6 +2,10 @@ do_populate_sdk[depends] += dpkg-native:do_populate_sysroot 
apt-native:do_popul
 do_populate_sdk[recrdeptask] += do_package_write_deb
 
 
+DEB_SDK_ARCH = ${@[bb.data.getVar('SDK_ARCH', d, 1), i386]\
+[bb.data.getVar('SDK_ARCH', d, 1) in \
+[x86, i486, i586, i686, pentium]]}
+
 populate_sdk_post_deb () {
 
local target_rootfs=$1
@@ -37,7 +41,7 @@ fakeroot populate_sdk_deb () {
## install nativesdk ##
echo Installing NATIVESDK packages
export INSTALL_ROOTFS_DEB=${SDK_OUTPUT}
-   export INSTALL_BASEARCH_DEB=${SDK_ARCH}
+   export INSTALL_BASEARCH_DEB=${DEB_SDK_ARCH}
export INSTALL_ARCHS_DEB=${SDK_PACKAGE_ARCHS}
export INSTALL_PACKAGES_NORMAL_DEB=${TOOLCHAIN_HOST_TASK}
export INSTALL_PACKAGES_ATTEMPTONLY_DEB=
-- 
1.7.6


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RC2 PULL 01/13] Uprev to latest version of prelink_git, fixing TLS issues

[Saul Wold]

From: Mark Hatle mark.ha...@windriver.com

[YOCTO #1473]

From the upstream cross prelink respository:

Fix printf typecast problem

Without this fix the printed TLS(...) information is incorrect, which
causes the core prelinker code to incorrectly prelink.  This bug triggers
primarily on x86 (32-bit) hosts, targeting x86 (32-bit) targets and arm
targets.

Signed-off-by: Mark Hatle mark.ha...@windriver.com
---
 meta/recipes-devtools/prelink/prelink_git.bb |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/prelink/prelink_git.bb 
b/meta/recipes-devtools/prelink/prelink_git.bb
index 1565ca6..af6de8e 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -8,9 +8,9 @@ and executables, so that far fewer relocations need to be 
resolved at \
 runtime and thus programs come up faster.
 LICENSE = GPLv2
 LIC_FILES_CHKSUM = file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b
-SRCREV = 964f6eba613bf1c791a2a0b858cd044f05e2f151
+SRCREV = 3e3f9b0876aa5ac83a783a95b8bab52cb38ed785
 PV = 1.0+git${SRCPV}
-PR = r6
+PR = r7
 
 #
 # The cron script attempts to re-prelink the system daily -- on
-- 
1.7.6


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RC2 PULL 05/13] task-core: split into task-core-console and task-core-x11

[Saul Wold]

From: Paul Eggleton paul.eggle...@linux.intel.com

[YOCTO #1481]

Since tasks are referred to almost exclusively via RDEPENDS, and bitbake
will build an entire task recipe when only one of its task packages are
actually needed, building a console-only image that uses
task-core-apps-console (or less directly, has apps-console in its
IMAGE_FEATURES) will cause a build of a whole list of X11 applications
that aren't needed. Splitting the task-core recipe into X11 and console
portions prevents this issue.

Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com
---
 .../conf/distro/include/distro_tracking_fields.inc |   10 +--
 meta/conf/multilib.conf|3 +-
 meta/recipes-core/tasks/task-core-console.bb   |   28 
 .../tasks/{task-core.bb = task-core-x11.bb}   |   17 ++--
 4 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 meta/recipes-core/tasks/task-core-console.bb
 rename meta/recipes-sato/tasks/{task-core.bb = task-core-x11.bb} (79%)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc 
b/meta/conf/distro/include/distro_tracking_fields.inc
index a7fc011..9dfa6a9 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -2460,9 +2460,13 @@ RECIPE_LATEST_VERSION_pn-core-image-sato-sdk = 1.0
 RECIPE_MAINTAINER_pn-core-image-sato-sdk = Dongxiao Xu 
dongxiao...@intel.com
 DISTRO_PN_ALIAS_pn-core-image-sdk = OE-Core
 
-RECIPE_STATUS_pn-task-core = green
-RECIPE_LATEST_VERSION_pn-task-core = 1.0
-RECIPE_MAINTAINER_pn-task-core = Dongxiao Xu dongxiao...@intel.com
+RECIPE_STATUS_pn-task-core-console = green
+RECIPE_LATEST_VERSION_pn-task-core-console = 1.0
+RECIPE_MAINTAINER_pn-task-core-console = Dongxiao Xu dongxiao...@intel.com
+
+RECIPE_STATUS_pn-task-core-x11 = green
+RECIPE_LATEST_VERSION_pn-task-core-x11 = 1.0
+RECIPE_MAINTAINER_pn-task-core-x11 = Dongxiao Xu dongxiao...@intel.com
 
 RECIPE_STATUS_pn-task-core-basic = green
 RECIPE_LATEST_VERSION_pn-task-core-basic = 1.0
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 16db375..3133bf1 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -368,12 +368,13 @@ BBCLASSEXTEND_append_pn-task-base =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-apps-x11-pimlico =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-basic =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-boot =  ${MULTILIBS}
+BBCLASSEXTEND_append_pn-task-core-console =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-lsb =  ${MULTILIBS}
-BBCLASSEXTEND_append_pn-task-core =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-nfs =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-ssh-dropbear =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-ssh-openssh =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-tools =  ${MULTILIBS}
+BBCLASSEXTEND_append_pn-task-core-x11 =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-task-core-x11-sato =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-tasks =  ${MULTILIBS}
 BBCLASSEXTEND_append_pn-tcf-agent =  ${MULTILIBS}
diff --git a/meta/recipes-core/tasks/task-core-console.bb 
b/meta/recipes-core/tasks/task-core-console.bb
new file mode 100644
index 000..cb22732
--- /dev/null
+++ b/meta/recipes-core/tasks/task-core-console.bb
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2011 Intel Corporation
+#
+
+DESCRIPTION = Tasks for core console applications
+LICENSE = MIT
+LIC_FILES_CHKSUM = 
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
+PR = r35
+
+PACKAGES = \
+task-core-apps-console \
+task-core-apps-console-dbg \
+task-core-apps-console-dev \
+
+
+PACKAGE_ARCH = ${MACHINE_ARCH}
+
+ALLOW_EMPTY = 1
+
+SPLASH ?= psplash
+
+RDEPENDS_task-core-apps-console = \
+avahi-daemon \
+dbus \
+portmap \
+${SPLASH}
+
diff --git a/meta/recipes-sato/tasks/task-core.bb 
b/meta/recipes-sato/tasks/task-core-x11.bb
similarity index 79%
rename from meta/recipes-sato/tasks/task-core.bb
rename to meta/recipes-sato/tasks/task-core-x11.bb
index a595ad7..26d550a 100644
--- a/meta/recipes-sato/tasks/task-core.bb
+++ b/meta/recipes-sato/tasks/task-core-x11.bb
@@ -1,17 +1,14 @@
 #
-# Copyright (C) 2007-2008 OpenedHand Ltd.
+# Copyright (C) 2011 Intel Corporation
 #
 
-DESCRIPTION = Tasks for OpenedHand Poky
+DESCRIPTION = Tasks for core X11 applications
 LICENSE = MIT
 LIC_FILES_CHKSUM = 
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
 
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
-PR = r34
+PR = r35
 
 PACKAGES = \
-task-core-apps-console \
-task-core-apps-console-dbg \
-task-core-apps-console-dev \
 task-core-apps-x11-core \
 task-core-apps-x11-core-dbg \
 task-core-apps-x11-core-dev \
@@ -29,18 +26,10 @@ XSERVER ?= xserver-kdrive-fbdev
 
 ALLOW_EMPTY = 1
 
-SPLASH ?= psplash
-
 # 

[OE-core] [RC2 PULL 09/13] initramfs-live-install: add support for grub2

[Saul Wold]

From: Tom Zanussi tom.zanu...@intel.com

grub2 needs a different set of install steps from grub 0.97.  This
adds them to init-install.sh and adds an install-time check that
determines which version is being used and which steps to use
depending on the version of grub selected.

Signed-off-by: Tom Zanussi tom.zanu...@intel.com
---
 .../initrdscripts/files/init-install.sh|   31 
 .../initrdscripts/initramfs-live-install_1.0.bb|8 ++---
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh 
b/meta/recipes-core/initrdscripts/files/init-install.sh
index 5e6b81c..fb6cea8 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2008 Intel
+# Copyright (C) 2008-2011 Intel
 #
 # install.sh [device_name] [rootfs_name] [video_mode] [vga_mode]
 #
@@ -126,6 +126,7 @@ mkswap $swap
 
 mkdir /ssd
 mkdir /rootmnt
+mkdir /bootmnt
 
 mount $rootfs /ssd
 mount -o rw,loop,noatime,nodiratime /media/$1/$2 /rootmnt
@@ -142,6 +143,16 @@ if [ -d /ssd/etc/ ] ; then
 fi
 fi
 
+if [ -f /ssd/etc/grub.d/40_custom ] ; then
+echo Preparing custom grub2 menu...
+sed -i s@__ROOTFS__@$rootfs@g /ssd/etc/grub.d/40_custom
+sed -i s/__VIDEO_MODE__/$3/g /ssd/etc/grub.d/40_custom
+sed -i s/__VGA_MODE__/$4/g /ssd/etc/grub.d/40_custom
+mount $bootfs /bootmnt
+cp /ssd/etc/grub.d/40_custom /bootmnt/40_custom
+umount /bootmnt
+fi
+
 umount /ssd
 umount /rootmnt
 
@@ -151,11 +162,19 @@ grub-install --root-directory=/ssd /dev/${device}
 
 echo (hd0) /dev/${device}  /ssd/boot/grub/device.map
 
-echo default 0  /ssd/boot/grub/menu.lst
-echo timeout 30  /ssd/boot/grub/menu.lst
-echo title Live Boot/Install-Image  /ssd/boot/grub/menu.lst
-echo root  (hd0,0)  /ssd/boot/grub/menu.lst
-echo kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet  
/ssd/boot/grub/menu.lst
+if [ -f /ssd/40_custom ] ; then
+mv /ssd/40_custom /ssd/boot/grub/grub.cfg
+sed -i /#/d /ssd/boot/grub/grub.cfg
+sed -i /exec tail/d /ssd/boot/grub/grub.cfg
+chmod 0444 /ssd/boot/grub/grub.cfg
+else
+echo Preparing custom grub menu...
+echo default 0  /ssd/boot/grub/menu.lst
+echo timeout 30  /ssd/boot/grub/menu.lst
+echo title Live Boot/Install-Image  /ssd/boot/grub/menu.lst
+echo root  (hd0,0)  /ssd/boot/grub/menu.lst
+echo kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet  
/ssd/boot/grub/menu.lst
+fi
 
 cp /media/$1/vmlinuz /ssd/boot/
 
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb 
b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
index 0eeabf1..619b16c 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
@@ -1,9 +1,9 @@
-DESCRIPTION = A live image init script
+DESCRIPTION = A live image init script for grub
 LICENSE = MIT
 LIC_FILES_CHKSUM = 
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
 SRC_URI = file://init-install.sh
 
-PR = r4
+PR = r5
 
 RDEPENDS=grub parted e2fsprogs-mke2fs
 
@@ -19,6 +19,4 @@ INHIBIT_DEFAULT_DEPS = 1
 
 FILES_${PN} =  /install.sh 
 
-# Alternatives to grub need adding for other arch support
-# consistent with grub 0.97
-COMPATIBLE_HOST = i.86.*-linux
+COMPATIBLE_HOST = (i.86|x86_64).*-linux
-- 
1.7.6


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RC2 PULL 12/13] distro_tracking: update package alias

[Saul Wold]

From: Dongxiao Xu dongxiao...@intel.com

Update package alias which exist in other two distributions.

Signed-off-by: Dongxiao Xu dongxiao...@intel.com
---
 .../conf/distro/include/distro_tracking_fields.inc |   14 ++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc 
b/meta/conf/distro/include/distro_tracking_fields.inc
index 9dfa6a9..b8dc982 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -319,6 +319,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-db = n/a
 RECIPE_COMMENTS_pn-db = 
 RECIPE_LAST_UPDATE_pn-db = Jul 21, 2006
 RECIPE_MAINTAINER_pn-db = Dongxiao Xu dongxiao...@intel.com
+DISTRO_PN_ALIAS_pn-db = Debian=db5.1 Ubuntu=db5.1
 
 RECIPE_STATUS_pn-libtirpc = green
 RECIPE_DEPENDENCY_CHECK_pn-libtirpc = not done
@@ -2184,11 +2185,13 @@ RECIPE_LATEST_RELEASE_DATE_pn-ofono=2011/03/15
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-ofono=15 days
 RECIPE_LAST_UPDATE_pn-ofono = Apr 15, 2011
 RECIPE_MAINTAINER_pn-ofono = Dongxiao Xu dongxiao...@intel.com
+DISTRO_PN_ALIAS_pn-ofono = Debian=ofono Ubuntu=ofono
 
 RECIPE_STATUS_pn-libtelepathy = red
 RECIPE_LATEST_VERSION_pn-libtelepathy = 0.3.3
 RECIPE_LAST_UPDATE_pn-libtelepathy = Jul 21, 2008
 RECIPE_MAINTAINER_pn-libtelepathy = Dongxiao Xu dongxiao...@intel.com
+DISTRO_PN_ALIAS_pn-libtelepathy = Debian=libtelepathy2 Ubuntu=libtelepathy2
 
 RECIPE_STATUS_pn-telepathy-farsight = red
 RECIPE_LATEST_VERSION_pn-telepathy-farsight = 0.0.14
@@ -3010,6 +3013,7 @@ RECIPE_STATUS_pn-python-pycurl=green
 RECIPE_LATEST_VERSION_pn-python-pycurl=7.19.0
 RECIPE_LAST_UPDATE_pn-python-pycurl = Mar 25, 2010
 RECIPE_MAINTAINER_pn-python-pycurl = Nitin A Kamble 
nitin.a.kam...@intel.com
+DISTRO_PN_ALIAS_pn-python-pycurl = Debian=python-pycurl Ubuntu=python-pycurl
 
 RECIPE_STATUS_pn-python-pygobject=green
 DISTRO_PN_ALIAS_pn-python-pygobject = Meego=pygobject2 Fedora=pygobject2 
Ubuntu=pygobject Debian=pygobject
@@ -5809,3 +5813,13 @@ DISTRO_PN_ALIAS_pn-rt-tests = Debian=rt-tests Ubuntu 
=rt-tests
 DISTRO_PN_ALIAS_pn-xserver-xf86-lite = Fedora=xorg-x11-server 
Ubuntu=xserver-xorg
 DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = Fedora=xorg-x11-server 
Ubuntu=xserver-xorg
 DISTRO_PN_ALIAS_pn-xserver-kdrive = Fedora=xorg-x11-server 
Ubuntu=xserver-xorg
+DISTRO_PN_ALIAS_pn-dtc = Fedora=dtc Ubuntu=dtc
+DISTRO_PN_ALIAS_pn-dtc-native = Fedora=dtc Ubuntu=dtc
+DISTRO_PN_ALIAS_pn-gail = Fedora=gail Ubuntu=libgail-3-0
+DISTRO_PN_ALIAS_pn-linux-yocto = Debian=linux-base Ubuntu=linux
+DISTRO_PN_ALIAS_pn-linux-yocto-rt = Debian=linux-base Ubuntu=linux
+DISTRO_PN_ALIAS_pn-libsdl = Fedora=SDL Opensuse=SDL
+DISTRO_PN_ALIAS_pn-lame = Debian=lame Ubuntu=lame
+DISTRO_PN_ALIAS_pn-libiconv = Fedora=mingw-libiconv 
Opensuse=cross-mingw-libiconv
+DISTRO_PN_ALIAS_pn-qt4-native = Fedora=qt4 Debian=qt4-dev-tools
+DISTRO_PN_ALIAS_pn-update-alternatives-dpkg = Opensuse=update-alternatives 
Mandriva=update-alternatives
-- 
1.7.6


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RC2 PULL 11/13] task-core-sdk: change task-core - task-core-console

[Saul Wold]

Signed-off-by: Saul Wold s...@linux.intel.com
---
 meta/recipes-core/tasks/task-core-sdk.bb |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/tasks/task-core-sdk.bb 
b/meta/recipes-core/tasks/task-core-sdk.bb
index 52fdd75..5743631 100644
--- a/meta/recipes-core/tasks/task-core-sdk.bb
+++ b/meta/recipes-core/tasks/task-core-sdk.bb
@@ -6,7 +6,7 @@ DESCRIPTION = Software Development Tasks for OpenedHand Poky
 LICENSE = MIT
 LIC_FILES_CHKSUM = 
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
 
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
-DEPENDS = task-core
+DEPENDS = task-core-console
 PR = r7
 
 ALLOW_EMPTY = 1
-- 
1.7.6


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [RC2 PULL 13/13] distro-tracking: Update alias

[Saul Wold]

From: Zhai Edwin edwin.z...@intel.com

Signed-off-by: Zhai Edwin edwin.z...@intel.com
---
 .../conf/distro/include/distro_tracking_fields.inc |   28 +++-
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc 
b/meta/conf/distro/include/distro_tracking_fields.inc
index b8dc982..13106c0 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -2648,11 +2648,11 @@ 
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libmusicbrainz=2 years
 RECIPE_LAST_UPDATE_pn-libmusicbrainz = Nov 16, 2010
 RECIPE_MAINTAINER_pn-libmusicbrainz = Dongxiao Xu dongxiao...@intel.com
 
-RECIPE_STATUS_pn-clutter-gst-1.4 = red
-DISTRO_PN_ALIAS_pn-clutter-gst-1.4 = OpenSuSE=clutter-gst Debian=clutter-gst
-RECIPE_LATEST_VERSION_pn-clutter-gst-1.4 = 
0.11.0+git0+d48c6fc67b48304f90e51b520631c1ecc10410af
-RECIPE_LAST_UPDATE_pn-clutter-gst-1.4 = Feb 4, 2010
-RECIPE_MAINTAINER_pn-clutter-gst-1.4 = Dongxiao Xu dongxiao...@intel.com
+RECIPE_STATUS_pn-clutter-gst-1.6 = red
+DISTRO_PN_ALIAS_pn-clutter-gst-1.6 = Fedora=clutter-gst Debian=libclutter-gst
+RECIPE_LATEST_VERSION_pn-clutter-gst-1.6 = 1.3.8
+RECIPE_LAST_UPDATE_pn-clutter-gst-1.6 = Mar 28, 2011
+RECIPE_MAINTAINER_pn-clutter-gst-1.6 = Dongxiao Xu dongxiao...@intel.com
 
 RECIPE_STATUS_pn-farsight2 = red
 RECIPE_LATEST_VERSION_pn-farsight2 = 0.0.20
@@ -2715,7 +2715,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-gst-fluendo-mp3 = 
2010/10/21
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gst-fluendo-mp3 = 3 months
 RECIPE_LAST_UPDATE_pn-gst-fluendo-mp3 = Dec 7, 2010
 RECIPE_MAINTAINER_pn-gst-fluendo-mp3 = Dongxiao Xu dongxiao...@intel.com
-DISTRO_PN_ALIAS_pn-gst-fluendo-mp3 = Debian=gstreamer0.10-fluendo-mp3  
Ubuntu=gstreamer0.10-fluendo-mp3
+DISTRO_PN_ALIAS_pn-gst-fluendo-mp3 = Debian=gstreamer0.10-fluendo-mp3 
Ubuntu=gstreamer0.10-fluendo-mp3
 
 RECIPE_STATUS_pn-gst-fluendo-mpegdemux = green
 RECIPE_LATEST_VERSION_pn-gst-fluendo-mpegdemux = 0.10.67
@@ -2957,10 +2957,17 @@ RECIPE_MANUAL_CHECK_DATE_pn-libtool = Jul 06, 2011
 RECIPE_MAINTAINER_pn-libtool = Nitin A Kamble nitin.a.kam...@intel.com
 
 RECIPE_STATUS_pn-linux-libc-headers=green 
+DISTRO_PN_ALIAS_pn-linux-libc-headers = Debian=linux-kernel-headers 
Ubuntu=linux-kernel-headers
 RECIPE_LATEST_VERSION_pn-linux-libc-headers=2.6.36
 RECIPE_LAST_UPDATE_pn-linux-libc-headers = Nov 8, 2010
 RECIPE_MAINTAINER_pn-linux-libc-headers = Nitin A Kamble 
nitin.a.kam...@intel.com
 
+RECIPE_STATUS_pn-linux-libc-headers-yocto = green 
+DISTRO_PN_ALIAS_pn-linux-libc-headers-yocto = Debian=linux-kernel-headers 
Ubuntu=linux-kernel-headers
+RECIPE_LATEST_VERSION_pn-linux-libc-headers-yocto = 2.6.36
+RECIPE_LAST_UPDATE_pn-linux-libc-headers-yocto = Nov 8, 2010
+RECIPE_MAINTAINER_pn-linux-libc-headers-yocto = Nitin A Kamble 
nitin.a.kam...@intel.com
+
 RECIPE_STATUS_pn-lsof=green 
 RECIPE_LATEST_VERSION_pn-lsof=4.84
 RECIPE_LAST_UPDATE_pn-lsof = Nov 8, 2010
@@ -4957,6 +4964,7 @@ RECIPE_LAST_UPDATE_pn-screenshot = Jun 25, 2010
 RECIPE_MAINTAINER_pn-screenshot = Zhai Edwin edwin.z...@intel.com
 
 RECIPE_STATUS_pn-tasks = green
+DISTRO_PN_ALIAS_pn-tasks = Debian=tasks Fedora=tasks
 RECIPE_DEPENDENCY_CHECK_pn-tasks = not done
 RECIPE_LATEST_VERSION_pn-tasks = 0.18
 RECIPE_NO_OF_PATCHES_pn-tasks = 1
@@ -4968,6 +4976,7 @@ RECIPE_LAST_UPDATE_pn-tasks = Nov 19, 2010
 RECIPE_MAINTAINER_pn-tasks = Zhai Edwin edwin.z...@intel.com
 
 RECIPE_STATUS_pn-contacts = green
+DISTRO_PN_ALIAS_pn-contacts = Debian=contacts Fedora=contacts
 RECIPE_DEPENDENCY_CHECK_pn-contacts = not done
 RECIPE_LATEST_VERSION_pn-contacts = 
0.12+git0+19853893fdb595de6aa59db0d9dc2f9451ed2933
 RECIPE_NO_OF_PATCHES_pn-contacts = 1
@@ -4979,6 +4988,7 @@ RECIPE_LAST_UPDATE_pn-contacts = Jun 25, 2010
 RECIPE_MAINTAINER_pn-contacts = Zhai Edwin edwin.z...@intel.com
 
 RECIPE_STATUS_pn-dates = green
+DISTRO_PN_ALIAS_pn-dates = Debian=dates Fedora=dates
 RECIPE_DEPENDENCY_CHECK_pn-dates = not done
 RECIPE_LATEST_VERSION_pn-dates = 
0.4.11+git0+514185dc1f6588085fda41eb59898b93d0487dd4
 RECIPE_NO_OF_PATCHES_pn-dates = 1
@@ -5036,6 +5046,7 @@ RECIPE_NO_UPDATE_REASON_pn-gtk+ = Do not upgrade to 
version: 2.99.2 because pre
 RECIPE_MAINTAINER_pn-gtk+ = Zhai Edwin edwin.z...@intel.com
 
 RECIPE_STATUS_pn-gdk-pixbuf = green
+DISTRO_PN_ALIAS_pn-gdk-pixbuf = Debian=libgdk-pixbuf2.0 Fedora=gdk-pixbuf
 RECIPE_LATEST_VERSION_pn-gdk-pixbuf = 2.22.1
 RECIPE_LAST_UPDATE_pn-gdk-pixbuf = Nov 25, 2010
 RECIPE_MAINTAINER_pn-gdk-pixbuf = Zhai Edwin edwin.z...@intel.com
@@ -5207,6 +5218,7 @@ RECIPE_LAST_UPDATE_pn-matchbox-config-gtk = Jul 6, 2010
 RECIPE_MAINTAINER_pn-matchbox-config-gtk = Zhai Edwin edwin.z...@intel.com
 
 RECIPE_STATUS_pn-matchbox-keyboard = green
+DISTRO_PN_ALIAS_pn-matchbox-keyboard = Debian=matchbox-keyboard 
Fedora=matchbox-keyboard
 RECIPE_DEPENDENCY_CHECK_pn-matchbox-keyboard = not done
 RECIPE_LATEST_VERSION_pn-matchbox-keyboard = 0.0+svnr2075
 

[OE-core] [RC2 PULL 10/13] grub2: new recipe

[Saul Wold]

From: Tom Zanussi tom.zanu...@intel.com

This adds the grub-1.98 from meta-intel while upgrading it to 1.99.

Signed-off-by: Tom Zanussi tom.zanu...@intel.com
---
 meta/recipes-bsp/grub/grub-1.99/40_custom  |9 
 .../grub/grub-1.99/grub-install.in.patch   |   20 +
 meta/recipes-bsp/grub/grub_1.99.bb |   44 
 3 files changed, 73 insertions(+), 0 deletions(-)
 create mode 100755 meta/recipes-bsp/grub/grub-1.99/40_custom
 create mode 100644 meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
 create mode 100644 meta/recipes-bsp/grub/grub_1.99.bb

diff --git a/meta/recipes-bsp/grub/grub-1.99/40_custom 
b/meta/recipes-bsp/grub/grub-1.99/40_custom
new file mode 100755
index 000..0d80854
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-1.99/40_custom
@@ -0,0 +1,9 @@
+#!/bin/sh
+exec tail -n +3 $0
+# This file provides an easy way to add custom menu entries.  Simply type the
+# menu entries you want to add after this comment.  Be careful not to change
+# the 'exec tail' line above.
+menuentry Linux {
+set root=(hd0,1)
+linux /boot/vmlinuz root=__ROOTFS__ rw __VIDEO_MODE__ __VGA_MODE__ quiet
+}
diff --git a/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch 
b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
new file mode 100644
index 000..326951d
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
@@ -0,0 +1,20 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Our use of grub-install doesn't require the -x option, so we should be
+be able make use of grep versions that don't support it.
+
+Signed-off-by: Tom Zanussi tom.zanu...@intel.com
+
+Index: grub-1.99/util/grub-install.in
+===
+--- grub-1.99.orig/util/grub-install.in2011-09-09 22:37:20.093906679 
-0500
 grub-1.99/util/grub-install.in 2011-09-09 22:37:30.854737882 -0500
+@@ -510,7 +510,7 @@
+ 
+ if [ x${devabstraction_module} = x ] ; then
+ if [ x${install_device} != x ]; then
+-  if echo ${install_device} | grep -qx (.*) ; then
++  if echo ${install_device} | grep -q (.*) ; then
+ install_drive=${install_device}
+   else
+ install_drive=`$grub_probe --device-map=${device_map} 
--target=drive --device ${install_device}` || exit 1
diff --git a/meta/recipes-bsp/grub/grub_1.99.bb 
b/meta/recipes-bsp/grub/grub_1.99.bb
new file mode 100644
index 000..d9df573
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub_1.99.bb
@@ -0,0 +1,44 @@
+SUMMARY = GRUB2 is the next-generation GRand Unified Bootloader
+
+DESCRIPTION = GRUB2 is the next generaion of a GPLed bootloader \
+intended to unify bootloading across x86 operating systems. In \
+addition to loading the Linux kernel, it implements the Multiboot \
+standard, which allows for flexible loading of multiple boot images.
+
+HOMEPAGE = http://www.gnu.org/software/grub/;
+SECTION = bootloaders
+PRIORITY = optional
+
+LICENSE = GPLv3
+LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504
+
+RDEPENDS = diffutils freetype
+PR = r0
+
+SRC_URI = ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
+  file://grub-install.in.patch;apply=yes \
+  file://40_custom
+
+inherit autotools
+inherit gettext
+
+EXTRA_OECONF = --with-platform=pc --disable-grub-mkfont 
--target=${TARGET_ARCH} --program-prefix=
+
+do_configure() {
+oe_runconf
+}
+
+python __anonymous () {
+import re
+host = bb.data.getVar('HOST_SYS', d, 1)
+if not re.match('x86.64.*-linux', host) and not re.match('i.86.*-linux', 
host):
+raise bb.parse.SkipPackage(incompatible with host %s % host)
+}
+
+do_install_append () {
+install -m 0755 ${WORKDIR}/40_custom ${D}${sysconfdir}/grub.d/40_custom
+}
+
+FILES_${PN}-doc = ${datadir}
+FILES_${PN} = /usr /etc
+
-- 
1.7.6


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core