Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -7,7 +7,8 @@
|
||||
ROOTFS_CLOOP_DEPENDENCIES = host-cloop host-cdrkit
|
||||
|
||||
define ROOTFS_CLOOP_CMD
|
||||
$(HOST_DIR)/usr/bin/genisoimage -r $(TARGET_DIR) | $(HOST_DIR)/usr/bin/create_compressed_fs - 65536 > $@
|
||||
$(HOST_DIR)/usr/bin/genisoimage -r $(TARGET_DIR) | \
|
||||
$(HOST_DIR)/usr/bin/create_compressed_fs - 65536 > $@
|
||||
endef
|
||||
|
||||
$(eval $(call ROOTFS_TARGET,cloop))
|
||||
$(eval $(call ROOTFS_TARGET,cloop))
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
# In terms of configuration option, this macro assumes that the
|
||||
# BR2_TARGET_ROOTFS_$(FSTYPE) config option allows to enable/disable
|
||||
# the generation of a filesystem image of a particular type. If
|
||||
# configura options BR2_TARGET_ROOTFS_$(FSTYPE)_GZIP,
|
||||
# the configuration options BR2_TARGET_ROOTFS_$(FSTYPE)_GZIP,
|
||||
# BR2_TARGET_ROOTFS_$(FSTYPE)_BZIP2 or
|
||||
# BR2_TARGET_ROOTFS_$(FSTYPE)_LZMA exist and are enabled, then the
|
||||
# macro will automatically generate a compressed filesystem image.
|
||||
@@ -76,22 +76,26 @@ $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES)
|
||||
rm -f $$(FAKEROOT_SCRIPT)
|
||||
rm -f $$(TARGET_DIR_WARNING_FILE)
|
||||
rm -f $$(USERS_TABLE)
|
||||
echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT)
|
||||
echo "set -e" >> $$(FAKEROOT_SCRIPT)
|
||||
echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
|
||||
ifneq ($$(ROOTFS_USERS_TABLES),)
|
||||
cat $$(ROOTFS_USERS_TABLES) >> $$(USERS_TABLE)
|
||||
endif
|
||||
printf '$$(subst $$(sep),\n,$$(PACKAGES_USERS))' >> $$(USERS_TABLE)
|
||||
$$(call PRINTF,$$(PACKAGES_USERS)) >> $$(USERS_TABLE)
|
||||
PATH=$$(BR_PATH) $$(TOPDIR)/support/scripts/mkusers $$(USERS_TABLE) $$(TARGET_DIR) >> $$(FAKEROOT_SCRIPT)
|
||||
ifneq ($$(ROOTFS_DEVICE_TABLES),)
|
||||
cat $$(ROOTFS_DEVICE_TABLES) > $$(FULL_DEVICE_TABLE)
|
||||
ifeq ($$(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
|
||||
printf '$$(subst $$(sep),\n,$$(PACKAGES_DEVICES_TABLE))' >> $$(FULL_DEVICE_TABLE)
|
||||
$$(call PRINTF,$$(PACKAGES_DEVICES_TABLE)) >> $$(FULL_DEVICE_TABLE)
|
||||
endif
|
||||
printf '$$(subst $$(sep),\n,$$(PACKAGES_PERMISSIONS_TABLE))' >> $$(FULL_DEVICE_TABLE)
|
||||
$$(call PRINTF,$$(PACKAGES_PERMISSIONS_TABLE)) >> $$(FULL_DEVICE_TABLE)
|
||||
echo "$$(HOST_DIR)/usr/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
|
||||
endif
|
||||
echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT)
|
||||
$$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\
|
||||
echo "echo '$$(TERM_BOLD)>>> Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \
|
||||
echo $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep))
|
||||
$$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT)
|
||||
chmod a+x $$(FAKEROOT_SCRIPT)
|
||||
PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
|
||||
$$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE)
|
||||
|
||||
@@ -39,8 +39,8 @@ ROOTFS_JFFS2_DEPENDENCIES = host-mtd
|
||||
|
||||
ifneq ($(BR2_TARGET_ROOTFS_JFFS2_SUMMARY),)
|
||||
define ROOTFS_JFFS2_CMD
|
||||
$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $@.nosummary && \
|
||||
$(SUMTOOL) $(SUMTOOL_OPTS) -i $@.nosummary -o $@ && \
|
||||
$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $@.nosummary
|
||||
$(SUMTOOL) $(SUMTOOL_OPTS) -i $@.nosummary -o $@
|
||||
rm $@.nosummary
|
||||
endef
|
||||
else
|
||||
|
||||
@@ -26,8 +26,7 @@ endif
|
||||
|
||||
define ROOTFS_SQUASHFS_CMD
|
||||
$(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $@ -noappend \
|
||||
$(ROOTFS_SQUASHFS_ARGS) && \
|
||||
chmod 0644 $@
|
||||
$(ROOTFS_SQUASHFS_ARGS)
|
||||
endef
|
||||
|
||||
$(eval $(call ROOTFS_TARGET,squashfs))
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS))
|
||||
|
||||
define ROOTFS_TAR_CMD
|
||||
tar -c$(TAR_OPTS)f $@ --numeric-owner -C $(TARGET_DIR) .
|
||||
tar $(TAR_OPTS) -cf $@ --numeric-owner -C $(TARGET_DIR) .
|
||||
endef
|
||||
|
||||
$(eval $(call ROOTFS_TARGET,tar))
|
||||
|
||||
@@ -21,9 +21,9 @@ UBINIZE_CONFIG_FILE_PATH = fs/ubifs/ubinize.cfg
|
||||
endif
|
||||
|
||||
define ROOTFS_UBI_CMD
|
||||
$(INSTALL) -m 0644 $(UBINIZE_CONFIG_FILE_PATH) $(BUILD_DIR)/ubinize.cfg ;\
|
||||
$(SED) 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' $(BUILD_DIR)/ubinize.cfg ;\
|
||||
$(HOST_DIR)/usr/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg ;\
|
||||
$(INSTALL) -m 0644 $(UBINIZE_CONFIG_FILE_PATH) $(BUILD_DIR)/ubinize.cfg
|
||||
$(SED) 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' $(BUILD_DIR)/ubinize.cfg
|
||||
$(HOST_DIR)/usr/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg
|
||||
rm $(BUILD_DIR)/ubinize.cfg
|
||||
endef
|
||||
|
||||
|
||||
Reference in New Issue
Block a user