From 1a6fbd19e4dfbd29d9ea0ebe8578a407ba241b2b Mon Sep 17 00:00:00 2001 From: Richard Neese Date: Fri, 23 Apr 2021 10:07:06 -0400 Subject: [PATCH] fixing pine book pro builds --- .../armbian/create_desktop_package.sh | 5 +++-- .../xfce/armbian/create_desktop_package.sh | 6 +++--- .../families/include/rockchip64_common.inc | 16 ---------------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/_all_environments/armbian/create_desktop_package.sh b/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/_all_environments/armbian/create_desktop_package.sh index 99c4057f13..3f40efe828 100644 --- a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/_all_environments/armbian/create_desktop_package.sh +++ b/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/_all_environments/armbian/create_desktop_package.sh @@ -1,8 +1,9 @@ # install custom xorg for pinebook-pro -cp -R "${SRC}"/packages/bsp/pinebook-pro/xorg.conf "${destination}"/etc/X11/xorg.conf.d/ +cp -R "${SRC}"/packages/bsp/pinebook-pro/xorg.conf "${destination}"/etc/X11/ + # install custom asound state for pinebook-pro -cp -R "${SRC}"/packages/asound.state/ "${destination}"/etc/ +cp -R "${SRC}"/packages/blobs/asound.state/asound.state.pinebook-pro "${destination}"/etc/ ## touchpad and keyboard tweaks # from https://github.com/ayufan-rock64/linux-package/tree/master/root-pinebookpro diff --git a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/armbian/create_desktop_package.sh b/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/armbian/create_desktop_package.sh index 355908f17a..ff0a034834 100644 --- a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/armbian/create_desktop_package.sh +++ b/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/armbian/create_desktop_package.sh @@ -1,4 +1,4 @@ # powerconfig, touchpad, and special keys -cp $SRC/packages/bsp/pinebook-pro/xfce4-power-manager.xml ${SDCARD}/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ -cp $SRC/packages/bsp/pinebook-pro/pointers.xml ${SDCARD}/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ -cp $SRC/packages/bsp/pinebook-pro/xfce4-keyboard-shortcuts.xml ${SDCARD}/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/ diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index b656b2f031..d2f7d5ab15 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -371,22 +371,6 @@ family_tweaks_bsp() fi fi - if [[ $BOARD == pinebook-pro ]]; then - - ## accelerated X - cp $SRC/packages/bsp/pinebook-pro/xorg.conf $destination/etc/X11/ - ## touchpad and keyboard tweaks - # from https://github.com/ayufan-rock64/linux-package/tree/master/root-pinebookpro - cp $SRC/packages/bsp/pinebook-pro/40-pinebookpro-touchpad.conf $destination/etc/X11/xorg.conf.d/ - mkdir -p $destination/etc/udev/hwdb.d/ - cp $SRC/packages/bsp/pinebook-pro/10-usb-kbd.hwdb $destination/etc/udev/hwdb.d/ - ## brightness and power management defaults - mkdir -p $destination/usr/local/share/xdg/xfce4/xfconf/xfce-perchannel-xml/ - cp $SRC/packages/bsp/pinebook-pro/xfce4-power-manager.xml $destination/usr/local/share/xdg/xfce4/xfconf/xfce-perchannel-xml/ - ## additional keyboard configs in lib/desktop.sh - - fi - if [[ $BOARD == helios64 ]]; then mkdir -p $destination/etc/udev/rules.d/