diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-18 11:33:19 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-18 11:33:19 +0100 |
| commit | 943dd0f6551440135286fc386698e66b71a76b1e (patch) | |
| tree | 9c35def6546ed2185a81625ed448f914dcb87055 /conf | |
| parent | f205d8a02477ad9e9031db16f50ca79531886763 (diff) | |
| parent | d6c55524b1522cd2789f506586a10e729adcb262 (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/distro/include/sane-srcrevs.inc | 4 | ||||
| -rw-r--r-- | conf/machine/include/davinci.inc | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index bfe33ba365..8f9d839afb 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1090,6 +1090,10 @@ sha256=88fcb1dbf934af33163667a6677312065c7d0a7f01cd764e3374c4c19b386ec4 md5=a357558552436b0b5ea0333b3e2327df sha256=75c4520cde3b1d10ae7846983bde66d114fea9479f6acef352850dae92a1100c +[http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.11.tar.gz] +md5=65ada3d997fe85109191a5fb083f248c +sha256=86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9 + [http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.6.tar.gz] md5=2b8beffad9179d80e598c22c80efb135 sha256=89f94840b1b42ddfe53a8aee415331516f1bbdd942b42d25e74906a332cdf22a diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 9aa36882e2..a3ce00ddfa 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -46,7 +46,7 @@ SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953" SRCREV_pn-diversity-daemon ?= "571" SRCREV_pn-diversity-radar ?= "453" SRCREV_pn-e-tasks ?= "14" -SRCREV_pn-e-wm-config-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-config-illume-shr ?= "cb4159e653d770da8e8f9fc9a65135839533d4c5" SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-e-wm-sysactions-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" @@ -77,7 +77,7 @@ SRCREV_pn-ezxd ?= "2074" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-ffalarms ?= "67" SRCREV_pn-flashrom ?= "3682" -SRCREV_pn-frameworkd-config-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-frameworkd-config-shr ?= "cb4159e653d770da8e8f9fc9a65135839533d4c5" SRCREV_pn-frameworkd-config-shr_SHR_REV = ${SRCREV_pn-frameworkd-config-shr} SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b" SRCREV_pn-fsoraw ?= "20" diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc index 206afd46f2..baae3ff327 100644 --- a/conf/machine/include/davinci.inc +++ b/conf/machine/include/davinci.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-arm926ejs.inc # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r10" +MACHINE_KERNEL_PR = "r11" TARGET_ARCH = "arm" |