diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2009-05-17 02:47:27 +0400 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2009-05-17 02:47:27 +0400 |
| commit | 0f1b411ed82919e0d7adab458f48be53ef14fd6b (patch) | |
| tree | 6b2c120a46f2a91b5d381116d800ffcd55ff5d65 /conf | |
| parent | e49fd68b702de6546cc18b61ea20ff8c34599834 (diff) | |
| parent | 793e489438f1eb09720d69804b211eca5004e7fe (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net: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 | 2 | ||||
| -rw-r--r-- | conf/machine/include/kirkwood.inc | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 2d66999d3a..aa5b5beaec 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -10182,6 +10182,10 @@ sha256=cae6ed86296d01be98ee3be0c224c4323eee508941a7f162a0366d56655afe06 md5=62749c6cdf28ce31aae335092fa107df sha256=cae6ed86296d01be98ee3be0c224c4323eee508941a7f162a0366d56655afe06 +[http://downloads.sourceforge.net/hdparm/hdparm-9.15.tar.gz] +md5=0524dd10ad986285ff4eeb3507f7471c +sha256=689a413119c4d670ed95b9ac24511655c4805db678ad93866ab1036a0ba4d6bf + [http://handhelds.org/~zecke/oe_packages/hexatrolic-103beta3-zecke1.tar.bz2] md5=1d9420e8b5a6d5fa491c458ffafd4adb sha256=b60a5358e56e676529e7d3d655d5107a76b9a2434e38952711fea794f65721ce diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 60d53abc71..1f97381738 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -249,7 +249,7 @@ SRCREV_pn-usbpath-native ?= "3172" SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8" SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b" SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd" -SRCREV_pn-webkit-gtk ?= "43434" +SRCREV_pn-webkit-gtk ?= "43635" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "4522" diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc index 8f995899c9..3f0b8003f5 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 = "r2" +MACHINE_KERNEL_PR = "r4" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" |