X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f985faf3dec28b89248a3a2f770ac48911d9161a..69ee3ecd38c5545e3b2e96bef804f3aba57816f0:/include/image.mk diff --git a/include/image.mk b/include/image.mk index c56e7cf19..d7385439c 100644 --- a/include/image.mk +++ b/include/image.mk @@ -1,14 +1,18 @@ -# +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # +override TARGET_BUILD= include $(INCLUDE_DIR)/prereq.mk include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/host.mk -KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) + +override MAKEFLAGS= +override MAKE:=$(SUBMAKE) +KDIR=$(KERNEL_BUILD_DIR) ifneq ($(CONFIG_BIG_ENDIAN),y) JFFS2OPTS := --pad --little-endian --squash @@ -35,29 +39,35 @@ endef ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y) + define Image/mkfs/jffs2/sub + # FIXME: removing this line will cause strange behaviour in the foreach loop below + $(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(JFFS2OPTS) -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(1) -d $(TARGET_DIR) + $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(1)) + $(call Image/Build,jffs2-$(1)) + endef define Image/mkfs/jffs2 - rm -rf $(BUILD_DIR)/root/jffs - - $(foreach SZ,$(JFFS2_BLOCKSIZE),\ - $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e $(patsubst %k,%KiB,$(SZ)) -o $(KDIR)/root.jffs2-$(SZ) -d $(BUILD_DIR)/root; \ - $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(SZ)); \ - $(call Image/Build,jffs2-$(SZ)) \ - ) + rm -rf $(TARGET_DIR)/jffs + $(foreach SZ,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/sub,$(SZ))) endef endif - + ifeq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),y) define Image/mkfs/squashfs - @mkdir -p $(BUILD_DIR)/root/jffs - $(STAGING_DIR)/bin/mksquashfs-lzma $(BUILD_DIR)/root $(KDIR)/root.squashfs -nopad -noappend -root-owned $(SQUASHFS_OPTS) + @mkdir -p $(TARGET_DIR)/jffs + $(STAGING_DIR_HOST)/bin/mksquashfs-lzma $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned $(SQUASHFS_OPTS) $(call Image/Build,squashfs) endef endif - + ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y) define Image/mkfs/tgz - $(TAR) -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ . - $(call Image/Build,tgz) + $(TAR) -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(TARGET_DIR)/ . + endef + endif + + ifeq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),y) + define Image/mkfs/cpiogz + ( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.cpio.gz ) endef endif else @@ -70,20 +80,26 @@ endif ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y) E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_FSPART)*1024))) - + define Image/mkfs/ext2 - $(STAGING_DIR)/bin/genext2fs -U -b $(E2SIZE) -I $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2 + $(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -I $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext2 $(call Image/Build,ext2) endef endif +ifeq ($(CONFIG_TARGET_ROOTFS_ISO),y) + define Image/mkfs/iso + $(call Image/Build,iso) + endef +endif + define Image/mkfs/prepare/default - find $(BUILD_DIR)/root -type f -not -perm +0100 -not -name 'ssh_host*' | $(XARGS) chmod 0644 - find $(BUILD_DIR)/root -type f -perm +0100 | $(XARGS) chmod 0755 - find $(BUILD_DIR)/root -type d | $(XARGS) chmod 0755 - mkdir -p $(BUILD_DIR)/root/tmp - chmod 0777 $(BUILD_DIR)/root/tmp + find $(TARGET_DIR) -type f -not -perm +0100 -not -name 'ssh_host*' | $(XARGS) chmod 0644 + find $(TARGET_DIR) -type f -perm +0100 | $(XARGS) chmod 0755 + find $(TARGET_DIR) -type d | $(XARGS) chmod 0755 + $(INSTALL_DIR) $(TARGET_DIR)/tmp + chmod 0777 $(TARGET_DIR)/tmp endef define Image/mkfs/prepare @@ -94,30 +110,34 @@ define BuildImage download: prepare: ifneq ($(IB),1) - compile: compile-targets + compile: compile-targets FORCE $(call Build/Compile) else compile: endif ifneq ($(IB),1) - install: compile install-targets + install: compile install-targets FORCE $(call Image/Prepare) $(call Image/mkfs/prepare) $(call Image/BuildKernel) $(call Image/mkfs/jffs2) $(call Image/mkfs/squashfs) $(call Image/mkfs/tgz) + $(call Image/mkfs/cpiogz) $(call Image/mkfs/ext2) + $(call Image/mkfs/iso) else install: compile install-targets $(call Image/BuildKernel) $(call Image/mkfs/jffs2) $(call Image/mkfs/squashfs) $(call Image/mkfs/tgz) + $(call Image/mkfs/cpiogz) $(call Image/mkfs/ext2) + $(call Image/mkfs/iso) endif - + ifneq ($(IB),1) clean: clean-targets $(call Build/Clean)