RFC Distro config changes

From: Richard Purdie <[email protected]>

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 <[email protected]>

---

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

meta/conf/distro/include/default-providers.inc new file +0 -0

new file mode 100644
index 0000000..d51ac64

+PREFERRED_PROVIDER_opkg ?= "opkg"

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

Quoted 26 lines

From: Richard Purdie <[email protected]>

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 <[email protected]>

---

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

meta/conf/distro/include/default-providers.inc new file +0 -0

new file mode 100644
index 0000000..d51ac64
@@ -0,0 +1,34 @@

meta/conf/distro/include/default-providers.inc line 24

Quoted 1 line

meta/conf/distro/include/default-providers.inc new file +1 -0

+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 ;)

meta/conf/distro/include/default-providers.inc line 31

Quoted 1 line

meta/conf/distro/include/default-providers.inc new file +1 -0

+PREFERRED_PROVIDER_opkg ?= "opkg"

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

Quoted 8 lines

meta/conf/distro/include/default-versions.inc new file +2 -0

new file mode 100644
index 0000000..0abbd8f
@@ -0,0 +1,18 @@
+#
+# Default preferred versions

meta/conf/distro/include/default-versions.inc

Quoted 4 lines

meta/conf/distro/include/default-versions.inc new file +4 -0

+#
+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.

meta/conf/distro/include/default-versions.inc line 11

Quoted 4 lines

meta/conf/distro/include/default-versions.inc new file +4 -0

+# 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?

Quoted 28 lines

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

Quoted 26 lines

From: Richard Purdie <[email protected]>

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 <[email protected]>

---

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

meta/conf/distro/include/default-providers.inc new file +0 -0

new file mode 100644
index 0000000..d51ac64
@@ -0,0 +1,34 @@

Quoted 5 lines

meta/conf/distro/include/default-providers.inc line 24

Quoted 1 line

meta/conf/distro/include/default-providers.inc new file +1 -0

+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? ;-).

Quoted 4 lines

meta/conf/distro/include/default-providers.inc line 31

Quoted 1 line

meta/conf/distro/include/default-providers.inc new file +1 -0

+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?

Quoted 8 lines

Quoted 8 lines

meta/conf/distro/include/default-versions.inc new file +2 -0

new file mode 100644
index 0000000..0abbd8f
@@ -0,0 +1,18 @@
+#
+# Default preferred versions

Quoted 8 lines

meta/conf/distro/include/default-versions.inc

Quoted 4 lines

meta/conf/distro/include/default-versions.inc new file +4 -0

+#
+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...

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

Quoted 35 lines · Koen Kooi

Quoted 33 lines

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

Quoted 25 lines

From: Richard Purdie <[email protected]>

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 <[email protected]>

---

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

meta/conf/distro/include/default-providers.inc new file +0 -0

new file mode 100644
index 0000000..d51ac64

meta/conf/distro/include/default-providers.inc

Quoted 2 lines

meta/conf/distro/include/default-providers.inc new file +1 -0

@@ -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 ;)

Quoted 2 lines

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

Quoted 40 lines

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

Quoted 37 lines · Koen Kooi

Quoted 28 lines

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

Quoted 26 lines

From: Richard Purdie <[email protected]>

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 <[email protected]>

---

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

meta/conf/distro/include/default-providers.inc new file +0 -0

new file mode 100644
index 0000000..d51ac64
@@ -0,0 +1,34 @@

Quoted 5 lines

meta/conf/distro/include/default-providers.inc line 24

Quoted 1 line

meta/conf/distro/include/default-providers.inc new file +1 -0

+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? ;-).

Quoted 1 line

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?

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

Quoted 17 lines · Koen Kooi

Quoted 16 lines

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

Quoted 13 lines · Koen Kooi

Quoted 9 lines

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

Review

Quoted 4 lines

+++ b/meta/conf/distro/include/default-providers.inc

(quoted diff) +1 -0

@@ -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? ;-).

Quoted 7 lines

Quoted 1 line

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.

Quoted 2 lines

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.

From: Richard Purdie <[email protected]>

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 <[email protected]>

---

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

meta/conf/bitbake.conf +0 -0

index d843e70..ce74a9b 100644
@@ -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

meta/conf/bitbake.conf +1 -3

-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

meta/conf/distro/defaultsetup.conf new file +0 -0

new file mode 100644
index 0000000..af5ef7b

meta/conf/distro/include/tcmode-default.inc renamed from meta/conf/distro/include/poky-default.inc +1 -1

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
@@ -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"

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

Quoted 22 lines

From: Richard Purdie <[email protected]>

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 <[email protected]>

---

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

Quoted 12 lines

meta/conf/bitbake.conf +0 -0

index d843e70..ce74a9b 100644
@@ -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

meta/conf/bitbake.conf +1 -3

-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

Quoted 1 line

include conf/distro/${DISTRO}.conf

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

Quoted 8 lines

include conf/documentation.conf
require conf/sanity.conf

meta/conf/distro/defaultsetup.conf new file +0 -0

new file mode 100644
index 0000000..af5ef7b

meta/conf/distro/defaultsetup.conf line 8

Quoted 8 lines

meta/conf/distro/defaultsetup.conf new file +8 -0

@@ -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.

meta/conf/distro/include/tclibc-eglibc.inc line 7

Quoted 9 lines

meta/conf/distro/include/tclibc-eglibc.inc renamed from meta/conf/distro/include/poky-eglibc.inc +3 -0

@@ -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

Quoted 17 lines

meta/conf/distro/include/tcmode-default.inc renamed from meta/conf/distro/include/poky-default.inc +1 -1

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
@@ -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"

meta/conf/distro/include/tcmode-default.inc line 13

Quoted 4 lines

meta/conf/distro/include/tcmode-default.inc renamed from meta/conf/distro/include/poky-default.inc +2 -2

-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

Quoted 24 lines · Koen Kooi

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

Quoted 22 lines

From: Richard Purdie <[email protected]>

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 <[email protected]>

---

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

Quoted 15 lines

Quoted 12 lines

meta/conf/bitbake.conf +0 -0

index d843e70..ce74a9b 100644
@@ -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

meta/conf/bitbake.conf +1 -3

-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

Quoted 1 line

include conf/distro/${DISTRO}.conf

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

Fixed, thanks.

Quoted 28 lines

Quoted 8 lines

include conf/documentation.conf
require conf/sanity.conf

meta/conf/distro/defaultsetup.conf new file +0 -0

new file mode 100644
index 0000000..af5ef7b

meta/conf/distro/defaultsetup.conf line 8

Quoted 8 lines

meta/conf/distro/defaultsetup.conf new file +8 -0

@@ -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"

Quoted 1 line

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.

Quoted 12 lines

meta/conf/distro/include/tclibc-eglibc.inc line 7

Quoted 9 lines

meta/conf/distro/include/tclibc-eglibc.inc renamed from meta/conf/distro/include/poky-eglibc.inc +3 -0

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

Quoted 3 lines

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.

Quoted 46 lines

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"

Quoted 4 lines

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?

meta/conf/distro/include/default-distrovars.inc new file +2 -0

+
+DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi

nfs zeroconf pci"

+LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime"

meta/conf/distro/include/default-distrovars.inc new file +7 -0

+
+# 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"

meta/conf/distro/include/default-distrovars.inc new file +2 -0

+COMMERCIAL_VIDEO_PLUGINS ?= ""
+# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec

gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"

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

2011/5/10 Richard Purdie <[email protected]> [...]

meta/conf/distro/include/default-distrovars.inc line 1

Quoted 9 lines

meta/conf/distro/include/default-distrovars.inc new file +1 -0

new file mode 100644
index 0000000..ab26a30
@@ -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

meta/conf/distro/include/default-distrovars.inc line 3

Quoted 3 lines

meta/conf/distro/include/default-distrovars.inc new file +2 -0

+
+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

meta/conf/distro/include/default-distrovars.inc line 5

Quoted 3 lines

meta/conf/distro/include/default-distrovars.inc new file +2 -0

+
+OEINCLUDELOGS ?= "yes"

in local.conf.sample?

meta/conf/distro/include/default-distrovars.inc line 6

Quoted 2 lines

meta/conf/distro/include/default-distrovars.inc new file +1 -0

+KERNEL_CONSOLE ?= "ttyS0"

I'm inclined to put this into the machine conf. Is this really a distro thing?

Quoted 4 lines

meta/conf/distro/include/default-distrovars.inc new file +4 -0

+
+require conf/distro/include/preferred-xorg-versions.inc
+
+PCMCIA_MANAGER ?= "pcmciautils"

meta/conf/distro/include/default-distrovars.inc line 15

Quoted 6 lines

meta/conf/distro/include/default-distrovars.inc new file +5 -0

+
+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.

Quoted 3 lines

meta/conf/distro/include/default-distrovars.inc new file +1 -0

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

meta/conf/distro/include/default-distrovars.inc line 22

Quoted 6 lines

meta/conf/distro/include/default-distrovars.inc new file +5 -0

+
+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.

meta/conf/distro/include/default-distrovars.inc line 27

Quoted 7 lines

meta/conf/distro/include/default-distrovars.inc new file +2 -0

+
+# This is a list of packages that are used by the build system to build

the distribution, they are not

meta/conf/distro/include/default-distrovars.inc new file +3 -0

+# 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)

Quoted 11 lines

+LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime"

meta/conf/distro/include/default-distrovars.inc new file +7 -0

+
+# 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 ?= ""

meta/conf/distro/include/default-distrovars.inc line 41

Quoted 7 lines

+# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"

meta/conf/distro/include/default-distrovars.inc new file +4 -0

+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.

meta/conf/distro/include/default-distrovars.inc

Quoted 3 lines

meta/conf/distro/include/default-distrovars.inc new file +2 -0

+
+BB_GENERATE_MIRROR_TARBALLS ??= "0"

local.conf.sample ?

Quoted 1 line

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.

Quoted 4 lines

2011/5/10 Richard Purdie <[email protected]> [...]

Quoted 12 lines

meta/conf/distro/include/default-distrovars.inc line 1

Quoted 9 lines

meta/conf/distro/include/default-distrovars.inc new file +1 -0

new file mode 100644
index 0000000..ab26a30
@@ -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.

Quoted 7 lines

meta/conf/distro/include/default-distrovars.inc line 3

Quoted 4 lines

meta/conf/distro/include/default-distrovars.inc new file +2 -0

+
+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.

Quoted 5 lines

meta/conf/distro/include/default-distrovars.inc line 5

Quoted 4 lines

meta/conf/distro/include/default-distrovars.inc new file +2 -0

+
+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.

Quoted 5 lines

meta/conf/distro/include/default-distrovars.inc line 6

Quoted 3 lines

meta/conf/distro/include/default-distrovars.inc new file +1 -0

+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.

Quoted 4 lines

Quoted 4 lines

meta/conf/distro/include/default-distrovars.inc new file +4 -0

+
+require conf/distro/include/preferred-xorg-versions.inc
+
+PCMCIA_MANAGER ?= "pcmciautils"

Quoted 8 lines

meta/conf/distro/include/default-distrovars.inc line 15

Quoted 6 lines

meta/conf/distro/include/default-distrovars.inc new file +5 -0

+
+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.

Quoted 1 line

meta/conf/distro/include/default-distrovars.inc line 16

Quoted 1 line

meta/conf/distro/include/default-distrovars.inc new file +1 -0

+DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost

wifi

Quoted 4 lines

Quoted 2 lines

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.

Quoted 8 lines

meta/conf/distro/include/default-distrovars.inc line 22

Quoted 6 lines

meta/conf/distro/include/default-distrovars.inc new file +5 -0

+
+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.

Quoted 2 lines

meta/conf/distro/include/default-distrovars.inc

Quoted 2 lines

meta/conf/distro/include/default-distrovars.inc new file +2 -0

+
+# This is a list of packages that are used by the build system to

build

Quoted 9 lines

meta/conf/distro/include/default-distrovars.inc line 27

Quoted 5 lines

the distribution, they are not

meta/conf/distro/include/default-distrovars.inc new file +3 -0

+# 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)

Quoted 7 lines

meta/conf/distro/include/default-distrovars.inc

Quoted 7 lines

+LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime"

meta/conf/distro/include/default-distrovars.inc new file +5 -0

+
+# 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"

Quoted 4 lines

Quoted 4 lines

meta/conf/distro/include/default-distrovars.inc new file +2 -0

+COMMERCIAL_AUDIO_PLUGINS ?= ""
+# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad

gst-plugins-ugly-mpegaudioparse"
+COMMERCIAL_VIDEO_PLUGINS ?= ""

Quoted 8 lines

meta/conf/distro/include/default-distrovars.inc line 41

Quoted 7 lines

+# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"

meta/conf/distro/include/default-distrovars.inc new file +4 -0

+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.

Quoted 4 lines

meta/conf/distro/include/default-distrovars.inc

Quoted 3 lines

meta/conf/distro/include/default-distrovars.inc new file +2 -0

+
+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

From: Richard Purdie <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

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

meta/conf/distro/defaultsetup.conf +0 -0

index af5ef7b..8da6c0a 100644
@@ -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"

meta/conf/distro/include/default-distrovars.inc new file +11 -0

new file mode 100644
index 0000000..ab26a30
@@ -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"
+

meta/conf/distro/include/default-distrovars.inc line 21

Quoted 6 lines

+++ b/meta/conf/distro/include/default-distrovars.inc

meta/conf/distro/include/default-distrovars.inc new file +3 -0

@@ -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

From: Richard Purdie <[email protected]>

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

Quoted 5 lines

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.

Quoted 5 lines

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.

Quoted 2 lines

 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?

From: Richard Purdie <[email protected]>

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

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

Quoted 12 lines

From: Richard Purdie <[email protected]>

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.

Quoted 3 lines

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

Quoted 18 lines

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

Quoted 15 lines

From: Richard Purdie <[email protected]>

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

Quoted 2 lines

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:

(quoted diff) +4 -0

+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.

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

Quoted 8 lines

For the uclibc bits, I'm proposing
to add:

(quoted diff) +4 -0

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

Quoted 1 line

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.

Quoted 4 lines

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.

Quoted 9 lines

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

Quoted 8 lines

For the uclibc bits, I'm proposing
to add:

(quoted diff) +4 -0

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

Quoted 5 lines

Quoted 1 line

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 :/.

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

Quoted 22 lines · Koen Kooi

Quoted 9 lines

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

Quoted 8 lines

For the uclibc bits, I'm proposing
to add:

(quoted diff) +4 -0

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

Quoted 5 lines

Quoted 1 line

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 :(.

Quoted 2 lines

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
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Quoted 14 lines · Koen Kooi

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

Quoted 12 lines

From: Richard Purdie <[email protected]>

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.

Quoted 6 lines

Quoted 3 lines

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:

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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Review

Quoted 6 lines · Richard Purdie

On Tue, 2011-05-10 at 17:58 +0200, Koen Kooi wrote:

(quoted diff) +4 -0

+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

From: Richard Purdie <[email protected]>

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.

Quoted 5 lines · Richard Purdie

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...