Merge branch 'master' of git+ssh://openadk.org/git/openadk

10 files changed, 29 insertions, 29 deletions

diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk
index 441eefb3e..e1c3b0772 100644
--- a/mk/host-bottom.mk
+++ b/mk/host-bottom.mk
@@ -56,6 +56,7 @@ else
 	    ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE)
 endif
 endif
+	${MAKE} host-configure $(MAKE_TRACE)
 	touch $@
 
 host-build:
diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile
index 97c818199..f36b241d6 100644
--- a/package/bcm2835-vc/Makefile
+++ b/package/bcm2835-vc/Makefile
@@ -6,11 +6,12 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		bcm2835-vc
 # actually f65a4eef05ee436976f9be219d3db841d3d6b8ec from 05.10.2013
 PKG_VERSION:=		0.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		027d42d1ba803fabdc6bc4ec78d52e67
 PKG_DESCR:=		vc tools for raspberry pi (bcm2835)
 PKG_SECTION:=		base
 PKG_DEPENDS:=		libpthread
+PKG_BUILDDEP:=		cmake-host
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
@@ -22,7 +23,7 @@ $(eval $(call PKG_template,BCM2835_VC,bcm2835-vc,${PKG_VERSION}-${PKG_RELEASE},$
 CONFIG_STYLE:=          manual
 
 do-configure:
-	(cd $(WRKBUILD) && cmake -DCMAKE_SYSTEM_NAME=Linux .)
+	(cd $(WRKBUILD) && PATH='${TARGET_PATH}' cmake -DCMAKE_SYSTEM_NAME=Linux .)
 
 bcm2835-vc-install:
 	$(INSTALL_DIR) ${IDIR_BCM2835_VC}/opt/vc/{bin,lib}
diff --git a/package/cmake/Makefile b/package/cmake/Makefile
index 379a762c9..322f8878f 100644
--- a/package/cmake/Makefile
+++ b/package/cmake/Makefile
@@ -4,32 +4,38 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		cmake
-PKG_VERSION:=		2.8.4
+PKG_VERSION:=		2.8.12
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		209b7d1d04b2e00986538d74ba764fcf
+PKG_MD5SUM:=		105bc6d21cc2e9b6aff901e43c53afea
 PKG_DESCR:=		cmake utility
 PKG_SECTION:=		lang
 PKG_URL:=		http://www.cmake.org/
 PKG_SITES:=		http://www.cmake.org/files/v2.8/
 
-PKG_SYSTEM_DEPENDS:=	native
-
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call HOST_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE}))
+#$(eval $(call PKG_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+HOST_STYLE:=		manual
 CONFIG_STYLE:=		manual
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
-pre-configure:
-	(cd $(WRKBUILD); ./configure -prefix=/usr)
+host-configure:
+	(cd $(WRKBUILD); ./configure --prefix=/usr)
+
+cmake-hostinstall:
+	$(INSTALL_BIN) $(WRKBUILD)/bin/cmake \
+		$(STAGING_HOST_DIR)/usr/bin
 
 do-configure:
-	
+	(cd $(WRKBUILD); ./configure --prefix=/usr)
 
 cmake-install:
 	$(INSTALL_DIR) $(IDIR_CMAKE)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/cmake \
 		$(IDIR_CMAKE)/usr/bin
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/yajl/Makefile b/package/yajl/Makefile
index 4b8394e11..44f7d247b 100644
--- a/package/yajl/Makefile
+++ b/package/yajl/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		c953a53344c0e20a892fc042bbe69744
 PKG_DESCR:=		a small event-driven JSON parser written in ANSI C
 PKG_SECTION:=		libs
+PKG_BUILDDEP:=		cmake-host
 PKG_URL:=		http://lloyd.github.com/yajl/
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev
@@ -20,7 +21,7 @@ $(eval $(call PKG_template,YAJL,yajl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
 CONFIG_STYLE:=		manual
 
 do-configure:
-	(cd ${WRKBUILD} && ./configure --prefix /usr)
+	(cd ${WRKBUILD} && PATH='${TARGET_PATH}' ./configure --prefix /usr)
 
 yajl-install:
 	$(INSTALL_DIR) $(IDIR_YAJL)/usr/lib
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 985009051..e00ef2da4 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -166,13 +166,8 @@ if [[ -n $ADK_PACKAGE_GLIB ]]; then
 	NEED_GETTEXT="$NEED_GETTEXT glib"
 fi
 
-if [[ -n $ADK_PACKAGE_BCM2835_VC ]]; then
-	NEED_CMAKE="$NEED_CMAKE bcm2835-vc"
-fi
-
 if [[ -n $ADK_PACKAGE_YAJL ]]; then
 	NEED_RUBY="$NEED_RUBY yajl"
-	NEED_CMAKE="$NEED_CMAKE yajl"
 fi
 
 if [[ -n $ADK_PACKAGE_XBMC ]]; then
@@ -347,13 +342,6 @@ if [[ -n $NEED_BISON ]]; then
 	fi
 fi
 
-if [[ -n $NEED_CMAKE ]]; then
-	if ! which cmake >/dev/null 2>&1; then
-		echo >&2 You need cmake to build $NEED_CMAKE
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_ZIP ]]; then
 	if ! which zip >/dev/null 2>&1; then
 		echo >&2 You need zip to build $NEED_ZIP
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 0007e8a36..6dc9cd306 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -7,14 +7,10 @@ include $(TOPDIR)/mk/modules.mk
 include $(TOPDIR)/mk/kernel-build.mk
 include $(TOPDIR)/mk/image.mk
 
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
-KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage
-else ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
-KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage
-else ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+ifeq ($(ADK_TARGET_KERNEL_ZIMAGE),y)
 KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage
 else
-KERNEL:=$(LINUX_DIR)/vmlinux
+KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL)
 endif
 
 LOADADDR:=0x20008000
diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm
index 1e62f2abb..141e80d25 100644
--- a/target/arm/sys-available/qemu-arm
+++ b/target/arm/sys-available/qemu-arm
@@ -6,5 +6,6 @@ config ADK_TARGET_SYSTEM_QEMU_ARM
 	select ADK_EABI
 	select ADK_TARGET_NO_FPU
 	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Qemu Emulator (arm).
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi
index b8753c36d..9d743ed18 100644
--- a/target/arm/sys-available/raspberry-pi
+++ b/target/arm/sys-available/raspberry-pi
@@ -15,6 +15,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_TARGET_WITH_INPUT
 	select ADK_PACKAGE_BCM2835_FIRMWARE
 	select ADK_PACKAGE_BCM2835_VC
+	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	  Raspberry PI
 
diff --git a/target/arm/sys-available/sharp-zaurus b/target/arm/sys-available/sharp-zaurus
index f236cb350..848dfdbd1 100644
--- a/target/arm/sys-available/sharp-zaurus
+++ b/target/arm/sys-available/sharp-zaurus
@@ -17,5 +17,6 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	select ADK_KERNEL_MACH_SPITZ
 	select ADK_KERNEL_PXA_SHARP_Cxx00
 	select ADK_KERNEL_SPI_PXA2XX
+	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Sharp Zaurus CL3200 (Terrier)
diff --git a/target/config/Config.in b/target/config/Config.in
index d6cfaafd0..e38d19cd3 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -4,11 +4,15 @@
 config ADK_TARGET_KERNEL_VMLINUZ
 	boolean
 
+config ADK_TARGET_KERNEL_ZIMAGE
+	boolean
+
 config ADK_TARGET_KERNEL_BZIMAGE
 	boolean
 
 config ADK_TARGET_KERNEL
 	string
+	default "zImage" if ADK_TARGET_KERNEL_ZIMAGE
 	default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ
 	default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE
 	default "vmlinux"