Install xfce4-power-manager by default on xfce desktop (#4205)

* Install xfce4-power-manager by default on xfce desktop - remove x11 config which is obsolete and prevent dkms functinality - remove per board power manager install * Update xfce4 configs
2025-09-24 19:47:06 +07:00 · 2022-09-20 17:20:43 +02:00
parent 6b4fdfcf77
commit 4dcd053eed
17 changed files with 16 additions and 32 deletions
--- a/config/boards/bananapim64.conf
+++ b/config/boards/bananapim64.conf
@@ -4,4 +4,3 @@ BOARDFAMILY="sun50iw1"
 BOOTCONFIG_DEFAULT="sun50iw1p1_config"
 BOOTCONFIG="bananapi_m64_defconfig"
 KERNEL_TARGET="current,edge"
-PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
--- a/config/boards/clockworkpi-a06.conf
+++ b/config/boards/clockworkpi-a06.conf
@@ -4,5 +4,4 @@ BOARDFAMILY="rockchip64"
 BOOTCONFIG="clockworkpi-a06-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
-PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
 BOOT_LOGO="no"
--- a/config/boards/lime-a64.conf
+++ b/config/boards/lime-a64.conf
@@ -5,4 +5,3 @@ BOOTCONFIG_DEFAULT="sun50iw1p1_config"
 BOOTCONFIG="a64-olinuxino_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
-PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
--- a/config/boards/olimex-som204-a20.eos
+++ b/config/boards/olimex-som204-a20.eos
@@ -7,4 +7,4 @@ MODULES_EDGE="bonding g_serial gpio-ir-tx r8723bs "
 SERIALCON="ttyS0,ttyGS0"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="current,edge"
-PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager xinput-calibrator"
+PACKAGE_LIST_DESKTOP_BOARD="xinput-calibrator"
--- a/config/boards/orangepiwin.csc
+++ b/config/boards/orangepiwin.csc
@@ -3,4 +3,3 @@ BOARD_NAME="Orange Pi Win"
 BOARDFAMILY="sun50iw1"
 BOOTCONFIG="orangepi_win_defconfig"
 KERNEL_TARGET="legacy,current,edge"
-PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
--- a/config/boards/pine64.conf
+++ b/config/boards/pine64.conf
@@ -4,4 +4,3 @@ BOARDFAMILY="sun50iw1"
 BOOTCONFIG="pine64_plus_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
-PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
--- a/config/boards/pinebook-a64.csc
+++ b/config/boards/pinebook-a64.csc
@@ -4,5 +4,4 @@ BOARDFAMILY="sun50iw1"
 BOOTCONFIG="pinebook_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
-PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
 BOOT_LOGO="desktop"
--- a/config/boards/pinebook-pro.conf
+++ b/config/boards/pinebook-pro.conf
@@ -5,7 +5,6 @@ BOOTCONFIG="pinebook-pro-rk3399_defconfig"
 BOOT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb"
 KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
-PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
 BOOT_LOGO="desktop"
 BOOT_SCENARIO="blobless"
 ASOUND_STATE="asound.state.pinebook-pro"
--- a/config/boards/teres-a64.csc
+++ b/config/boards/teres-a64.csc
@@ -4,5 +4,4 @@ BOARDFAMILY="sun50iw1"
 BOOTCONFIG="teres_i_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
-PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
 BOOT_LOGO="desktop"
--- a/config/desktop/buster/environments/xfce/config_base/packages
+++ b/config/desktop/buster/environments/xfce/config_base/packages
@@ -116,6 +116,7 @@ xdg-user-dirs
 xdg-user-dirs-gtk
 xfce4
 xfce4-notifyd
+xfce4-power-manager
 xfce4-screenshooter
 xfce4-terminal
 xfonts-100dpi
--- a/config/desktop/focal/environments/xfce/config_base/packages
+++ b/config/desktop/focal/environments/xfce/config_base/packages
@@ -147,6 +147,7 @@ xdg-user-dirs
 xdg-user-dirs-gtk
 xfce4
 xfce4-notifyd
+xfce4-power-manager
 xfce4-screenshooter
 xfce4-terminal
 xfonts-100dpi
--- a/config/desktop/jammy/environments/xfce/config_base/packages
+++ b/config/desktop/jammy/environments/xfce/config_base/packages
@@ -152,6 +152,7 @@ xdg-user-dirs
 xdg-user-dirs-gtk
 xfce4
 xfce4-notifyd
+xfce4-power-manager
 xfce4-screenshooter
 xfce4-terminal
 xfonts-100dpi
--- a/config/desktop/sid/environments/xfce/config_base/packages
+++ b/config/desktop/sid/environments/xfce/config_base/packages
@@ -46,6 +46,7 @@ x11-xserver-utils
 xarchiver
 xfce4
 xfce4-notifyd
+xfce4-power-manager
 xfce4-screenshooter
 xfce4-terminal
 xfonts-base
--- a/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -36,7 +36,7 @@
          <property name="color-style" type="int" value="0"/>
          <property name="image-style" type="int" value="5"/>
          <property name="image-path" type="string" value="/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg"/>
-          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-light-3840x2160.jpg"/>
+          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg"/>
        </property>
        <property name="workspace1" type="empty">
          <property name="color-style" type="int" value="0"/>
--- a/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -51,7 +51,6 @@
    <property name="plugin-6" type="string" value="systray">
      <property name="names-visible" type="array">
        <value type="string" value="networkmanager applet"/>
-        <value type="string" value="xfce4-power-manager"/>
        <value type="string" value="pasystray"/>
      </property>
    </property>
--- a/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
+++ b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
@@ -3,17 +3,15 @@
 <channel name="xfce4-power-manager" version="1.0">
  <property name="xfce4-power-manager" type="empty">
    <property name="power-button-action" type="empty"/>
-    <property name="brightness-switch-restore-on-exit" type="int" value="-1"/>
-    <property name="brightness-switch" type="int" value="0"/>
-    <property name="show-tray-icon" type="int" value="1"/>
-    <property name="lid-action-on-battery" type="uint" value="1"/>
-    <property name="logind-handle-lid-switch" type="bool" value="false"/>
-    <property name="lid-action-on-ac" type="uint" value="0"/>
-    <property name="inactivity-sleep-mode-on-battery" type="uint" value="1"/>
-    <property name="sleep-button-action" type="uint" value="1"/>
-    <property name="hibernate-button-action" type="uint" value="1"/>
+    <property name="dpms-enabled" type="bool" value="true"/>
+    <property name="blank-on-ac" type="int" value="0"/>
    <property name="lock-screen-suspend-hibernate" type="bool" value="false"/>
-    <property name="critical-power-action" type="uint" value="4"/>
-    <property name="critical-power-level" type="uint" value="5"/>
+    <property name="logind-handle-lid-switch" type="bool" value="false"/>
+    <property name="show-tray-icon" type="bool" value="false"/>
+    <property name="general-notification" type="bool" value="true"/>
+    <property name="presentation-mode" type="bool" value="false"/>
+    <property name="lid-action-on-battery" type="uint" value="0"/>
+    <property name="lid-action-on-ac" type="uint" value="0"/>
+    <property name="handle-brightness-keys" type="bool" value="true"/>
  </property>
 </channel>
--- a/packages/bsp/common/etc/X11/xorg.conf.d/01-armbian-defaults.conf
+++ b/packages/bsp/common/etc/X11/xorg.conf.d/01-armbian-defaults.conf
@@ -1,10 +1 @@
-Section "Monitor"
-	Identifier		"Monitor0"
-	Option			"DPMS" "false"
-EndSection
-Section "ServerFlags"
-	Option			"BlankTime" "0"
-	Option			"StandbyTime" "0"
-	Option			"SuspendTime" "0"
-	Option			"OffTime" "0"
-EndSection
+# Default Armbian config