From 5b315f887568607e63b73ffb174ab5d537466cef Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Mon, 14 Oct 2019 10:25:50 +0200 Subject: [PATCH] Clone and checkout is not needed anymore The version of git installed in tinycore is now 2.18.0. Thre's no need to clone and checkout anymore. Leaving depth option that also implies single-branch. Change-Id: I077b687241a5862f4753065d4de9bc062d886005 --- tinyipa/build-tinyipa.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tinyipa/build-tinyipa.sh b/tinyipa/build-tinyipa.sh index 7060745..5ede966 100755 --- a/tinyipa/build-tinyipa.sh +++ b/tinyipa/build-tinyipa.sh @@ -17,9 +17,8 @@ CHROOT_CMD="sudo chroot $BUILDDIR /usr/bin/env -i PATH=$CHROOT_PATH http_proxy=$ TC=1001 STAFF=50 -# NOTE(moshele): Git < 1.7.10 requires a separate checkout, see LP #1590912 -function clone_and_checkout { - git clone $1 $2 --depth=1 --branch $3; cd $2; git checkout $3; cd - +function clone_single_branch { + git clone --branch $3 --depth=1 $1 $2 } echo "Building tinyipa:" @@ -59,9 +58,9 @@ mkdir "$BUILDDIR" sudo sh -c "echo $TINYCORE_MIRROR_URL > $BUILDDIR/opt/tcemirror" # Download TGT, Qemu-utils, Biosdevname and IPMItool source -clone_and_checkout "https://github.com/fujita/tgt.git" "${BUILDDIR}/tmp/tgt" "v1.0.79" -clone_and_checkout "https://github.com/qemu/qemu.git" "${BUILDDIR}/tmp/qemu" "v3.1.1" -clone_and_checkout "https://github.com/lyonel/lshw.git" "${BUILDDIR}/tmp/lshw" "B.02.18" +clone_single_branch "https://github.com/fujita/tgt.git" "${BUILDDIR}/tmp/tgt" "v1.0.79" +clone_single_branch "https://github.com/qemu/qemu.git" "${BUILDDIR}/tmp/qemu" "v3.1.1" +clone_single_branch "https://github.com/lyonel/lshw.git" "${BUILDDIR}/tmp/lshw" "B.02.18" if $TINYIPA_REQUIRE_BIOSDEVNAME; then wget -N -O - https://linux.dell.com/biosdevname/biosdevname-0.7.2/biosdevname-0.7.2.tar.gz | tar -xz -C "${BUILDDIR}/tmp" -f - fi