Patchwork [2/6] bitbake.conf: Include the new default-providers.inc and default-versions.inc files

login
register
mail settings
Submitter Richard Purdie
Date May 10, 2011, 2 p.m.
Message ID <6a6f3589dba7aff0cb89f233807e5d051d8d3e08.1305035617.git.richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/3641/
State New, archived
Headers show

Comments

Richard Purdie - May 10, 2011, 2 p.m.
From: Richard Purdie <richard.purdie@linuxfoundation.org>

These are the minimal defaults to allow OE-Core to function standalone with
no distro set and are constucted such that the distro can either override values,
or totally replace the include file entirely as needed.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/bitbake.conf                            |    3 +
 meta/conf/distro/include/default-providers.inc    |   34 ++++++++++++
 meta/conf/distro/include/default-versions.inc     |   18 ++++++
 meta/conf/distro/include/poky-fixed-revisions.inc |   27 ---------
 meta/conf/distro/poky.conf                        |   59 +--------------------
 5 files changed, 56 insertions(+), 85 deletions(-)
 create mode 100644 meta/conf/distro/include/default-providers.inc
 create mode 100644 meta/conf/distro/include/default-versions.inc
 delete mode 100644 meta/conf/distro/include/poky-fixed-revisions.inc
Koen Kooi - May 10, 2011, 2:20 p.m.
Op 10 mei 2011, om 16:00 heeft Richard Purdie het volgende geschreven:

> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> 
> These are the minimal defaults to allow OE-Core to function standalone with
> no distro set and are constucted such that the distro can either override values,
> or totally replace the include file entirely as needed.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/conf/bitbake.conf                            |    3 +
> meta/conf/distro/include/default-providers.inc    |   34 ++++++++++++
> meta/conf/distro/include/default-versions.inc     |   18 ++++++
> meta/conf/distro/include/poky-fixed-revisions.inc |   27 ---------
> meta/conf/distro/poky.conf                        |   59 +--------------------
> 5 files changed, 56 insertions(+), 85 deletions(-)
> create mode 100644 meta/conf/distro/include/default-providers.inc
> create mode 100644 meta/conf/distro/include/default-versions.inc
> delete mode 100644 meta/conf/distro/include/poky-fixed-revisions.inc
> 

> diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> new file mode 100644
> index 0000000..d51ac64
> --- /dev/null
> +++ b/meta/conf/distro/include/default-providers.inc
> @@ -0,0 +1,34 @@
> 
> +PREFERRED_PROVIDER_gconf ?= "gconf-dbus"

the dbus port has long been merged upstream, so proper gconf would be a better choice. We could ignore it and just use dconf in meta-gnome, though ;)


> +PREFERRED_PROVIDER_opkg ?= "opkg"

We should sync with OE and drop the ssl/gpg stuff noone seems to be using.

> diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
> new file mode 100644
> index 0000000..0abbd8f
> --- /dev/null
> +++ b/meta/conf/distro/include/default-versions.inc
> @@ -0,0 +1,18 @@
> +#
> +# Default preferred versions
> +#
> +PULSEAUDIOVERSION ?= "0.9.22"
> +PULSEAUDIOVERSION_arm ?= "0.9.15"
> +PREFERRED_VERSION_pulseaudio ?= "${PULSEAUDIOVERSION}

AIUI 0.9.15 is the last version that doesn't need atomic ops. In OE we backported the necessary bits to gcc 4.3.x, gcc 4.5.x already has them. So lets drop the _arm override or atleast document why.

> +# Force the python versions in one place
> +PYTHON_BASEVERSION ?= "2.6"
> +PREFERRED_VERSION_python ?= "2.6.6"
> +PREFERRED_VERSION_python-native ?= "2.6.6"

Not really related, but update to 2.7.x?

regards,

Koen
Richard Purdie - May 11, 2011, 9:09 a.m.
On Tue, 2011-05-10 at 16:20 +0200, Koen Kooi wrote:
> Op 10 mei 2011, om 16:00 heeft Richard Purdie het volgende geschreven:
> 
> > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > 
> > These are the minimal defaults to allow OE-Core to function standalone with
> > no distro set and are constucted such that the distro can either override values,
> > or totally replace the include file entirely as needed.
> > 
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > meta/conf/bitbake.conf                            |    3 +
> > meta/conf/distro/include/default-providers.inc    |   34 ++++++++++++
> > meta/conf/distro/include/default-versions.inc     |   18 ++++++
> > meta/conf/distro/include/poky-fixed-revisions.inc |   27 ---------
> > meta/conf/distro/poky.conf                        |   59 +--------------------
> > 5 files changed, 56 insertions(+), 85 deletions(-)
> > create mode 100644 meta/conf/distro/include/default-providers.inc
> > create mode 100644 meta/conf/distro/include/default-versions.inc
> > delete mode 100644 meta/conf/distro/include/poky-fixed-revisions.inc
> > 
> 
> > diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> > new file mode 100644
> > index 0000000..d51ac64
> > --- /dev/null
> > +++ b/meta/conf/distro/include/default-providers.inc
> > @@ -0,0 +1,34 @@
> > 
> > +PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
> 
> the dbus port has long been merged upstream, so proper gconf would be
> a better choice. We could ignore it and just use dconf in meta-gnome,
> though ;)

I agree we should be using gconf, could someone send me the recipe
though? ;-).

> > +PREFERRED_PROVIDER_opkg ?= "opkg"
> 
> We should sync with OE and drop the ssl/gpg stuff noone seems to be
> using.

You mean disable ssl/gpg in all cases?

> > diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
> > new file mode 100644
> > index 0000000..0abbd8f
> > --- /dev/null
> > +++ b/meta/conf/distro/include/default-versions.inc
> > @@ -0,0 +1,18 @@
> > +#
> > +# Default preferred versions
> > +#
> > +PULSEAUDIOVERSION ?= "0.9.22"
> > +PULSEAUDIOVERSION_arm ?= "0.9.15"
> > +PREFERRED_VERSION_pulseaudio ?= "${PULSEAUDIOVERSION}
> 
> AIUI 0.9.15 is the last version that doesn't need atomic ops. In OE we
> backported the necessary bits to gcc 4.3.x, gcc 4.5.x already has
> them. So lets drop the _arm override or atleast document why.

If we don't need 0.9.15, lets get rid of it...

> > +# Force the python versions in one place
> > +PYTHON_BASEVERSION ?= "2.6"
> > +PREFERRED_VERSION_python ?= "2.6.6"
> > +PREFERRED_VERSION_python-native ?= "2.6.6"
> 
> Not really related, but update to 2.7.x?

Sure. Patches welcome :)

Just to be clear, these are a reflection of what is in OECore today.
These things are good imrovements and  I'm more than happy to change or
remove these entries as needed but they're all further standalone
changes in their own right so I'm not going to hold the patch series on
them.

Cheers,

Richard
Koen Kooi - May 11, 2011, 10:08 a.m.
Op 11 mei 2011, om 11:09 heeft Richard Purdie het volgende geschreven:

> On Tue, 2011-05-10 at 16:20 +0200, Koen Kooi wrote:
>> Op 10 mei 2011, om 16:00 heeft Richard Purdie het volgende geschreven:
>> 
>>> From: Richard Purdie <richard.purdie@linuxfoundation.org>
>>> 
>>> These are the minimal defaults to allow OE-Core to function standalone with
>>> no distro set and are constucted such that the distro can either override values,
>>> or totally replace the include file entirely as needed.
>>> 
>>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>>> ---
>>> meta/conf/bitbake.conf                            |    3 +
>>> meta/conf/distro/include/default-providers.inc    |   34 ++++++++++++
>>> meta/conf/distro/include/default-versions.inc     |   18 ++++++
>>> meta/conf/distro/include/poky-fixed-revisions.inc |   27 ---------
>>> meta/conf/distro/poky.conf                        |   59 +--------------------
>>> 5 files changed, 56 insertions(+), 85 deletions(-)
>>> create mode 100644 meta/conf/distro/include/default-providers.inc
>>> create mode 100644 meta/conf/distro/include/default-versions.inc
>>> delete mode 100644 meta/conf/distro/include/poky-fixed-revisions.inc
>>> 
>> 
>>> diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
>>> new file mode 100644
>>> index 0000000..d51ac64
>>> --- /dev/null
>>> +++ b/meta/conf/distro/include/default-providers.inc
>>> @@ -0,0 +1,34 @@
>>> 
>>> +PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
>> 
>> the dbus port has long been merged upstream, so proper gconf would be
>> a better choice. We could ignore it and just use dconf in meta-gnome,
>> though ;)
> 
> I agree we should be using gconf, could someone send me the recipe
> though? ;-).

I think we want to keep gconf in meta-gnome and pull the dependants out of oe-core

>>> +PREFERRED_PROVIDER_opkg ?= "opkg"
>> 
>> We should sync with OE and drop the ssl/gpg stuff noone seems to be
>> using.
> 
> You mean disable ssl/gpg in all cases?

Yes, that's what we did in OE and no one complained, not even the usual suspects.

>>> diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
>>> new file mode 100644
>>> index 0000000..0abbd8f
>>> --- /dev/null
>>> +++ b/meta/conf/distro/include/default-versions.inc
>>> @@ -0,0 +1,18 @@
>>> +#
>>> +# Default preferred versions
>>> +#
>>> +PULSEAUDIOVERSION ?= "0.9.22"
>>> +PULSEAUDIOVERSION_arm ?= "0.9.15"
>>> +PREFERRED_VERSION_pulseaudio ?= "${PULSEAUDIOVERSION}
>> 
>> AIUI 0.9.15 is the last version that doesn't need atomic ops. In OE we
>> backported the necessary bits to gcc 4.3.x, gcc 4.5.x already has
>> them. So lets drop the _arm override or atleast document why.
> 
> If we don't need 0.9.15, lets get rid of it...

Exactly :)
Richard Purdie - May 11, 2011, 11:24 a.m.
On Wed, 2011-05-11 at 12:08 +0200, Koen Kooi wrote:
> Op 11 mei 2011, om 11:09 heeft Richard Purdie het volgende geschreven:
> 
> > On Tue, 2011-05-10 at 16:20 +0200, Koen Kooi wrote:
> >> Op 10 mei 2011, om 16:00 heeft Richard Purdie het volgende geschreven:
> >> 
> >>> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> >>> 
> >>> These are the minimal defaults to allow OE-Core to function standalone with
> >>> no distro set and are constucted such that the distro can either override values,
> >>> or totally replace the include file entirely as needed.
> >>> 
> >>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> >>> ---
> >>> meta/conf/bitbake.conf                            |    3 +
> >>> meta/conf/distro/include/default-providers.inc    |   34 ++++++++++++
> >>> meta/conf/distro/include/default-versions.inc     |   18 ++++++
> >>> meta/conf/distro/include/poky-fixed-revisions.inc |   27 ---------
> >>> meta/conf/distro/poky.conf                        |   59 +--------------------
> >>> 5 files changed, 56 insertions(+), 85 deletions(-)
> >>> create mode 100644 meta/conf/distro/include/default-providers.inc
> >>> create mode 100644 meta/conf/distro/include/default-versions.inc
> >>> delete mode 100644 meta/conf/distro/include/poky-fixed-revisions.inc
> >>> 
> >> 
> >>> diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> >>> new file mode 100644
> >>> index 0000000..d51ac64
> >>> --- /dev/null
> >>> +++ b/meta/conf/distro/include/default-providers.inc
> >>> @@ -0,0 +1,34 @@
> >>> 
> >>> +PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
> >> 
> >> the dbus port has long been merged upstream, so proper gconf would be
> >> a better choice. We could ignore it and just use dconf in meta-gnome,
> >> though ;)
> > 
> > I agree we should be using gconf, could someone send me the recipe
> > though? ;-).
> 
> I think we want to keep gconf in meta-gnome and pull the dependants out of oe-core

We have a slight dependency conflict here as we've said we want sato in
OECore so we have something we can actually test.

Are we now saying sato also needs to be separated out into its own
layer?

Or can we define meta-gnome as being the gnome pieces without direct
requirements in OECore for a minimal gtk desktop?

Cheers,

Richard
Koen Kooi - May 11, 2011, 11:43 a.m.
Op 11 mei 2011, om 13:24 heeft Richard Purdie het volgende geschreven:

> On Wed, 2011-05-11 at 12:08 +0200, Koen Kooi wrote:
>> Op 11 mei 2011, om 11:09 heeft Richard Purdie het volgende geschreven:
>> 
>>> On Tue, 2011-05-10 at 16:20 +0200, Koen Kooi wrote:
>>>> Op 10 mei 2011, om 16:00 heeft Richard Purdie het volgende geschreven:
>>>> 
>>>>> From: Richard Purdie <richard.purdie@linuxfoundation.org>
>>>>> 
>>>>> These are the minimal defaults to allow OE-Core to function standalone with
>>>>> no distro set and are constucted such that the distro can either override values,
>>>>> or totally replace the include file entirely as needed.
>>>>> 
>>>>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>>>>> ---
>>>>> meta/conf/bitbake.conf                            |    3 +
>>>>> meta/conf/distro/include/default-providers.inc    |   34 ++++++++++++
>>>>> meta/conf/distro/include/default-versions.inc     |   18 ++++++
>>>>> meta/conf/distro/include/poky-fixed-revisions.inc |   27 ---------
>>>>> meta/conf/distro/poky.conf                        |   59 +--------------------
>>>>> 5 files changed, 56 insertions(+), 85 deletions(-)
>>>>> create mode 100644 meta/conf/distro/include/default-providers.inc
>>>>> create mode 100644 meta/conf/distro/include/default-versions.inc
>>>>> delete mode 100644 meta/conf/distro/include/poky-fixed-revisions.inc
>>>>> 
>>>> 
>>>>> diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
>>>>> new file mode 100644
>>>>> index 0000000..d51ac64
>>>>> --- /dev/null
>>>>> +++ b/meta/conf/distro/include/default-providers.inc
>>>>> @@ -0,0 +1,34 @@
>>>>> 
>>>>> +PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
>>>> 
>>>> the dbus port has long been merged upstream, so proper gconf would be
>>>> a better choice. We could ignore it and just use dconf in meta-gnome,
>>>> though ;)
>>> 
>>> I agree we should be using gconf, could someone send me the recipe
>>> though? ;-).
>> 
>> I think we want to keep gconf in meta-gnome and pull the dependants out of oe-core
> 
> We have a slight dependency conflict here as we've said we want sato in
> OECore so we have something we can actually test.
> 
> Are we now saying sato also needs to be separated out into its own
> layer?

I think that's the best way forward.

> Or can we define meta-gnome as being the gnome pieces without direct
> requirements in OECore for a minimal gtk desktop?

If it's using gconf, it's not a minimal gtk desktop anymore. I see the point in having something like sato in oe-core, but I don't think that's worth having gconf(-dbus) in oe-core. But this is a different discussion, since there are other things that can use gconf (e.g. gstreamer) in oe-core, which we would need to take a look at.

Let's get your distro set merged and then improve on it.

regards,

Koen
Richard Purdie - May 11, 2011, 1:34 p.m.
On Wed, 2011-05-11 at 13:43 +0200, Koen Kooi wrote:
> Op 11 mei 2011, om 13:24 heeft Richard Purdie het volgende geschreven:
> 
> > On Wed, 2011-05-11 at 12:08 +0200, Koen Kooi wrote:
> >> Op 11 mei 2011, om 11:09 heeft Richard Purdie het volgende geschreven:
> >> 
> >>> On Tue, 2011-05-10 at 16:20 +0200, Koen Kooi wrote:
> >>>> Op 10 mei 2011, om 16:00 heeft Richard Purdie het volgende geschreven:
> >>>>> +++ b/meta/conf/distro/include/default-providers.inc
> >>>>> @@ -0,0 +1,34 @@
> >>>>> 
> >>>>> +PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
> >>>> 
> >>>> the dbus port has long been merged upstream, so proper gconf would be
> >>>> a better choice. We could ignore it and just use dconf in meta-gnome,
> >>>> though ;)
> >>> 
> >>> I agree we should be using gconf, could someone send me the recipe
> >>> though? ;-).
> >> 
> >> I think we want to keep gconf in meta-gnome and pull the dependants out of oe-core
> > 
> > We have a slight dependency conflict here as we've said we want sato in
> > OECore so we have something we can actually test.
> > 
> > Are we now saying sato also needs to be separated out into its own
> > layer?
> 
> I think that's the best way forward.
> 
> > Or can we define meta-gnome as being the gnome pieces without direct
> > requirements in OECore for a minimal gtk desktop?
> 
> If it's using gconf, it's not a minimal gtk desktop anymore. I see the
> point in having something like sato in oe-core, but I don't think
> that's worth having gconf(-dbus) in oe-core. But this is a different
> discussion, since there are other things that can use gconf (e.g.
> gstreamer) in oe-core, which we would need to take a look at.

It could be argued that gtk with no way to store settings is a little
useless. I'm in favour of having the core graphics testable so I'm not
100% convinced of your argument above. It certainly goes against the
viewpoint that came out of the TSC meetings so we need further
discussion.

In the meantime, replacing gconf-dbus with gconf would seem to move us
closer to where we want to be overall.

> Let's get your distro set merged and then improve on it.

Done :)

Cheers,

Richard

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4a1bfa1..d843e70 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -627,6 +627,9 @@  include conf/build/${BUILD_SYS}.conf
 include conf/target/${TARGET_SYS}.conf
 include conf/machine/${MACHINE}.conf
 include conf/machine-sdk/${SDKMACHINE}.conf
+include conf/distro/include/default-providers.inc
+include conf/distro/include/default-versions.inc
+include conf/distro/include/world-broken.inc
 include conf/distro/${DISTRO}.conf
 include conf/documentation.conf
 require conf/sanity.conf
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
new file mode 100644
index 0000000..d51ac64
--- /dev/null
+++ b/meta/conf/distro/include/default-providers.inc
@@ -0,0 +1,34 @@ 
+#
+# Default virtual providers
+#
+PREFERRED_PROVIDER_virtual/db ?= "db"
+PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
+PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
+
+#
+# Default virtual runtime providers
+#
+VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
+
+#
+# Default recipe providers
+#
+PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
+PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
+PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
+PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"
+PREFERRED_PROVIDER_libgcc ?= "libgcc"
+PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
+PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-libc-headers-nativesdk"
+PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
+PREFERRED_PROVIDER_opkg ?= "opkg"
+PREFERRED_PROVIDER_opkg-native ?= "opkg-native"
+PREFERRED_PROVIDER_opkg-nativesdk ?= "opkg-nativesdk"
+
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
new file mode 100644
index 0000000..0abbd8f
--- /dev/null
+++ b/meta/conf/distro/include/default-versions.inc
@@ -0,0 +1,18 @@ 
+#
+# Default preferred versions
+#
+PULSEAUDIOVERSION ?= "0.9.22"
+PULSEAUDIOVERSION_arm ?= "0.9.15"
+PREFERRED_VERSION_pulseaudio ?= "${PULSEAUDIOVERSION}"
+
+# Force the python versions in one place
+PYTHON_BASEVERSION ?= "2.6"
+PREFERRED_VERSION_python ?= "2.6.6"
+PREFERRED_VERSION_python-native ?= "2.6.6"
+
+# Force the older version of liberation-fonts until we fix the fontforge issue
+PREFERRED_VERSION_liberation-fonts ?= "1.04"
+
+
+
+
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
deleted file mode 100644
index 9486080..0000000
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ /dev/null
@@ -1,27 +0,0 @@ 
-# Preferred Versions:
-#
-PREFERRED_VERSION_libmatchbox ?= "1.9"
-PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
-PREFERRED_VERSION_elfutils ?= "0.89"
-PREFERRED_VERSION_hal ?= "0.5.14"
-PREFERRED_VERSION_hal-info ?= "20091130"
-PREFERRED_VERSION_udev ?= "164"
-PREFERRED_VERSION_wpa-supplicant ?= "0.7.3"
-PREFERRED_VERSION_pseudo = "1.0"
-PREFERRED_VERSION_pseudo-native = "1.0"
-
-PULSEAUDIOVERSION ?= "0.9.22"
-PULSEAUDIOVERSION_arm ?= "0.9.15"
-PREFERRED_VERSION_pulseaudio ?= "${PULSEAUDIOVERSION}"
-
-# Force the python versions in one place
-PYTHON_BASEVERSION ?= "2.6"
-PREFERRED_VERSION_python ?= "2.6.6"
-PREFERRED_VERSION_python-native ?= "2.6.6"
-
-# Force the older version of liberation-fonts until we fix the fontforge issue
-PREFERRED_VERSION_liberation-fonts ?= "1.04"
-
-
-
-
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 37fde0f..2e9d327 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -1,5 +1,3 @@ 
-#@TYPE: Distribution#@NAME: Poky
-#@DESCRIPTION: Distribution configuration for the Yocto Project build by Poky
 
 DISTRO = "poky"
 DISTRO_NAME = "Yocto (Built by Poky 4.0)"
@@ -28,29 +26,8 @@  QA_LOGFILE = "${TMPDIR}/qa.log"
 
 IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
 
-#IPK_FEED_URIS += " \
-#           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
-#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
-#            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
-#               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
-#               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
-#            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
-#              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
-
-#RPM_FEED_URIS += " \
-#           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
-#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
-#            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
-#               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
-#               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
-#            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
-#              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
-
 OEINCLUDELOGS = "yes"
 KERNEL_CONSOLE = "ttyS0"
-#DEBUG_OPTIMIZATION = "-O -g3"
-#DEBUG_BUILD = "1"
-#INHIBIT_PACKAGE_STRIP = "1"
 
 # Default to TARGETOS values for EABI on arm
 GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
@@ -67,39 +44,7 @@  SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
 
 CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}"
 
-#
-# Preferred providers:
-#
-
-# Virtuals:
-PREFERRED_PROVIDER_virtual/db ?= "db"
-PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
-PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
-PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
-
-VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
-
-# Others:
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
-PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-libc-headers-nativesdk"
-PREFERRED_PROVIDER_libgcc ?= "libgcc"
-PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"
-PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
-PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
-PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
-PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
-PREFERRED_PROVIDER_opkg ?= "opkg"
-PREFERRED_PROVIDER_opkg-native ?= "opkg-native"
-PREFERRED_PROVIDER_opkg-nativesdk ?= "opkg-nativesdk"
-
-PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"
-
-require conf/distro/include/poky-fixed-revisions.inc
+
 require conf/distro/include/preferred-xorg-versions.inc
 
 PCMCIA_MANAGER ?= "pcmciautils"
@@ -148,8 +93,6 @@  COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses"
 
 BB_GENERATE_MIRROR_TARBALLS ??= "0"
 
-require conf/distro/include/world-broken.inc
-
 PREMIRRORS ?= "\
 bzr://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
 cvs://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \