diff options
| author |   Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-07-14 01:07:34 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-07-14 01:07:34 +0400 |
| commit | 1a35b6063591e39cb54f30188a0f8baa36c5f61b (patch) | |
| tree | 9f13a1a4f14ae2745abe92d8a37c742a849922df /conf | |
| parent | 3be79bbe6aeb0fb0ce9ad543cff54a166169c52f (diff) | |
| parent | b62ea92436361e3f89eb433389a2fd48f967e4f0 (diff) | |
| download | openembedded-1a35b6063591e39cb54f30188a0f8baa36c5f61b.tar.gz | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/compatibility-providers.conf | 1 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/preferred-shr-versions.inc | 8 |
3 files changed, 5 insertions, 6 deletions
diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf index 350521a0ac..3c193d6ae9 100644 --- a/conf/compatibility-providers.conf +++ b/conf/compatibility-providers.conf @@ -70,6 +70,5 @@ PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" PREFERRED_PROVIDER_virtual/libx11-native ?= "libx11-native" PREFERRED_PROVIDER_virtual/psplash ?= "psplash-angstrom" -PREFERRED_PROVIDER_virtual/shr-splash-theme ?= "shr-splash-theme-logo" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_xserver ?= "xserver-xorg" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 685ec4533f..f13cc2223d 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -200,7 +200,7 @@ SEPPUKU_COMPONENT = "org.openembedded.dev" OESTATS_SERVER ?= "tinderbox.openembedded.org" # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "ipv4 ipv6 nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci pam" +DISTRO_FEATURES = "largefile ipv4 ipv6 nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci pam" # Use-like features DISTRO_FEATURES += "tk" diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 4433a4106a..a8226264ee 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -31,8 +31,8 @@ PREFERRED_VERSION_openssh = "5.2p1" # upgrades used in Angstrom PREFERRED_VERSION_xserver-common = "1.33" PREFERRED_VERSION_xserver-nodm-init = "2.0" -PREFERRED_VERSION_gtk+ = "2.20.0" -PREFERRED_VERSION_gtk+-native = "2.20.0" +PREFERRED_VERSION_gtk+ = "2.20.1" +PREFERRED_VERSION_gtk+-native = "2.20.1" PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libtool = "2.2.6b" PREFERRED_VERSION_libtool-native = "2.2.6b" @@ -41,8 +41,8 @@ PREFERRED_VERSION_libtool-sdk = "2.2.6b" PREFERRED_VERSION_udev = "151" PREFERRED_VERSION_usbutils = "0.86" PREFERRED_VERSION_wpa-supplicant = "0.6.9" -PREFERRED_VERSION_glib-2.0 = "2.24.0" -PREFERRED_VERSION_glib-2.0-native = "2.24.0" +PREFERRED_VERSION_glib-2.0 = "2.24.1" +PREFERRED_VERSION_glib-2.0-native = "2.24.1" UDEV_GE_141 = "1" PREFERRED_VERSION_postgresql = "8.4.4" |