diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:31:14 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:32:21 +0200 |
| commit | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (patch) | |
| tree | 95aa163c4c2762647e8dfb1f499236cfcceeb687 /mk | |
| parent | 41c3a26c00f63f880d657aaaa6935015915f275f (diff) | |
split targethelp from install target
cleanup target/*/Makefile stuff.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/image.mk | 8 | ||||
| -rw-r--r-- | mk/rootfs.mk | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mk/image.mk b/mk/image.mk index b9e56b70a..9c657d404 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -117,11 +117,11 @@ endif KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX) -kernel-package: $(KERNEL) +kernel-package: kernel-strip $(TRACE) target/$(ADK_TARGET_ARCH)-create-kernel-package rm -rf $(KERNEL_PKGDIR) @mkdir -p $(KERNEL_PKGDIR)/boot - cp $(KERNEL) $(KERNEL_PKGDIR)/boot/kernel + cp $(BUILD_DIR)/$(TARGET_KERNEL) $(KERNEL_PKGDIR)/boot/kernel @${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \ ../linux/kernel.control ${KERNEL_VERSION} ${CPU_ARCH} $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR) $(MAKE_TRACE) @@ -150,6 +150,9 @@ ${FW_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}/.adk kernel-package cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \ sed "s#\(.*\)#:0:0::::::\1#" | sort | \ ${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@ +ifeq ($(ADK_HARDWARE_QEMU),y) + @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) +endif ${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}/.adk cd ${TARGET_DIR}; find . | grep -v ./boot/ | sed -n '/^\.\//s///p' | \ @@ -239,6 +242,7 @@ endif @-rm $(LINUX_DIR)/usr/initramfs_data.cpio* 2>/dev/null env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \ -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE) + @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) ${FW_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package mkdir -p ${TARGET_DIR}/boot/syslinux diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 36c01b27d..3956cf6a5 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -48,9 +48,9 @@ endif $(eval $(call rootfs_template,usb,USB,$(USB))) $(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS))) -$(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE,rootfstype=tmpfs)) $(eval $(call rootfs_template,initramfs,INITRAMFS,rootfstype=tmpfs)) $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK,rootfstype=tmpfs)) +$(eval $(call rootfs_template,initramfs-archive,INITRAMFS_ARCHIVE,rootfstype=tmpfs)) $(eval $(call rootfs_template,squashfs,SQUASHFS,$(MTDDEV) rootfstype=squashfs)) $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3)) $(eval $(call rootfs_template,jffs2,JFFS2,$(MTDDEV) rootfstype=jffs2)) |