Skip to content

Commit fa89616

Browse files
committed
Put dependencies into packages, added some missing config
1 parent 424a243 commit fa89616

8 files changed

Lines changed: 31 additions & 3 deletions

File tree

Config.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ source "$BR2_EXTERNAL_BLACKHAT_PATH/package/python-nmap/Config.in"
55
source "$BR2_EXTERNAL_BLACKHAT_PATH/package/python-pywifi/Config.in"
66
source "$BR2_EXTERNAL_BLACKHAT_PATH/package/bjorn/Config.in"
77
source "$BR2_EXTERNAL_BLACKHAT_PATH/package/python-pandas/Config.in"
8+
source "$BR2_EXTERNAL_BLACKHAT_PATH/package/python-getmac/Config.in"
9+
source "$BR2_EXTERNAL_BLACKHAT_PATH/package/python-rich/Config.in"

configs/flipper_blackhat_a33_defconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ BR2_PACKAGE_PYTHON3_READLINE=y
114114
BR2_PACKAGE_PYTHON3_SQLITE=y
115115
BR2_PACKAGE_PYTHON3_XZ=y
116116
BR2_PACKAGE_PYTHON_FLASK=y
117+
BR2_PACKAGE_PYTHON_PYBIND=y
118+
BR2_PACKAGE_PYTHON_SIMPLEJSON=y
117119
BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
118120
BR2_PACKAGE_TIFF=y
119121
BR2_PACKAGE_WEBP=y
@@ -125,6 +127,7 @@ BR2_PACKAGE_LIBNDP=y
125127
BR2_PACKAGE_APR_UTIL=y
126128
BR2_PACKAGE_LIBCAP=y
127129
BR2_PACKAGE_LIBGLIB2=y
130+
BR2_PACKAGE_OPENBLAS=y
128131
BR2_PACKAGE_NEWT=y
129132
BR2_PACKAGE_GNURADIO=y
130133
BR2_PACKAGE_GR_OSMOSDR=y
@@ -205,7 +208,7 @@ BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
205208
BR2_PACKAGE_NANO=y
206209
BR2_TARGET_ROOTFS_EXT2=y
207210
BR2_TARGET_ROOTFS_EXT2_4=y
208-
BR2_TARGET_ROOTFS_EXT2_SIZE="2048M"
211+
BR2_TARGET_ROOTFS_EXT2_SIZE="1024M"
209212
BR2_TARGET_UBOOT=y
210213
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
211214
BR2_TARGET_UBOOT_CUSTOM_VERSION=y

genimage/genimage.cfg

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ image userfs.vfat {
1616
file "scripts/telegram_example.py" {
1717
image = "scripts/telegram_example.py"
1818
}
19+
file "scripts/start_bjorn.sh" {
20+
image = "scripts/start_bjorn.sh"
21+
}
22+
file "scripts/stop_bjorn.sh" {
23+
image = "scripts/stop_bjorn.sh"
24+
}
1925
files = {
2026
"readme.txt",
2127
"cmdline.txt",

genimage/post-build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ cp $CONFIG_DIR/../package/blackhat/scripts/port_scan.py $BINARIES_DIR/scripts/
1717
cp $CONFIG_DIR/../package/blackhat/scripts/data_thief.py $BINARIES_DIR/scripts/
1818
cp $CONFIG_DIR/../package/blackhat/scripts/data_loader.py $BINARIES_DIR/scripts/
1919
cp $CONFIG_DIR/../package/blackhat/scripts/telegram_example.py $BINARIES_DIR/scripts/
20+
cp $CONFIG_DIR/../package/blackhat/scripts/start_bjorn.sh $BINARIES_DIR/scripts/
21+
cp $CONFIG_DIR/../package/blackhat/scripts/stop_bjorn.sh $BINARIES_DIR/scripts/
2022

2123
rm -f $TARGET_DIR/etc/init.d/S50dropbear
2224
rm -f $TARGET_DIR/etc/init.d/S50nginx

package/bjorn/Config.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ config BR2_PACKAGE_BJORN
1313
select BR2_PACKAGE_PYTHON_LEGACY_CGI
1414
select BR2_PACKAGE_GNUTLS_OPENSSL
1515
select BR2_PACKAGE_WGET
16-
16+
select BR2_PACKAGE_PYTHON_PANDAS
17+
select BR2_PACKAGE_PYTHON_GETMAC
18+
select BR2_PACKAGE_PYTHON_RICH

package/bjorn/bjorn.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ BJORN_DEPENDENCIES = \
2323
python-pysmb \
2424
python-smbprotocol \
2525
python-sqlalchemy \
26-
python-legacy-cgi
26+
python-legacy-cgi \
27+
python-pandas \
28+
python-getmac \
29+
python-rich
2730

2831
BJORN_LICENSE = MIT
2932
BJORN_LICENSE_FILES = LICENSE
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
cd /root/bjorn/
4+
chmod +x kill_port_8000.sh
5+
./kill_port_8000.sh
6+
python Bjorn.py > /dev/null 2>&1 &
7+
echo Bjorn Started!
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
kill $(pidof python Bjorn.py)

0 commit comments

Comments
 (0)