From 267d6fac33c89dfea3917d4b0b65f0566ec0fcfc Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Thu, 30 Jan 2020 15:25:32 -0700 Subject: [PATCH] We want to build on Debian too... --- modules/live-build-config/build.sh | 14 +++++++------- runme.sh | 2 -- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/live-build-config/build.sh b/modules/live-build-config/build.sh index 16f29826..fd78f05c 100755 --- a/modules/live-build-config/build.sh +++ b/modules/live-build-config/build.sh @@ -140,13 +140,13 @@ if dpkg --compare-versions "$ver_live_build" lt 1:20151215kali1; then fi # Check we have a good debootstrap -ver_debootstrap=$(dpkg-query -f '${Version}' -W debootstrap) -if dpkg --compare-versions "$ver_debootstrap" lt "1.0.97"; then - if ! echo "$ver_debootstrap" | grep -q kali; then - echo "ERROR: You need debootstrap >= 1.0.97 (or a Kali patched debootstrap). Your current version: $ver_debootstrap" >&2 - exit 1 - fi -fi +#ver_debootstrap=$(dpkg-query -f '${Version}' -W debootstrap) +#if dpkg --compare-versions "$ver_debootstrap" lt "1.0.97"; then +# if ! echo "$ver_debootstrap" | grep -q kali; then +# echo "ERROR: You need debootstrap >= 1.0.97 (or a Kali patched debootstrap). Your current version: $ver_debootstrap" >&2 +# exit 1 +# fi +#fi # We need root rights at some point if [ "$(whoami)" != "root" ]; then diff --git a/runme.sh b/runme.sh index 2c2fecde..df7fd895 100755 --- a/runme.sh +++ b/runme.sh @@ -64,8 +64,6 @@ fi #This is the stuff that's common to both distros rm -rf build mkdir build -git submodule init -git submodule update apt install git build-essential cdebootstrap live-build debian-cd curl wget -y cd ./debs bash get-debs.sh