Changeset 5904 in /cluster/svnroot


Ignore:
Timestamp:
Feb 23, 2017 11:26:33 PM (4 years ago)
Author:
skylar
Message:

use pbzip2 re #997

Location:
bccd-ng/branches/skylar/bccd-3.4.0-build_ng
Files:
2 edited

Legend:

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

    r5903 r5904  
    3232debootstrap:
    3333        # Script will either create a new debootstrap (if executing a debootstrap project) or extract the imported
    34         # debootstrap.tar artifact
     34        # debootstrap.tar.bz2 artifact
    3535        "$(WORKSPACE)"/bin/prepare_debootstrap
    3636
    37 target/debootstrap-bccd.tar: target/bccd.noarch.deb debootstrap
     37target/debootstrap-bccd.tar.bz2: target/bccd.noarch.deb debootstrap
    3838        /bin/cp -v "$<" "$(WORKSPACE)/debootstrap/tmp"
    3939        "$(WORKSPACE)/bin/bccd_install_pkgs"
    40         /bin/tar -C "$(WORKSPACE)" -cf "$@" debootstrap
     40        # Using pbzip2 takes a couple minutes but saves 50% / 2+GB of space
     41        /bin/tar -C "$(WORKSPACE)" -cf - debootstrap | nice /usr/bin/pbzip2 -c > "$(@)"
    4142
    42 target/debootstrap.tar: debootstrap
    43         /bin/tar -C "$(WORKSPACE)" -cf "$(@)" "$<"
     43target/debootstrap.tar.bz2: debootstrap
     44        /bin/tar -C "$(WORKSPACE)" -cf - "$<" | nice /usr/bin/pbzip2 -c > "$(@)"
    4445
    4546iso/live/initrd.img: debootstrap
     
    5152        /bin/cp "$(WORKSPACE)/debootstrap/boot/vmlinuz-$(KERN_REV)" "$(WORKSPACE)/$@"
    5253
    53 iso/live/filesystem.squashfs: target/debootstrap-bccd.tar
     54iso/live/filesystem.squashfs: target/debootstrap-bccd.tar.bz2
    5455        /usr/local/bin/mksquashfs \
    5556                "$<" \
  • bccd-ng/branches/skylar/bccd-3.4.0-build_ng/bin/prepare_debootstrap

    r5896 r5904  
    1313
    1414DBS_DIR="${WORKSPACE}/debootstrap"
    15 DBS_TAR="${WORKSPACE}/target/debootstrap.tar"
     15DBS_TAR="${WORKSPACE}/target/debootstrap.tar.bz2"
    1616
    1717if [[ ! -d "${DBS_DIR}" ]]; then
     
    2727        http://debmirror.cluster.earlham.edu
    2828elif [[ -r "${DBS_TAR}" ]]; then
    29     tar -C "${WORKSPACE}" -xf "${DBS_TAR}"
     29    nice pbzip2 -dc "${DBS_TAR}" | tar -C "${WORKSPACE}" -xf -
    3030else
    3131    echo "No valid action available!" >&2
Note: See TracChangeset for help on using the changeset viewer.