diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-11-01 11:46:24 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-11-01 11:46:24 +0100 |
| commit | dfac41b5e2fe1215d4ec4282af4040219d89dc22 (patch) | |
| tree | 080fcbe9364274fc27dd2efa4f558789c60062aa /conf | |
| parent | b0ab0545bf361b06d7a22d5106508df299d4ddf3 (diff) | |
| parent | 9393ac7170efdc97c6dc03f54a5f074c6005b1eb (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 | 4 | ||||
| -rw-r--r-- | conf/machine/include/kirkwood.inc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index d01c21c3d2..e41bd939cb 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -18866,6 +18866,10 @@ sha256=7744d78131619b73a82adb6f73d6cfc6bad11a6ad2806c0f5130f88fe88ac9dd md5=37b4479951fa0cf052269d27c41ca200 sha256=6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 +[ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc1.tar.bz2] +md5=1c03d3f4ccedcd9de1c0ac2226e0031c +sha256=f62969cd61dc9718973708b79f5e86f653f630097f5ad14f90d78fcff677c0da + [http://www.mythtv.org/mc/mythtv-0.18.1.tar.bz2] md5=e6cabf88feeaf6ae8f830d3fdf7b113d sha256=86c9cf038d5d8a3fdf137ff735b55820281543a4a08e86cfad81a113a7b9a1d2 diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc index 20f53bf643..f91607cf76 100644 --- a/conf/machine/include/kirkwood.inc +++ b/conf/machine/include/kirkwood.inc @@ -11,7 +11,7 @@ USE_DEVFS = "0" PREFERRED_PROVIDER_virtual/bootloader = "" PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood" -MACHINE_KERNEL_PR = "r11" +MACHINE_KERNEL_PR = "r12" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" |