diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-12-14 20:36:24 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-12-14 20:36:24 +0100 |
| commit | 9c094a8fa77e3e77cb46d909e2dbcc6a219b08d0 (patch) | |
| tree | 42c6e078411598291abe1230a11b5bf0a0304676 /conf | |
| parent | 2b11ddd3a67033f2ce79ee4c475954c43467f085 (diff) | |
| parent | 7144e15e91b327e75a5270db8457a2c5cfa62f9a (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 10 | ||||
| -rw-r--r-- | conf/compatibility-providers.conf | 2 | ||||
| -rw-r--r-- | conf/machine/da850-omapl138-evm.conf | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 5bd11e0a44..2f05eb22c2 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1550,9 +1550,9 @@ sha256=68b1d0acd1a6e17d91412635cd4f65ba58d293e62a01475a43f3712c49a46e7d md5=03e5e7ab8ac3acc59661c6e9c09089b7 sha256=fcda8bca508490bea642c83fcf718565bf4ed4c50f2d7b34761da61fe2e6bc9d -[http://downloads.vdm-design.de/aceofpenguins-launcher-0.3.tar.gz] -md5=2fe7dcdbbdbf3b2821f627e02c406caa -sha256=13013cd19cb165825f4ef5cc790b0e103705f68ece470fd12012db97e3e60839 +[http://downloads.vdm-design.de/aceofpenguins-launcher-0.4.tar.gz] +md5=40f19a26cbfa35de8346efe582b5d984 +sha256=ea09581b3a31e3409968876461da3e384dcb0000abbb0060ae14e4fccb4994e1 [http://downloads.sourceforge.net/acpid/acpid-1.0.10.tar.gz] md5=61156ef32015c56dc0f2e3317f4ae09e @@ -6742,6 +6742,10 @@ sha256=e4db7a6305ffe2333fae08c940ded8f7e5b02999e0917b0ea4ef3764c80f58c8 md5=145f4d2ba24c54288bad2d66ddd2baf2 sha256=d7bcc7cafb1c78f00b380dc2facdb82c5a2fb1475e1ddfc8e5d44a2b855cec1a +[http://www.fbreader.org/fbreader-sources-0.12.1.tgz] +md5=7236d094a91f26d19a3cfd3db8fcf946 +sha256=02a6a143abf3b5ab875392acef8d67f5cc991ea364e3bd250628e6a31b1f9923 + [http://only.mawhrin.net/fbreader/obsolete/fbreader-sources-0.7.3d.tgz] md5=705a89bb03860fb312a7afa25db0310e sha256=ec9f93968147526a9b2dd17e31a6d2795356b2eeed309f796f655b37b98abd83 diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf index d2ee2b6a23..10a81f2943 100644 --- a/conf/compatibility-providers.conf +++ b/conf/compatibility-providers.conf @@ -61,7 +61,7 @@ PREFERRED_PROVIDER_virtual/gail ?= "gtk+" PREFERRED_PROVIDER_virtual/javac-native ?= "ecj-bootstrap-native" PREFERRED_PROVIDER_virtual/java-initial ?= "jamvm-initial" PREFERRED_PROVIDER_virtual/java-native ?= "jamvm-native" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" #PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat" diff --git a/conf/machine/da850-omapl138-evm.conf b/conf/machine/da850-omapl138-evm.conf index b61c00ca27..aaf7583e5d 100644 --- a/conf/machine/da850-omapl138-evm.conf +++ b/conf/machine/da850-omapl138-evm.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI DA850/OMAPL138 EVM board require conf/machine/include/davinci.inc -require conf/machine/include/omapl138.inc +require conf/machine/include/omapl138.conf UBOOT_MACHINE = "da850_omapl138_evm_config" UBOOT_ENTRYPOINT = "0xc0008000" |