diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-27 17:40:44 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-27 17:40:44 +0400 |
| commit | 6e75ec0e0df8fae7b5b3d53e691fcc584458a397 (patch) | |
| tree | bf647618be3747a7a309af5f766839fe66c911d9 /conf | |
| parent | b8ffa54b8a26ef3548fada3177be9f5532417aae (diff) | |
| parent | 6eea2d81d154d7d1e12e89676e3246ac434360f1 (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 12 | ||||
| -rw-r--r-- | conf/machine/mx31ads.conf | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 392ec5063b..d5bb8906cf 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -5938,6 +5938,14 @@ sha256=6810168a3f2e20103d936513bce225dfcdda4bf1ae5f9f8042af47025c097cef md5=87970d6784f536cde84f9bcbaaa52720 sha256=6810168a3f2e20103d936513bce225dfcdda4bf1ae5f9f8042af47025c097cef +[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.12.4.tar.gz] +md5=aaefede2405a40c87438e7e833d69b70 +sha256=dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d + +[ftp://ftp.us.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.12.4.tar.gz] +md5=aaefede2405a40c87438e7e833d69b70 +sha256=dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d + [http://openzaurus.org/mirror/fakeroot_1.2.13.tar.gz] md5=cf25d5d4c943ebf2293fe6f23ecba0fd sha256=6f51ebdf0e18bea58d18f79e8ffebb797fe57bdf44b96dff9d84b70467af7841 @@ -23698,6 +23706,10 @@ sha256=944ab9cfcfc9a4bd7efeecf32ea609fa6517970a9708c44eee6d5750c4ff8e0c md5=0b0428f4a6237a64dc8b7d378ace3f06 sha256=3bc5bf49ed02a3d93b4b9b71c7814960e972c1bde4e9fb83b2cd500c83ae4a9a +[http://mirrors.m0k.org/transmission/files/transmission-1.73.tar.bz2] +md5=9c1b5d84fb9ddbbd50b5776c1cd6daa4 +sha256=edd775e06e66dc775ca8272bbd2e47ac4fef6fcb884ccc1001589343fd9d0866 + [http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2] md5=3b713239e5e6b269b31cb665563358df sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1 diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf index de429c3cce..ebbbf70ca6 100644 --- a/conf/machine/mx31ads.conf +++ b/conf/machine/mx31ads.conf @@ -8,7 +8,7 @@ MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget" GUI_MACHINE_CLASS = "smallscreen" -PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" +PREFERRED_PROVIDER_virtual/kernel = "linux" require conf/machine/include/tune-arm1136jf-s.inc |