From a3f325947f56a5c0d1107757f5ae58a5007affd5 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Tue, 22 Mar 2016 21:37:18 +0300 Subject: [PATCH 1/2] Faster check for git presence in compile.sh --- compile.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compile.sh b/compile.sh index 5dd49fa801..da40e12a0f 100755 --- a/compile.sh +++ b/compile.sh @@ -73,7 +73,9 @@ fi #-------------------------------------------------------------------------------------------------------------------------------- # Get updates of the main build libraries #-------------------------------------------------------------------------------------------------------------------------------- -apt-get -qq -y --no-install-recommends install git +[[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' git 2>/dev/null) != *ii* ]] && \ + apt-get -qq -y --no-install-recommends install git + if [[ ! -d $SRC/lib ]]; then git clone https://github.com/igorpecovnik/lib fi @@ -101,4 +103,4 @@ fi # If you are committing new version of this file, increment VERSION # Only integers are supported -# VERSION=14 +# VERSION=15 From fecfc1061a860d22c6571610d13273b59784b1c3 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Tue, 22 Mar 2016 22:28:03 +0300 Subject: [PATCH 2/2] Prevent writing u-boot to connected SD card on host --- boards.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards.sh b/boards.sh index a5eb1022a1..e340287bd1 100644 --- a/boards.sh +++ b/boards.sh @@ -220,7 +220,7 @@ install_kernel (){ # install uboot display_alert "Install u-boot" "$CHOSEN_UBOOT" "info" - chroot $CACHEDIR/sdcard /bin/bash -c "dpkg -i /tmp/${CHOSEN_UBOOT}_${REVISION}_armhf.deb > /dev/null" + chroot $CACHEDIR/sdcard /bin/bash -c "DEVICE=/dev/null dpkg -i /tmp/${CHOSEN_UBOOT}_${REVISION}_armhf.deb > /dev/null" # install headers display_alert "Install headers" "$HEADERS_TMP" "info"