merge of '9814a7ac8b5ebeadd190ad216196e5efd3a70ff3'

     and 'b5e43fe5c6d401e028b978c17ce615d2a97900ef'

9 files changed, 15 insertions, 10 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 8b9b58ebc5..821a3a1ce5 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1554,9 +1554,9 @@ sha256=80fd209d065887729fdeb81f5a91638626e7ed31dabab40c446bd12042df9057
 md5=c0b57a115e24005f9828ca7b53908779
 sha256=f0127ba9cd9936b08f982999f6fd9004c8c4b97401e68bda4d91eec29300d8bd
 
-[http://www.cmake.org/files/v2.4/cmake-2.4.7.tar.gz]
-md5=4476c423b8f74266136964e42ea88028
-sha256=2fd5feb294b933ae3a0071b8c7a396797cf79dfe6b0ffeff8788e07ff4107d56
+[http://www.cmake.org/files/v2.4/cmake-2.4.8.tar.gz]
+md5=f5dd061c31765a49dc17ae8bdc986779
+sha256=f20607d4f33376ea648307681630574662d0c3f59d88a7a02ad547b6320631f1
 
 [ftp://ftp.logilab.fr/pub/common/common-0.4.4.tar.gz]
 md5=4cd3ce38efbd27c6cf4223f0ced2a5b5
diff --git a/packages/apex/apex-nslu2-1.5.13/defconfig b/packages/apex/apex-nslu2-1.5.13/defconfig
index 91517025bf..264f8539fc 100644
--- a/packages/apex/apex-nslu2-1.5.13/defconfig
+++ b/packages/apex/apex-nslu2-1.5.13/defconfig
@@ -136,7 +136,8 @@ CONFIG_AUTOBOOT=y
 CONFIG_AUTOBOOT_DELAY=10
 CONFIG_ENV_STARTUP_KERNEL_COPY=y
 # CONFIG_ENV_REGION_KERNEL_SWAP is not set
-# CONFIG_ENV_STARTUP_PREFIX_P is not set
+CONFIG_ENV_STARTUP_PREFIX_P=y
+CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+256m"
 
 #
 #    Regions
diff --git a/packages/apex/apex-nslu2-16mb-1.5.13/defconfig b/packages/apex/apex-nslu2-16mb-1.5.13/defconfig
index 420e0a61fd..11658813d5 100644
--- a/packages/apex/apex-nslu2-16mb-1.5.13/defconfig
+++ b/packages/apex/apex-nslu2-16mb-1.5.13/defconfig
@@ -136,7 +136,8 @@ CONFIG_AUTOBOOT=y
 CONFIG_AUTOBOOT_DELAY=10
 CONFIG_ENV_STARTUP_KERNEL_COPY=y
 # CONFIG_ENV_REGION_KERNEL_SWAP is not set
-# CONFIG_ENV_STARTUP_PREFIX_P is not set
+CONFIG_ENV_STARTUP_PREFIX_P=y
+CONFIG_ENV_STARTUP_PREFIX="sdram-init; memscan -u 0+256m"
 
 #
 #    Regions
diff --git a/packages/apex/apex-nslu2-16mb_1.5.13.bb b/packages/apex/apex-nslu2-16mb_1.5.13.bb
index 5fc835fc00..2937876c03 100644
--- a/packages/apex/apex-nslu2-16mb_1.5.13.bb
+++ b/packages/apex/apex-nslu2-16mb_1.5.13.bb
@@ -3,7 +3,7 @@ SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 	   file://defconfig"
diff --git a/packages/apex/apex-nslu2_1.5.13.bb b/packages/apex/apex-nslu2_1.5.13.bb
index ac3858f3a5..7fc7ea65b6 100644
--- a/packages/apex/apex-nslu2_1.5.13.bb
+++ b/packages/apex/apex-nslu2_1.5.13.bb
@@ -3,7 +3,7 @@ SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 	   file://defconfig"
diff --git a/packages/cmake/cmake-native_2.4.7.bb b/packages/cmake/cmake-native_2.4.8.bb
index fcfdda1c1a..fcfdda1c1a 100644
--- a/packages/cmake/cmake-native_2.4.7.bb
+++ b/packages/cmake/cmake-native_2.4.8.bb
diff --git a/packages/cmake/cmake_2.4.7.bb b/packages/cmake/cmake_2.4.8.bb
index 619aea9701..619aea9701 100644
--- a/packages/cmake/cmake_2.4.7.bb
+++ b/packages/cmake/cmake_2.4.8.bb
diff --git a/packages/fastjar/fastjar-native_0.95.bb b/packages/fastjar/fastjar-native_0.95.bb
index 520235d799..3d003306b8 100644
--- a/packages/fastjar/fastjar-native_0.95.bb
+++ b/packages/fastjar/fastjar-native_0.95.bb
@@ -4,6 +4,8 @@ SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
+PR = "r1"
+
 DEPENDS = "zlib-native"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/fastjar/fastjar-${PV}.tar.gz"
@@ -20,7 +22,8 @@ do_configure () {
 }
 
 do_stage() {
+	#we should teach autotools.bbclass:autotools_stage_all() about ${STAGING_BINDIR}
 	install -d ${STAGING_BINDIR}
-	install -m 755 fastjar ${STAGING_BINDIR}/fastjar
-	install -m 755 grepjar ${STAGING_BINDIR}
+	install -m 755 .libs/fastjar ${STAGING_BINDIR}/fastjar
+	install -m 755 .libs/grepjar ${STAGING_BINDIR}
 }
diff --git a/packages/opie-taskbar/opie-taskbar-images.inc b/packages/opie-taskbar/opie-taskbar-images.inc
index b74eda45c3..73122914fd 100644
--- a/packages/opie-taskbar/opie-taskbar-images.inc
+++ b/packages/opie-taskbar/opie-taskbar-images.inc
@@ -54,4 +54,4 @@ python do_package_prepend () {
 }
 
 PACKAGE_ARCH = "all"
-PACKAGES =+ "${PN}-dbg ${PN}-320x480 ${PN}-480x320 ${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320"
+PACKAGES =+ "${PN}-320x480 ${PN}-480x320 ${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320"