diff --git a/external/config/desktop/bionic/appgroups/browsers/orangepi/create_desktop_package.sh b/external/config/desktop/bionic/appgroups/browsers/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/bionic/appgroups/browsers/orangepi/create_desktop_package.sh rename to external/config/desktop/bionic/appgroups/browsers/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/bionic/environments/xfce/orangepi/create_desktop_package.sh b/external/config/desktop/bionic/environments/xfce/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/bionic/environments/xfce/orangepi/create_desktop_package.sh rename to external/config/desktop/bionic/environments/xfce/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/bionic/environments/xfce/debian/orangepi-bsp-desktop/postinst b/external/config/desktop/bionic/environments/xfce/debian/bananapi-bsp-desktop/postinst similarity index 100% rename from external/config/desktop/bionic/environments/xfce/debian/orangepi-bsp-desktop/postinst rename to external/config/desktop/bionic/environments/xfce/debian/bananapi-bsp-desktop/postinst diff --git a/external/config/desktop/bionic/environments/xfce/debian/orangepi-bsp-desktop/prepare.sh b/external/config/desktop/bionic/environments/xfce/debian/bananapi-bsp-desktop/prepare.sh similarity index 100% rename from external/config/desktop/bionic/environments/xfce/debian/orangepi-bsp-desktop/prepare.sh rename to external/config/desktop/bionic/environments/xfce/debian/bananapi-bsp-desktop/prepare.sh diff --git a/external/config/desktop/bookworm/environments/gnome/orangepi b/external/config/desktop/bookworm/environments/gnome/bananapi similarity index 100% rename from external/config/desktop/bookworm/environments/gnome/orangepi rename to external/config/desktop/bookworm/environments/gnome/bananapi diff --git a/external/config/desktop/bookworm/environments/mate/orangepi/create_desktop_package.sh b/external/config/desktop/bookworm/environments/mate/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/bookworm/environments/mate/orangepi/create_desktop_package.sh rename to external/config/desktop/bookworm/environments/mate/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/bookworm/environments/xfce/orangepi/create_desktop_package.sh b/external/config/desktop/bookworm/environments/xfce/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/bookworm/environments/xfce/orangepi/create_desktop_package.sh rename to external/config/desktop/bookworm/environments/xfce/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/bullseye/environments/gnome/orangepi b/external/config/desktop/bullseye/environments/gnome/bananapi similarity index 100% rename from external/config/desktop/bullseye/environments/gnome/orangepi rename to external/config/desktop/bullseye/environments/gnome/bananapi diff --git a/external/config/desktop/bullseye/environments/xfce/orangepi/create_desktop_package.sh b/external/config/desktop/bullseye/environments/xfce/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/bullseye/environments/xfce/orangepi/create_desktop_package.sh rename to external/config/desktop/bullseye/environments/xfce/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/buster/appgroups/browsers/orangepi/create_desktop_package.sh b/external/config/desktop/buster/appgroups/browsers/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/buster/appgroups/browsers/orangepi/create_desktop_package.sh rename to external/config/desktop/buster/appgroups/browsers/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/buster/environments/gnome/orangepi/create_desktop_package.sh b/external/config/desktop/buster/environments/gnome/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/buster/environments/gnome/orangepi/create_desktop_package.sh rename to external/config/desktop/buster/environments/gnome/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/buster/environments/lxde/orangepi/create_desktop_package.sh b/external/config/desktop/buster/environments/lxde/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/buster/environments/lxde/orangepi/create_desktop_package.sh rename to external/config/desktop/buster/environments/lxde/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/buster/environments/mate/orangepi/create_desktop_package.sh b/external/config/desktop/buster/environments/mate/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/buster/environments/mate/orangepi/create_desktop_package.sh rename to external/config/desktop/buster/environments/mate/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/buster/environments/xfce/orangepi/create_desktop_package.sh b/external/config/desktop/buster/environments/xfce/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/buster/environments/xfce/orangepi/create_desktop_package.sh rename to external/config/desktop/buster/environments/xfce/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/focal/appgroups/browsers/orangepi/create_desktop_package.sh b/external/config/desktop/focal/appgroups/browsers/ bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/focal/appgroups/browsers/orangepi/create_desktop_package.sh rename to external/config/desktop/focal/appgroups/browsers/ bananapi/create_desktop_package.sh diff --git a/external/config/desktop/focal/environments/budgie/orangepi/create_desktop_package.sh b/external/config/desktop/focal/environments/budgie/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/focal/environments/budgie/orangepi/create_desktop_package.sh rename to external/config/desktop/focal/environments/budgie/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/focal/environments/cinnamon/orangepi/create_desktop_package.sh b/external/config/desktop/focal/environments/cinnamon/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/focal/environments/cinnamon/orangepi/create_desktop_package.sh rename to external/config/desktop/focal/environments/cinnamon/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/focal/environments/deepin/orangepi/create_desktop_package.sh b/external/config/desktop/focal/environments/deepin/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/focal/environments/deepin/orangepi/create_desktop_package.sh rename to external/config/desktop/focal/environments/deepin/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/focal/environments/enlightenment/orangepi/create_desktop_package.sh b/external/config/desktop/focal/environments/enlightenment/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/focal/environments/enlightenment/orangepi/create_desktop_package.sh rename to external/config/desktop/focal/environments/enlightenment/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/focal/environments/gnome/orangepi/create_desktop_package.sh b/external/config/desktop/focal/environments/gnome/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/focal/environments/gnome/orangepi/create_desktop_package.sh rename to external/config/desktop/focal/environments/gnome/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/focal/environments/i3-wm/orangepi/create_desktop_package.sh b/external/config/desktop/focal/environments/i3-wm/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/focal/environments/i3-wm/orangepi/create_desktop_package.sh rename to external/config/desktop/focal/environments/i3-wm/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/focal/environments/kde-plasma/orangepi/create_desktop_package.sh b/external/config/desktop/focal/environments/kde-plasma/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/focal/environments/kde-plasma/orangepi/create_desktop_package.sh rename to external/config/desktop/focal/environments/kde-plasma/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/focal/environments/mate/orangepi/create_desktop_package.sh b/external/config/desktop/focal/environments/mate/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/focal/environments/mate/orangepi/create_desktop_package.sh rename to external/config/desktop/focal/environments/mate/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/focal/environments/xfce/orangepi/create_desktop_package.sh b/external/config/desktop/focal/environments/xfce/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/focal/environments/xfce/orangepi/create_desktop_package.sh rename to external/config/desktop/focal/environments/xfce/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/focal/environments/xfce/debian/orangepi-bsp-desktop/postinst b/external/config/desktop/focal/environments/xfce/debian/bananapi-bsp-desktop/postinst similarity index 100% rename from external/config/desktop/focal/environments/xfce/debian/orangepi-bsp-desktop/postinst rename to external/config/desktop/focal/environments/xfce/debian/bananapi-bsp-desktop/postinst diff --git a/external/config/desktop/focal/environments/xfce/debian/orangepi-bsp-desktop/prepare.sh b/external/config/desktop/focal/environments/xfce/debian/bananapi-bsp-desktop/prepare.sh similarity index 100% rename from external/config/desktop/focal/environments/xfce/debian/orangepi-bsp-desktop/prepare.sh rename to external/config/desktop/focal/environments/xfce/debian/bananapi-bsp-desktop/prepare.sh diff --git a/external/config/desktop/focal/environments/xmonad/orangepi/create_desktop_package.sh b/external/config/desktop/focal/environments/xmonad/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/focal/environments/xmonad/orangepi/create_desktop_package.sh rename to external/config/desktop/focal/environments/xmonad/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/jammy/appgroups/browsers/orangepi/create_desktop_package.sh b/external/config/desktop/jammy/appgroups/browsers/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/jammy/appgroups/browsers/orangepi/create_desktop_package.sh rename to external/config/desktop/jammy/appgroups/browsers/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/jammy/environments/gnome/orangepi/create_desktop_package.sh b/external/config/desktop/jammy/environments/gnome/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/jammy/environments/gnome/orangepi/create_desktop_package.sh rename to external/config/desktop/jammy/environments/gnome/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/jammy/environments/kde-plasma/orangepi/create_desktop_package.sh b/external/config/desktop/jammy/environments/kde-plasma/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/jammy/environments/kde-plasma/orangepi/create_desktop_package.sh rename to external/config/desktop/jammy/environments/kde-plasma/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/jammy/environments/xfce/orangepi/create_desktop_package.sh b/external/config/desktop/jammy/environments/xfce/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/jammy/environments/xfce/orangepi/create_desktop_package.sh rename to external/config/desktop/jammy/environments/xfce/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/jammy/environments/xfce/debian/orangepi-bsp-desktop/postinst b/external/config/desktop/jammy/environments/xfce/debian/bananapi/postinst similarity index 100% rename from external/config/desktop/jammy/environments/xfce/debian/orangepi-bsp-desktop/postinst rename to external/config/desktop/jammy/environments/xfce/debian/bananapi/postinst diff --git a/external/config/desktop/jammy/environments/xfce/debian/orangepi-bsp-desktop/prepare.sh b/external/config/desktop/jammy/environments/xfce/debian/bananapi/prepare.sh similarity index 100% rename from external/config/desktop/jammy/environments/xfce/debian/orangepi-bsp-desktop/prepare.sh rename to external/config/desktop/jammy/environments/xfce/debian/bananapi/prepare.sh diff --git a/external/config/desktop/sid/appgroups/browsers/orangepi/create_desktop_package.sh b/external/config/desktop/sid/appgroups/browsers/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/sid/appgroups/browsers/orangepi/create_desktop_package.sh rename to external/config/desktop/sid/appgroups/browsers/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/sid/environments/gnome/orangepi/create_desktop_package.sh b/external/config/desktop/sid/environments/gnome/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/sid/environments/gnome/orangepi/create_desktop_package.sh rename to external/config/desktop/sid/environments/gnome/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/sid/environments/lxde/orangepi/create_desktop_package.sh b/external/config/desktop/sid/environments/lxde/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/sid/environments/lxde/orangepi/create_desktop_package.sh rename to external/config/desktop/sid/environments/lxde/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/sid/environments/mate/orangepi/create_desktop_package.sh b/external/config/desktop/sid/environments/mate/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/sid/environments/mate/orangepi/create_desktop_package.sh rename to external/config/desktop/sid/environments/mate/bananapi/create_desktop_package.sh diff --git a/external/config/desktop/sid/environments/xfce/orangepi/create_desktop_package.sh b/external/config/desktop/sid/environments/xfce/bananapi/create_desktop_package.sh similarity index 100% rename from external/config/desktop/sid/environments/xfce/orangepi/create_desktop_package.sh rename to external/config/desktop/sid/environments/xfce/bananapi/create_desktop_package.sh diff --git a/external/config/fex/orangepizero.fex b/external/config/fex/bpi-m4berry.fex similarity index 99% rename from external/config/fex/orangepizero.fex rename to external/config/fex/bpi-m4berry.fex index 5cc8c18..ff7d1be 100755 --- a/external/config/fex/orangepizero.fex +++ b/external/config/fex/bpi-m4berry.fex @@ -1,6 +1,6 @@ [product] version = "100" -machine = "Xunlong Orange Pi Zero" +machine = "Banana Pi BPI-M4 Berry" [platform] debug_mode = 1 diff --git a/external/config/optional/boards/orangepi3b/_packages/bsp-cli/usr/bin/hciattach_opi b/external/config/optional/boards/bpi-m4berry/_packages/bsp-cli/usr/bin/hciattach_bpi similarity index 100% rename from external/config/optional/boards/orangepi3b/_packages/bsp-cli/usr/bin/hciattach_opi rename to external/config/optional/boards/bpi-m4berry/_packages/bsp-cli/usr/bin/hciattach_bpi diff --git a/external/config/optional/boards/orangepi4-lts/_packages/bsp-cli/usr/bin/hciattach_opi b/external/config/optional/boards/orangepi4-lts/_packages/bsp-cli/usr/bin/hciattach_opi deleted file mode 100755 index 6766016..0000000 Binary files a/external/config/optional/boards/orangepi4-lts/_packages/bsp-cli/usr/bin/hciattach_opi and /dev/null differ diff --git a/external/config/optional/boards/orangepi4/_packages/bsp-cli/usr/bin/brcm_patchram_plus b/external/config/optional/boards/orangepi4/_packages/bsp-cli/usr/bin/brcm_patchram_plus deleted file mode 100755 index 488ec25..0000000 Binary files a/external/config/optional/boards/orangepi4/_packages/bsp-cli/usr/bin/brcm_patchram_plus and /dev/null differ diff --git a/external/config/optional/boards/orangepi4/_packages/bsp-cli/usr/bin/hciattach_opi b/external/config/optional/boards/orangepi4/_packages/bsp-cli/usr/bin/hciattach_opi deleted file mode 100755 index 6766016..0000000 Binary files a/external/config/optional/boards/orangepi4/_packages/bsp-cli/usr/bin/hciattach_opi and /dev/null differ diff --git a/external/config/optional/boards/orangepi400/_config/desktop/_all_distributions/environments/xfce/debian/orangepi-bsp-desktop/postinst b/external/config/optional/boards/orangepi400/_config/desktop/_all_distributions/environments/xfce/debian/orangepi-bsp-desktop/postinst deleted file mode 100644 index f262746..0000000 --- a/external/config/optional/boards/orangepi400/_config/desktop/_all_distributions/environments/xfce/debian/orangepi-bsp-desktop/postinst +++ /dev/null @@ -1,2 +0,0 @@ -sed -i '/xfdesktop/a ' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml -sed -i '/xfdesktop/a ' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml diff --git a/external/config/optional/boards/orangepi400/_packages/bsp-cli/usr/bin/hciattach_opi b/external/config/optional/boards/orangepi400/_packages/bsp-cli/usr/bin/hciattach_opi deleted file mode 100755 index 2012b12..0000000 Binary files a/external/config/optional/boards/orangepi400/_packages/bsp-cli/usr/bin/hciattach_opi and /dev/null differ diff --git a/external/config/optional/boards/orangepi400/_packages/bsp-desktop/usr/bin/capslock.sh b/external/config/optional/boards/orangepi400/_packages/bsp-desktop/usr/bin/capslock.sh deleted file mode 100755 index fe83093..0000000 --- a/external/config/optional/boards/orangepi400/_packages/bsp-desktop/usr/bin/capslock.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -sleep 0.35 -if [[ $(xset q | grep "Caps Lock" | cut -d " " -f10) == off ]]; -then - #notify-send -i keyboard "Caps Lock" "Off"; - echo 0 > /sys/class/leds/caps_led/brightness -else - #notify-send -i keyboard "Caps Lock" "On"; - echo 1 > /sys/class/leds/caps_led/brightness -fi diff --git a/external/config/optional/boards/orangepi400/_packages/bsp-desktop/usr/bin/numlock.sh b/external/config/optional/boards/orangepi400/_packages/bsp-desktop/usr/bin/numlock.sh deleted file mode 100755 index dbd3e99..0000000 --- a/external/config/optional/boards/orangepi400/_packages/bsp-desktop/usr/bin/numlock.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -sleep 0.35 -if [[ $(xset q | grep "Num Lock" | cut -d ":" -f5) == *off* ]]; -then - #notify-send -i keyboard "Num Lock" "Off"; - echo 0 > /sys/class/leds/num_led/brightness -else - #notify-send -i keyboard "Num Lock" "On"; - echo 1 > /sys/class/leds/num_led/brightness -fi diff --git a/external/config/optional/boards/orangepi800/_config/desktop/_all_distributions/environments/xfce/debian/orangepi-bsp-desktop/postinst b/external/config/optional/boards/orangepi800/_config/desktop/_all_distributions/environments/xfce/debian/orangepi-bsp-desktop/postinst deleted file mode 100644 index f262746..0000000 --- a/external/config/optional/boards/orangepi800/_config/desktop/_all_distributions/environments/xfce/debian/orangepi-bsp-desktop/postinst +++ /dev/null @@ -1,2 +0,0 @@ -sed -i '/xfdesktop/a ' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml -sed -i '/xfdesktop/a ' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml diff --git a/external/config/optional/boards/orangepi800/_packages/bsp-cli/usr/bin/hciattach_opi b/external/config/optional/boards/orangepi800/_packages/bsp-cli/usr/bin/hciattach_opi deleted file mode 100755 index 6766016..0000000 Binary files a/external/config/optional/boards/orangepi800/_packages/bsp-cli/usr/bin/hciattach_opi and /dev/null differ diff --git a/external/config/optional/boards/orangepi800/_packages/bsp-desktop/usr/bin/capslock.sh b/external/config/optional/boards/orangepi800/_packages/bsp-desktop/usr/bin/capslock.sh deleted file mode 100755 index fe83093..0000000 --- a/external/config/optional/boards/orangepi800/_packages/bsp-desktop/usr/bin/capslock.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -sleep 0.35 -if [[ $(xset q | grep "Caps Lock" | cut -d " " -f10) == off ]]; -then - #notify-send -i keyboard "Caps Lock" "Off"; - echo 0 > /sys/class/leds/caps_led/brightness -else - #notify-send -i keyboard "Caps Lock" "On"; - echo 1 > /sys/class/leds/caps_led/brightness -fi diff --git a/external/config/optional/boards/orangepi800/_packages/bsp-desktop/usr/bin/numlock.sh b/external/config/optional/boards/orangepi800/_packages/bsp-desktop/usr/bin/numlock.sh deleted file mode 100755 index dbd3e99..0000000 --- a/external/config/optional/boards/orangepi800/_packages/bsp-desktop/usr/bin/numlock.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -sleep 0.35 -if [[ $(xset q | grep "Num Lock" | cut -d ":" -f5) == *off* ]]; -then - #notify-send -i keyboard "Num Lock" "Off"; - echo 0 > /sys/class/leds/num_led/brightness -else - #notify-send -i keyboard "Num Lock" "On"; - echo 1 > /sys/class/leds/num_led/brightness -fi diff --git a/external/config/optional/boards/orangepicm4/_packages/bsp-cli/usr/bin/hciattach_opi b/external/config/optional/boards/orangepicm4/_packages/bsp-cli/usr/bin/hciattach_opi deleted file mode 100755 index 6766016..0000000 Binary files a/external/config/optional/boards/orangepicm4/_packages/bsp-cli/usr/bin/hciattach_opi and /dev/null differ diff --git a/output/debug/logs-18_10_2023-09_45_19.tgz b/output/debug/logs-18_10_2023-09_45_19.tgz new file mode 100644 index 0000000..a72018c Binary files /dev/null and b/output/debug/logs-18_10_2023-09_45_19.tgz differ diff --git a/output/debug/output.log b/output/debug/output.log index f1e7062..56ed5ce 100644 --- a/output/debug/output.log +++ b/output/debug/output.log @@ -1,3 +1,3 @@ -Displaying message: ERROR in function source ./build.sh:305 -> scripts/main.sh:223 -> scripts/general.sh:0 err -Displaying message: Board configuration does not define valid kernel config err +Displaying message: ERROR in function source ./build.sh:305 -> scripts/main.sh:177 -> scripts/general.sh:0 err +Displaying message: No option selected err Displaying message: Process terminated info diff --git a/output/debug/timestamp b/output/debug/timestamp index a48689b..6093630 100644 --- a/output/debug/timestamp +++ b/output/debug/timestamp @@ -1 +1 @@ -18_10_2023-09_45_19 +18_10_2023-10_10_58