diff options
116 files changed, 2630 insertions, 911 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass index ca9c9458e1..d70cfa5daf 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -90,6 +90,7 @@ fakeroot do_rootfs () { ${IMAGE_PREPROCESS_COMMAND} export TOPDIR=${TOPDIR} + export DISTRO=${USERDISTRO} export MACHINE=${MACHINE} for type in ${IMAGE_FSTYPES}; do diff --git a/conf/bitbake.conf b/conf/bitbake.conf index ac2d281123..27a04a028c 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -529,6 +529,10 @@ OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUIL include conf/site.conf include conf/auto.conf include conf/local.conf +# USERDISTRO should always contain original DISTRO value as set by user +# If a distro config overrides DISTRO for whatever reason (e.g. to get +# overrides like it wants), USERDISTRO must be reassigned with := first +USERDISTRO = "${DISTRO}" include conf/build/${BUILD_SYS}.conf include conf/target/${TARGET_SYS}.conf include conf/machine/${MACHINE}.conf @@ -541,7 +545,7 @@ require conf/sanity.conf ################################################################## DL_DIR ?= "${TMPDIR}/downloads" -IMAGE_FSTYPES ?= "jffs2" +IMAGE_FSTYPES ?= "tar.gz" PCMCIA_MANAGER ?= "pcmcia-cs" DEFAULT_TASK_PROVIDER ?= "task-base" MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index fe216800c3..6ba20c4830 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -2,6 +2,8 @@ #@NAME: Angstrom #@DESCRIPTION: Release independent distribution configuration for Angstrom +# Preserve original DISTRO value +USERDISTRO := "${DISTRO}" DISTRO = "angstrom" DISTRO_NAME = "Angstrom" diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 2c2e0acb03..5641c8ee39 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1 +1,8 @@ +PREFERRED_VERSION_dbus = "1.1.4" +PREFERRED_VERSION_busybox = "1.9.1" +PREFERRED_VERSION_gst-pulse = "0.9.7" +PREFERRED_VERSION_libtool = "1.2.14" +PREFERRED_VERSION_pulseaudio = "0.9.9" +PREFERRED_VERSION_udev = "118" PREFERRED_VERSION_vte = "0.16.10" + diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index aaf7b02a09..43ffa1de9f 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -46,7 +46,6 @@ SRCDATE_rosetta ?= "20060804" SRCDATE_gpesyncd ?= "20070701" # GNOME -SRCDATE_gconf-dbus ?= "2007051 |