Merge branch 'master' of 88.198.237.222:/git/m1-debian

diff --git a/bootstrap.sh b/bootstrap.sh
index f5800105d2be71d3edcbcc51b925cd358b0dcd05..ba03c1aad67100b02fa14763ac5bd838235984a8 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -100,7 +100,7 @@ build_live_stick()
 )
 }
 
-build_fs()
+build_dd()
 {
 (
         rm -f media
@@ -161,5 +161,5 @@ build_linux
 build_rootfs
 build_live_stick
 build_di_stick
-build_fs
+build_dd
 upload_artefacts

diff --git a/fwx.sh b/fwx.sh
index 1aa6812c35f9231543a929a9b8c18deeb7e79c81..f017df04f3965806b69f633687d573e907cd8657 100644 (file)
--- a/fwx.sh
+++ b/fwx.sh
@@ -7,9 +7,8 @@ export LANG=C
 
 export DYLD_LIBRARY_PATH=$PWD/Frameworks/Python.framework/Versions/Current/lib
 export DYLD_FRAMEWORK_PATH=$PWD/Frameworks
-python=Frameworks/Python.framework/Versions/3.9/bin/python3.9
 export SSL_CERT_FILE=$PWD/Frameworks/Python.framework/Versions/Current/etc/openssl/cert.pem
-export PATH="$PWD/bin:$PATH"
+export PATH="$PWD/Frameworks/Python.framework/Versions/3.9/bin:$PATH"
 
 python3 -m firmware.wifi /usr/share/firmware/wifi /tmp/linux-firmware.tar