diff --git a/external/cache/debs/extra/jammy-utils/hostapd_2.10-6~armbian22.02.3+1_arm64.deb b/external/cache/debs/extra/jammy-utils/hostapd_2.10-6~armbian22.02.3+1_arm64.deb new file mode 100644 index 0000000..004c6a0 Binary files /dev/null and b/external/cache/debs/extra/jammy-utils/hostapd_2.10-6~armbian22.02.3+1_arm64.deb differ diff --git a/external/cache/debs/extra/jammy-utils/hostapd_2.9-102~armbian20.11.0-trunk+1_arm64.deb b/external/cache/debs/extra/jammy-utils/hostapd_2.9-102~armbian20.11.0-trunk+1_arm64.deb deleted file mode 100755 index ac6edba..0000000 Binary files a/external/cache/debs/extra/jammy-utils/hostapd_2.9-102~armbian20.11.0-trunk+1_arm64.deb and /dev/null differ diff --git a/external/config/sources/families/include/sunxi64_common.inc b/external/config/sources/families/include/sunxi64_common.inc index 64e649d..284b8e3 100644 --- a/external/config/sources/families/include/sunxi64_common.inc +++ b/external/config/sources/families/include/sunxi64_common.inc @@ -27,7 +27,7 @@ family_tweaks() # execute specific tweaks function if present [[ $(type -t family_tweaks_s) == function ]] && family_tweaks_s #cp $SRC/packages/blobs/splash/orangepi-u-boot-24.bmp $SDCARD/boot/boot.bmp - + #if [[ $BOARD == orangepizero2 ]]; then # install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/xfce4-zorinmenulite-plugin_1.1.2_arm64.deb" @@ -38,6 +38,15 @@ family_tweaks() # install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/dockbarx-theme-zorin_1.1.0_all.deb" # #install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/scratch-desktop_3.26.0_arm64.deb" #fi + + if [[ $BOARD =~ orangepi3-lts|orangepizero2|orangepizero2-b|orangepizero2-lts ]]; then + + [[ $RELEASE == bookworm ]] && dpkg_install_deb_chroot "$EXTER/cache/debs/extra/${RELEASE}-utils/wpasupplicant_2.10-9_arm64.deb" + [[ $RELEASE == jammy ]] && dpkg_install_deb_chroot "$EXTER/cache/debs/extra/${RELEASE}-utils/wpasupplicant_2.10-6_arm64.deb" + + rm $SDCARD/root/*.deb >/dev/null 2>&1 + fi + } write_uboot_platform() diff --git a/external/config/sources/families/sun50iw6.conf b/external/config/sources/families/sun50iw6.conf index bf8a639..b6e6af8 100644 --- a/external/config/sources/families/sun50iw6.conf +++ b/external/config/sources/families/sun50iw6.conf @@ -73,15 +73,9 @@ family_tweaks_s() fi - if [[ $BOARD == orangepi3-lts ]]; then - - [[ $RELEASE == bookworm ]] && dpkg_install_deb_chroot "$EXTER/cache/debs/extra/${RELEASE}-utils/wpasupplicant_2.10-9_arm64.deb" - [[ $RELEASE == jammy ]] && dpkg_install_deb_chroot "$EXTER/cache/debs/extra/${RELEASE}-utils/wpasupplicant_2.10-6_arm64.deb" - - rm $SDCARD/root/*.deb >/dev/null 2>&1 - fi } + family_tweaks_bsp() { : diff --git a/scripts/chroot-buildpackages.sh b/scripts/chroot-buildpackages.sh index db2af5d..72d9fd5 100755 --- a/scripts/chroot-buildpackages.sh +++ b/scripts/chroot-buildpackages.sh @@ -435,4 +435,6 @@ chroot_installpackages() EOF chmod +x "${SDCARD}"/tmp/install.sh chroot "${SDCARD}" /bin/bash -c "/tmp/install.sh" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 + + [[ -f ${SDCARD}/etc/hostapd.conf ]] && sed -i "s/^ssid=.*/ssid=OrangePi/" ${SDCARD}/etc/hostapd.conf } #############################################################################