Added support for running on aarch64 (issue #21)

fO-000 · Apr 22, 2022 · a233bb9 · a233bb9
1 parent 63ff2c7
commit a233bb9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -3,6 +3,7 @@ $(info machine: $(shell uname -m))
 PROJECT_NAME := $(shell basename `pwd`)
 MICROBIT_BIN = ./build/bbc-microbit-classic-gcc/src/firmware/bluescan-advsniff-combined.hex
 MICROBIT_PATH = /media/${USER}/MICROBIT
+NETHUNTER_ROOT = /data/local/nhsystem/kali-arm64
 
 TWINE_PROXY := HTTPS_PROXY=http://localhost:7890
 
@@ -50,3 +51,10 @@ microbit-purge:
 .PHONY: release
 release:
 	$(TWINE_PROXY) twine upload dist/*.whl dist/*.tar.gz
+
+
+.PHONY: push
+push:
+	@adb push dist/*.whl /sdcard/Download/
+	@adb shell su -c mv /sdcard/Download/*.whl $(NETHUNTER_ROOT)/root/Desktop/temp
+	@scp dist/*.whl Raspberry-Pi-4-via-Local-Ethernet:~/Desktop/temp
diff --git a/README-cn.md b/README-cn.md
@@ -13,7 +13,7 @@
 </p>
 
 <p align="center">
-    <img src="https://img.shields.io/badge/Tested%20on-Ubuntu%2021.10%20(x64)%20%7C%20Kali%202022.1%20(x64)-brightgreen">
+    <img src="https://img.shields.io/badge/Tested%20on-Ubuntu%2021.10%20(x64)%20%7C%20Kali%202022.1%20(x64)%20%7C%20Kali%20on%20Raspberry%20Pi%204%202022.1%20(aarch64)-brightgreen">
 </p>
 
 > 本项目由 Sourcell Xu（杭州安恒信息 海特实验室）维护。

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 </p>
 
 <p align="center">
-    <img src="https://img.shields.io/badge/Tested%20on-Ubuntu%2021.10%20(x64)%20%7C%20Kali%202022.1%20(x64)-brightgreen">
+    <img src="https://img.shields.io/badge/Tested%20on-Ubuntu%2021.10%20(x64)%20%7C%20Kali%202022.1%20(x64)%20%7C%20Kali%20on%20Raspberry%20Pi%204%202022.1%20(aarch64)-brightgreen">
 </p>
 
 > This project is maintained by Sourcell Xu from DBAPP Security HatLab.

diff --git a/setup.cfg b/setup.cfg
@@ -29,12 +29,12 @@ package_dir =
 packages = find:
 python_requires = >=3.9
 install_requires =
-    xpycommon >= 0.0.7
-    pyclui >= 0.0.13
-    bthci >= 0.0.24
-    btsmp >= 0.0.6
-    btatt >= 0.0.8
-    btgatt >= 0.0.12
+    xpycommon >= 0.0.8
+    pyclui >= 0.0.14
+    bthci >= 0.0.25
+    btsmp >= 0.0.7
+    btatt >= 0.0.9
+    btgatt >= 0.0.13
     bluepy >= 1.3.0
     halo >= 0.0.31
     docopt >= 0.6.2

diff --git a/src/bluescan/__init__.py b/src/bluescan/__init__.py
@@ -11,7 +11,7 @@
 logger = Logger(__name__, logging.INFO)
 
 PROJECT_NAME = 'bluescan'
-VERSION = '0.7.4'
+VERSION = '0.8.0'
 
 PKG_ROOT = Path(__file__).parent