hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

image: generate separate jffs2 images w/o padding 

The new root.jffs2-*-raw images can be used for firmware
images with custom padding requirements.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38196 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Gabor Juhos 2013-09-25 20:03:20 +00:00
parent 07b5a8ccf4
commit e51a6a6d99
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/image.mk
View File

@ -20,9 +20,9 @@ IMG_PREFIX:=openwrt-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt
ifneq ($(CONFIG_BIG_ENDIAN),) ifneq ($(CONFIG_BIG_ENDIAN),)
JFFS2OPTS := --pad --big-endian --squash-uids -v JFFS2OPTS := --big-endian --squash-uids -v
else else
JFFS2OPTS := --pad --little-endian --squash-uids -v JFFS2OPTS := --little-endian --squash-uids -v
endif endif
ifeq ($(CONFIG_JFFS2_RTIME),y) ifeq ($(CONFIG_JFFS2_RTIME),y)
@ -84,7 +84,8 @@ endif
define Image/mkfs/jffs2/sub define Image/mkfs/jffs2/sub
# FIXME: removing this line will cause strange behaviour in the foreach loop below # FIXME: removing this line will cause strange behaviour in the foreach loop below
$(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(2) -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/' $(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) --pad -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(2) -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/'
$(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(2)-raw -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/'
$(call add_jffs2_mark,$(KDIR)/root.jffs2-$(2)) $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(2))
$(call Image/Build,jffs2-$(2)) $(call Image/Build,jffs2-$(2))
endef endef