Use sbc packages, and clean up the package list

common.d/packages.sh

@@ -9,30 +9,23 @@ minimal_pkgs="ca-certificates iw network-manager parted sudo wpasupplicant"
 
 # This is the list of minimal common packages
 common_min_pkgs="$minimal_pkgs apt-transport-https command-not-found \
-firmware-atheros firmware-libertas firmware-linux firmware-realtek fontconfig \
-ifupdown initramfs-tools kali-defaults kali-tweaks man-db mlocate net-tools \
+fontconfig ifupdown kali-defaults kali-tweaks man-db mlocate net-tools \
 netcat-traditional pciutils psmisc rfkill screen snmp snmpd tftp tmux unrar \
 usbutils vim wireless-regdb zerofree zsh zsh-autosuggestions \
 zsh-syntax-highlighting"
 
 # This is the list of common packages
-common_pkgs="$minimal_pkgs apt-transport-https bluez bluez-firmware dialog \
-ifupdown initramfs-tools inxi kali-linux-core libnss-systemd man-db mlocate \
-net-tools network-manager pciutils psmisc rfkill screen snmp snmpd tftp \
-triggerhappy unrar usbutils whiptail wireless-regdb zerofree"
+common_pkgs="$minimal_pkgs apt-transport-https dialog \
+ifupdown inxi kali-linux-core libnss-systemd man-db mlocate net-tools \
+network-manager pciutils psmisc rfkill screen snmp snmpd tftp \
+triggerhappy usbutils whiptail zerofree"
 
 services="apache2 atftpd openvpn ssh tightvncserver"
 
-# This is the list of minimal cli based tools
-cli_min_tools="aircrack-ng cewl crunch dnsrecon dnsutils ethtool exploitdb \
-hydra john libnfc-bin medusa metasploit-framework mfoc ncrack nmap \
-passing-the-hash proxychains recon-ng sqlmap tcpdump theharvester tor tshark \
-whois windows-binaries winexe wpscan"
-
 extra_custom_pkgs=""
 
 # This is the list of most cli based tools
-cli_tools_pkgs="kali-linux-arm"
+cli_tools_pkgs="kali-linux-headless"
 
 # Desktop packages to install
 case $desktop in
@@ -48,11 +41,7 @@ esac
 # Installed kernel sources when using a kernel that isn't packaged.
 custom_kernel_pkgs="bc bison libssl-dev"
 
-rpi_pkgs="fake-hwclock ntpdate u-boot-tools"
-
-# Packages specific to the boards and using the GPIO on it
-gpio_pkgs="i2c-tools python3-configobj python3-pip python3-requests \
-python3-rpi.gpio python3-smbus"
+rpi_pkgs="kali-sbc-raspberrypi"
 
 # Add swap packages
 if [ "$swap" = yes ]; then
@@ -67,7 +56,7 @@ packages="$common_pkgs $cli_tools_pkgs $services $extra_custom_pkgs"
 
 # Do not add re4son_pkgs to this list, as we do not have his repo added when these are installed
 if [[ "$hw_model" == *rpi* ]]; then
-    extra+=" $gpio_pkgs $rpi_pkgs"
+    extra+="$rpi_pkgs"
 
 fi
 
@@ -75,12 +64,11 @@ if [ "$minimal" = "1" ]; then
     image_mode="minimal"
 
     if [ "$slim" = "1" ]; then
-        cli_min_tools=""
         image_mode="slim"
-        packages="$common_min_pkgs $cli_min_tools ssh"
+        packages="$common_min_pkgs ssh"
 
     else
-        packages="$common_min_pkgs $cli_min_tools $services $extra_custom_pkgs"
+        packages="$common_min_pkgs $services $extra_custom_pkgs"
 
     fi
 
@@ -93,9 +81,8 @@ third_stage_pkgs="binutils ca-certificates console-common console-setup curl \
 git libterm-readline-gnu-perl locales wget"
 
 # Re4son packages
-re4son_pkgs="bluetooth bluez bluez-firmware kalipi-bootloader kalipi-config \
-kalipi-kernel kalipi-kernel-headers kalipi-re4son-firmware kalipi-tft-config \
-pi-bluetooth"
+re4son_pkgs="kalipi-bootloader kalipi-kernel kalipi-kernel-headers \
+kalipi-re4son-firmware"
 
 # PiTail specific packages
 pitail_pkgs="bluelog blueranger bluesnarfer bluez-tools bridge-utils cmake \

common.d/radxa_zero.sh

@@ -15,8 +15,8 @@ basic_network
 
 # Third stage
 cat <<EOF >>"${work_dir}"/third-stage
-status_stage3 'Install u-boot tools'
-eatmydata apt-get install -y u-boot-menu u-boot-tools
+status_stage3 'Install kali-sbc package'
+eatmydata apt-get install -y kali-sbc-amlogic
 
 # We need "file" for the kernel scripts we run, and it won't be installed if you pass --slim
 # So we always make sure it's installed. Also, for hdmi audio, we need to run commands

nanopi-neo-plus2.sh

@@ -26,7 +26,7 @@ add_interface eth0
 # Third stage
 cat <<EOF >>"${work_dir}"/third-stage
 status_stage3 'Install kernel and bootloader packages'
-eatmydata apt-get install -y linux-image-arm64 u-boot-menu u-boot-sunxi firmware-brcm80211
+eatmydata apt-get install -y kali-sbc-allwinner linux-image-arm64 firmware-brcm80211
 
 # Note: This just creates an empty /boot/extlinux/extlinux.conf for us to use
 # later.

odroid-c2.sh

@@ -34,7 +34,7 @@ mkdir -p /etc/X11/xorg.conf.d
 cp -p /bsp/xorg/20-meson.conf /etc/X11/xorg.conf.d/
 
 status_stage3 'Install the kernel packages'>
-eatmydata apt-get install -y dkms linux-image-arm64 u-boot-menu
+eatmydata apt-get install -y dkms kali-sbc-amlogic linux-image-arm64
 
 # We will replace this later, via sed, to point to the correct root partition (hopefully?)
 status_stage3 'Run u-boot-update to generate the extlinux.conf file'

pinebook-pro.sh

@@ -30,10 +30,7 @@ cat <<EOF >>"${work_dir}"/third-stage
 # We use the one that armbian has in their repository at
 # https://github.com/armbian/firmware/
 # It uses the 43456 files.
-eatmydata apt-get install -y dkms linux-image-arm64 u-boot-menu u-boot-rockchip
-
-status_stage3 'Install bluez for bluetooth'
-eatmydata apt-get install -y bluez bluez-firmware
+eatmydata apt-get install -y dkms kali-sbc-rockchip linux-image-arm64
 
 status_stage3 'Touchpad settings'
 mkdir -p /etc/X11/xorg.conf.d/

pinebook.sh

@@ -34,7 +34,7 @@ status_stage3 'Copy rpi services'
 cp -p /bsp/services/rpi/*.service /etc/systemd/system/
 
 status_stage3 'Install the kernel packages'
-eatmydata apt-get install -y dkms linux-headers-arm64 linux-image-arm64 u-boot-menu u-boot-sunxi
+eatmydata apt-get install -y dkms kali-sbc-allwinner linux-headers-arm64 linux-image-arm64
 
 # Note: This just creates an empty /boot/extlinux/extlinux.conf for us to use
 # later.