diff options
| author |   Carsten Haitzler (Raster <raster@rasterman.com> | 2009-01-16 11:37:56 +1100 |
|---|---|---|
| committer | Carsten Haitzler (Raster) <raster@rasterman.com> | 2009-02-20 00:56:49 +1100 |
| commit | 031caf7b1c5dc7888f9bab6444041101d1f0d5ca (patch) | |
| tree | 90ab696b1c463c251e3ec618f6a5d6e62ca089bd | |
| parent | 1fa4ef3d19f36e2be7b58feae6b1a06a1ec102b7 (diff) | |
| download | openembedded-031caf7b1c5dc7888f9bab6444041101d1f0d5ca.tar.gz | |
preferred-om-2008-versions: fix nfs-utils and automake so things actually build
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index f78c804203..21ef836956 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -56,7 +56,7 @@ PREFERRED_VERSION_aumix ?= "2.8" PREFERRED_VERSION_autoconf ?= "2.61" PREFERRED_VERSION_autoconf-native ?= "2.61" PREFERRED_VERSION_autofs ?= "4.1.4" -PREFERRED_VERSION_automake ?= "1.10" +PREFERRED_VERSION_automake ?= "1.9.6" PREFERRED_VERSION_automake-native ?= "1.10" PREFERRED_VERSION_avahi ?= "0.6.22" PREFERRED_VERSION_avahi-python ?= "0.6.21" @@ -282,7 +282,11 @@ PREFERRED_VERSION_dvbtraffic ?= "0.0cvs20060814" PREFERRED_VERSION_dviviewer ?= "1.0.2" PREFERRED_VERSION_e2fsprogs ?= "1.38" PREFERRED_VERSION_e2fsprogs-libs ?= "1.41.2" +<<<<<<< HEAD:conf/distro/include/preferred-om-2008-versions.inc PREFERRED_VERSION_e2fsprogs-libs-native ?= "1.35" +======= +PREFERRED_VERSION_e2fsprogs-libs-native ?= "1.41.2" +>>>>>>> preferred-om-2008-versions: fix nfs-utils and automake so things actually build:conf/distro/include/preferred-om-2008-versions.inc PREFERRED_VERSION_e2fsprogs-native ?= "1.38" PREFERRED_VERSION_e2tools ?= "0.0.16" PREFERRED_VERSION_e2tools-native ?= "0.0.16" @@ -1331,7 +1335,7 @@ PREFERRED_VERSION_net-snmp ?= "5.4.1" PREFERRED_VERSION_net-tools ?= "1.60" PREFERRED_VERSION_network-manager-applet ?= "0.6.5" PREFERRED_VERSION_network-suspend-scripts ?= "1.1" -PREFERRED_VERSION_nfs-utils ?= "1.0.6" +PREFERRED_VERSION_nfs-utils ?= "1.1.2" PREFERRED_VERSION_ngrep ?= "1.42" PREFERRED_VERSION_nis-all ?= "1.0" PREFERRED_VERSION_nkf ?= "2.07" |