Skip to content
Snippets Groups Projects
Commit 9048e09d authored by Christopher Spinrath's avatar Christopher Spinrath
Browse files

$RSYNC eingeführt und -v Flag entfernt (von rsync Aufrufen)

parent a09b7c99
No related branches found
No related tags found
No related merge requests found
...@@ -18,6 +18,8 @@ ifeq ($(ARCH),i686) ...@@ -18,6 +18,8 @@ ifeq ($(ARCH),i686)
ALTARCH=i386 ALTARCH=i386
endif endif
RSYNC=rsync -a --progress
define archdir = define archdir =
$(WORKSPACE)/$1 $(WORKSPACE)/$1
endef endef
...@@ -163,12 +165,12 @@ rootfs_deduplicate $(COMMON_DIR)$(STATE_DIR)/rootfs_deduplicated: $(PRIMARY_ARCH ...@@ -163,12 +165,12 @@ rootfs_deduplicate $(COMMON_DIR)$(STATE_DIR)/rootfs_deduplicated: $(PRIMARY_ARCH
"$(PRIMARY_ARCH_DIR)$(CHECKSUMS)" "$(SECONDARY_ARCH_DIR)$(CHECKSUMS)" > "$(COMMON_DIR)$(CHECKSUMS)" || true "$(PRIMARY_ARCH_DIR)$(CHECKSUMS)" "$(SECONDARY_ARCH_DIR)$(CHECKSUMS)" > "$(COMMON_DIR)$(CHECKSUMS)" || true
cut -d" " -f3- "$(COMMON_DIR)$(CHECKSUMS)" > "$(COMMON_DIR)/common_files.list" cut -d" " -f3- "$(COMMON_DIR)$(CHECKSUMS)" > "$(COMMON_DIR)/common_files.list"
$(info Copying common files...) $(info Copying common files...)
rsync -av --files-from="$(COMMON_DIR)/common_files.list" "$(PRIMARY_ARCH_DIR)$(ROOTFS)/" "$(COMMON_DIR)/lip-common" $(RSYNC) --files-from="$(COMMON_DIR)/common_files.list" "$(PRIMARY_ARCH_DIR)$(ROOTFS)/" "$(COMMON_DIR)/lip-common"
$(info Copying $(PRIMARY_ARCH) files...) $(info Copying $(PRIMARY_ARCH) files...)
rsync -av "$(PRIMARY_ARCH_DIR)$(ROOTFS)/" "$(COMMON_DIR)/lip-$(PRIMARY_ARCH)" $(RSYNC) "$(PRIMARY_ARCH_DIR)$(ROOTFS)/" "$(COMMON_DIR)/lip-$(PRIMARY_ARCH)"
cd "$(COMMON_DIR)/lip-$(PRIMARY_ARCH)" && tr \\n \\0 < "$(COMMON_DIR)/common_files.list" | xargs -0 rm cd "$(COMMON_DIR)/lip-$(PRIMARY_ARCH)" && tr \\n \\0 < "$(COMMON_DIR)/common_files.list" | xargs -0 rm
$(info Copying $(SECONDARY_ARCH) files...) $(info Copying $(SECONDARY_ARCH) files...)
rsync -av "$(SECONDARY_ARCH_DIR)$(ROOTFS)/" "$(COMMON_DIR)/lip-$(SECONDARY_ARCH)" $(RSYNC) "$(SECONDARY_ARCH_DIR)$(ROOTFS)/" "$(COMMON_DIR)/lip-$(SECONDARY_ARCH)"
cd "$(COMMON_DIR)/lip-$(SECONDARY_ARCH)" && tr \\n \\0 < "$(COMMON_DIR)/common_files.list" | xargs -0 rm cd "$(COMMON_DIR)/lip-$(SECONDARY_ARCH)" && tr \\n \\0 < "$(COMMON_DIR)/common_files.list" | xargs -0 rm
touch "$(COMMON_DIR)$(STATE_DIR)/rootfs_deduplicated" touch "$(COMMON_DIR)$(STATE_DIR)/rootfs_deduplicated"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment