diff options
author | Michael Lauer <mickey@vanille-media.de> | 2007-11-02 11:59:18 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2007-11-02 11:59:18 +0000 |
commit | 60d98f25ec00aa5f3e1c44893486411cbe54f89e (patch) | |
tree | 73774986da4c7b49d3444767cd437efff559d557 | |
parent | c6ef36cc8d4bfb799c8bb1aa96be2625f10eb4bb (diff) |
conf files: remove preferred-openmoko-versions.inc (they're included in sane-srcdates.inc),
catch up with distro configurations
-rw-r--r-- | conf/distro/angstrom-2007.1.conf | 1 | ||||
-rw-r--r-- | conf/distro/angstrom-2008.1.conf | 1 | ||||
-rw-r--r-- | conf/distro/include/preferred-openmoko-versions.inc | 10 | ||||
-rw-r--r-- | conf/distro/openmoko.conf | 4 |
4 files changed, 1 insertions, 15 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index fe6be3e614..4c4f436512 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -160,7 +160,6 @@ PREFERRED_VERSION_dbus-glib ?= "0.74" require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc require conf/distro/include/preferred-xorg-versions.inc -require conf/distro/include/preferred-openmoko-versions.inc # Virtuals: diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 93b666c896..3afdd8054a 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -92,7 +92,6 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc require conf/distro/include/preferred-xorg-versions-X11R7.3.inc -require conf/distro/include/preferred-openmoko-versions.inc # Virtuals: diff --git a/conf/distro/include/preferred-openmoko-versions.inc b/conf/distro/include/preferred-openmoko-versions.inc deleted file mode 100644 index c002776d70..0000000000 --- a/conf/distro/include/preferred-openmoko-versions.inc +++ /dev/null @@ -1,10 +0,0 @@ -# -# Specify which versions of OpenMoko packages to build -# - -# -# Bootloader and Kernel -# - -SRCREV_pn-linux-openmoko ?= "2937" - diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 0f2716b0db..758f6c612f 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -37,8 +37,6 @@ PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12" # we want the openmoko svn version of gsmd PREFERRED_PROVIDER_libgsmd = "libgsmd" -require conf/distro/include/preferred-openmoko-versions.inc - # Bleeding-edge developers should add the following line to their local.conf: # require conf/distro/include/moko-autorev.inc @@ -62,7 +60,7 @@ PACKAGE_ARCH_pn-keymaps_fic-gta02 = "${MACHINE_CLASS}" PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}" PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}" -# Select packge versions we wash to use. +# Select package versions we want to use. PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" |