diff options
Diffstat (limited to 'meta/conf/distro')
| -rw-r--r-- | meta/conf/distro/include/default-providers.inc | 34 | ||||
| -rw-r--r-- | meta/conf/distro/include/default-versions.inc (renamed from meta/conf/distro/include/poky-fixed-revisions.inc) | 13 | ||||
| -rw-r--r-- | meta/conf/distro/poky.conf | 59 |
3 files changed, 37 insertions, 69 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc new file mode 100644 index 0000000000..d51ac64ef4 --- /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/poky-fixed-revisions.inc b/meta/conf/distro/include/default-versions.inc index 948608001e..0abbd8f87d 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/default-versions.inc @@ -1,15 +1,6 @@ -# 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" - +# Default preferred versions +# PULSEAUDIOVERSION ?= "0.9.22" PULSEAUDIOVERSION_arm ?= "0.9.15" PREFERRED_VERSION_pulseaudio ?= "${PULSEAUDIOVERSION}" diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 37fde0f022..2e9d327ecf 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 \ |