From: mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 11 Sep 2010 18:43:14 +0000 (+0000)
Subject: maemo-kexec: Automatically download kernel
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=82b77c0fc009e971ad95b130043e61fede8ac4fd;p=packages.git

maemo-kexec: Automatically download kernel


git-svn-id: svn://svn.openwrt.org/openwrt/packages@23021 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/utils/maemo-kexec/Config.in b/utils/maemo-kexec/Config.in
index 7a6a9eb66..74c8c86aa 100644
--- a/utils/maemo-kexec/Config.in
+++ b/utils/maemo-kexec/Config.in
@@ -1,8 +1,13 @@
+config MAEMO_KEXEC_DOWNLOAD_KERNEL
+	bool "Download latest Maemo kernel"
+	default y
+	depends on PACKAGE_maemo-kexec
+
 config MAEMO_KEXEC_KERNEL_PATH
 	string
 	prompt "Path to the Maemo kernel image"
 	default "PLEASE_CONFIGURE_MAEMO_ZIMAGE"
-	depends on PACKAGE_maemo-kexec
+	depends on PACKAGE_maemo-kexec && !MAEMO_KEXEC_DOWNLOAD_KERNEL
 	help
 	  Defines the path to the Maemo kernel zImage.
 
diff --git a/utils/maemo-kexec/Makefile b/utils/maemo-kexec/Makefile
index 02cdcaff3..05b7f50dd 100644
--- a/utils/maemo-kexec/Makefile
+++ b/utils/maemo-kexec/Makefile
@@ -8,9 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=maemo-kexec
-PKG_VERSION:=0.1
+PKG_VERSION:=1.0
 PKG_RELEASE:=1
 
+PKG_SOURCE:=maemo-rx44-2008.43-7.kernel
+PKG_SOURCE_URL:=http://bu3sch.de/misc/
+PKG_MD5SUM:=3cbf571c0618bfe20a69babab6b33bea
+UNPACK_CMD=$(CP) $(DL_DIR)/$(PKG_SOURCE) $(PKG_BUILD_DIR)/
+
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_MAEMO_KEXEC_DOWNLOAD_KERNEL \
+	CONFIG_MAEMO_KEXEC_KERNEL_PATH
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/maemo-kexec
@@ -18,29 +27,31 @@ define Package/maemo-kexec
   CATEGORY:=Utilities
   DEPENDS:=@TARGET_omap24xx +kexec-tools
   TITLE:=Kexec Maemo from OpenWRT
-  MENU:=1
 endef
 
 define Package/maemo-kexec/description
  Kexec Maemo from OpenWRT.
- The Maemo kernel image must be provided and the Maemo rootfs
- must be in the rootfs MTD partition.
+ The Maemo rootfs must be in the rootfs MTD partition.
 endef
 
 define Package/maemo-kexec/config
 	source "$(SOURCE)/Config.in"
 endef
 
+define Build/Configure
+endef
+
 define Build/Compile
 endef
 
+MAEMO_KRNL_SRC:=$(if $(CONFIG_MAEMO_KEXEC_DOWNLOAD_KERNEL),\
+		     $(PKG_BUILD_DIR)/$(PKG_SOURCE),\
+		     $(CONFIG_MAEMO_KEXEC_KERNEL_PATH))
+
 define Package/maemo-kexec/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_DIR) $(1)/boot
+	$(INSTALL_DIR) $(1)/boot $(1)/sbin
 	$(INSTALL_BIN) ./files/sbin/boot-maemo $(1)/sbin/
-	# --- COPYING MAEMO zImage ---
-	# If this fails, please check CONFIG_MAEMO_KEXEC_KERNEL_PATH
-	$(INSTALL_DATA) $(CONFIG_MAEMO_KEXEC_KERNEL_PATH) $(1)/boot/maemo.zImage
+	$(INSTALL_DATA) $(MAEMO_KRNL_SRC) $(1)/boot/maemo.zImage
 endef
 
 $(eval $(call BuildPackage,maemo-kexec))