From 4398b980ba11f6a76f6c863f67f174cf1dc2bef6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 20 Nov 2006 17:13:43 +0000 Subject: conf: Sync with OE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@892 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/include/angstrom.inc | 42 +++++++++++----------- meta/conf/distro/include/maemo-preferred.inc | 10 ------ meta/conf/distro/include/openzaurus.inc | 2 +- .../distro/include/preferred-gpe-versions-2.7.inc | 6 ++-- .../distro/include/preferred-opie-versions.inc | 2 +- meta/conf/distro/include/sane-srcdates.inc | 15 ++++---- 6 files changed, 35 insertions(+), 42 deletions(-) delete mode 100644 meta/conf/distro/include/maemo-preferred.inc (limited to 'meta/conf/distro/include') diff --git a/meta/conf/distro/include/angstrom.inc b/meta/conf/distro/include/angstrom.inc index 5ff9e1c94..3bf87abdb 100644 --- a/meta/conf/distro/include/angstrom.inc +++ b/meta/conf/distro/include/angstrom.inc @@ -5,47 +5,47 @@ DISTRO = "angstrom" DISTRO_NAME = "Angstrom" +TARGET_VENDOR = "-angstrom" +MACHINE_TASK_PROVIDER = "task-base" + +# Can be "glibc" and "uclibc" +ANGSTROM_MODE ?= "glibc" + +DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}" +require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc + #Use this variable in feeds and other parts that need a URI ANGSTROM_URI = "http://www.angstrom-distribution.org" #Set the default maintainer to angstrom-dev -MAINTAINER = "Angstrom Developers " +MAINTAINER = "Angstrom Developers " #use ipkg package format with debian style naming #use multimachine buildrules -INHERIT += "package_ipk debian multimachine" +INHERIT += "package_ipk debian multimachine sanity" #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable PREFERRED_PROVIDER_qemu-native = "qemu-native" ENABLE_BINARY_LOCALE_GENERATION ?= "1" - -#Use the ARM EABI when building for an ARM cpu. We can't use overrides -#here because this breaks all places where ":=" is used. -#if you want to build using uclibc, specify "-uclibcgnueabi" -TARGET_VENDOR = "-angstrom" -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" -#uclibc (needs gcc 4.1.1 or newer) -#TARGET_OS = "linux${@['','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" - -#mess with compiler flags to use -Os instead of -O2 -#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -BUILD_OPTIMIZATION = "-Os" -CXXFLAGS += "-fvisibility-inlines-hidden" +#qemu doesn't like armv6/eabi/vfp +ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0" #ARM EABI is softfloat by default, but let's make sure :) -TARGET_FPU_arm = "soft" +#make it overridable for platforms with FPU, like ep93xx or i.mx31 +TARGET_FPU_arm ?= "soft" +TARGET_FPU_ixp4xx ?= "soft" + -#Always ship these packages -BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit" +#Make a LE jffs2 image +SLUGOS_IMAGESEX = "little-endian" #Name the generated images in a sane way IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" -DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE} +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" # Angstrom *always* has some form of release config, so error out if someone thinks he knows better DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" # We want images supporting the following features (for task-base) -DISTO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" +DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" diff --git a/meta/conf/distro/include/maemo-preferred.inc b/meta/conf/distro/include/maemo-preferred.inc deleted file mode 100644 index 943f24432..000000000 --- a/meta/conf/distro/include/maemo-preferred.inc +++ /dev/null @@ -1,10 +0,0 @@ -PREFERRED_PROVIDER_gconf = "gconf-osso" -PREFERRED_PROVIDER_tslib = "tslib-maemo" -PREFERRED_VERSION_dbus = "0.23.1-osso5" -PREFERRED_VERSION_audiofile = "0.2.6-3osso4" -PREFERRED_PROVIDER_esd = "osso-esd" -PREFERRED_VERSION_gtk+ = "2.6.4-1.osso7" -PREFERRED_VERSION_glib-2.0 = "2.6.4" -PREFERRED_VERSION_pango = "1.8.1" -PREFERRED_VERSION_atk = "1.9.0" -PREFERRED_VERSION_diet-x11 ?= "6.2.1" \ No newline at end of file diff --git a/meta/conf/distro/include/openzaurus.inc b/meta/conf/distro/include/openzaurus.inc index 01877956e..ea408ff22 100644 --- a/meta/conf/distro/include/openzaurus.inc +++ b/meta/conf/distro/include/openzaurus.inc @@ -22,4 +22,4 @@ BB_MIN_VERSION = "1.4.4" INHERIT += "sanity" # We want images supporting the following features (for task-base) -DISTO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" +DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" diff --git a/meta/conf/distro/include/preferred-gpe-versions-2.7.inc b/meta/conf/distro/include/preferred-gpe-versions-2.7.inc index 36702025c..662dfc386 100644 --- a/meta/conf/distro/include/preferred-gpe-versions-2.7.inc +++ b/meta/conf/distro/include/preferred-gpe-versions-2.7.inc @@ -6,8 +6,8 @@ #SRCDATE_minimo=20050401 #set some preferred providers: -PREFERRED_PROVIDER_gconf=gconf-dbus -PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus +PREFERRED_PROVIDER_gconf="gconf-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" #specify versions, as the header says :) PREFERRED_VERSION_libmatchbox ?= "1.7" @@ -20,9 +20,9 @@ PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" PREFERRED_VERSION_atk ?= "1.9.0" PREFERRED_VERSION_cairo ?= "0.5.2" PREFERRED_VERSION_glib-2.0 ?= "2.6.4" +PREFERRED_VERSION_pango ?= "1.8.2" PREFERRED_VERSION_gtk+ ?= "2.6.10" PREFERRED_VERSION_gtk-engines ?= "2.6.5" -PREFERRED_VERSION_pango ?= "1.8.1" PREFERRED_VERSION_librsvg ?= "2.6.5" PREFERRED_VERSION_libgpewidget ?= "0.109" PREFERRED_VERSION_libgpepimc ?= "0.5" diff --git a/meta/conf/distro/include/preferred-opie-versions.inc b/meta/conf/distro/include/preferred-opie-versions.inc index 34c1fd498..d7c5b94f7 100644 --- a/meta/conf/distro/include/preferred-opie-versions.inc +++ b/meta/conf/distro/include/preferred-opie-versions.inc @@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHRE PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie" PREFERRED_VERSION_qte-mt = "${QTE_VERSION}" PREFERRED_VERSION_qte = "${QTE_VERSION}" -PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}" +PREFERRED_VERSION_libopie2 ?= "${OPIE_VERSION}" PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}" PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}" PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}" diff --git a/meta/conf/distro/include/sane-srcdates.inc b/meta/conf/distro/include/sane-srcdates.inc index 0696ad190..ffde56224 100644 --- a/meta/conf/distro/include/sane-srcdates.inc +++ b/meta/conf/distro/include/sane-srcdates.inc @@ -5,7 +5,6 @@ SRCDATE_at76c503a-modules ?= "20060814" SRCDATE_prism54-module ?= "20060814" # X11 libs, extentions and protos -SRCDATE_xcalibrate ?= "20060804" SRCDATE_compositeext ?= "20060814" SRCDATE_drm ?= "20060814" SRCDATE_drm-kernel ?= "20060814" @@ -22,8 +21,10 @@ SRCDATE_xxf86vmext ?= "20060814" # Matchbox / O-hand SRCDATE_contacts ?= "20060707" SRCDATE_dates ?= "20060707" -SRCDATE_web ?= "20060613" +SRCDATE_fstests ?= "20061111" SRCDATE_eds-dbus ?= "20060707" +SRCDATE_libmatchbox ?= "20060612" +SRCDATE_libfakekey ?= "20051101" SRCDATE_matchbox-common ?= "20060612" SRCDATE_matchbox-config-gtk ?= "20060612" SRCDATE_matchbox-desktop ?= "20060612" @@ -33,13 +34,14 @@ SRCDATE_matchbox-panel-manager ?= "20060612" SRCDATE_matchbox-stroke ?= "20060612" SRCDATE_matchbox-themes-extra ?= "20060612" SRCDATE_matchbox-wm ?= "20060612" -SRCDATE_libmatchbox ?= "20060612" -SRCDATE_libfakekey ?= "20051101" +SRCDATE_psplash ?= "20061011" +SRCDATE_web ?= "20060613" SRCDATE_zaurusd ?= "20060628" # GPE SRCDATE_dasher-gpe ?= "20060814" SRCDATE_rosetta ?= "20060804" +SRCDATE_libmimedir ?= "20060804" # GNOME SRCDATE_gconf-dbus ?= "20060719" @@ -54,12 +56,13 @@ SRCDATE_dvbtraffic ?= "20060814" SRCDATE_dvbtune ?= "20060814" SRCDATE_fdclock ?= "20060814" SRCDATE_fltk ?= "20060814" +SRCDATE_ipatience ?= "20061112" SRCDATE_ipkg-link ?= "20050930" SRCDATE_ipkg-link-1 ?= "20050930" SRCDATE_ipkg-utils ?= "20050930" SRCDATE_ipkg-utils-native ?= "20050930" SRCDATE_kaffe-qt ?= "20060814" -SRCDATE_kbdd ?= "20060814" +SRCDATE_kbdd ?= "20061019" SRCDATE_led ?= "20060814" SRCDATE_linux-input ?= "20060814" SRCDATE_madwifi-modules ?= "20060814" @@ -68,7 +71,7 @@ SRCDATE_minimo ?= "20050401" SRCDATE_mystun-server ?= "20060814" SRCDATE_olsrd ?= "20060814" SRCDATE_opencvs ?= "20060814" -SRCDATE_oprofile ?= "20060214" +SRCDATE_oprofile ?= "20061011" SRCDATE_portaudio ?= "20060814" SRCDATE_putty ?= "20060814" SRCDATE_python-cairo ?= "20060814" -- cgit v1.2.3