diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-04-13 14:07:22 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-04-13 14:07:22 +0000 |
| commit | 8a70f533b7f98f86f6b033e5838364e2ef6aeb4b (patch) | |
| tree | c49dde4e289d9e7477d6c5799f5df63569d618cf | |
| parent | 3b000fe74e296f4df75918aa6162c43514284e9c (diff) | |
| download | upstream-8a70f533b7f98f86f6b033e5838364e2ef6aeb4b.tar.gz upstream-8a70f533b7f98f86f6b033e5838364e2ef6aeb4b.tar.bz2 upstream-8a70f533b7f98f86f6b033e5838364e2ef6aeb4b.zip | |
finalize lzma/jffs2 support (currently not enebled by default, for kernels >=2.6.33) based on Edgar Soldin patches:
https://lists.openwrt.org/pipermail/openwrt-devel/2010-March/006550.html
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20837 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/image.mk | 7 | ||||
| -rw-r--r-- | include/kernel-defaults.mk | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/include/image.mk b/include/image.mk index 98e32b349a..f2791212bb 100644 --- a/include/image.mk +++ b/include/image.mk @@ -25,6 +25,11 @@ JFFS2OPTS := --pad --big-endian --squash SQUASHFS_OPTS := -be endif +JFFS2OPTS+= $(if $(CONFIG_KERNEL_JFFS2_RTIME)$(LINUX_2_4),-X,-x) rtime +JFFS2OPTS+= $(if $(CONFIG_KERNEL_JFFS2_ZLIB),-X,-x) zlib +JFFS2OPTS+= $(if $(CONFIG_KERNEL_JFFS2_LZMA)$(LINUX_2_4),-X,-x) lzma +JFFS2OPTS+= $(JFFS2COMPR) --compression-mode=size + ifneq ($(CONFIG_LINUX_2_4)$(CONFIG_LINUX_2_6_25),) USE_SQUASHFS3 := y endif @@ -59,7 +64,7 @@ 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) + $(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(JFFS2OPTS) -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(1) -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/' $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(1)) $(call Image/Build,jffs2-$(1)) endef diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 300139cab0..0969b844a0 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -97,9 +97,8 @@ define Kernel/Configure/2.6 endef define Kernel/Configure/Default $(LINUX_CONFCMD) > $(LINUX_DIR)/.config.target - echo "$(if $(CONFIG_KERNEL_KALLSYMS),CONFIG_KALLSYMS=y,# CONFIG_KALLSYMS is not set)" >> $(LINUX_DIR)/.config.target - echo "$(if $(CONFIG_KERNEL_PROFILING),CONFIG_PROFILING=y,# CONFIG_PROFILING is not set)" >> $(LINUX_DIR)/.config.target - echo "$(if $(CONFIG_KERNEL_DEBUG_FS),CONFIG_DEBUG_FS=y,# CONFIG_DEBUG_FS is not set)" >> $(LINUX_DIR)/.config.target +# copy CONFIG_KERNEL_* settings over to .config.target + awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target echo "# CONFIG_KPROBES is not set" >> $(LINUX_DIR)/.config.target |