Move power manager to Pinebook (family) configuration only

This commit is contained in:
Igor Pecovnik 2017-06-06 13:37:59 +02:00
parent 3159f5126d
commit fc8b195ba6
3 changed files with 3 additions and 6 deletions

View file

@ -71,6 +71,8 @@ family_tweaks()
if [[ $BOARD == pinebook-a64 ]]; then
cp "$SRC/lib/bin/icons/pinebook-a64_bootlogo.bmp" "$CACHEDIR/$SDCARD/bootlogo.bmp"
fi
# power manager
[[ $BUILD_DESKTOP == yes && $BOARD == pinebook-a64 ]] && chroot $CACHEDIR/$SDCARD /bin/bash -c "apt-get -qq -y install xfce4-power-manager >/dev/null 2>&1"
fi
if [[ $BRANCH == dev && $BOARD == pine64so ]]; then
echo "mmc0-broken-cd=on" >> $CACHEDIR/$SDCARD/boot/armbianEnv.txt

View file

@ -120,7 +120,7 @@ PACKAGE_LIST_DESKTOP="xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-f
gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin gcj-jre-headless xfce4-screenshooter libgnome2-perl gksu bluetooth \
network-manager-gnome xfce4-notifyd gnome-keyring gcr libgck-1-0 libgcr-3-common p11-kit pasystray pavucontrol pulseaudio \
paman pavumeter pulseaudio-module-gconf pulseaudio-module-bluetooth blueman libpam-gnome-keyring libgl1-mesa-dri mpv \
libreoffice-writer libreoffice-style-tango libreoffice-gtk policykit-1 fbi xfce4-power-manager profile-sync-daemon"
libreoffice-writer libreoffice-style-tango libreoffice-gtk policykit-1 fbi profile-sync-daemon"
# Release specific packages
case $RELEASE in

View file

@ -32,11 +32,6 @@ install_desktop ()
cp -R $SRC/lib/config/desktop/. $CACHEDIR/$SDCARD/etc/skel
cp -R $SRC/lib/config/desktop/. $CACHEDIR/$SDCARD/root
# remove power manager from panel for all except pinebook
if [[ $BOARD != pinebook* ]]; then
sed -i '/xfce4-power-manager/d' $CACHEDIR/$SDCARD/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
sed -i '/xfce4-power-manager/d' $CACHEDIR/$SDCARD/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
fi
# install wallpapers
d=$CACHEDIR/$SDCARD/usr/share/backgrounds/xfce/
test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/wallpapers/armbian*.jpg "$d"