Changeset 5898 in /cluster/svnroot


Ignore:
Timestamp:
Feb 20, 2017 7:39:35 PM (4 years ago)
Author:
skylar
Message:

change install-deb to target/debootstrap-bccd.tar re #997

File:
1 edited

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/skylar/bccd-3.4.0-build_ng/Makefile

    r5897 r5898  
    99export KERN_REV         :=      4.0.0bccd
    1010
    11 .PHONY: install-iso install-deb
     11.PHONY: install-iso
    1212
    1313build:
     
    3939        "$(WORKSPACE)"/bin/prepare_debootstrap
    4040
    41 install-deb: target/bccd.noarch.deb debootstrap
     41target/debootstrap-bccd.tar: debootstrap target/bccd.noarch.deb
    4242        /bin/cp -v "$<" "$(WORKSPACE)/debootstrap/tmp"
    4343        "$(WORKSPACE)/bin/bccd_install_pkgs"
     44        /bin/tar -C "$(WORKSPACE)" -cf "$@" "$<"
    4445
    4546target/debootstrap.tar: debootstrap
     
    4849iso/live/initrd.img: debootstrap
    4950        /usr/bin/sudo /usr/sbin/chroot "$(WORKSPACE)/debootstrap" mkinitramfs \
    50                 -o /boot/initrd-$(KERN_REV).diskless $(KERN_REV)
     51                -o "/boot/initrd-$(KERN_REV).diskless" "$(KERN_REV)"
    5152        /bin/cp "$(WORKSPACE)/debootstrap/boot/initrd-$(KERN_REV).diskless" "$(WORKSPACE)/$@"
    5253
     
    5455        /bin/cp "$(WORKSPACE)/debootstrap/boot/vmlinuz-$(KERN_REV)" "$(WORKSPACE)/$@"
    5556
    56 iso/live/filesystem.squashfs: install-deb
     57iso/live/filesystem.squashfs: target/debootstrap-bccd.tar
    5758        /usr/local/bin/mksquashfs \
    58                 $< \
    59                 $@ \
     59                "$<" \
     60                "$@" \
    6061                -comp xz
    6162
     
    8384# Copy the MD5 file target, and the associaetd ISO file, to ISO_INSTALL_DIR
    8485ifdef ISO_INSTALL_DIR
    85                 /bin/cp -v $< $(patsubst %.md5,,$<) $(ISO_INSTALL_DIR)
     86                /bin/cp -v "$<" $(patsubst %.md5,,"$<") "$(ISO_INSTALL_DIR)"
    8687endif
Note: See TracChangeset for help on using the changeset viewer.