X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1764da6cc8c37b3f80e26d77ed23bd586fc92d37..7e450a1c869a5b227e3c91c4e71049059f1193e6:/include/image.mk diff --git a/include/image.mk b/include/image.mk index c73814685..78e1a2fdc 100644 --- a/include/image.mk +++ b/include/image.mk @@ -4,6 +4,9 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # + +include $(INCLUDE_DIR)/prereq.mk +include $(INCLUDE_DIR)/kernel.mk KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) ifneq ($(CONFIG_BIG_ENDIAN),y) @@ -14,6 +17,19 @@ JFFS2OPTS := --pad --big-endian --squash SQUASHFS_OPTS := -be endif +define add_jffs2_mark + echo -ne '\xde\xad\xc0\xde' >> $(1) +endef + +# pad to 64k and add jffs2 end-of-filesystem mark +# do this twice to make sure that this works with 128k blocksize as well +define prepare_generic_squashfs + dd if=$(1) of=$(KDIR)/tmpfile.1 bs=64k conv=sync + $(call add_jffs2_mark,$(KDIR)/tmpfile.1) + dd of=$(1) if=$(KDIR)/tmpfile.1 bs=64k conv=sync + $(call add_jffs2_mark,$(1)) +endef + ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y) define Image/mkfs/jffs2 @@ -22,9 +38,10 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $(KDIR)/root.jffs2-64k -d $(BUILD_DIR)/root $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $(KDIR)/root.jffs2-128k -d $(BUILD_DIR)/root + # add End-of-Filesystem markers - echo -ne '\xde\xad\xc0\xde' >> $(KDIR)/root.jffs2-64k - echo -ne '\xde\xad\xc0\xde' >> $(KDIR)/root.jffs2-128k + $(call add_jffs2_mark,$(KDIR)/root.jffs2-64k) + $(call add_jffs2_mark,$(KDIR)/root.jffs2-128k) $(call Image/Build,jffs2-64k) $(call Image/Build,jffs2-128k) @@ -44,13 +61,18 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) tar -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ . endef endif - - +else + define Image/BuildKernel + cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.elf + endef endif + ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y) + E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_FSPART)*1024))) + define Image/mkfs/ext2 - $(STAGING_DIR)/bin/genext2fs -q -b 8192 -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2 + $(STAGING_DIR)/bin/genext2fs -U -b $(E2SIZE) -I $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2 $(call Image/Build,ext2) endef endif @@ -69,10 +91,17 @@ define Image/mkfs/prepare endef define BuildImage -compile: +download: +prepare: +ifneq ($(IB),1) + compile: compile-targets $(call Build/Compile) +else + compile: +endif -install: +ifneq ($(IB),1) + install: compile install-targets $(call Image/Prepare) $(call Image/mkfs/prepare) $(call Image/BuildKernel) @@ -80,17 +109,25 @@ install: $(call Image/mkfs/squashfs) $(call Image/mkfs/tgz) $(call Image/mkfs/ext2) +else + install: compile install-targets + $(call Image/BuildKernel) + $(call Image/mkfs/jffs2) + $(call Image/mkfs/squashfs) + $(call Image/mkfs/tgz) + $(call Image/mkfs/ext2) +endif -clean: +ifneq ($(IB),1) + clean: clean-targets $(call Build/Clean) -endef +else + clean: +endif compile-targets: install-targets: clean-targets: +endef + -download: -prepare: -compile: compile-targets -install: compile install-targets -clean: clean-targets