From: Thomas Glanzmann Date: Wed, 2 Feb 2022 12:25:18 +0000 (+0100) Subject: Merge branch 'master' of 88.198.237.222:/git/m1-debian X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/ab1a2650708e8f4b1a3856e69b45f79adc68ad9c?hp=fa9f7dc9149673fc5035ab6209343890d248486a Merge branch 'master' of 88.198.237.222:/git/m1-debian --- diff --git a/bootstrap.sh b/bootstrap.sh index f580010..ba03c1a 100644 --- 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 1aa6812..f017df0 100644 --- 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