diff options
| author |   Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-04 16:22:44 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-04 16:22:44 +0100 |
| commit | da8949a54021bddb460992a476f82c4319eb7ac6 (patch) | |
| tree | 39ccb76cf9e0b31c8fd630316d53cd25f9b960e5 /conf | |
| parent | 62ccf71524bf776d2693b5ef6dcdce923b066fe4 (diff) | |
| parent | 32acc4426ae74382edbe85105ab01ac85e9cc0fa (diff) | |
| download | openembedded-da8949a54021bddb460992a476f82c4319eb7ac6.tar.gz | |
Merge branch 'shr/merge' into TESTINGRC
Conflicts:
conf/distro/include/sane-srcrevs.inc
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 6 | ||||
| -rw-r--r-- | conf/distro/shr.conf | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 94cd318674..e77f316c9d 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1,3 +1,7 @@ +[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.8.10.tar.bz2] +md5=0461c2085ac1ad7e648aa84c4ba51dd1 +sha256=b84617a2fd219153a6df95dc7f4aa1ba9c07af5859a3d00fc23f9aaed2a1e3d5 + [http://www.directfb.org/downloads/Extras/++DFB-0.9.25.tar.gz] md5=c6a2705f6210d8ede50a947b375f1c0b sha256=b3dbf01563dd60d63cff543ea8cd0c885381e78ecbbab8ff176e46df3f198a88 diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 06f70c0fcc..2b4def7f59 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -259,9 +259,9 @@ SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" SRCREV_pn-opimd-utils ?= "7321c3f1a3cd781f9ed13ea3cac38879429dd420" -SRCREV_pn-opkg ?= "439" -SRCREV_pn-opkg-native ?= "439" -SRCREV_pn-opkg-sdk ?= "439" +SRCREV_pn-opkg ?= "446" +SRCREV_pn-opkg-native ?= "446" +SRCREV_pn-opkg-sdk ?= "446" SRCREV_pn-opkg-utils ?= "4578" SRCREV_pn-opkg-utils-native ?= "4595" SRCREV_pn-oprofileui ?= "173" diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index c4fe79ebf2..a1f2089d1b 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -31,6 +31,7 @@ DISTRO_TYPE = "debug" DISTRO = "shr" DISTRO_SSH_DAEMON = "openssh" +DISTRO_APM = "fso-apm" #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable ENABLE_BINARY_LOCALE_GENERATION ?= "1" @@ -184,7 +185,6 @@ PREFERRED_PROVIDER_virtual/db-native = "db3-native" PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" -DISTRO_apm = "fso-apm" ############################################################################# # PREFERRED VERSIONS |