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

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

[Richard Purdie]

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/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 \
-- 
1.7.4.1

[PATCH 1/6] Drop poky-floating-revisions.inc, poky-bleeding.conf and poky-lsb.conf

[Richard Purdie]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../distro/include/poky-floating-revisions.inc     |   83 --------------------
 meta/conf/distro/poky-bleeding.conf                |    8 --
 meta/conf/distro/poky-lsb.conf                     |    9 --
 3 files changed, 0 insertions(+), 100 deletions(-)
 delete mode 100644 meta/conf/distro/include/poky-floating-revisions.inc
 delete mode 100644 meta/conf/distro/poky-bleeding.conf
 delete mode 100644 meta/conf/distro/poky-lsb.conf

diff --git a/meta/conf/distro/include/poky-floating-revisions.inc b/meta/conf/distro/include/poky-floating-revisions.inc
deleted file mode 100644
index 22b4c38..0000000
--- a/meta/conf/distro/include/poky-floating-revisions.inc
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# Package Versions for cutting edge testing:
-#
-
-SRCREV_pn-exmap-console ?= "${AUTOREV}"
-#SRCREV_pn-opkg-native ?= "${AUTOREV}"
-#SRCREV_pn-opkg-sdk ?= "${AUTOREV}"
-#SRCREV_pn-opkg ?= "${AUTOREV}"
-#SRCREV_pn-opkg-utils-naitve ?= "${AUTOREV}"
-#SRCREV_pn-opkg-utils ?= "${AUTOREV}"
-SRCREV_pn-gconf-dbus ?= "${AUTOREV}"
-SRCREV_pn-contacts ?= "${AUTOREV}"
-SRCREV_pn-dates ?= "${AUTOREV}"
-#SRCREV_pn-gtkhtml2 ?= "${AUTOREV}"
-SRCREV_pn-web ?= "${AUTOREV}"
-SRCREV_pn-eds-dbus ?= "${AUTOREV}"
-SRCREV_pn-matchbox-common ?= "${AUTOREV}"
-SRCREV_pn-matchbox-config-gtk ?= "${AUTOREV}"
-SRCREV_pn-matchbox-desktop ?= "${AUTOREV}"
-SRCREV_pn-matchbox-keyboard ?= "${AUTOREV}"
-SRCREV_pn-matchbox-panel ?= "${AUTOREV}"
-SRCREV_pn-matchbox-panel-2 ?= "${AUTOREV}"
-SRCREV_pn-matchbox-stroke ?= "${AUTOREV}"
-SRCREV_pn-matchbox-themes-extra ?= "${AUTOREV}"
-SRCREV_pn-matchbox-terminal ?= "${AUTOREV}"
-SRCREV_pn-matchbox-wm ?= "${AUTOREV}"
-SRCREV_pn-matchbox-wm-2 ?= "${AUTOREV}"
-SRCREV_pn-settings-daemon ?= "${AUTOREV}"
-SRCREV_pn-screenshot ?= "${AUTOREV}"
-SRCREV_pn-libfakekey ?= "${AUTOREV}"
-SRCREV_pn-oprofileui ?= "${AUTOREV}"
-SRCREV_pn-zaurusd ?= "${AUTOREV}"
-SRCREV_pn-libowl-av ?= "${AUTOREV}"
-SRCREV_pn-owl-video ?= "${AUTOREV}"
-SRCREV_pn-psplash ?= "${AUTOREV}"
-SRCREV_pn-exmap-console ?= "${AUTOREV}"
-SRCREV_pn-gtk-sato-engine ?= "${AUTOREV}"
-SRCREV_pn-matchbox-theme-sato ?= "${AUTOREV}"
-SRCREV_pn-matchbox-theme-sato-2 ?= "${AUTOREV}"
-SRCREV_pn-tasks ?= "${AUTOREV}"
-SRCREV_pn-sato-icon-theme ?= "${AUTOREV}"
-SRCREV_pn-matchbox-desktop-sato ?= "${AUTOREV}"
-SRCREV_pn-oh-puzzles ?= "${AUTOREV}"
-SRCREV_pn-libowl ?= "${AUTOREV}"
-SRCREV_pn-matchbox-applet-light ?= "${AUTOREV}"
-SRCREV_pn-fstests ?= "${AUTOREV}"
-SRCREV_pn-xvideo-tests ?= "${AUTOREV}"
-SRCREV_pn-clutter ?= "${AUTOREV}"
-SRCREV_pn-clutter-gst ?= "${AUTOREV}"
-SRCREV_pn-gaku ?= "${AUTOREV}"
-SRCREV_pn-gypsy ?= "${AUTOREV}"
-#SRCREV_pn-webkit-gtk ?= "${AUTOREV}"
-SRCREV_pn-aaina ?= "${AUTOREV}"
-SRCREV_pn-clutter-cairo ?= "${AUTOREV}"
-SRCREV_pn-table ?= "${AUTOREV}"
-SRCREV_pn-libmatchbox ?= "${AUTOREV}"
-SRCREV_pn-tasks ?= "${AUTOREV}"
-SRCREV_pn-mutter ?= "${AUTOREV}"
-SRCREV_pn-ofono ?= "${AUTOREV}"
-
-SRCREV_pn-dri2proto = "${AUTOREV}"
-#PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}"
-SRCREV_pn-libdrm = "${AUTOREV}"
-#PREFERRED_VERSION_libdrm ?= "2.4.0+git${SRCREV}"
-SRCREV_pn-libxcb = "${AUTOREV}"
-#PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr${SRCREV}"
-SRCREV_pn-lib-proto = "${AUTOREV}"
-#PREFERRED_VERSION_xcb-proto ?= "1.2+gitr${SRCREV}"
-SRCREV_pn-libxcb-sdk = "${AUTOREV}"
-#PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr${SRCREV}"
-SRCREV_pn-xf86-input-evdev = "${AUTOREV}"
-#PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
-SRCREV_pn-xf86-input-mouse = "${AUTOREV}"
-#PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git${SRCREV}"
-SRCREV_pn-xf86-input-keyboard = "${AUTOREV}"
-#PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git${SRCREV}"
-SRCREV_pn-xf86-input-synaptics = "${AUTOREV}"
-#PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git${SRCREV}"
-
-#SRCDATE_oprofile ?= "${DATE}"
-
-PREFERRED_VERSION_oprofile ?= "0.9.4+cvs${SRCDATE_oprofile}"
-
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
deleted file mode 100644
index 328acfe..0000000
--- a/meta/conf/distro/poky-bleeding.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFERRED_VERSION_glib-2.0 ?= "2.17.4"
-PREFERRED_VERSION_glib-2.0-native ?= "2.17.4"
-PREFERRED_VERSION_atk ?= "1.22.0"
-PREFERRED_VERSION_pango ?= "1.21.2"
-PREFERRED_VERSION_gtk+ ?= "2.13.3"
-
-require conf/distro/include/poky-floating-revisions.inc
-require conf/distro/poky.conf
diff --git a/meta/conf/distro/poky-lsb.conf b/meta/conf/distro/poky-lsb.conf
deleted file mode 100644
index 5bc97ec..0000000
--- a/meta/conf/distro/poky-lsb.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-require conf/distro/poky.conf
-
-DISTRO = "linuxstdbase"
-DISTROOVERRIDES = "poky:linuxstdbase"
-
-DISTRO_FEATURES += "pam largefile"
-PREFERRED_PROVIDER_virtual/libx11 = "libx11"
-
-
-- 
1.7.4.1

[PATCH 0/6] RFC Distro config changes

[Richard Purdie]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

As discussed, we want to make OE-Core usable with no distro set. This patch series
makes some big steps towards that goal. I'd be interested in feedback on whether it
does the right things and would be usable by others.

The key is the inclusion of a distro/defaultsetup.conf file by bitbake.conf and 
in turn this pulls in a variety of other common include files which can likely be
shared. Any point of this cycle can be overridden by another layer so its totally
customisable. I'd encourage users to use the pieces they can where possible so we
all share best practises but obviously people have choice.

I did dump a load of "default" variables into default-distrovars.inc, I'm not
calling that file finished, I just had to draw the line somewhere and start a 
discussion about this :)

Also, I'm aware there are still a few poky-* files in meta/conf/distro/include.
Some of these can just be deleted, others renamed tcmode-* and I'll take care 
of that. I'll also delete the poky.conf file since it no longer contains anything
required to make OE-Core build as far as I know (wider testing needed).

Pull URL: git://git.openembedded.org/openembedded-core-contrib
  Branch: rpurdie/distro
  Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rpurdie/distro

Richard Purdie (6):
  Drop poky-floating-revisions.inc, poky-bleeding.conf and
    poky-lsb.conf
  bitbake.conf: Include the new default-providers.inc and
    default-versions.inc files
  distro: Add defaultsetup.conf, a set of default configuration
    providing sane overrridable default for commonly used options
  machine/qemu: Add qemu-config as an essential machine speicfic
    dependency and drop specific distro config
  conf/distro/include/default-distrovars.inc: Create set of default
    'distro' variable values
  preferred-xorg-versions.inc: Drop this, it makes no sense given we
    only have one version of these recipes

 meta/conf/bitbake.conf                             |    1 +
 meta/conf/distro/defaultsetup.conf                 |   24 +++
 meta/conf/distro/include/default-distrovars.inc    |   41 ++++++
 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 ----
 .../distro/include/poky-floating-revisions.inc     |   83 -----------
 .../distro/include/preferred-xorg-versions.inc     |  150 --------------------
 .../include/{poky-eglibc.inc => tclibc-eglibc.inc} |    6 +-
 .../include/{poky-glibc.inc => tclibc-glibc.inc}   |    6 +-
 .../include/{poky-uclibc.inc => tclibc-uclibc.inc} |    4 +
 .../{poky-default.inc => tcmode-default.inc}       |   13 +-
 meta/conf/distro/poky-bleeding.conf                |    8 -
 meta/conf/distro/poky-lsb.conf                     |    9 --
 meta/conf/distro/poky.conf                         |  150 ++------------------
 meta/conf/machine/include/qemu.inc                 |    1 +
 meta/conf/machine/qemux86-64.conf                  |    2 +-
 meta/conf/machine/qemux86.conf                     |    2 +-
 18 files changed, 149 insertions(+), 430 deletions(-)
 create mode 100644 meta/conf/distro/defaultsetup.conf
 create mode 100644 meta/conf/distro/include/default-distrovars.inc
 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
 delete mode 100644 meta/conf/distro/include/poky-floating-revisions.inc
 delete mode 100644 meta/conf/distro/include/preferred-xorg-versions.inc
 rename meta/conf/distro/include/{poky-eglibc.inc => tclibc-eglibc.inc} (92%)
 rename meta/conf/distro/include/{poky-glibc.inc => tclibc-glibc.inc} (91%)
 rename meta/conf/distro/include/{poky-uclibc.inc => tclibc-uclibc.inc} (86%)
 rename meta/conf/distro/include/{poky-default.inc => tcmode-default.inc} (85%)
 delete mode 100644 meta/conf/distro/poky-bleeding.conf
 delete mode 100644 meta/conf/distro/poky-lsb.conf

-- 
1.7.4.1

[PATCH 3/6] distro: Add defaultsetup.conf, a set of default configuration providing sane overrridable default for commonly used options

[Richard Purdie]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

The intent is to allow distros to share common core config but still allow
customisations. The core should work with no distro set but users
can still customise in any ways needed.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/bitbake.conf                             |    4 +-
 meta/conf/distro/defaultsetup.conf                 |   23 ++++++++++
 .../include/{poky-eglibc.inc => tclibc-eglibc.inc} |    6 ++-
 .../include/{poky-glibc.inc => tclibc-glibc.inc}   |    6 ++-
 .../include/{poky-uclibc.inc => tclibc-uclibc.inc} |    4 ++
 .../{poky-default.inc => tcmode-default.inc}       |   13 +++---
 meta/conf/distro/poky.conf                         |   46 +++++--------------
 7 files changed, 54 insertions(+), 48 deletions(-)
 create mode 100644 meta/conf/distro/defaultsetup.conf
 rename meta/conf/distro/include/{poky-eglibc.inc => tclibc-eglibc.inc} (92%)
 rename meta/conf/distro/include/{poky-glibc.inc => tclibc-glibc.inc} (91%)
 rename meta/conf/distro/include/{poky-uclibc.inc => tclibc-uclibc.inc} (86%)
 rename meta/conf/distro/include/{poky-default.inc => tcmode-default.inc} (85%)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d843e70..ce74a9b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -627,9 +627,7 @@ 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/defaultsetup.conf
 include conf/distro/${DISTRO}.conf
 include conf/documentation.conf
 require conf/sanity.conf
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
new file mode 100644
index 0000000..af5ef7b
--- /dev/null
+++ b/meta/conf/distro/defaultsetup.conf
@@ -0,0 +1,23 @@
+include conf/distro/include/default-providers.inc
+include conf/distro/include/default-versions.inc
+include conf/distro/include/world-broken.inc
+
+TARGET_VENDOR ?= "-oecore"
+
+TARGET_FPU_arm ?= "soft"
+TARGET_FPU_armeb ?= "soft"
+
+TCMODE ?= "default"
+require conf/distro/include/tcmode-${TCMODE}.inc
+
+TCLIBC ?= "eglibc"
+require conf/distro/include/tclibc-${TCLIBC}.inc
+
+CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + 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))]}"
+
+USER_CLASSES ?= ""
+PACKAGE_CLASSES ?= "package_ipk"
+INHERIT_INSANE ?= "insane"
+INHERIT_DISTRO ?= "debian devshell sstate license"
+INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_INSANE} ${INHERIT_DISTRO}"
+
diff --git a/meta/conf/distro/include/poky-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc
similarity index 92%
rename from meta/conf/distro/include/poky-eglibc.inc
rename to meta/conf/distro/include/tclibc-eglibc.inc
index 3d2c362..16625e3 100644
--- a/meta/conf/distro/include/poky-eglibc.inc
+++ b/meta/conf/distro/include/tclibc-eglibc.inc
@@ -2,6 +2,10 @@
 # eglibc specific configuration
 #
 
+TARGET_OS = "linux"
+TARGET_OS_arm = "linux-gnueabi"
+TARGET_OS_armeb = "linux-gnueabi"
+
 # Add glibc overrides to the overrides for eglibc.
 OVERRIDES .= ":libc-glibc"
 
@@ -17,8 +21,6 @@ PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk"
 PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk"
 PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "eglibc-initial-nativesdk"
 
-TARGET_OS = "${GLIBCTARGETOS}"
-
 CXXFLAGS += "-fvisibility-inlines-hidden"
 
 LIBC_DEPENDENCIES = "libsegfault \
diff --git a/meta/conf/distro/include/poky-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc
similarity index 91%
rename from meta/conf/distro/include/poky-glibc.inc
rename to meta/conf/distro/include/tclibc-glibc.inc
index 4be7122..79da986 100644
--- a/meta/conf/distro/include/poky-glibc.inc
+++ b/meta/conf/distro/include/tclibc-glibc.inc
@@ -2,6 +2,10 @@
 # glibc specific configuration
 #
 
+TARGET_OS = "linux"
+TARGET_OS_arm = "linux-gnueabi"
+TARGET_OS_armeb = "linux-gnueabi"
+
 # Add glibc to the overrides.
 OVERRIDES =. "libc-glibc:"
 
@@ -16,8 +20,6 @@ PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk"
 PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "glibc-nativesdk"
 PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "glibc-initial-nativesdk"
 
-TARGET_OS = "${GLIBCTARGETOS}"
-
 CXXFLAGS += "-fvisibility-inlines-hidden"
 
 LIBC_DEPENDENCIES = "\
diff --git a/meta/conf/distro/include/poky-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
similarity index 86%
rename from meta/conf/distro/include/poky-uclibc.inc
rename to meta/conf/distro/include/tclibc-uclibc.inc
index def9dfe..18748fa 100644
--- a/meta/conf/distro/include/poky-uclibc.inc
+++ b/meta/conf/distro/include/tclibc-uclibc.inc
@@ -2,6 +2,10 @@
 # uclibc specific configuration
 #
 
+TARGET_OS = "linux-uclibc"
+TARGET_OS_arm = "linux-uclibceabi"
+TARGET_OS_armeb = "linux-uclibceabi"
+
 # Add uclibc overrides to the overrides.
 OVERRIDES =. "libc-uclibc:"
 
diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/tcmode-default.inc
similarity index 85%
rename from meta/conf/distro/include/poky-default.inc
rename to meta/conf/distro/include/tcmode-default.inc
index 91985b3..909d802 100644
--- a/meta/conf/distro/include/poky-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -1,18 +1,16 @@
 #
-# Poky's default configuration
+# Default toolchain configuration
 #
 
-TARGET_VENDOR = "-poky"
-
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${POKYLIBC}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${POKYLIBC}-initial"
-PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${POKYLIBC}-nativesdk"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
+PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${TCLIBC}-nativesdk"
 
 PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
 
@@ -50,6 +48,7 @@ PREFERRED_VERSION_elfutils ?= "0.148"
 # some packages using an archive format incompatible with earlier gzip
 PREFERRED_VERSION_gzip-native ?= "1.4"
 
+# Setup suitable toolchain flags
 require conf/distro/include/as-needed.inc
-
+TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
 
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 2e9d327..f13a67f 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -1,56 +1,29 @@
-
 DISTRO = "poky"
-DISTRO_NAME = "Yocto (Built by Poky 4.0)"
-DISTRO_VERSION = "0.9+snapshot-${DATE}"
+DISTRO_NAME = "Yocto (Built by Poky 5.0)"
+DISTRO_VERSION = "1.0+snapshot-${DATE}"
+SDK_VENDOR = "-pokysdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
 MAINTAINER = "Poky <poky@yoctoproject.org>"
 
-USER_CLASSES ?= ""
-
-PACKAGE_CLASSES ?= "package_ipk"
-INHERIT_INSANE ?= "insane"
-INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian devshell ${INHERIT_INSANE} sstate license"
-# For some reason, this doesn't work
-# TARGET_OS ?= "linux"
-# TARGET_VENDOR ?= "-poky"
-# Set by POKYMODE instead
-TARGET_OS = "linux"
-TARGET_FPU_arm ?= "soft"
-TARGET_FPU_armeb ?= "soft"
-TARGET_FPU_nokia800 = "hard"
-
-TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
+TARGET_VENDOR = "-poky"
 
 QA_LOGFILE = "${TMPDIR}/qa.log"
 
 IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
 
+LOCALCONF_VERSION = "1"
+
 OEINCLUDELOGS = "yes"
 KERNEL_CONSOLE = "ttyS0"
 
-# Default to TARGETOS values for EABI on arm
-GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
-UCLIBCTARGETOS = "linux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
-
-POKYMODE ?= "default"
-require conf/distro/include/poky-${POKYMODE}.inc
-
-POKYLIBC ?= "eglibc"
-require conf/distro/include/poky-${POKYLIBC}.inc
-
-SDK_NAME = "${DISTRO}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
+SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
 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))]}"
-
-
 require conf/distro/include/preferred-xorg-versions.inc
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-#IMAGE_LINGUAS ?= "en-gb en-us"
-#LIMIT_BUILT_LOCALES ?= "en_GB en_US"
 IMAGE_LINGUAS ?= "en-us en-gb"
 LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
 ENABLE_BINARY_LOCALE_GENERATION ?= "1"
@@ -62,6 +35,8 @@ POKY_EXTRA_RDEPENDS = "task-core-boot"
 POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config"
 POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config"
 POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config"
+POKY_EXTRA_RDEPENDS_qemumips = "qemu-config"
+POKY_EXTRA_RDEPENDS_qemuppc = "qemu-config"
 POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config"
 POKY_EXTRA_RDEPENDS_qemux86-64 = "qemu-config"
 
@@ -93,6 +68,9 @@ COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses"
 
 BB_GENERATE_MIRROR_TARBALLS ??= "0"
 
+QEMU_TARGETS ?= "arm i386 mips mipsel ppc x86_64"
+# Other QEMU_TARGETS "mips64 mips64el sh4"
+
 PREMIRRORS ?= "\
 bzr://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
 cvs://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
-- 
1.7.4.1

[PATCH 6/6] preferred-xorg-versions.inc: Drop this, it makes no sense given we only have one version of these recipes

[Richard Purdie]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/distro/include/default-distrovars.inc    |    2 -
 .../distro/include/preferred-xorg-versions.inc     |  150 --------------------
 2 files changed, 0 insertions(+), 152 deletions(-)
 delete mode 100644 meta/conf/distro/include/preferred-xorg-versions.inc

diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index ab26a30..9b1d0ee 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -5,8 +5,6 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
 OEINCLUDELOGS ?= "yes"
 KERNEL_CONSOLE ?= "ttyS0"
 
-require conf/distro/include/preferred-xorg-versions.inc
-
 PCMCIA_MANAGER ?= "pcmciautils"
 
 IMAGE_LINGUAS ?= "en-us en-gb"
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
deleted file mode 100644
index da730e6..0000000
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ /dev/null
@@ -1,150 +0,0 @@
-#
-# The latest Xorg package versions
-#
-
-PREFERRED_VERSION_applewmproto ?= "1.4.1"
-PREFERRED_VERSION_bigreqsproto ?= "1.1.1"
-PREFERRED_VERSION_bigreqsproto-native ?= "1.1.1"
-PREFERRED_VERSION_bigreqsproto-nativesdk ?= "1.1.1"
-PREFERRED_VERSION_compositeproto ?= "0.4.2"
-PREFERRED_VERSION_damageproto ?= "1.2.1"
-PREFERRED_VERSION_dmxproto ?= "2.3.1"
-PREFERRED_VERSION_evieext ?= "1.1.1"
-PREFERRED_VERSION_fixesproto ?= "5.0"
-PREFERRED_VERSION_fontcacheproto ?= "0.1.3"
-PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3"
-PREFERRED_VERSION_fontsproto ?= "2.1.1"
-PREFERRED_VERSION_fontsproto-native ?= "2.1.1"
-PREFERRED_VERSION_gccmakedep ?= "1.0.2"
-PREFERRED_VERSION_glproto ?= "1.4.12"
-PREFERRED_VERSION_imake ?= "1.0.4"
-PREFERRED_VERSION_inputproto ?= "2.0.1"
-PREFERRED_VERSION_inputproto-native ?= "2.0.1"
-PREFERRED_VERSION_inputproto-nativesdk ?= "2.0.1"
-PREFERRED_VERSION_kbproto ?= "1.0.5"
-PREFERRED_VERSION_kbproto-native ?= "1.0.5"
-PREFERRED_VERSION_kbproto-nativesdk ?= "1.0.5"
-PREFERRED_VERSION_libapplewm ?= "1.0.0"
-PREFERRED_VERSION_libdmx ?= "1.1.1"
-PREFERRED_VERSION_libfontenc ?= "1.1.0"
-PREFERRED_VERSION_libfontenc-native ?= "1.1.0"
-PREFERRED_VERSION_libice ?= "1.0.7"
-PREFERRED_VERSION_liblbxutil ?= "1.1.0"
-PREFERRED_VERSION_liboldx ?= "1.0.1"
-PREFERRED_VERSION_libsm ?= "1.2.0"
-PREFERRED_VERSION_libwindowswm ?= "1.0.0"
-PREFERRED_VERSION_libx11 ?= "1.3.4"
-PREFERRED_VERSION_libx11-diet ?= "1.3"
-PREFERRED_VERSION_libx11-native ?= "1.3.4"
-PREFERRED_VERSION_libx11-nativesdk ?= "1.3.4"
-PREFERRED_VERSION_libx11-trim ?= "1.3.4"
-PREFERRED_VERSION_libxau ?= "1.0.6"
-PREFERRED_VERSION_libxau-native ?= "1.0.6"
-PREFERRED_VERSION_libxau-nativesdk ?= "1.0.6"
-PREFERRED_VERSION_libxaw ?= "1.0.5"
-PREFERRED_VERSION_libxcomposite ?= "0.4.3"
-PREFERRED_VERSION_libxcursor ?= "1.1.11"
-PREFERRED_VERSION_libxdamage ?= "1.1.3"
-PREFERRED_VERSION_libxdmcp ?= "1.1.0"
-PREFERRED_VERSION_libxdmcp-native ?= "1.1.0"
-PREFERRED_VERSION_libxdmcp-nativesdk ?= "1.1.0"
-PREFERRED_VERSION_libxevie ?= "1.0.2"
-PREFERRED_VERSION_libxext ?= "1.2.0"
-PREFERRED_VERSION_libxext-nativesdk ?= "1.2.0"
-PREFERRED_VERSION_libxfixes ?= "5.0"
-PREFERRED_VERSION_libxfont ?= "1.4.3"
-PREFERRED_VERSION_libxfont-native ?= "1.4.3"
-PREFERRED_VERSION_libxfontcache ?= "1.0.5"
-PREFERRED_VERSION_libxft ?= "2.2.0"
-PREFERRED_VERSION_libxi ?= "1.4.2"
-PREFERRED_VERSION_libxinerama ?= "1.1.1"
-PREFERRED_VERSION_libxkbfile ?= "1.0.7"
-PREFERRED_VERSION_libxkbui ?= "1.0.2"
-PREFERRED_VERSION_libxmu ?= "1.1.0"
-PREFERRED_VERSION_libxp ?= "1.0.1"
-PREFERRED_VERSION_libxpm ?= "3.5.9"
-PREFERRED_VERSION_libxprintapputil ?= "1.0.1"
-PREFERRED_VERSION_libxprintutil ?= "1.0.1"
-PREFERRED_VERSION_libxrandr ?= "1.3.1"
-PREFERRED_VERSION_libxrandr-nativesdk ?= "1.3.1"
-PREFERRED_VERSION_libxrender ?= "0.9.6"
-PREFERRED_VERSION_libxrender-nativesdk ?= "0.9.6"
-PREFERRED_VERSION_libxres ?= "1.0.5"
-PREFERRED_VERSION_libxscrnsaver ?= "1.2.1"
-PREFERRED_VERSION_libxt ?= "1.1.1"
-PREFERRED_VERSION_libxtrap ?= "1.0.0"
-PREFERRED_VERSION_libxtst ?= "1.2.0"
-PREFERRED_VERSION_libxv ?= "1.0.6"
-PREFERRED_VERSION_libxvmc ?= "1.0.6"
-PREFERRED_VERSION_libxxf86dga ?= "1.1.2"
-PREFERRED_VERSION_libxxf86misc ?= "1.0.3"
-PREFERRED_VERSION_libxxf86vm ?= "1.1.1"
-PREFERRED_VERSION_lndir ?= "1.0.1"
-PREFERRED_VERSION_makedepend ?= "1.0.3"
-PREFERRED_VERSION_makedepend-native ?= "1.0.3"
-PREFERRED_VERSION_pixman ?= "0.20.2"
-PREFERRED_VERSION_printproto ?= "1.0.5"
-PREFERRED_VERSION_randrproto ?= "1.3.2"
-PREFERRED_VERSION_randrproto-nativesdk ?= "1.3.2"
-PREFERRED_VERSION_recordproto ?= "1.14.1"
-PREFERRED_VERSION_renderproto ?= "0.11.1"
-PREFERRED_VERSION_renderproto-nativesdk ?= "0.11.1"
-PREFERRED_VERSION_resourceproto ?= "1.1.1"
-PREFERRED_VERSION_scrnsaverproto ?= "1.2.1"
-PREFERRED_VERSION_trapproto ?= "3.4.3"
-PREFERRED_VERSION_util-macros ?= "1.13.0"
-PREFERRED_VERSION_util-macros-native ?= "1.13.0"
-PREFERRED_VERSION_videoproto ?= "2.3.1"
-PREFERRED_VERSION_windowswmproto ?= "1.0.4"
-PREFERRED_VERSION_x11perf ?= "1.5.3"
-PREFERRED_VERSION_xauth ?= "1.0.5"
-PREFERRED_VERSION_xcmiscproto ?= "1.2.1"
-PREFERRED_VERSION_xcmiscproto-native ?= "1.2.1"
-PREFERRED_VERSION_xcmiscproto-nativesdk ?= "1.2.1"
-PREFERRED_VERSION_xdpyinfo ?= "1.2.0"
-PREFERRED_VERSION_xev ?= "1.0.3"
-PREFERRED_VERSION_xextproto ?= "7.2.0"
-PREFERRED_VERSION_xextproto-native ?= "7.2.0"
-PREFERRED_VERSION_xextproto-nativesdk ?= "7.2.0"
-PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0"
-PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0"
-PREFERRED_VERSION_xf86bigfontproto-nativesdk ?= "1.2.0"
-PREFERRED_VERSION_xf86dgaproto ?= "2.1"
-PREFERRED_VERSION_xf86driproto ?= "2.1.1"
-PREFERRED_VERSION_dri2proto ?= "2.3"
-PREFERRED_VERSION_xf86miscproto ?= "0.9.3"
-PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
-PREFERRED_VERSION_xf86vidmodeproto ?= "2.3.1"
-PREFERRED_VERSION_xhost ?= "1.0.4"
-PREFERRED_VERSION_xinit ?= "1.3.0"
-PREFERRED_VERSION_xineramaproto ?= "1.2.1"
-PREFERRED_VERSION_xmodmap ?= "1.0.5"
-PREFERRED_VERSION_xorg-cf-files ?= "1.0.4"
-PREFERRED_VERSION_xprop ?= "1.2.0"
-PREFERRED_VERSION_xproto ?= "7.0.21"
-PREFERRED_VERSION_xproto-native ?= "7.0.21"
-PREFERRED_VERSION_xproto-nativesdk ?= "7.0.21"
-PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
-PREFERRED_VERSION_xrandr ?= "1.3.4"
-PREFERRED_VERSION_xrdb ?= "1.0.5"
-PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2"
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
-PREFERRED_VERSION_xset ?= "1.2.1"
-PREFERRED_VERSION_xtrans ?= "1.2.6"
-PREFERRED_VERSION_xtrans-native ?= "1.2.6"
-PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6"
-PREFERRED_VERSION_xvinfo ?= "1.1.1"
-PREFERRED_VERSION_xwininfo ?= "1.1.1"
-PREFERRED_VERSION_mesa-dri ?= "7.10.2"
-PREFERRED_VERSION_libdrm ?= "2.4.25"
-PREFERRED_VERSION_xcb-proto ?= "1.6"
-PREFERRED_VERSION_libxcb ?= "1.7"
-PREFERRED_VERSION_libxcb-nativesdk ?= "1.7"
-PREFERRED_VERSION_libpciaccess ?= "0.12.1"
-PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
-PREFERRED_VERSION_xf86-input-mouse ?= "1.7.0"
-PREFERRED_VERSION_xf86-input-keyboard ?= "1.6.0"
-PREFERRED_VERSION_xf86-input-synaptics ?= "1.4.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.14.0"
-
-
-- 
1.7.4.1

[PATCH 4/6] machine/qemu: Add qemu-config as an essential machine speicfic dependency and drop specific distro config

[Richard Purdie]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/distro/poky.conf         |    7 -------
 meta/conf/machine/include/qemu.inc |    1 +
 meta/conf/machine/qemux86-64.conf  |    2 +-
 meta/conf/machine/qemux86.conf     |    2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index f13a67f..3a66a76 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -32,13 +32,6 @@ LOCALE_UTF8_ONLY = "0"
 DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
 
 POKY_EXTRA_RDEPENDS = "task-core-boot"
-POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config"
-POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config"
-POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config"
-POKY_EXTRA_RDEPENDS_qemumips = "qemu-config"
-POKY_EXTRA_RDEPENDS_qemuppc = "qemu-config"
-POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config"
-POKY_EXTRA_RDEPENDS_qemux86-64 = "qemu-config"
 
 DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"
 DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 61281bf..bd40983 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -19,3 +19,4 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 
 EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "qemu-config"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 182759a..ca91388 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -30,6 +30,6 @@ XSERVER ?= "xserver-xf86-dri-lite \
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "v86d"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
 TARGET_CC_ARCH = "-m64"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index f1a0939..8b14731 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -29,6 +29,6 @@ XSERVER ?= "xserver-xf86-dri-lite \
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "v86d"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
 TARGET_CC_ARCH = "-march=i586"
-- 
1.7.4.1

[PATCH 5/6] conf/distro/include/default-distrovars.inc: Create set of default 'distro' variable values

[Richard Purdie]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/distro/defaultsetup.conf              |    1 +
 meta/conf/distro/include/default-distrovars.inc |   43 ++++++++++++++++++++
 meta/conf/distro/poky.conf                      |   48 +----------------------
 3 files changed, 46 insertions(+), 46 deletions(-)
 create mode 100644 meta/conf/distro/include/default-distrovars.inc

diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
index af5ef7b..8da6c0a 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -1,5 +1,6 @@
 include conf/distro/include/default-providers.inc
 include conf/distro/include/default-versions.inc
+include conf/distro/include/default-distrovars.inc
 include conf/distro/include/world-broken.inc
 
 TARGET_VENDOR ?= "-oecore"
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
new file mode 100644
index 0000000..ab26a30
--- /dev/null
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -0,0 +1,43 @@
+QA_LOGFILE = "${TMPDIR}/qa.log"
+
+IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
+
+OEINCLUDELOGS ?= "yes"
+KERNEL_CONSOLE ?= "ttyS0"
+
+require conf/distro/include/preferred-xorg-versions.inc
+
+PCMCIA_MANAGER ?= "pcmciautils"
+
+IMAGE_LINGUAS ?= "en-us en-gb"
+LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
+LOCALE_UTF8_ONLY ?= "0"
+
+DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
+
+DISTRO_EXTRA_RDEPENDS += "task-core-boot"
+DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
+
+IMAGE_FEATURES ?= ""
+
+# This is a list of packages that are used by the build system to build the distribution, they are not
+# directly part of the distribution. 
+HOSTTOOLS_WHITELIST_GPLv3 ?= ""
+WHITELIST_GPLv3 ?= "less"
+LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime" 
+
+# This is a list of packages that require a commercial license to ship
+# product. If shipped as part of an image these packages may have 
+# implications so they are disabled by default
+COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp"
+COMMERCIAL_AUDIO_PLUGINS ?= ""
+# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
+COMMERCIAL_VIDEO_PLUGINS ?= ""
+# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
+COMMERCIAL_QT ?= ""
+# COMMERCIAL_QT ?= "qmmp"
+# Set of common licenses used for license.bbclass
+COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses"
+
+BB_GENERATE_MIRROR_TARBALLS ??= "0"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 3a66a76..fd0a936 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -8,59 +8,13 @@ MAINTAINER = "Poky <poky@yoctoproject.org>"
 
 TARGET_VENDOR = "-poky"
 
-QA_LOGFILE = "${TMPDIR}/qa.log"
-
-IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
-
 LOCALCONF_VERSION = "1"
 
-OEINCLUDELOGS = "yes"
-KERNEL_CONSOLE = "ttyS0"
-
 SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
 SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
 
-require conf/distro/include/preferred-xorg-versions.inc
-
-PCMCIA_MANAGER ?= "pcmciautils"
-
-IMAGE_LINGUAS ?= "en-us en-gb"
-LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
-ENABLE_BINARY_LOCALE_GENERATION ?= "1"
-LOCALE_UTF8_ONLY = "0"
-
-DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
-
-POKY_EXTRA_RDEPENDS = "task-core-boot"
-
-DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"
-DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
-
-IMAGE_FEATURES ?= ""
-
 EXTRAOPKGCONFIG = "poky-feed-config-opkg"
 
-# This is a list of packages that are used by poky to build the distribution, they are not
-# directly part of the distribution. 
-HOSTTOOLS_WHITELIST_GPLv3 ?= ""
-WHITELIST_GPLv3 ?= "less"
-LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime" 
-
-# This is a list of packages that require a commercial license to ship
-# product. If shipped as part of an image these packages may have 
-# implications so they are disabled by default
-COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp"
-COMMERCIAL_AUDIO_PLUGINS ?= ""
-# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
-COMMERCIAL_VIDEO_PLUGINS ?= ""
-# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
-COMMERCIAL_QT ?= ""
-# COMMERCIAL_QT ?= "qmmp"
-# Set of common licenses used for license.bbclass
-COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses"
-
-BB_GENERATE_MIRROR_TARBALLS ??= "0"
-
 QEMU_TARGETS ?= "arm i386 mips mipsel ppc x86_64"
 # Other QEMU_TARGETS "mips64 mips64el sh4"
 
@@ -79,3 +33,5 @@ ftp://.*/.*      http://autobuilder.yoctoproject.org/sources/ \n \
 http://.*/.*     http://autobuilder.yoctoproject.org/sources/ \n \
 https://.*/.*    http://autobuilder.yoctoproject.org/sources/ \n"
 
+
+
-- 
1.7.4.1

Re: [PATCH 0/6] RFC Distro config changes

[Frans Meulenbroeks]

2011/5/10 Richard Purdie <richard.purdie@linuxfoundation.org>

> From: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> As discussed, we want to make OE-Core usable with no distro set. This patch
> series
> makes some big steps towards that goal. I'd be interested in feedback on
> whether it
> does the right things and would be usable by others.
>
> The key is the inclusion of a distro/defaultsetup.conf file by bitbake.conf
> and
> in turn this pulls in a variety of other common include files which can
> likely be
> shared. Any point of this cycle can be overridden by another layer so its
> totally
> customisable. I'd encourage users to use the pieces they can where possible
> so we
> all share best practises but obviously people have choice.
>
> I did dump a load of "default" variables into default-distrovars.inc, I'm
> not
> calling that file finished, I just had to draw the line somewhere and start
> a
> discussion about this :)
>
> Also, I'm aware there are still a few poky-* files in
> meta/conf/distro/include.
> Some of these can just be deleted, others renamed tcmode-* and I'll take
> care
> of that. I'll also delete the poky.conf file since it no longer contains
> anything
> required to make OE-Core build as far as I know (wider testing needed).
>
> Pull URL: git://git.openembedded.org/openembedded-core-contrib
>  Branch: rpurdie/distro
>  Browse:
> http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rpurdie/distro
>

THere is something wrong with git.
If I browse to the 2nd url I get:
Bad object id: rpurdie/distro
going to git and navigating to the branch gives the same result.

 Anyway, although I am not able to review the changes on git, a thumbs up
for the initiative.

Frans

Re: [PATCH 0/6] RFC Distro config changes

[Richard Purdie]

On Tue, 2011-05-10 at 16:05 +0200, Frans Meulenbroeks wrote:
> > Pull URL: git://git.openembedded.org/openembedded-core-contrib
> >  Branch: rpurdie/distro
> >  Browse:
> > http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rpurdie/distro
> >
> 
> THere is something wrong with git.
> If I browse to the 2nd url I get:
> Bad object id: rpurdie/distro
> going to git and navigating to the branch gives the same result.
> 
>  Anyway, although I am not able to review the changes on git, a thumbs up
> for the initiative.

I've noticed this happening with branches on that repository for the
past couple of days, its not just this branch.

Khem/Cliff/Tom: Who might be able to look into and help fix this?

Frans: You can still checkout the branch and look, its just the web
interface that has issues.

Cheers,

Richard

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

[Koen Kooi]

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

Re: [PATCH 5/6] conf/distro/include/default-distrovars.inc: Create set of default 'distro' variable values

[Frans Meulenbroeks]

Some minor remarks on the default-distrovars.inc contents:

2011/5/10 Richard Purdie <richard.purdie@linuxfoundation.org>
[...]

> diff --git a/meta/conf/distro/include/default-distrovars.inc
> b/meta/conf/distro/include/default-distrovars.inc
> new file mode 100644
> index 0000000..ab26a30
> --- /dev/null
> +++ b/meta/conf/distro/include/default-distrovars.inc
> @@ -0,0 +1,43 @@
> +QA_LOGFILE = "${TMPDIR}/qa.log"
>
Should this be here? I would expect the class file that uses this to have
this as default and/or have this in local.conf.sample.
This does not seem too distro specific

> +
> +IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
>
Hm, again something that is probalby not distro related. And why only for
_ext2 and not eg for _ext3 or for _jffs2
Personally I always stuff this in my image recipe

> +
> +OEINCLUDELOGS ?= "yes"
>
in local.conf.sample?

> +KERNEL_CONSOLE ?= "ttyS0"
>
I'm inclined to put this into the machine conf. Is this really a distro
thing?

> +
> +require conf/distro/include/preferred-xorg-versions.inc
> +
> +PCMCIA_MANAGER ?= "pcmciautils"
> +
> +IMAGE_LINGUAS ?= "en-us en-gb"
> +LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
> +ENABLE_BINARY_LOCALE_GENERATION ?= "1"
> +LOCALE_UTF8_ONLY ?= "0"
>
Again something I tend to do in image recipes; then again this might be
because I do not use feeds, only make images.

> +
> +DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi
> nfs zeroconf pci"
>
Is this the complete range? I would expect all features to be enabled by
default (and let MACHINE_FEATURES reduce that set)

> +
> +DISTRO_EXTRA_RDEPENDS += "task-core-boot"
> +DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
> +
> +IMAGE_FEATURES ?= ""
>
Has a var with ?= assignment of an empty string any meaning. Thought an
empty string would be the default.

> +
> +# This is a list of packages that are used by the build system to build
> the distribution, they are not
> +# directly part of the distribution.
> +HOSTTOOLS_WHITELIST_GPLv3 ?= ""
> +WHITELIST_GPLv3 ?= "less"
>
I'm not sure why less is listed in the line above:
the less license is not gpl (at least not less 443)


> +LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc
> gcc-runtime"
> +
> +# This is a list of packages that require a commercial license to ship
> +# product. If shipped as part of an image these packages may have
> +# implications so they are disabled by default
> +COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp"
> +COMMERCIAL_AUDIO_PLUGINS ?= ""
> +# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad
> gst-plugins-ugly-mpegaudioparse"
> +COMMERCIAL_VIDEO_PLUGINS ?= ""
> +# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec
> gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
> +COMMERCIAL_QT ?= ""
> +# COMMERCIAL_QT ?= "qmmp"
> +# Set of common licenses used for license.bbclass
> +COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses"
>
maybe the above could be in a separate license.inc file or so.

> +
> +BB_GENERATE_MIRROR_TARBALLS ??= "0"
>
local.conf.sample ?

Enjoy! Frans

Re: [PATCH 3/6] distro: Add defaultsetup.conf, a set of default configuration providing sane overrridable default for commonly used options

[Koen Kooi]

Op 10 mei 2011, om 16:00 heeft Richard Purdie het volgende geschreven:

> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> 
> The intent is to allow distros to share common core config but still allow
> customisations. The core should work with no distro set but users
> can still customise in any ways needed.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/conf/bitbake.conf                             |    4 +-
> meta/conf/distro/defaultsetup.conf                 |   23 ++++++++++
> .../include/{poky-eglibc.inc => tclibc-eglibc.inc} |    6 ++-
> .../include/{poky-glibc.inc => tclibc-glibc.inc}   |    6 ++-
> .../include/{poky-uclibc.inc => tclibc-uclibc.inc} |    4 ++
> .../{poky-default.inc => tcmode-default.inc}       |   13 +++---
> meta/conf/distro/poky.conf                         |   46 +++++--------------
> 7 files changed, 54 insertions(+), 48 deletions(-)
> create mode 100644 meta/conf/distro/defaultsetup.conf
> rename meta/conf/distro/include/{poky-eglibc.inc => tclibc-eglibc.inc} (92%)
> rename meta/conf/distro/include/{poky-glibc.inc => tclibc-glibc.inc} (91%)
> rename meta/conf/distro/include/{poky-uclibc.inc => tclibc-uclibc.inc} (86%)
> rename meta/conf/distro/include/{poky-default.inc => tcmode-default.inc} (85%)
> 
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index d843e70..ce74a9b 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -627,9 +627,7 @@ 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/defaultsetup.conf
> include conf/distro/${DISTRO}.conf

Please include it after $DISTRO, otherwise ?= in $DISTRO won't work as intended.

> include conf/documentation.conf
> require conf/sanity.conf
> diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
> new file mode 100644
> index 0000000..af5ef7b
> --- /dev/null
> +++ b/meta/conf/distro/defaultsetup.conf
> @@ -0,0 +1,23 @@
> +include conf/distro/include/default-providers.inc
> +include conf/distro/include/default-versions.inc
> +include conf/distro/include/world-broken.inc
> +
> +TARGET_VENDOR ?= "-oecore"
> +
> +TARGET_FPU_arm ?= "soft"
> +TARGET_FPU_armeb ?= "soft"

Something more elaborate would be better, this is what angstrom has:

conf/distro/include/angstrom.inc:TARGET_FPU_arm = "soft"
conf/distro/include/angstrom.inc:TARGET_FPU_armeb = "soft"
conf/distro/include/angstrom.inc:TARGET_FPU_ixp4xx = "soft"
conf/distro/include/angstrom.inc:TARGET_FPU_ppc405 = "soft"
conf/distro/include/angstrom.inc:TARGET_FPU_armv6 = "hard"
conf/distro/include/angstrom.inc:TARGET_FPU_armv6-novfp = "soft"
conf/distro/include/angstrom.inc:TARGET_FPU_armv7a = "hard"
conf/distro/include/angstrom.inc:TARGET_FPU_ppc603e = "hard"

you really want to use hard (don't confuse it with hardfp) on armv7a.

> +INHERIT_INSANE ?= "insane"

excellent!

> 
> --- a/meta/conf/distro/include/poky-eglibc.inc
> +++ b/meta/conf/distro/include/tclibc-eglibc.inc
> @@ -2,6 +2,10 @@
> # eglibc specific configuration
> #
> 
> +TARGET_OS = "linux"
> +TARGET_OS_arm = "linux-gnueabi"
> +TARGET_OS_armeb = "linux-gnueabi"

Maybe something like angstroms version:

TARGET_OS = "linux"
TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d,1) in ['ppce500', 'ppce500v2']]}"

or the sane-toolchain version:

def compute_os_portion_of_target_triplet (d):
    import bb
    arm_eabi_unsupported_arches = "armv1 armv2 armv3"
    ppc_spe_supporting_arches = "ppce500v2 ppce500"
    gnu_suffix = ""
    if bb.data.getVar('LIBC', d, 1) == "uclibc":
        libc_suffix = "uclibc"
    else:
        libc_suffix = ""

    if bb.data.getVar('TARGET_ARCH',d,1) in ['bfin']:
        if libc_suffix is not "uclibc":
            bb.fatal("bfin is not supported on glibc/eglibc. Please choose uclibc")
        else:
            os_suffix = "uclinux"
    else:
        os_suffix = "linux"
    bparch = bb.data.getVar('BASE_PACKAGE_ARCH', d,1)

    if bb.data.getVar('DISTRO_FEATURES',d,1) is not None and \
    bparch is not None:
        if 'eabi' in bb.data.getVar('DISTRO_FEATURES',d,1).split() and \
        bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]:
            if bparch in arm_eabi_unsupported_arches.split():
                bb.fatal("DISTRO requested EABI but selected machine does not support EABI")
                abi_suffix = ""
            else:
                if libc_suffix is not "uclibc":
                    gnu_suffix = "gnu"
                abi_suffix = "eabi"
        elif bparch in ppc_spe_supporting_arches.split():
            if libc_suffix is not "uclibc":
                gnu_suffix = "gnu"
            abi_suffix = "spe"
        else:
            abi_suffix = ""
    else:
        bb.note("DISTRO_FEATURES is not set abi suffix not set")
        abi_suffix = ""

    if bb.data.getVar('TOOLCHAIN_BRAND', d, 1) is not None and \
    "csl" in bb.data.getVar('TOOLCHAIN_BRAND', d, 1):
        gnu_suffix = "gnu"

    if libc_suffix + gnu_suffix + abi_suffix is not "":
        return os_suffix + "-" + libc_suffix + gnu_suffix + abi_suffix
    else:
        return os_suffix

> diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/tcmode-default.inc
> similarity index 85%
> rename from meta/conf/distro/include/poky-default.inc
> rename to meta/conf/distro/include/tcmode-default.inc
> index 91985b3..909d802 100644
> --- a/meta/conf/distro/include/poky-default.inc
> +++ b/meta/conf/distro/include/tcmode-default.inc
> @@ -1,18 +1,16 @@

> -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${POKYLIBC}"
> +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}"
> PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
> PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
> PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
> PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
> PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
> PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
> -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${POKYLIBC}-initial"
> -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${POKYLIBC}-nativesdk"
> +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
> +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${TCLIBC}-nativesdk"

Angstrom has this for *libc:

# The things *libc can provide.
PREFERRED_PROVIDER_virtual/libc = "${TCLIBC}"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}"

# And the same as above for the nativesdk
PREFERRED_PROVIDER_virtual/libc-nativesdk = "${TCLIBC}-nativesdk"
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk = "${TCLIBC}-initial-nativesdk"
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk = "${TCLIBC}-nativesdk"

I needed the initial-nativesdk for meta-toolchain, but I can't recall the exact problem

regards,

Koen

Re: [PATCH 0/6] RFC Distro config changes

[Koen Kooi]

Op 10 mei 2011, om 16:00 heeft Richard Purdie het volgende geschreven:

> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> 
> As discussed, we want to make OE-Core usable with no distro set. This patch series
> makes some big steps towards that goal. I'd be interested in feedback on whether it
> does the right things and would be usable by others.
> 
> The key is the inclusion of a distro/defaultsetup.conf file by bitbake.conf and 
> in turn this pulls in a variety of other common include files which can likely be
> shared. Any point of this cycle can be overridden by another layer so its totally
> customisable. I'd encourage users to use the pieces they can where possible so we
> all share best practises but obviously people have choice.
> 
> I did dump a load of "default" variables into default-distrovars.inc, I'm not
> calling that file finished, I just had to draw the line somewhere and start a 
> discussion about this :)


For angstrom we had to change a few things, have a look at http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/meta-angstrom/tree/conf/distro/include/angstrom-core-tweaks.inc , specifically lines 12-18 and 53-54



regards,

Koen

Re: [PATCH 5/6] conf/distro/include/default-distrovars.inc: Create set of default 'distro' variable values

[Richard Purdie]

On Tue, 2011-05-10 at 16:26 +0200, Frans Meulenbroeks wrote:
> Some minor remarks on the default-distrovars.inc contents:

To quote the email prefacing this patch series:

"""
I did dump a load of "default" variables into default-distrovars.inc,
I'm not calling that file finished, I just had to draw the line
somewhere and start a discussion about this :)
"""

but we can have this discussion.

> 2011/5/10 Richard Purdie <richard.purdie@linuxfoundation.org>
> [...]
> 
> > diff --git a/meta/conf/distro/include/default-distrovars.inc
> > b/meta/conf/distro/include/default-distrovars.inc
> > new file mode 100644
> > index 0000000..ab26a30
> > --- /dev/null
> > +++ b/meta/conf/distro/include/default-distrovars.inc
> > @@ -0,0 +1,43 @@
> > +QA_LOGFILE = "${TMPDIR}/qa.log"
> >
> Should this be here? I would expect the class file that uses this to have
> this as default and/or have this in local.conf.sample.
> This does not seem too distro specific

If this is unset, the logfile isn't generated at all with the current
defaults. I don't claim the current defaults are correct but its a
separate patch if we do want to change the defaults.

> > +
> > +IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
> >
> Hm, again something that is probalby not distro related. And why only for
> _ext2 and not eg for _ext3 or for _jffs2
> Personally I always stuff this in my image recipe

Left there pending a review of where various image sizes are set.

> > +
> > +OEINCLUDELOGS ?= "yes"
> >
> in local.conf.sample?

If its there, this can be dropped, yes. I think forcing it on by default
may be a good thing though. I'm not 100% sure that variable even still
exists tbh.

> > +KERNEL_CONSOLE ?= "ttyS0"
> >
> I'm inclined to put this into the machine conf. Is this really a distro
> thing?

No, left for compatibility pending cleanup.

> > +
> > +require conf/distro/include/preferred-xorg-versions.inc
> > +
> > +PCMCIA_MANAGER ?= "pcmciautils"
> > +
> > +IMAGE_LINGUAS ?= "en-us en-gb"
> > +LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
> > +ENABLE_BINARY_LOCALE_GENERATION ?= "1"
> > +LOCALE_UTF8_ONLY ?= "0"
> >
> Again something I tend to do in image recipes; then again this might be
> because I do not use feeds, only make images.

These ones are more distro policy and whilst an image can change them a
default is good in those cases. If there are defaults set elsewhere we
should review and pick the correct ones.

> > +DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi
> > nfs zeroconf pci"
> >
> Is this the complete range? I would expect all features to be enabled by
> default (and let MACHINE_FEATURES reduce that set)

Needs further investigation.

> > +
> > +DISTRO_EXTRA_RDEPENDS += "task-core-boot"
> > +DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
> > +
> > +IMAGE_FEATURES ?= ""
> >
> Has a var with ?= assignment of an empty string any meaning. Thought an
> empty string would be the default.

No, its not.

> > +
> > +# This is a list of packages that are used by the build system to build
> > the distribution, they are not
> > +# directly part of the distribution.
> > +HOSTTOOLS_WHITELIST_GPLv3 ?= ""
> > +WHITELIST_GPLv3 ?= "less"
> >
> I'm not sure why less is listed in the line above:
> the less license is not gpl (at least not less 443)
> 
> 
> > +LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc
> > gcc-runtime"
> > +
> > +# This is a list of packages that require a commercial license to ship
> > +# product. If shipped as part of an image these packages may have
> > +# implications so they are disabled by default
> > +COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp"
> > +COMMERCIAL_AUDIO_PLUGINS ?= ""
> > +# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad
> > gst-plugins-ugly-mpegaudioparse"
> > +COMMERCIAL_VIDEO_PLUGINS ?= ""
> > +# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec
> > gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
> > +COMMERCIAL_QT ?= ""
> > +# COMMERCIAL_QT ?= "qmmp"
> > +# Set of common licenses used for license.bbclass
> > +COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses"
> >
> maybe the above could be in a separate license.inc file or so.

Possibly, setting these to defaults is good though.

> > +
> > +BB_GENERATE_MIRROR_TARBALLS ??= "0"
> >
> local.conf.sample ?

I regard local.conf.sample as things a new user cares about. I don't
think this fits that category. Its here pending the creation of a more
"advanced settings" version of local.conf.sample we've talked about
being created.

Cheers,

Richard

[PATCH 0/6] RFC Distro config changes

[Khem Raj]

---------- Forwarded message ----------
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, May 10, 2011 at 8:35 PM
Subject: Re: [OE-core] [PATCH 0/6] RFC Distro config changes
To: Richard Purdie <richard.purdie@linuxfoundation.org>


On Tue, May 10, 2011 at 7:08 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>> THere is something wrong with git.
>> If I browse to the 2nd url I get:
>> Bad object id: rpurdie/distro
>> going to git and navigating to the branch gives the same result.
>>
>>  Anyway, although I am not able to review the changes on git, a thumbs up
>> for the initiative.
>
> I've noticed this happening with branches on that repository for the
> past couple of days, its not just this branch.
>
> Khem/Cliff/Tom: Who might be able to look into and help fix this?

Hi

This was a url rewrite problem when I tried to redirect gitweb traffic to cgit
the regexp was too liberal. I have rewritten the rewrite rules and now
everything should be hunky dory

Let me know if you run into problems

Sorry for inconvenience

-Khem

[OE-core] [PATCH 0/6] RFC Distro config changes

[Khem Raj]

---------- Forwarded message ----------
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, May 10, 2011 at 8:35 PM
Subject: Re: [OE-core] [PATCH 0/6] RFC Distro config changes
To: Richard Purdie <richard.purdie@linuxfoundation.org>


On Tue, May 10, 2011 at 7:08 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>> THere is something wrong with git.
>> If I browse to the 2nd url I get:
>> Bad object id: rpurdie/distro
>> going to git and navigating to the branch gives the same result.
>>
>>  Anyway, although I am not able to review the changes on git, a thumbs up
>> for the initiative.
>
> I've noticed this happening with branches on that repository for the
> past couple of days, its not just this branch.
>
> Khem/Cliff/Tom: Who might be able to look into and help fix this?

Hi

This was a url rewrite problem when I tried to redirect gitweb traffic to cgit
the regexp was too liberal. I have rewritten the rewrite rules and now
everything should be hunky dory

Let me know if you run into problems

Sorry for inconvenience

-Khem

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

[Richard Purdie]

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

Re: [PATCH 3/6] distro: Add defaultsetup.conf, a set of default configuration providing sane overrridable default for commonly used options

[Richard Purdie]

On Tue, 2011-05-10 at 16:31 +0200, Koen Kooi wrote:
> Op 10 mei 2011, om 16:00 heeft Richard Purdie het volgende geschreven:
> 
> > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > 
> > The intent is to allow distros to share common core config but still allow
> > customisations. The core should work with no distro set but users
> > can still customise in any ways needed.
> > 
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > meta/conf/bitbake.conf                             |    4 +-
> > meta/conf/distro/defaultsetup.conf                 |   23 ++++++++++
> > .../include/{poky-eglibc.inc => tclibc-eglibc.inc} |    6 ++-
> > .../include/{poky-glibc.inc => tclibc-glibc.inc}   |    6 ++-
> > .../include/{poky-uclibc.inc => tclibc-uclibc.inc} |    4 ++
> > .../{poky-default.inc => tcmode-default.inc}       |   13 +++---
> > meta/conf/distro/poky.conf                         |   46 +++++--------------
> > 7 files changed, 54 insertions(+), 48 deletions(-)
> > create mode 100644 meta/conf/distro/defaultsetup.conf
> > rename meta/conf/distro/include/{poky-eglibc.inc => tclibc-eglibc.inc} (92%)
> > rename meta/conf/distro/include/{poky-glibc.inc => tclibc-glibc.inc} (91%)
> > rename meta/conf/distro/include/{poky-uclibc.inc => tclibc-uclibc.inc} (86%)
> > rename meta/conf/distro/include/{poky-default.inc => tcmode-default.inc} (85%)
> > 
> > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> > index d843e70..ce74a9b 100644
> > --- a/meta/conf/bitbake.conf
> > +++ b/meta/conf/bitbake.conf
> > @@ -627,9 +627,7 @@ 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/defaultsetup.conf
> > include conf/distro/${DISTRO}.conf
> 
> Please include it after $DISTRO, otherwise ?= in $DISTRO won't work as intended.

Fixed, thanks.


> > include conf/documentation.conf
> > require conf/sanity.conf
> > diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
> > new file mode 100644
> > index 0000000..af5ef7b
> > --- /dev/null
> > +++ b/meta/conf/distro/defaultsetup.conf
> > @@ -0,0 +1,23 @@
> > +include conf/distro/include/default-providers.inc
> > +include conf/distro/include/default-versions.inc
> > +include conf/distro/include/world-broken.inc
> > +
> > +TARGET_VENDOR ?= "-oecore"
> > +
> > +TARGET_FPU_arm ?= "soft"
> > +TARGET_FPU_armeb ?= "soft"
> 
> Something more elaborate would be better, this is what angstrom has:
> 
> conf/distro/include/angstrom.inc:TARGET_FPU_arm = "soft"
> conf/distro/include/angstrom.inc:TARGET_FPU_armeb = "soft"
> conf/distro/include/angstrom.inc:TARGET_FPU_ixp4xx = "soft"
> conf/distro/include/angstrom.inc:TARGET_FPU_ppc405 = "soft"
> conf/distro/include/angstrom.inc:TARGET_FPU_armv6 = "hard"
> conf/distro/include/angstrom.inc:TARGET_FPU_armv6-novfp = "soft"
> conf/distro/include/angstrom.inc:TARGET_FPU_armv7a = "hard"
> conf/distro/include/angstrom.inc:TARGET_FPU_ppc603e = "hard"
> 
> you really want to use hard (don't confuse it with hardfp) on armv7a.

Agreed but we have a problem here as the default OVERRIDES in OECore
don't include BASE_PACKAGE_ARCH. I'm kind of reluctant to do so too as
the number of cases we need this are small and the strings aren't very
unique. I'b feel happier if the override was something like
parch-${BASE_PACKAGE_ARCH} as you could at least easily spot where it
was being used.

I appreciate we need to do something here, its just a question of what.

> > --- a/meta/conf/distro/include/poky-eglibc.inc
> > +++ b/meta/conf/distro/include/tclibc-eglibc.inc
> > @@ -2,6 +2,10 @@
> > # eglibc specific configuration
> > #
> > 
> > +TARGET_OS = "linux"
> > +TARGET_OS_arm = "linux-gnueabi"
> > +TARGET_OS_armeb = "linux-gnueabi"
> 
> Maybe something like angstroms version:
> 
> TARGET_OS = "linux"
> TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
> TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d,1) in ['ppce500', 'ppce500v2']]}"

I decided the _arm was more readable. Once we address the OVERRIDE
issue, we can add the spe bits.

> or the sane-toolchain version:
> 
> def compute_os_portion_of_target_triplet (d):
>     import bb
>     arm_eabi_unsupported_arches = "armv1 armv2 armv3"
>     ppc_spe_supporting_arches = "ppce500v2 ppce500"
>     gnu_suffix = ""
>     if bb.data.getVar('LIBC', d, 1) == "uclibc":
>         libc_suffix = "uclibc"
>     else:
>         libc_suffix = ""
> 
>     if bb.data.getVar('TARGET_ARCH',d,1) in ['bfin']:
>         if libc_suffix is not "uclibc":
>             bb.fatal("bfin is not supported on glibc/eglibc. Please choose uclibc")
>         else:
>             os_suffix = "uclinux"
>     else:
>         os_suffix = "linux"
>     bparch = bb.data.getVar('BASE_PACKAGE_ARCH', d,1)
> 
>     if bb.data.getVar('DISTRO_FEATURES',d,1) is not None and \
>     bparch is not None:
>         if 'eabi' in bb.data.getVar('DISTRO_FEATURES',d,1).split() and \
>         bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]:
>             if bparch in arm_eabi_unsupported_arches.split():
>                 bb.fatal("DISTRO requested EABI but selected machine does not support EABI")
>                 abi_suffix = ""
>             else:
>                 if libc_suffix is not "uclibc":
>                     gnu_suffix = "gnu"
>                 abi_suffix = "eabi"
>         elif bparch in ppc_spe_supporting_arches.split():
>             if libc_suffix is not "uclibc":
>                 gnu_suffix = "gnu"
>             abi_suffix = "spe"
>         else:
>             abi_suffix = ""
>     else:
>         bb.note("DISTRO_FEATURES is not set abi suffix not set")
>         abi_suffix = ""
> 
>     if bb.data.getVar('TOOLCHAIN_BRAND', d, 1) is not None and \
>     "csl" in bb.data.getVar('TOOLCHAIN_BRAND', d, 1):
>         gnu_suffix = "gnu"
> 
>     if libc_suffix + gnu_suffix + abi_suffix is not "":
>         return os_suffix + "-" + libc_suffix + gnu_suffix + abi_suffix
>     else:
>         return os_suffix

My eyes! We must be able to something more readable than that. Do we
even support armv1?

> > diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/tcmode-default.inc
> > similarity index 85%
> > rename from meta/conf/distro/include/poky-default.inc
> > rename to meta/conf/distro/include/tcmode-default.inc
> > index 91985b3..909d802 100644
> > --- a/meta/conf/distro/include/poky-default.inc
> > +++ b/meta/conf/distro/include/tcmode-default.inc
> > @@ -1,18 +1,16 @@
> 
> > -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${POKYLIBC}"
> > +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}"
> > PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
> > PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
> > PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
> > PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
> > PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
> > PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
> > -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${POKYLIBC}-initial"
> > -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${POKYLIBC}-nativesdk"
> > +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
> > +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${TCLIBC}-nativesdk"
> 
> Angstrom has this for *libc:
> 
> # The things *libc can provide.
> PREFERRED_PROVIDER_virtual/libc = "${TCLIBC}"
> PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
> PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}"
> 
> # And the same as above for the nativesdk
> PREFERRED_PROVIDER_virtual/libc-nativesdk = "${TCLIBC}-nativesdk"
> PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk = "${TCLIBC}-initial-nativesdk"
> PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk = "${TCLIBC}-nativesdk"
> 
> I needed the initial-nativesdk for meta-toolchain, but I can't recall the exact problem

These are partly in tcmode-default.inc and partly in in tclibc-*.inc.
I've fixed this for them all to be in tcmode-default.inc :)

Cheers,

Richard

Re: [PATCH 0/6] RFC Distro config changes

[Richard Purdie]

On Tue, 2011-05-10 at 17:58 +0200, Koen Kooi wrote:
> Op 10 mei 2011, om 16:00 heeft Richard Purdie het volgende geschreven:
> 
> > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > 
> > As discussed, we want to make OE-Core usable with no distro set. This patch series
> > makes some big steps towards that goal. I'd be interested in feedback on whether it
> > does the right things and would be usable by others.
> > 
> > The key is the inclusion of a distro/defaultsetup.conf file by bitbake.conf and 
> > in turn this pulls in a variety of other common include files which can likely be
> > shared. Any point of this cycle can be overridden by another layer so its totally
> > customisable. I'd encourage users to use the pieces they can where possible so we
> > all share best practises but obviously people have choice.
> > 
> > I did dump a load of "default" variables into default-distrovars.inc, I'm not
> > calling that file finished, I just had to draw the line somewhere and start a 
> > discussion about this :)
> 
> For angstrom we had to change a few things, have a look at
> http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/meta-angstrom/tree/conf/distro/include/angstrom-core-tweaks.inc , specifically lines 12-18 and 53-54

I don't understand what TOOLCHAIN_PATH and TOOLCHAIN_SYSPATH do, I can't
find any reference to them in OECore. For the uclibc bits, I'm proposing
to add:

+DEPLOY_DIR_append = "-uclibc"
+STAGING_DIR_TARGET_append = "-uclibc"
+STAGING_DIR_HOST_append = "-uclibc"
+SSTATE_MANIFESTS_append = "-uclibc"

to tclibc-uclibc.inc.

For the SDK/TOOLCHAIN bits, I need to have a close look at the SDK and
figure out what the implications are there as I want to ensure that they
can all be parallel installed as well as being in separate tarballs but
its something we need to look at.

Cheers,

Richard

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

[Koen Kooi]

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 :)

Re: [PATCH 0/6] RFC Distro config changes

[Koen Kooi]

Op 11 mei 2011, om 11:45 heeft Richard Purdie het volgende geschreven:

> On Tue, 2011-05-10 at 17:58 +0200, Koen Kooi wrote:
>> Op 10 mei 2011, om 16:00 heeft Richard Purdie het volgende geschreven:
>> 
>>> From: Richard Purdie <richard.purdie@linuxfoundation.org>
>>> 
>>> As discussed, we want to make OE-Core usable with no distro set. This patch series
>>> makes some big steps towards that goal. I'd be interested in feedback on whether it
>>> does the right things and would be usable by others.
>>> 
>>> The key is the inclusion of a distro/defaultsetup.conf file by bitbake.conf and 
>>> in turn this pulls in a variety of other common include files which can likely be
>>> shared. Any point of this cycle can be overridden by another layer so its totally
>>> customisable. I'd encourage users to use the pieces they can where possible so we
>>> all share best practises but obviously people have choice.
>>> 
>>> I did dump a load of "default" variables into default-distrovars.inc, I'm not
>>> calling that file finished, I just had to draw the line somewhere and start a 
>>> discussion about this :)
>> 
>> For angstrom we had to change a few things, have a look at
>> http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/meta-angstrom/tree/conf/distro/include/angstrom-core-tweaks.inc , specifically lines 12-18 and 53-54
> 
> I don't understand what TOOLCHAIN_PATH and TOOLCHAIN_SYSPATH do, I can't
> find any reference to them in OECore.

They are for torublesome recipes combined with external toolchains. Denys, could you enlighten us a bit more on those?

> For the uclibc bits, I'm proposing
> to add:
> 
> +DEPLOY_DIR_append = "-uclibc"
> +STAGING_DIR_TARGET_append = "-uclibc"
> +STAGING_DIR_HOST_append = "-uclibc"
> +SSTATE_MANIFESTS_append = "-uclibc"
> 
> to tclibc-uclibc.inc.

Can we use _append_libc-uclibc = "uclibc" or even plain ${TCLIBC} in a generic include file? That would be a lot more readable and fix glibc vs eglibc.

> For the SDK/TOOLCHAIN bits, I need to have a close look at the SDK and
> figure out what the implications are there as I want to ensure that they
> can all be parallel installed as well as being in separate tarballs but
> its something we need to look at.

I needed 'armv5te' and 'armv7a' in the tarball name, so that's how this is derived. It matched the OE names, but Khem found some bugs and changed it a little.

Re: [PATCH 0/6] RFC Distro config changes

[Richard Purdie]

On Wed, 2011-05-11 at 12:13 +0200, Koen Kooi wrote:
> Op 11 mei 2011, om 11:45 heeft Richard Purdie het volgende geschreven:
> > For the uclibc bits, I'm proposing
> > to add:
> > 
> > +DEPLOY_DIR_append = "-uclibc"
> > +STAGING_DIR_TARGET_append = "-uclibc"
> > +STAGING_DIR_HOST_append = "-uclibc"
> > +SSTATE_MANIFESTS_append = "-uclibc"
> > 
> > to tclibc-uclibc.inc.
> 
> Can we use _append_libc-uclibc = "uclibc" or even plain ${TCLIBC} in a
> generic include file? That would be a lot more readable and fix glibc
> vs eglibc.

Changing uclibc around is ok as its not something that has worked well
in with OE-Core for a while. What I'm trying to avoid is having to bump
all the versions of the sstate files, the sysroot layout and associated
version numbers which is what would have to happen if we change the
eglibc layout :(.

Obviously, if angstrom switches layout its pain for you though so I
suspect someone loses with this either way :/.

> > For the SDK/TOOLCHAIN bits, I need to have a close look at the SDK and
> > figure out what the implications are there as I want to ensure that they
> > can all be parallel installed as well as being in separate tarballs but
> > its something we need to look at.
> 
> I needed 'armv5te' and 'armv7a' in the tarball name, so that's how
> this is derived. It matched the OE names, but Khem found some bugs and
> changed it a little.

Makes sense and I see the need, I just want to ensure the tarballs we
have can be parallel installed.

Cheers,

Richard

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

[Richard Purdie]

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

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

[Koen Kooi]

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

Re: [PATCH 0/6] RFC Distro config changes

[Koen Kooi]

Op 11 mei 2011, om 12:54 heeft Richard Purdie het volgende geschreven:

> On Wed, 2011-05-11 at 12:13 +0200, Koen Kooi wrote:
>> Op 11 mei 2011, om 11:45 heeft Richard Purdie het volgende geschreven:
>>> For the uclibc bits, I'm proposing
>>> to add:
>>> 
>>> +DEPLOY_DIR_append = "-uclibc"
>>> +STAGING_DIR_TARGET_append = "-uclibc"
>>> +STAGING_DIR_HOST_append = "-uclibc"
>>> +SSTATE_MANIFESTS_append = "-uclibc"
>>> 
>>> to tclibc-uclibc.inc.
>> 
>> Can we use _append_libc-uclibc = "uclibc" or even plain ${TCLIBC} in a
>> generic include file? That would be a lot more readable and fix glibc
>> vs eglibc.
> 
> Changing uclibc around is ok as its not something that has worked well
> in with OE-Core for a while. What I'm trying to avoid is having to bump
> all the versions of the sstate files, the sysroot layout and associated
> version numbers which is what would have to happen if we change the
> eglibc layout :(.
> 
> Obviously, if angstrom switches layout its pain for you though so I
> suspect someone loses with this either way :/.

I would think consistency is best, so either set always append TCLIBC or never. This isn't a lot more pain than the '-' to '_' change in machine names a while ago. And that even had runtime pains!

regards,

Koen

Re: [PATCH 5/6] conf/distro/include/default-distrovars.inc: Create set of default 'distro' variable values

[Frans Meulenbroeks]

2011/5/10 Richard Purdie <richard.purdie@linuxfoundation.org>

> On Tue, 2011-05-10 at 16:26 +0200, Frans Meulenbroeks wrote:
> > Some minor remarks on the default-distrovars.inc contents:
>
> To quote the email prefacing this patch series:
>
> """
> I did dump a load of "default" variables into default-distrovars.inc,
> I'm not calling that file finished, I just had to draw the line
> somewhere and start a discussion about this :)
> """
>
> but we can have this discussion.
>

I saw that note. Idea was indeed to initiate the discussion and make
suggestions for improvements.


>
> > 2011/5/10 Richard Purdie <richard.purdie@linuxfoundation.org>
> > [...]
> >
> > > diff --git a/meta/conf/distro/include/default-distrovars.inc
> > > b/meta/conf/distro/include/default-distrovars.inc
> > > new file mode 100644
> > > index 0000000..ab26a30
> > > --- /dev/null
> > > +++ b/meta/conf/distro/include/default-distrovars.inc
> > > @@ -0,0 +1,43 @@
> > > +QA_LOGFILE = "${TMPDIR}/qa.log"
> > >
> > Should this be here? I would expect the class file that uses this to have
> > this as default and/or have this in local.conf.sample.
> > This does not seem too distro specific
>
> If this is unset, the logfile isn't generated at all with the current
> defaults. I don't claim the current defaults are correct but its a
> separate patch if we do want to change the defaults.
>

It is good to to have the qa file made by default, but I am not sure whether
it is distro specific.
Actually I probably would expect things like QA_LOGFILE to live in the same
spot as where TMPDIR and DOWNLOADDIR etc are defined

>
> > > +
> > > +IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
> > >
> > Hm, again something that is probalby not distro related. And why only for
> > _ext2 and not eg for _ext3 or for _jffs2
> > Personally I always stuff this in my image recipe
>
> Left there pending a review of where various image sizes are set.
>

Ok understood

>
> > > +
> > > +OEINCLUDELOGS ?= "yes"
> > >
> > in local.conf.sample?
>
> If its there, this can be dropped, yes. I think forcing it on by default
> may be a good thing though. I'm not 100% sure that variable even still
> exists tbh.
>

In openembedded/classes and openembedded/site this var does not exist. I do
not have an oe-core/yocto tree handy to check if it is there.
BTW I do have BBINCLUDELOGS in my local.conf.sample. As far as I know this
is a bitbake var and actually being used.

>
> > > +KERNEL_CONSOLE ?= "ttyS0"
> > >
> > I'm inclined to put this into the machine conf. Is this really a distro
> > thing?
>
> No, left for compatibility pending cleanup.
>
> > > +
> > > +require conf/distro/include/preferred-xorg-versions.inc
> > > +
> > > +PCMCIA_MANAGER ?= "pcmciautils"
> > > +
> > > +IMAGE_LINGUAS ?= "en-us en-gb"
> > > +LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
> > > +ENABLE_BINARY_LOCALE_GENERATION ?= "1"
> > > +LOCALE_UTF8_ONLY ?= "0"
> > >
> > Again something I tend to do in image recipes; then again this might be
> > because I do not use feeds, only make images.
>
> These ones are more distro policy and whilst an image can change them a
> default is good in those cases. If there are defaults set elsewhere we
> should review and pick the correct ones.
>
> > > +DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost
> wifi
> > > nfs zeroconf pci"
> > >
> > Is this the complete range? I would expect all features to be enabled by
> > default (and let MACHINE_FEATURES reduce that set)
>
> Needs further investigation.
>
> > > +
> > > +DISTRO_EXTRA_RDEPENDS += "task-core-boot"
> > > +DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
> > > +
> > > +IMAGE_FEATURES ?= ""
> > >
> > Has a var with ?= assignment of an empty string any meaning. Thought an
> > empty string would be the default.
>
> No, its not.
>
> > > +
> > > +# This is a list of packages that are used by the build system to
> build
> > > the distribution, they are not
> > > +# directly part of the distribution.
> > > +HOSTTOOLS_WHITELIST_GPLv3 ?= ""
> > > +WHITELIST_GPLv3 ?= "less"
> > >
> > I'm not sure why less is listed in the line above:
> > the less license is not gpl (at least not less 443)
> >
> >
> > > +LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc
> > > gcc-runtime"
> > > +
> > > +# This is a list of packages that require a commercial license to ship
> > > +# product. If shipped as part of an image these packages may have
> > > +# implications so they are disabled by default
> > > +COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg
> qmmp"
> > > +COMMERCIAL_AUDIO_PLUGINS ?= ""
> > > +# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad
> > > gst-plugins-ugly-mpegaudioparse"
> > > +COMMERCIAL_VIDEO_PLUGINS ?= ""
> > > +# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec
> > > gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
> > > +COMMERCIAL_QT ?= ""
> > > +# COMMERCIAL_QT ?= "qmmp"
> > > +# Set of common licenses used for license.bbclass
> > > +COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses"
> > >
> > maybe the above could be in a separate license.inc file or so.embedded
>
> Possibly, setting these to defaults is good though.
>
> > > +
> > > +BB_GENERATE_MIRROR_TARBALLS ??= "0"
> > >
> > local.conf.sample ?
>
> I regard local.conf.sample as things a new user cares about. I don't
> think this fits that category. Its here embeddedpending the creation of a
> more
> "advanced settings" version of local.conf.sample we've talked about
> being created.
>
> I'm unaware of any discussion on an advanced settings version of
local.conf.sample.

Anyway there are two different groups of users for oe/yocto:
Those who want to do a distro with package feeds etc and those (like me) who
are more into creating (lean &lightweight) images for embedded,
non-networked (or non network upgradeable)  devices (like a microwave etc).
For the latter it could be very useful to have a "distro-less" system or a
very simple default distro. Main interest for those people is probably the
cross environment and the image creation capabilities.
If  one wants full control on what is being in the image it helps to have
that in a logical location.

But I am digressing...

Frans.

Re: [PATCH 0/6] RFC Distro config changes

[Richard Purdie]

On Tue, 2011-05-10 at 15:00 +0100, Richard Purdie wrote:
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> 
> As discussed, we want to make OE-Core usable with no distro set. This patch series
> makes some big steps towards that goal. I'd be interested in feedback on whether it
> does the right things and would be usable by others.
> 
> The key is the inclusion of a distro/defaultsetup.conf file by bitbake.conf and 
> in turn this pulls in a variety of other common include files which can likely be
> shared. Any point of this cycle can be overridden by another layer so its totally
> customisable. I'd encourage users to use the pieces they can where possible so we
> all share best practises but obviously people have choice.
> 
> I did dump a load of "default" variables into default-distrovars.inc, I'm not
> calling that file finished, I just had to draw the line somewhere and start a 
> discussion about this :)
> 
> Also, I'm aware there are still a few poky-* files in meta/conf/distro/include.
> Some of these can just be deleted, others renamed tcmode-* and I'll take care 
> of that. I'll also delete the poky.conf file since it no longer contains anything
> required to make OE-Core build as far as I know (wider testing needed).
> 
> Pull URL: git://git.openembedded.org/openembedded-core-contrib
>   Branch: rpurdie/distro
>   Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rpurdie/distro
> 
> Richard Purdie (6):
>   Drop poky-floating-revisions.inc, poky-bleeding.conf and
>     poky-lsb.conf
>   bitbake.conf: Include the new default-providers.inc and
>     default-versions.inc files
>   distro: Add defaultsetup.conf, a set of default configuration
>     providing sane overrridable default for commonly used options
>   machine/qemu: Add qemu-config as an essential machine speicfic
>     dependency and drop specific distro config
>   conf/distro/include/default-distrovars.inc: Create set of default
>     'distro' variable values
>   preferred-xorg-versions.inc: Drop this, it makes no sense given we
>     only have one version of these recipes

I've taken feedback on board, tweaked the series and then merged it. My
reasoning is that whilst this might not be 100% perfect in every way, it
moves us a lot closer to where we want to be. We were going to start
seeing patch conflicts if it was out of tree for too long and that
didn't seem worthwhile.

Cheers,

Richard

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

[Richard Purdie]

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

Re: [PATCH 0/6] RFC Distro config changes

[Khem Raj]

On Wed, May 11, 2011 at 2:45 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Tue, 2011-05-10 at 17:58 +0200, Koen Kooi wrote:
>> Op 10 mei 2011, om 16:00 heeft Richard Purdie het volgende geschreven:
>>
>> > From: Richard Purdie <richard.purdie@linuxfoundation.org>
>> >
>> > As discussed, we want to make OE-Core usable with no distro set. This patch series
>> > makes some big steps towards that goal. I'd be interested in feedback on whether it
>> > does the right things and would be usable by others.
>> >
>> > The key is the inclusion of a distro/defaultsetup.conf file by bitbake.conf and
>> > in turn this pulls in a variety of other common include files which can likely be
>> > shared. Any point of this cycle can be overridden by another layer so its totally
>> > customisable. I'd encourage users to use the pieces they can where possible so we
>> > all share best practises but obviously people have choice.
>> >
>> > I did dump a load of "default" variables into default-distrovars.inc, I'm not
>> > calling that file finished, I just had to draw the line somewhere and start a
>> > discussion about this :)
>>
>> For angstrom we had to change a few things, have a look at
>> http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/meta-angstrom/tree/conf/distro/include/angstrom-core-tweaks.inc , specifically lines 12-18 and 53-54
>
> I don't understand what TOOLCHAIN_PATH and TOOLCHAIN_SYSPATH do, I can't
> find any reference to them in OECore. For the uclibc bits, I'm proposing
> to add:
>
> +DEPLOY_DIR_append = "-uclibc"
> +STAGING_DIR_TARGET_append = "-uclibc"
> +STAGING_DIR_HOST_append = "-uclibc"
> +SSTATE_MANIFESTS_append = "-uclibc"
>

this wont work. Since virtclasses empty out some of these vars e.g. native
resets STAGING_DIR_HOST but this will still append -uclibc to it since append
happens at the end


> to tclibc-uclibc.inc.
>
> For the SDK/TOOLCHAIN bits, I need to have a close look at the SDK and
> figure out what the implications are there as I want to ensure that they
> can all be parallel installed as well as being in separate tarballs but
> its something we need to look at.
>
> Cheers,
>
> Richard
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [PATCH 0/6] RFC Distro config changes

[Otavio Salvador]

On Wed, May 11, 2011 at 10:30, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> I've taken feedback on board, tweaked the series and then merged it. My
> reasoning is that whilst this might not be 100% perfect in every way, it
> moves us a lot closer to where we want to be. We were going to start
> seeing patch conflicts if it was out of tree for too long and that
> didn't seem worthwhile.

I have expected at least another review cycle since this is a huge
change and potential to change a lot of stuff for users...

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

Re: [PATCH 5/6] conf/distro/include/default-distrovars.inc: Create set of default 'distro' variable values

[Khem Raj]

On Tue, May 10, 2011 at 7:00 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/conf/distro/defaultsetup.conf              |    1 +
>  meta/conf/distro/include/default-distrovars.inc |   43 ++++++++++++++++++++
>  meta/conf/distro/poky.conf                      |   48 +----------------------
>  3 files changed, 46 insertions(+), 46 deletions(-)
>  create mode 100644 meta/conf/distro/include/default-distrovars.inc
>
> diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
> index af5ef7b..8da6c0a 100644
> --- a/meta/conf/distro/defaultsetup.conf
> +++ b/meta/conf/distro/defaultsetup.conf
> @@ -1,5 +1,6 @@
>  include conf/distro/include/default-providers.inc
>  include conf/distro/include/default-versions.inc
> +include conf/distro/include/default-distrovars.inc
>  include conf/distro/include/world-broken.inc
>
>  TARGET_VENDOR ?= "-oecore"
> diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
> new file mode 100644
> index 0000000..ab26a30
> --- /dev/null
> +++ b/meta/conf/distro/include/default-distrovars.inc
> @@ -0,0 +1,43 @@
> +QA_LOGFILE = "${TMPDIR}/qa.log"
> +
> +IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
> +
> +OEINCLUDELOGS ?= "yes"
> +KERNEL_CONSOLE ?= "ttyS0"
> +
> +require conf/distro/include/preferred-xorg-versions.inc
> +
> +PCMCIA_MANAGER ?= "pcmciautils"
> +
> +IMAGE_LINGUAS ?= "en-us en-gb"
> +LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
> +ENABLE_BINARY_LOCALE_GENERATION ?= "1"
> +LOCALE_UTF8_ONLY ?= "0"
> +
> +DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
> +
> +DISTRO_EXTRA_RDEPENDS += "task-core-boot"
> +DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
> +


others can be overridden but the above two are a problem. they are forcing
distros to have these in RDEPENDS and RRECOMMENDS e.g. a distro
which does not want kernel-module-af-packet will have to have some way
to remove it. My opinion is do not add them to policy

-Khem

Re: [PATCH 0/6] RFC Distro config changes

[Khem Raj]

On (11/05/11 13:45), Koen Kooi wrote:
> 
> Op 11 mei 2011, om 12:54 heeft Richard Purdie het volgende geschreven:
> 
> > On Wed, 2011-05-11 at 12:13 +0200, Koen Kooi wrote:
> >> Op 11 mei 2011, om 11:45 heeft Richard Purdie het volgende geschreven:
> >>> For the uclibc bits, I'm proposing
> >>> to add:
> >>> 
> >>> +DEPLOY_DIR_append = "-uclibc"
> >>> +STAGING_DIR_TARGET_append = "-uclibc"
> >>> +STAGING_DIR_HOST_append = "-uclibc"
> >>> +SSTATE_MANIFESTS_append = "-uclibc"
> >>> 
> >>> to tclibc-uclibc.inc.
> >> 
> >> Can we use _append_libc-uclibc = "uclibc" or even plain ${TCLIBC} in a
> >> generic include file? That would be a lot more readable and fix glibc
> >> vs eglibc.
> > 
> > Changing uclibc around is ok as its not something that has worked well
> > in with OE-Core for a while. What I'm trying to avoid is having to bump
> > all the versions of the sstate files, the sysroot layout and associated
> > version numbers which is what would have to happen if we change the
> > eglibc layout :(.
> > 
> > Obviously, if angstrom switches layout its pain for you though so I
> > suspect someone loses with this either way :/.
> 
> I would think consistency is best, so either set always append TCLIBC or never. This isn't a lot more pain than the '-' to '_' change in machine names a while ago. And that even had runtime pains!
> 

I would agree we should always append TCLIBC

> regards,
> 
> Koen
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
-Khem

Re: [PATCH 0/6] RFC Distro config changes

[Khem Raj]

On (15/05/11 13:22), Khem Raj wrote:
> On Wed, May 11, 2011 at 2:45 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > On Tue, 2011-05-10 at 17:58 +0200, Koen Kooi wrote:
> > +DEPLOY_DIR_append = "-uclibc"
> > +STAGING_DIR_TARGET_append = "-uclibc"
> > +STAGING_DIR_HOST_append = "-uclibc"
> > +SSTATE_MANIFESTS_append = "-uclibc"
> >
> 
> this wont work. Since virtclasses empty out some of these vars e.g. native
> resets STAGING_DIR_HOST but this will still append -uclibc to it since append
> happens at the end

Something like below can serve us better

--- a/meta/conf/distro/include/tclibc-uclibc.inc
+++ b/meta/conf/distro/include/tclibc-uclibc.inc
@@ -21,10 +21,10 @@ CXXFLAGS += "-fvisibility-inlines-hidden"
 IMAGE_LINGUAS = ""

 DEPLOY_DIR_IMAGE = "${TMPDIR}/deploy/images"
-DEPLOY_DIR_append = "-uclibc"
-STAGING_DIR_TARGET_append = "-uclibc"
-STAGING_DIR_HOST_append = "-uclibc"
-SSTATE_MANIFESTS_append = "-uclibc"
+DEPLOY_DIR_append = "${@["-uclibc", ""][oe.utils.inherits(d, 'native', 'nativesdk')]}"
+STAGING_DIR_TARGET_append = "${@["-uclibc", ""][oe.utils.inherits(d, 'native', 'nativesdk')]}"
+STAGING_DIR_HOST_append = "${@["-uclibc", ""][oe.utils.inherits(d, 'native', 'nativesdk')]}"
+SSTATE_MANIFESTS_append = "${@["-uclibc", ""][oe.utils.inherits(d, 'native', 'nativesdk')]}"

 LIBC_DEPENDENCIES = "\
     uclibc \

Re: [PATCH 3/6] distro: Add defaultsetup.conf, a set of default configuration providing sane overrridable default for commonly used options

[Khem Raj]

On (11/05/11 10:37), Richard Purdie wrote:
> On Tue, 2011-05-10 at 16:31 +0200, Koen Kooi wrote:
> > Op 10 mei 2011, om 16:00 heeft Richard Purdie het volgende geschreven:
> > 
> > > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > 
> > > The intent is to allow distros to share common core config but still allow
> > > customisations. The core should work with no distro set but users
> > > can still customise in any ways needed.
> > > 
> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > ---
> > > meta/conf/bitbake.conf                             |    4 +-
> > > meta/conf/distro/defaultsetup.conf                 |   23 ++++++++++
> > > .../include/{poky-eglibc.inc => tclibc-eglibc.inc} |    6 ++-
> > > .../include/{poky-glibc.inc => tclibc-glibc.inc}   |    6 ++-
> > > .../include/{poky-uclibc.inc => tclibc-uclibc.inc} |    4 ++
> > > .../{poky-default.inc => tcmode-default.inc}       |   13 +++---
> > > meta/conf/distro/poky.conf                         |   46 +++++--------------
> > > 7 files changed, 54 insertions(+), 48 deletions(-)
> > > create mode 100644 meta/conf/distro/defaultsetup.conf
> > > rename meta/conf/distro/include/{poky-eglibc.inc => tclibc-eglibc.inc} (92%)
> > > rename meta/conf/distro/include/{poky-glibc.inc => tclibc-glibc.inc} (91%)
> > > rename meta/conf/distro/include/{poky-uclibc.inc => tclibc-uclibc.inc} (86%)
> > > rename meta/conf/distro/include/{poky-default.inc => tcmode-default.inc} (85%)
> > > 
> > > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> > > index d843e70..ce74a9b 100644
> > > --- a/meta/conf/bitbake.conf
> > > +++ b/meta/conf/bitbake.conf
> > > @@ -627,9 +627,7 @@ 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/defaultsetup.conf
> > > include conf/distro/${DISTRO}.conf
> > 
> > Please include it after $DISTRO, otherwise ?= in $DISTRO won't work as intended.
> 
> Fixed, thanks.
> 
> 
> > > include conf/documentation.conf
> > > require conf/sanity.conf
> > > diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
> > > new file mode 100644
> > > index 0000000..af5ef7b
> > > --- /dev/null
> > > +++ b/meta/conf/distro/defaultsetup.conf
> > > @@ -0,0 +1,23 @@
> > > +include conf/distro/include/default-providers.inc
> > > +include conf/distro/include/default-versions.inc
> > > +include conf/distro/include/world-broken.inc
> > > +
> > > +TARGET_VENDOR ?= "-oecore"
> > > +
> > > +TARGET_FPU_arm ?= "soft"
> > > +TARGET_FPU_armeb ?= "soft"
> > 
> > Something more elaborate would be better, this is what angstrom has:
> > 
> > conf/distro/include/angstrom.inc:TARGET_FPU_arm = "soft"
> > conf/distro/include/angstrom.inc:TARGET_FPU_armeb = "soft"
> > conf/distro/include/angstrom.inc:TARGET_FPU_ixp4xx = "soft"
> > conf/distro/include/angstrom.inc:TARGET_FPU_ppc405 = "soft"
> > conf/distro/include/angstrom.inc:TARGET_FPU_armv6 = "hard"
> > conf/distro/include/angstrom.inc:TARGET_FPU_armv6-novfp = "soft"
> > conf/distro/include/angstrom.inc:TARGET_FPU_armv7a = "hard"
> > conf/distro/include/angstrom.inc:TARGET_FPU_ppc603e = "hard"
> > 
> > you really want to use hard (don't confuse it with hardfp) on armv7a.
> 
> Agreed but we have a problem here as the default OVERRIDES in OECore
> don't include BASE_PACKAGE_ARCH. I'm kind of reluctant to do so too as
> the number of cases we need this are small and the strings aren't very
> unique. I'b feel happier if the override was something like
> parch-${BASE_PACKAGE_ARCH} as you could at least easily spot where it
> was being used.
> 
> I appreciate we need to do something here, its just a question of what.
> 
> > > --- a/meta/conf/distro/include/poky-eglibc.inc
> > > +++ b/meta/conf/distro/include/tclibc-eglibc.inc
> > > @@ -2,6 +2,10 @@
> > > # eglibc specific configuration
> > > #
> > > 
> > > +TARGET_OS = "linux"
> > > +TARGET_OS_arm = "linux-gnueabi"
> > > +TARGET_OS_armeb = "linux-gnueabi"
> > 
> > Maybe something like angstroms version:
> > 
> > TARGET_OS = "linux"
> > TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
> > TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d,1) in ['ppce500', 'ppce500v2']]}"
> 
> I decided the _arm was more readable. Once we address the OVERRIDE
> issue, we can add the spe bits.
> 
> > or the sane-toolchain version:
> > 
> > def compute_os_portion_of_target_triplet (d):
> >     import bb
> >     arm_eabi_unsupported_arches = "armv1 armv2 armv3"
> >     ppc_spe_supporting_arches = "ppce500v2 ppce500"
> >     gnu_suffix = ""
> >     if bb.data.getVar('LIBC', d, 1) == "uclibc":
> >         libc_suffix = "uclibc"
> >     else:
> >         libc_suffix = ""
> > 
> >     if bb.data.getVar('TARGET_ARCH',d,1) in ['bfin']:
> >         if libc_suffix is not "uclibc":
> >             bb.fatal("bfin is not supported on glibc/eglibc. Please choose uclibc")
> >         else:
> >             os_suffix = "uclinux"
> >     else:
> >         os_suffix = "linux"
> >     bparch = bb.data.getVar('BASE_PACKAGE_ARCH', d,1)
> > 
> >     if bb.data.getVar('DISTRO_FEATURES',d,1) is not None and \
> >     bparch is not None:
> >         if 'eabi' in bb.data.getVar('DISTRO_FEATURES',d,1).split() and \
> >         bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]:
> >             if bparch in arm_eabi_unsupported_arches.split():
> >                 bb.fatal("DISTRO requested EABI but selected machine does not support EABI")
> >                 abi_suffix = ""
> >             else:
> >                 if libc_suffix is not "uclibc":
> >                     gnu_suffix = "gnu"
> >                 abi_suffix = "eabi"
> >         elif bparch in ppc_spe_supporting_arches.split():
> >             if libc_suffix is not "uclibc":
> >                 gnu_suffix = "gnu"
> >             abi_suffix = "spe"
> >         else:
> >             abi_suffix = ""
> >     else:
> >         bb.note("DISTRO_FEATURES is not set abi suffix not set")
> >         abi_suffix = ""
> > 
> >     if bb.data.getVar('TOOLCHAIN_BRAND', d, 1) is not None and \
> >     "csl" in bb.data.getVar('TOOLCHAIN_BRAND', d, 1):
> >         gnu_suffix = "gnu"
> > 
> >     if libc_suffix + gnu_suffix + abi_suffix is not "":
> >         return os_suffix + "-" + libc_suffix + gnu_suffix + abi_suffix
> >     else:
> >         return os_suffix
> 
> My eyes! We must be able to something more readable than that. Do we
> even support armv1?


oe had lot of combinations to consider e.g.
oabi/eabi/spe/uclinux/uclibc/external-toolchain when it came to
compute the TARGET_OS and while not so readable may be it did address
all of the combinations and permutations well. oe-core may not *yet* worry for many of them
and some like oabi can be dropped but eventually it might need something
handy to compute TARGET_OS may be a map would be more readable.

-Khem

Re: [PATCH 0/6] RFC Distro config changes

[Richard Purdie]

On Sun, 2011-05-15 at 17:27 -0300, Otavio Salvador wrote:
> On Wed, May 11, 2011 at 10:30, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > I've taken feedback on board, tweaked the series and then merged it. My
> > reasoning is that whilst this might not be 100% perfect in every way, it
> > moves us a lot closer to where we want to be. We were going to start
> > seeing patch conflicts if it was out of tree for too long and that
> > didn't seem worthwhile.
> 
> I have expected at least another review cycle since this is a huge
> change and potential to change a lot of stuff for users...

Its a process of iterative improvement. I'm not calling what is there
now 100% complete, just a lot better than what preceded it. If there are
further changes needed, lets discuss them! :)

Cheers,

Richard

Re: [PATCH 5/6] conf/distro/include/default-distrovars.inc: Create set of default 'distro' variable values

[Richard Purdie]

On Sun, 2011-05-15 at 13:48 -0700, Khem Raj wrote:
> > +++ b/meta/conf/distro/include/default-distrovars.inc
> > @@ -0,0 +1,43 @@

> > +DISTRO_EXTRA_RDEPENDS += "task-core-boot"
> > +DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
> > +
> 
> 
> others can be overridden but the above two are a problem. they are forcing
> distros to have these in RDEPENDS and RRECOMMENDS e.g. a distro
> which does not want kernel-module-af-packet will have to have some way
> to remove it. My opinion is do not add them to policy

Agreed, I merged your patch to remove these two things.

Cheers,

Richard