mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-02 07:57:43 +00:00
jffs2: convert to ROOTFS_TARGET infrastructure
We also remove the BR2_TARGET_ROOTFS_JFFS2_OUTPUT option, that could be used to specify an alternate name for the generated image file. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
208d06abf9
commit
bd36a7273a
@ -114,8 +114,4 @@ config BR2_TARGET_ROOTFS_JFFS2_SUMMARY
|
|||||||
A summarised image can be mounted faster if support is
|
A summarised image can be mounted faster if support is
|
||||||
enabled in the kernel (CONFIG_JFFS2_SUMMARY)
|
enabled in the kernel (CONFIG_JFFS2_SUMMARY)
|
||||||
|
|
||||||
config BR2_TARGET_ROOTFS_JFFS2_OUTPUT
|
|
||||||
string "Output File"
|
|
||||||
default "$(IMAGE).jffs2"
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -32,55 +32,30 @@ JFFS2_OPTS += -n
|
|||||||
SUMTOOL_OPTS += -n
|
SUMTOOL_OPTS += -n
|
||||||
endif
|
endif
|
||||||
|
|
||||||
JFFS2_TARGET := $(call qstrip,$(BR2_TARGET_ROOTFS_JFFS2_OUTPUT))
|
|
||||||
ifneq ($(TARGET_DEVICE_TABLE),)
|
ifneq ($(TARGET_DEVICE_TABLE),)
|
||||||
JFFS2_OPTS += -D $(TARGET_DEVICE_TABLE)
|
JFFS2_OPTS += -D $(TARGET_DEVICE_TABLE)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ROOTFS_JFFS2_DEPENDENCIES = host-mtd
|
||||||
|
|
||||||
#
|
|
||||||
# mtd-host is a dependency which builds a local copy of mkfs.jffs2 if it is needed.
|
|
||||||
# the actual build is done from package/mtd/mtd.mk and it sets the
|
|
||||||
# value of MKFS_JFFS2 to either the previously installed copy or the one
|
|
||||||
# just built.
|
|
||||||
#
|
|
||||||
$(JFFS2_TARGET): host-fakeroot host-mtd makedevs
|
|
||||||
# Use fakeroot to pretend all target binaries are owned by root
|
|
||||||
rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
|
|
||||||
touch $(BUILD_DIR)/.fakeroot.00000
|
|
||||||
cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
|
|
||||||
echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
|
|
||||||
ifneq ($(TARGET_DEVICE_TABLE),)
|
|
||||||
# Use fakeroot to pretend to create all needed device nodes
|
|
||||||
echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
|
|
||||||
>> $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
|
|
||||||
endif
|
|
||||||
# Use fakeroot so mkfs.jffs2 believes the previous fakery
|
|
||||||
ifneq ($(BR2_TARGET_ROOTFS_JFFS2_SUMMARY),)
|
ifneq ($(BR2_TARGET_ROOTFS_JFFS2_SUMMARY),)
|
||||||
echo "$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $(JFFS2_TARGET).nosummary && " \
|
define ROOTFS_JFFS2_CMD
|
||||||
"$(SUMTOOL) $(SUMTOOL_OPTS) -i $(JFFS2_TARGET).nosummary -o $(JFFS2_TARGET) && " \
|
$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $$@.nosummary && \
|
||||||
"rm $(JFFS2_TARGET).nosummary" \
|
$(SUMTOOL) $(SUMTOOL_OPTS) -i $$@.nosummary -o $$@ && \
|
||||||
>> $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
|
rm $$@.nosummary
|
||||||
|
endef
|
||||||
else
|
else
|
||||||
echo "$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $(JFFS2_TARGET)" \
|
define ROOTFS_JFFS2_CMD
|
||||||
>> $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
|
$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $$@
|
||||||
|
endef
|
||||||
endif
|
endif
|
||||||
chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
|
|
||||||
$(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
|
define JFFS2_GEN_SREC
|
||||||
-@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
|
$(TARGET_CROSS)objcopy -I binary -O srec --adjust-vma 0xa1000000 $$@ $$@.srec
|
||||||
@ls -l $(JFFS2_TARGET)
|
endef
|
||||||
|
|
||||||
ifeq ($(BR2_JFFS2_TARGET_SREC),y)
|
ifeq ($(BR2_JFFS2_TARGET_SREC),y)
|
||||||
$(TARGET_CROSS)objcopy -I binary -O srec --adjust-vma 0xa1000000 $(JFFS2_TARGET) $(JFFS2_TARGET).srec
|
ROOTFS_JFFS2_POST_GEN_HOOKS += JFFS2_GEN_SREC
|
||||||
@ls -l $(JFFS2_TARGET).srec
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
jffs2root: $(JFFS2_TARGET)
|
$(eval $(call ROOTFS_TARGET,jffs2))
|
||||||
|
|
||||||
#############################################################
|
|
||||||
#
|
|
||||||
# Toplevel Makefile options
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
ifeq ($(BR2_TARGET_ROOTFS_JFFS2),y)
|
|
||||||
TARGETS+=jffs2root
|
|
||||||
endif
|
|
Loading…
x
Reference in New Issue
Block a user