Changeset 20837


Ignore:
Timestamp:
2010-04-13T16:07:22+02:00 (8 years ago)
Author:
acoul
Message:

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

Location:
trunk/include
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/image.mk

    r20834 r20837  
    2525SQUASHFS_OPTS :=  -be 
    2626endif 
     27 
     28JFFS2OPTS+= $(if $(CONFIG_KERNEL_JFFS2_RTIME)$(LINUX_2_4),-X,-x) rtime 
     29JFFS2OPTS+= $(if $(CONFIG_KERNEL_JFFS2_ZLIB),-X,-x) zlib 
     30JFFS2OPTS+= $(if $(CONFIG_KERNEL_JFFS2_LZMA)$(LINUX_2_4),-X,-x) lzma 
     31JFFS2OPTS+= $(JFFS2COMPR) --compression-mode=size 
    2732 
    2833ifneq ($(CONFIG_LINUX_2_4)$(CONFIG_LINUX_2_6_25),) 
     
    6065    define Image/mkfs/jffs2/sub 
    6166                # FIXME: removing this line will cause strange behaviour in the foreach loop below 
    62                 $(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(JFFS2OPTS) -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(1) -d $(TARGET_DIR) 
     67                $(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 '/^.+$$$$/' 
    6368                $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(1)) 
    6469                $(call Image/Build,jffs2-$(1)) 
  • trunk/include/kernel-defaults.mk

    r18457 r20837  
    9898define Kernel/Configure/Default 
    9999        $(LINUX_CONFCMD) > $(LINUX_DIR)/.config.target 
    100         echo "$(if $(CONFIG_KERNEL_KALLSYMS),CONFIG_KALLSYMS=y,# CONFIG_KALLSYMS is not set)" >> $(LINUX_DIR)/.config.target 
    101         echo "$(if $(CONFIG_KERNEL_PROFILING),CONFIG_PROFILING=y,# CONFIG_PROFILING is not set)" >> $(LINUX_DIR)/.config.target 
    102         echo "$(if $(CONFIG_KERNEL_DEBUG_FS),CONFIG_DEBUG_FS=y,# CONFIG_DEBUG_FS is not set)" >> $(LINUX_DIR)/.config.target 
     100# copy CONFIG_KERNEL_* settings over to .config.target 
     101        awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target 
    103102        echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target 
    104103        echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target 
Note: See TracChangeset for help on using the changeset viewer.