templates/steps/bootstrap/debian/debootstrap_arm.yaml in kameleon-builder-2.1.3 vs templates/steps/bootstrap/debian/debootstrap_arm.yaml in kameleon-builder-2.2.0

- old
+ new

@@ -2,29 +2,21 @@ - enable_cache: true - debootstrap: - check_cmd_out: debootstrap - check_cmd_out: qemu-arm-static - - exec_out: | - if [ $$enable_cache = true ]; then - [[ ! -f "$$rootfs_download_path/.kameleon_timestamp" ]] || CACHE_AVAILABLE=1 - fi - if [ -n $CACHE_AVAILABLE ]; then - mkdir -p $$rootfs_download_path - debootstrap --no-check-gpg --foreign --variant=minbase --arch=$$arch --include="$$include_pkg" $$release $$rootfs_download_path $$repository - QEMU_USER_PATH=$(which qemu-arm-static) - cp $QEMU_USER_PATH $$rootfs_download_path/usr/bin/qemu-arm-static - chroot $$rootfs_download_path /usr/bin/qemu-arm-static -cpu cortex-a9 /bin/sh /debootstrap/debootstrap --second-stage - echo "deb $$repository wheezy main contrib non-free" > $$rootfs_download_path/etc/apt/sources.list - chroot $$rootfs_download_path /usr/bin/qemu-arm-static -cpu cortex-a9 /bin/sh apt-get update - chroot $$rootfs_download_path /usr/bin/qemu-arm-static -cpu cortex-a9 /bin/sh apt-get install -y --force-yes vim - date +%s > $$rootfs_download_path/.kameleon_timestamp - fi - - exec_out: false - - exec_out: date +%s > $$rootfs_download_path/.kameleon_timestamp - - exec_out: cat /etc/resolv.conf > $$rootfs_download_path/etc/resolv.conf + - exec_out:| + mkdir -p $$rootfs + debootstrap --no-check-gpg --foreign --variant=minbase --arch=$$arch --include="$$include_pkg" $$release $$rootfs $$repository + QEMU_USER_PATH=$(which qemu-arm-static) + cp $QEMU_USER_PATH $$rootfs/usr/bin/qemu-arm-static + chroot $$rootfs /usr/bin/qemu-arm-static -cpu cortex-a9 /bin/sh /debootstrap/debootstrap --second-stage + echo "deb $$repository wheezy main contrib non-free" > $$rootfs/etc/apt/sources.list + chroot $$rootfs /usr/bin/qemu-arm-static -cpu cortex-a9 /bin/sh apt-get update + chroot $$rootfs /usr/bin/qemu-arm-static -cpu cortex-a9 /bin/sh apt-get install -y --force-yes vim + - exec_out: cat /etc/resolv.conf > $$rootfs/etc/resolv.conf - write_out: - - $$rootfs_download_path/etc/network/interfaces + - $$rootfs/etc/network/interfaces - | auto lo iface lo inet loopback auto eth0 iface eth0 inet dhcp