From 162c07bb25579ce7e5cdc8fa1b6b6a3aa1cdc73b Mon Sep 17 00:00:00 2001 From: Daniel Schulte <trilader@gmail.com> Date: Fri, 26 Sep 2014 16:01:22 +0200 Subject: [PATCH] Bugfix: Rsync oder Make ignorieren #foo nicht. $(RYNC) -> $(RSYNC) --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5ef7b43..3ba93c5 100644 --- a/Makefile +++ b/Makefile @@ -224,8 +224,8 @@ image_binary_files: image_git_pull $(IMAGE_BINARIES) "$(PRIMARY_ARCH_DIR)$(ISO_CONTENT)/EFI" \ "$(PRIMARY_ARCH_DIR)$(ISO_CONTENT)/preseed" \ "$(PRIMARY_ARCH_DIR)$(ISO_CONTENT)/.disk" \ - "$(IMAGE_DIR)/"#<-- rsync target - $(RYNC) "$(SECONDARY_ARCH_DIR)$(ISO_CONTENT)/.disk/casper-uuid-generic" "$(IMAGE_DIR)/.disk/casper-uuid-generic-$(SECONDARY_ARCH)" + "$(IMAGE_DIR)/" + $(RSYNC) "$(SECONDARY_ARCH_DIR)$(ISO_CONTENT)/.disk/casper-uuid-generic" "$(IMAGE_DIR)/.disk/casper-uuid-generic-$(SECONDARY_ARCH)" mkdir -p "$(IMAGE_DIR)/casper" $(RSYNC) --progress "$(COMMON_DIR)/lip-common.squashfs" \ "$(COMMON_DIR)/lip-$(PRIMARY_ARCH).squashfs" \ @@ -233,7 +233,7 @@ image_binary_files: image_git_pull $(IMAGE_BINARIES) "$(PRIMARY_ARCH_DIR)$(ISO_CONTENT)/casper/filesystem.manifest" \ "$(PRIMARY_ARCH_DIR)$(ISO_CONTENT)/casper/filesystem.manifest-remove" \ "$(PRIMARY_ARCH_DIR)/filesystem.size" \ - "$(IMAGE_DIR)/casper/"#<-- rsync target + "$(IMAGE_DIR)/casper/" $(RSYNC) "$(PRIMARY_ARCH_DIR)$(INITRD_TARGET)" "$(IMAGE_DIR)/casper/initrd-$(PRIMARY_ARCH).lz" $(RSYNC) "$(SECONDARY_ARCH_DIR)$(INITRD_TARGET)" "$(IMAGE_DIR)/casper/initrd-$(SECONDARY_ARCH).lz" cd "$(PRIMARY_ARCH_DIR)$(ROOTFS)" && $(RSYNC) -L vmlinuz "$(IMAGE_DIR)/casper/vmlinuz-$(PRIMARY_ARCH)" -- GitLab