summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorLukas Gorris <lukas.gorris@gmail.com>2009-04-02 21:23:17 +0200
committerLukas Gorris <lukas.gorris@gmail.com>2009-04-02 21:23:17 +0200
commitc1bc969ba3030b6c421cc5d8facc8e1b281d8b9b (patch)
treeeb11b688cc03f3e5efdf5823bda6ac497db5c11c /conf
parent052a3fba741a0b82204c93a37caaee17b32b6115 (diff)
parent4af6bdcda04ee551a4b07cd6e14c250d207b3266 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf5
-rw-r--r--conf/checksums.ini62
-rw-r--r--conf/distro/angstrom-2008.1.conf19
-rw-r--r--conf/distro/include/angstrom-2007-for-openmoko.inc1
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc3
-rw-r--r--conf/distro/include/sane-srcrevs.inc6
-rw-r--r--conf/distro/kaeilos.conf1
-rw-r--r--conf/distro/oplinux.conf1
8 files changed, 68 insertions, 30 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 7c159afcee..a0d652a26d 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -1,4 +1,9 @@
##################################################################
+# Recipe Parsing
+##################################################################
+BBMASK = "/(nonworking|obsolete)/"
+
+##################################################################
# Standard target filesystem layout.
##################################################################
diff --git a/conf/checksums.ini b/conf/checksums.ini
index a88da9eddc..f7ef05b30e 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3410,6 +3410,10 @@ sha256=fbd7a0595eba5cf0cb168d9893e883f5cc7a68a7d6fec23cb3688508b247fa22
md5=82b08b1980ec6fbfc83b4dc0e2df10f7
sha256=543435cb0988acc90a6e651e424eb331aba3f73361036d7af458bc1233973199
+[http://ftp.gnome.org/pub/GNOME/sources/cheese/2.26/cheese-2.26.0.tar.bz2]
+md5=17c991c695c3a7549da6e42d1b327d79
+sha256=297c7aa579e14c1c22fbbc19254fbefca3b79ef8e6643856c83be0fdb8721412
+
[http://www.0x50.org/download/0.4/0.4.29/cherokee-0.4.29.tar.gz]
md5=854e6e61a69781746496012658d8ef98
sha256=7091536ef2a51d2548ac6268cc846dda9c37f7f7348597868c793f42b9be7d78
@@ -5334,6 +5338,10 @@ sha256=6cf629d628ee2ae908c9aa3c530fa05344dfe47a9b770c1d9d1e7cc16d7528b3
md5=af51614c7b78f8b8c68e9ece3d8f4d8f
sha256=cc6ff7b30911bf80d8d72d6db7cc7ecbf51b2f5bb66796b79da33f8f680402ac
+[http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.27/epiphany-2.27.1.tar.bz2]
+md5=840fb2dc0511039de378927e3bccd802
+sha256=36d2b3652b5bbf7b459fda95ac0f25c429aa2e05e42fede3e88ce463879bdb8b
+
[http://enlightenment.freedesktop.org/files/epsilon-0.3.0.007.tar.gz]
md5=408d3c63f9efa06e93e29a691c28985e
sha256=6f40962eb8d76e0e9d76ec9f461d62c6af8561028d194358aed001827cc418fc
@@ -7834,6 +7842,10 @@ sha256=4bd3141b2c668b24b43ac10a7a7040ce0717d8f088aee8a93ef261e446d88818
md5=a2cc0424619f271bf1a65cc0fbe782f0
sha256=7ebe5b0c2bb296386f1d62c3a5d30ed50e353c8d9dc390b77e0b5fdf56e4dad9
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.26/gnome-desktop-2.26.0.tar.bz2]
+md5=796fc830e0baff24381809a7abe012f8
+sha256=3b3fe18bc30ad60f1bbbb2bc2d2ec14a2f9babb9312eb4834395b5839b7d7ee9
+
[http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.7/gnome-desktop-2.7.90.tar.bz2]
md5=16691f6bdc7c09445c457387adaba1f1
sha256=6a1499a1e50ac89210a9a1fdb36bc070ef6d1a02764a0f8d90de314dba01972e
@@ -7974,6 +7986,10 @@ sha256=e1ecc0ddc5a09481deb2daa1f30fa14472bfed541db46bb4f49f3d0d728b0a45
md5=0d246880611a4c58fe2ff99614b96918
sha256=6d6d0f013594f1d5f685bc9d35ad2c64d7817339a932d8e17eede5b8a3c8196a
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.26/gnome-panel-2.26.0.tar.bz2]
+md5=27965de9b12952b22b7e232af6acb0de
+sha256=e8e21b008d4afcebfc3241d0f91dd2dcc0b171b16f5675fc1b7ed699e79b56f3
+
[http://downloads.sourceforge.net/gnome-power/gnome-power-0.0.5.tar.gz]
md5=db310dadcc958a781a2752a6a7748e60
sha256=78f7dc6946e178513202f06afc19496c8ac1e3ac6c43c56c40f4db1a23762179
@@ -7998,6 +8014,10 @@ sha256=559b5d857b4fbc31418bc677f3391182ba1c357cabb8dfee04a1e709a7a63d01
md5=d8f8e61d99402e8b0a82d3c8d6e873be
sha256=7ad66f99a1bad1ae0bbb02bd7a7cf8ed17fdc3fd104fa5c68e04961459ad5c50
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-python-desktop/2.26/gnome-python-desktop-2.26.0.tar.bz2]
+md5=fbcf4ef5ec4a8c4eec4d390c5889c80f
+sha256=400a5401a591e271c3357d0a8cb05a7927b4c218130497d06f75df9763d4efd8
+
[http://ftp.gnome.org/pub/GNOME/sources/gnome-python-extras/2.19/gnome-python-extras-2.19.1.tar.bz2]
md5=08896c63d71ce44d20fafbaf9c0edc78
sha256=c5f74f4c46dbb379d119d6f74ca4a47653af251bea176dc7a0ecacccb88339f0
@@ -9186,6 +9206,10 @@ sha256=850b4512fa5e4bbb964c67c215fe8ce64fe6f7e6b704180a783d8c2a04169ccb
md5=4b148480f82e96d274248e13880ec873
sha256=ddab700db455e13bcf9bc0592b320e61c6a7c692fb3cef7881b14b2df1a39069
+[http://user.cs.tu-berlin.de/~jutta/gsm/gsm-1.0.12.tar.gz]
+md5=8909828c601e82e842e6a0ceade60a4e
+sha256=dde4e62e4ce35af29a15d26beca2fc0f98c0219553927453425cda01f16e4de4
+
[http://pyneo.org/downloads/gsm0710muxd-1.7.tgz]
md5=b4756f5e521dd2df552862c9766faf11
sha256=5149991a219e8f2059350ed9d52bb110c0695da6eb9fe256e9e213e69f83929f
@@ -11194,14 +11218,26 @@ sha256=a758c8f9b55d8288e2484dd1a2dcbd9c4ca3ca3052864a45cb104f613b7f712d
md5=b4f7ffcc294d41a6a4c40d6e44b7734d
sha256=280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38
+[http://projects.linuxtogo.org/frs/download.php/221/kexecboot-0.3.tar.gz]
+md5=3c3b8edb739146183b3ddff3e0af5f1c
+sha256=61a918b38a4b0b97e1469cbe3d9c4307af956bd95abec2067aa2fd278739cd96
+
[http://projects.linuxtogo.org/frs/?group_id=50/kexecboot-0.4.tar.gz]
md5=b4a4509ca3f546cfedd23aa6f99ab81d
sha256=b8c9d3a51f04bdecabbb4135079d408e02c98cdf3156bab8418a6830cb64b890
+[http://projects.linuxtogo.org/~jay7/kexecboot-0.4.tar.gz]
+md5=b4a4509ca3f546cfedd23aa6f99ab81d
+sha256=b8c9d3a51f04bdecabbb4135079d408e02c98cdf3156bab8418a6830cb64b890
+
[http://projects.linuxtogo.org/frs/?group_id=50/kexecboot-0.5.tar.gz]
md5=a937303d7ef3fc645f9dccf89e1494e2
sha256=49c95d62e32b66c9f97e791f667afa82f0714bc0a0e0ad48df010f4f36de42ab
+[http://projects.linuxtogo.org/frs/download.php/226/kexecboot-0.5.tar.gz]
+md5=a937303d7ef3fc645f9dccf89e1494e2
+sha256=49c95d62e32b66c9f97e791f667afa82f0714bc0a0e0ad48df010f4f36de42ab
+
[http://gpe.linuxtogo.org/download/source/keylaunch-2.0.10.tar.gz]
md5=2d81de20b26eac5ad44b759eb412e8eb
sha256=38715fcc508740deb3f169a01092f03ea4ce92c9ec3c2589a9510534aa52a540
@@ -13014,6 +13050,10 @@ sha256=d5a799e1d11cd91865cb716a11de970de97d7ef679684db0a893fc6a65a9acd0
md5=d006328ec5cebc5dbf3a18834db95bba
sha256=0abae1eef7210e4decab7f89ea5b3a012c06859e91923a7212ca50856bffd500
+[http://ftp.gnome.org/pub/GNOME/sources/libgweather/2.26/libgweather-2.26.0.tar.bz2]
+md5=b96016d7b35c66cf251189e9851ee252
+sha256=c1efdeb59fe87145d13d99b7bb6f51b56505081fb2ebc2f7fe7dc3f7699da45e
+
[http://www.handhelds.org/~mmp/files/libhal-nm-0.0.2.tar.gz]
md5=2f0882a711759113b2388a790abe8fd8
sha256=68dd467cf8bd54283da874af54ac35de58b88444371ea48bb5cef289a0942981
@@ -25670,25 +25710,9 @@ sha256=5e3db5f2387457f67798d664ed67c67337d2f84c45f15d986ee2f46f9b45d0d1
md5=d12efb18c7e3025c5e6a6f63144c2145
sha256=b968a10f52b0c5e807ec4c2c106f3aea301cf0ac00d04299b6961370c82c66d8
-[http://downloads.sourceforge.net/xine/xine-lib-1.0.tar.gz]
-md5=96e5195c366064e7778af44c3e71f43a
-sha256=6a283d383358200a9d6866d5d666a0227c8412d9c33d41f166f39c011482aed4
-
-[http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1.0.tar.gz]
-md5=96e5195c366064e7778af44c3e71f43a
-sha256=6a283d383358200a9d6866d5d666a0227c8412d9c33d41f166f39c011482aed4
-
-[http://heanet.dl.sourceforge.net/xine/xine-lib-1.0.tar.gz]
-md5=96e5195c366064e7778af44c3e71f43a
-sha256=6a283d383358200a9d6866d5d666a0227c8412d9c33d41f166f39c011482aed4
-
-[http://downloads.sourceforge.net/xine/xine-lib-1.1.0.tar.gz]
-md5=3537cfd58d253b4be20a4975e7086e38
-sha256=795085a067b3a11c1b3de48b4d07b01d8ffb6123bd188a73cb53b0605f875c64
-
-[http://heanet.dl.sourceforge.net/xine/xine-lib-1.1.0.tar.gz]
-md5=3537cfd58d253b4be20a4975e7086e38
-sha256=795085a067b3a11c1b3de48b4d07b01d8ffb6123bd188a73cb53b0605f875c64
+[http://downloads.sourceforge.net/xine/xine-lib-1.1.16.tar.bz2]
+md5=acd1a210c5a6444e8fd44696469352bb
+sha256=27df9c8f962797b235d69154705cfdf18d3e325f028f54e3e804f6dadb8237be
[http://folks.o-hand.com/dodji/0xdeadbabe/xine.tgz]
md5=8b78ce490cde6eb3c586656e9bc5ead8
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index cde01e155f..e3e36d5c59 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -76,6 +76,15 @@ PREFERRED_VERSION_glibc-initial ?= "2.6.1"
PREFERRED_VERSION_uclibc ?= "0.9.30"
PREFERRED_VERSION_uclibc-initial ?= "0.9.30"
+# Preferred provider for virtual/psplash
+# This enforces a specific brand to be used, in our case the angstrom
+# one. In case you want to change the logo or something like that we
+# suggest you to create another recipe (e.g: psplash-<brand>) for that
+# and add that into your image.
+# You can also opt to change or override this line, but that isn't
+# needed because psplash is using update-alternatives.
+PREFERRED_PROVIDER_virtual/psplash ?= "psplash-angstrom"
+
PREFERRED_PROVIDER_avahi = "avahi"
#Small machines prefer kdrive, but we might ship full Xorg in other images
@@ -138,13 +147,12 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
# Others:
PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-PREFERRED_PROVIDER_esound ?= "pulseaudio"
+PREFERRED_PROVIDER_esound ?= "pulseaudio"
PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
@@ -188,6 +196,13 @@ IPKG_VARIANT = "opkg-nogpg angstrom-version ${ANGSTROM_FEED_CONFIGS}"
# do some task-base stuff here
+# Prefer bluez4, it's needed for things like connman. Bluez4 is also largely backward compatible with
+# bluez 3.x
+DISTRO_BLUETOOTH_MANAGER = "\
+ blueprobe \
+ bluez4 \
+ "
+
# We want to ship extra debug utils in the rootfs when doing a debug build
DEBUG_APPS ?= ""
DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
index daf4dd01bb..b931d340c3 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -156,7 +156,6 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
# Others:
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 55d5136090..5cb20101a5 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1084,10 +1084,7 @@ PREFERRED_VERSION_libxfontcache ?= "1.0.4"
PREFERRED_VERSION_libxfont-native ?= "1.3.0"
PREFERRED_VERSION_libxft ?= "2.1.12"
PREFERRED_VERSION_libxi ?= "1.1.3"
-PREFERRED_VERSION_libxine ?= "1.1.0"
-PREFERRED_VERSION_libxine-fb ?= "1.0"
PREFERRED_VERSION_libxinerama ?= "1.0.2"
-PREFERRED_VERSION_libxine-x11 ?= "1.0"
PREFERRED_VERSION_libxkbfile ?= "1.0.4"
PREFERRED_VERSION_libxkbui ?= "1.0.2"
PREFERRED_VERSION_libxml2 ?= "2.7.2"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 9a9ce1ac89..fc341f3726 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -37,7 +37,7 @@ SRCREV_pn-dfu-util ?= "4160"
SRCREV_pn-dfu-util-native ?= "4160"
SRCREV_pn-diversity-daemon ?= "571"
SRCREV_pn-diversity-radar ?= "453"
-SRCREV_pn-eds-dbus ?= "659"
+SRCREV_pn-eds-dbus ?= "736"
SRCREV_pn-eglibc ?= "7467"
SRCREV_pn-eglibc-initial ?= "7467"
SRCREV_pn-enlazar ?= "37"
@@ -101,7 +101,7 @@ SRCREV_pn-libowl ?= "277"
SRCREV_pn-libxosd ?= "627"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
-SRCREV_pn-linux-ixp4xx ?= "1085"
+SRCREV_pn-linux-ixp4xx ?= "1089"
SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5"
SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
@@ -234,7 +234,7 @@ SRCREV_pn-usbpath ?= "3172"
SRCREV_pn-usbpath-native ?= "3172"
SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
SRCREV_pn-vala-native ?= "54a924505856a839ad02dc95baa482e994e94a57"
-SRCREV_pn-webkit-gtk ?= "42069"
+SRCREV_pn-webkit-gtk ?= "42127"
SRCREV_pn-wlan-ng-modules ?= "1859"
SRCREV_pn-wlan-ng-utils ?= "1859"
SRCREV_pn-wmiconfig ?= "4522"
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index a65bbff2c8..1cc165b008 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -123,7 +123,6 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
# Others:
diff --git a/conf/distro/oplinux.conf b/conf/distro/oplinux.conf
index d4986bdc84..bab726ff16 100644
--- a/conf/distro/oplinux.conf
+++ b/conf/distro/oplinux.conf
@@ -42,7 +42,6 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_PROVIDER_esound ?= "pulseaudio"