summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2009-10-29 10:43:34 +0100
committerStefan Schmidt <stefan@datenfreihafen.org>2009-10-29 10:43:34 +0100
commit2012861d8154cd0241d8a3e1ab57b485006284dc (patch)
tree2d0a30200cf0752301ac25f5e35cd27d399941f4 /conf
parent1ca106793e669980354fa9c32fe931bb7a72b070 (diff)
parent31c440b89cf2f9002bc8df2f69a34b4948f0d0de (diff)
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
-rw-r--r--conf/checksums.ini36
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc6
-rw-r--r--conf/distro/include/sane-srcrevs.inc1
-rw-r--r--conf/machine/omap3-pandora.conf2
4 files changed, 41 insertions, 4 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index a6f06f0dc9..ccabc558dc 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -8094,6 +8094,10 @@ sha256=7ce4919b4742ad6aad9dbfb2b962434d70dbcf9c63bb513870f3276deb28bee0
md5=d5e8f9f2806c9662693f292b155dd238
sha256=f12699367ec4f48ffce87f8b116b55561a03e055c4bf74cc96e5adb3b4e2fce6
+[http://ftp.gnome.org/pub/GNOME/sources/gedit-plugins/2.28/gedit-plugins-2.28.0.tar.bz2]
+md5=7a0068ef250f2cfe8d60a5cf0e7a7c93
+sha256=d615d2f26e66d7a23f37205089096a60faa2cb6e9108f9034cf2e66b940bf2ca
+
[ftp://ftp.billsgames.com/unix/x/gemdropx/src/gemdropx-0.9.tar.gz]
md5=fd0337e89778e2dba74461c555ea8e42
sha256=e50495d292a1d456c28044efbf07c16d8865f8d95e1caba86f4c5b2e3fb1d28f
@@ -9118,6 +9122,10 @@ sha256=559b5d857b4fbc31418bc677f3391182ba1c357cabb8dfee04a1e709a7a63d01
md5=e5dcae40b2c291126843680dbed924a8
sha256=ede0203f1eec22b3ed4a91c7b769e437859e5bc4b89a8f8e80b3f7ca62317098
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-python/2.28/gnome-python-2.28.0.tar.bz2]
+md5=b627abbb0ed912e221cc072e3dd6f9d6
+sha256=f2c984587450086dff8eb0a72a8d8c616d51fecfcc790601c35641be140efa0c
+
[http://ftp.gnome.org/pub/GNOME/sources/gnome-python-desktop/2.23/gnome-python-desktop-2.23.0.tar.bz2]
md5=d8f8e61d99402e8b0a82d3c8d6e873be
sha256=7ad66f99a1bad1ae0bbb02bd7a7cf8ed17fdc3fd104fa5c68e04961459ad5c50
@@ -9294,6 +9302,10 @@ sha256=173df749482f7391e50a6eb8339107b2b201582978637c63190c4a79f8e66d07
md5=338f0084f04a16f78797ad01f85d3251
sha256=a3c7fdbbafa6c9cfee7f16c067b043c3041cd0240292aa92b653a2221ae04503
+[http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.9/gnumeric-1.9.14.tar.bz2]
+md5=6781d0df02e603c556758d90e96e37f6
+sha256=0f934eddd2204f938f0359d8c39ef590ab4fec60d6922853e6c8c23e3069d7f4
+
[ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.2.2.tar.bz2]
md5=c34736eb7cb687f9e5b6d4df48aaf7c8
sha256=174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57
@@ -9402,6 +9414,10 @@ sha256=b126902259875a24ece29bdf1f93cc7fd4fd7b83508cae1c15dabd10b4d537cd
md5=3d8d3357f9d58af901cd1d6eb42e2973
sha256=a252aff88d801175b27fd7c20e00b0b5f674a5a70e64cd95091abdcab87db35c
+[http://ftp.gnome.org/pub/GNOME/sources/goffice/0.7/goffice-0.7.14.tar.bz2]
+md5=c48a89bfceeb604f163aa55540088021
+sha256=0fe2f4d7c39e85b5b577c6fa7a88c9a135ae5819cc521083af888e4c23deaacd
+
[http://downloads.sourceforge.net/gparted/gparted-0.3.3.tar.bz2]
md5=f3d16ccfda72fa1dac9fa1ff9ded2c42
sha256=c7c86abd344055bdf1f840a037d04064759f52039cb075260b60369b721f245c
@@ -10814,6 +10830,10 @@ sha256=18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af
md5=bb7ef5463a74a80454ced2c1d47a0192
sha256=05fce9327dbe78a74ad4cd45383d541f96f19d40d3c03076cdf6908ad28ad241
+[http://download.gnome.org/sources/gtk+/2.18/gtk+-2.18.3.tar.bz2]
+md5=369e173600efc272131b53b1902679e8
+sha256=1c0665fe560a560851e8b3c9a6501d416c4b54abfb6fa07549d703a04ea768bf
+
[http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2]
md5=c6697665e06cad01e87c2cf8d0913725
sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0
@@ -14738,6 +14758,10 @@ sha256=ef7833047caf66ed3de7b0195223911d28e45c78617d25c6bd05a53fd6c30a0c
md5=b35e95f6bd7b8add9981b6cf6336674a
sha256=458e7b2ca26f0d212f91b445f0a93db62a679ec671bd3cc980f3c1ac65f06b96
+[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-1.14.16.tar.bz2]
+md5=8478d83fda0b6e57f36550c11a693ee1
+sha256=11fd8fca1bdbcfa426276a124ad083cca9632f03cf766523bcdfb2fca0b08908
+
[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-1.14.2.tar.bz2]
md5=aea16a8408b65f95c308b0db3e3d3d47
sha256=8b78905b3c61f67dbe9b50782b7005ee5a44cdb48dd0f654f42732b4807c829d
@@ -17982,6 +18006,10 @@ sha256=9b74a776831c3680c10ad5c3d04985a1368c4fdf2f383a0e8efcc3cda925baaf
md5=06935203b20e9794121a2c354fc9dea5
sha256=3b0e4a2c5c3e4457ce8f44e6cbb9f14ddfb66a515017b430f4f4484893e8ce9d
+[http://archive.xfce.org/src/apps/midori/0.2/midori-0.2.0.tar.bz2]
+md5=805e2e59a93a0a4b7652d6547b2bd923
+sha256=97c79d20807899bad4b241385c7cbf3a4f85d2673b1b6c12059878450e3e971a
+
[http://git.xfce.org/kalikiana/midori/snapshot/midori-abbfc163a39d7f1f01725fe2cfe3df516f9fa0f4.tar.bz2]
md5=d50f0a9683dee60685bcd48e04970949
sha256=c5eb824148935697cf4fc36f11cfd7a05fbe6a3392d8f32e296e2cdfd21de3ee
@@ -18666,6 +18694,10 @@ sha256=777ff60afa89426f0e52e49b0e7a7661ddb45b59d2ebbfdcbe07fd179e526ff3
md5=49fc135e1cde90cd935c1229467fa37e
sha256=33a878a8fc3efdd74519b09b4ec3d16fa9d3a0436b321c13344e5f3ab723c5e4
+[ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc1.tar.bz2]
+md5=049e93d78d5370351539c9a23b47e1af
+sha256=8e6823f4b92d88c837735322ca71199919406a2826bddae257c6e0f52d089cd7
+
[http://kldp.net/frs/download.php/3742/nabi-0.17.tar.gz]
md5=8746890ea666ac1b7ae6db77993c6592
sha256=1a239a7bb0644441ca781459fbf5a1c5fb95e823351bf308aa680eb60cc45b94
@@ -21790,6 +21822,10 @@ sha256=c746693328bfed7838a1f3bfac41b13d7f39a81ac961559cd0daf700fc677da7
md5=431e7d4632163b93d1ee43cd071a389c
sha256=db0ab6f998bc5750aba2dfa96c8932f673914d8bf804a2c1c769b4a6e3f192d2
+[ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.20/pygobject-2.20.0.tar.bz2]
+md5=10e1fb79be3d698476a28b1e1b0c5640
+sha256=41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81
+
[http://downloads.sourceforge.net/pygoogle/pygoogle-0.6.tar.gz]
md5=334e2d9e5a765ffa9769e2c4cdfcd110
sha256=ad3f4530977a15e52b379ef301a4a80cf69a883f24dd6cebc5b47b3009c092a4
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 36c556a679..3098101d7f 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -11,7 +11,7 @@ PREFERRED_VERSION_glib-2.0-native = "2.22.1"
PREFERRED_VERSION_glibmm = "2.22.1"
PREFERRED_VERSION_glproto = "1.4.9"
PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_gtk+ = "2.18.0"
+PREFERRED_VERSION_gtk+ = "2.18.3"
PREFERRED_VERSION_gtkmm = "2.18.1"
PREFERRED_VERSION_hal = "0.5.13"
PREFERRED_VERSION_libgemwidget = "1.0"
@@ -28,8 +28,8 @@ PREFERRED_VERSION_pango = "1.24.4"
PREFERRED_VERSION_pkgconfig = "0.23"
PREFERRED_VERSION_pkgconfig-native = "0.23"
PREFERRED_VERSION_pulseaudio = "0.9.15"
-PREFERRED_VERSION_python = "2.6.1"
-PREFERRED_VERSION_samba = "3.3.0"
+PREFERRED_VERSION_python = "2.6.2"
+PREFERRED_VERSION_samba = "3.3.9"
PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2"
PREFERRED_VERSION_udev = "141"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index f4cb5f4d61..2f22a7d91d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -232,7 +232,6 @@ SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512"
SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
SRCREV_pn-usbpath ?= "3172"
SRCREV_pn-usbpath-native ?= "3172"
-SRCREV_pn-webkit-gtk ?= "48579"
SRCREV_pn-wlan-ng-modules ?= "1859"
SRCREV_pn-wlan-ng-utils ?= "1859"
SRCREV_pn-wmiconfig ?= "5394"
diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf
index 16d28ba6a3..b06cb319ca 100644
--- a/conf/machine/omap3-pandora.conf
+++ b/conf/machine/omap3-pandora.conf
@@ -5,6 +5,8 @@
TARGET_ARCH = "arm"
require conf/machine/include/omap3.inc
+PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora"
+
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
XSERVER = "xserver-xorg \
xf86-input-evdev \
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-31 14:56:42 +0000