From c064c11b475712fb3d4792c682aff9c6e17bf0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sun, 18 Jul 2021 15:41:58 +0200 Subject: [PATCH] Remove duplicated entries for Pinebook PRO bsp creation (#3031) * Remove duplicated entries for Pinebook PRO bsp creation * Link only CLI and desktop BSP package per board * Adjust " --- .../debian/armbian-bsp-desktop/prepare.sh | 8 +- lib/desktop.sh | 1 + .../pinebook-pro/xfce4-keyboard-shortcuts.xml | 185 ------------------ .../bsp/pinebook-pro/xfce4-power-manager.xml | 19 -- 4 files changed, 4 insertions(+), 209 deletions(-) delete mode 100644 packages/bsp/pinebook-pro/xfce4-keyboard-shortcuts.xml delete mode 100644 packages/bsp/pinebook-pro/xfce4-power-manager.xml diff --git a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh b/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh index 41e9b8ee31..43534504ab 100755 --- a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh +++ b/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh @@ -1,5 +1,3 @@ -# powerconfig, touchpad, and special keys -mkdir -p $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ -cp $SRC/packages/bsp/pinebook-pro/xfce4-power-manager.xml $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ -cp $SRC/packages/bsp/pinebook-pro/pointers.xml $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ -cp $SRC/packages/bsp/pinebook-pro/xfce4-keyboard-shortcuts.xml $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ +# special keys +mkdir -p "$(destination)"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ +cp $SRC/packages/bsp/pinebook-pro/pointers.xml "$(destination)"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ diff --git a/lib/desktop.sh b/lib/desktop.sh index dee4d19c6e..0e328c19ad 100644 --- a/lib/desktop.sh +++ b/lib/desktop.sh @@ -132,6 +132,7 @@ create_bsp_desktop_package () Section: xorg Priority: optional Provides: armbian-bsp-desktop, armbian-bsp-desktop-${BOARD} + Depends: ${BSP_CLI_PACKAGE_NAME} Description: Armbian Board Specific Packages for desktop users using $ARCH ${BOARD} machines EOF diff --git a/packages/bsp/pinebook-pro/xfce4-keyboard-shortcuts.xml b/packages/bsp/pinebook-pro/xfce4-keyboard-shortcuts.xml deleted file mode 100644 index d8ed64be34..0000000000 --- a/packages/bsp/pinebook-pro/xfce4-keyboard-shortcuts.xml +++ /dev/null @@ -1,185 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/bsp/pinebook-pro/xfce4-power-manager.xml b/packages/bsp/pinebook-pro/xfce4-power-manager.xml deleted file mode 100644 index 48d0d0cede..0000000000 --- a/packages/bsp/pinebook-pro/xfce4-power-manager.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - -