Merge pull request #2793 from RichNeese/pinebook-pro-build-fix

fixing pine book pro builds
This commit is contained in:
lanefu 2021-04-25 10:39:55 -04:00 committed by GitHub
commit d4fa3b0372
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 21 deletions

View file

@ -1,11 +1,14 @@
# install custom xorg for pinebook-pro
cp -R "${SRC}"/packages/bsp/pinebook-pro/xorg.conf "${destination}"/etc/X11/xorg.conf.d/
mkdir -p "${destination}"/etc/X11/
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
mkdir -p $destination/etc/X11/xorg.conf.d/
# 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/
#keyboard hwdb
mkdir -p $destination/etc/udev/hwdb.d/
cp $SRC/packages/bsp/pinebook-pro/10-usb-kbd.hwdb $destination/etc/udev/hwdb.d/

View file

@ -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/

View file

@ -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/