From a46eeafa8672a080fbba4e9d49eaca11ff5246e6 Mon Sep 17 00:00:00 2001 From: lanefu Date: Mon, 19 Jul 2021 02:14:34 -0400 Subject: [PATCH] move pinebook tweaks (#3033) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * move pinebook tweaks * fix dest * Add also special keys definitions * Clear out tech dept * Delete prepare.sh Co-authored-by: Igor Pečovnik --- .../debian/armbian-bsp-desktop/prepare.sh | 5 --- .../debian/armbian-bsp-desktop/prepare.sh | 16 --------- .../debian/armbian-bsp-desktop/prepare.sh | 3 -- .../families/include/rockchip64_common.inc | 36 +++++++++++++------ lib/makeboarddeb.sh | 11 ------ 5 files changed, 25 insertions(+), 46 deletions(-) delete mode 100755 config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh delete mode 100755 config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh delete mode 100755 config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh diff --git a/config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh b/config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh deleted file mode 100755 index 88727b83b7..0000000000 --- a/config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh +++ /dev/null @@ -1,5 +0,0 @@ -mkdir -p "${destination}"/etc/ -cp -R "${SRC}"/packages/blobs/asound.state/ "${destination}"/etc/ - -mkdir -p "${destination}"/etc/X11/ -cp -R "${SRC}"/packages/bsp/rk3399/xorg.conf "${destination}"/etc/X11/ diff --git a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh b/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh deleted file mode 100755 index dc0832fd6c..0000000000 --- a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/_all_environments/debian/armbian-bsp-desktop/prepare.sh +++ /dev/null @@ -1,16 +0,0 @@ -# install custom xorg for pinebook-pro -mkdir -p "${destination}"/etc/X11/ -cp -R "${SRC}"/packages/bsp/pinebook-pro/xorg.conf "${destination}"/etc/X11/ - -# install custom asound state for pinebook-pro -mkdir -p "${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/ 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 deleted file mode 100755 index 43534504ab..0000000000 --- a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh +++ /dev/null @@ -1,3 +0,0 @@ -# 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/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index b59d97af8f..dc4e80b54d 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -359,17 +359,6 @@ family_tweaks() fi - if [[ $BOARD == pinebook-pro ]]; then - - chroot $SDCARD /bin/bash -c "echo SuspendState=freeze >> /etc/systemd/sleep.conf" - chroot $SDCARD /bin/bash -c "echo HandlePowerKey=ignore >> /etc/systemd/login.d" - fi - - if [[ $BOARD == station* ]]; then - - cp -R $SRC/packages/blobs/rtl8723bt_fw/* $SDCARD/lib/firmware/rtl_bt/ - - fi } @@ -447,6 +436,31 @@ family_tweaks_bsp() fi + if [[ $BOARD == pinebook-pro ]]; then + + chroot $SDCARD /bin/bash -c "echo SuspendState=freeze >> /etc/systemd/sleep.conf" + chroot $SDCARD /bin/bash -c "echo HandlePowerKey=ignore >> /etc/systemd/login.d" + + # 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/ + + # 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/ + fi + + if [[ $BOARD == station* ]]; then + + cp -R "${SRC}/packages/blobs/rtl8723bt_fw/*" "${destination}/lib/firmware/rtl_bt/" + + fi + # Graphics and media mkdir -p $destination/etc/udev/rules.d cp $SRC/packages/bsp/rk3399/50-mali.rules $destination/etc/udev/rules.d/ diff --git a/lib/makeboarddeb.sh b/lib/makeboarddeb.sh index 04662dd341..0d7841343b 100644 --- a/lib/makeboarddeb.sh +++ b/lib/makeboarddeb.sh @@ -179,17 +179,6 @@ create_board_package() fi EOF - - if [[ $RELEASE == bionic ]] || [[ $RELEASE == focal && $BOARDFAMILY == sun50iw6 ]]; then - cat <<-EOF >> "${destination}"/DEBIAN/postinst - # temporally disable acceleration on some arch in Bionic due to broken mesa packages - echo 'Section "Device" - \tIdentifier \t"Default Device" - \tOption \t"AccelMethod" "none" - EndSection' >> /etc/X11/xorg.conf.d/01-armbian-defaults.conf - EOF - fi - # install bootscripts if they are not present. Fix upgrades from old images if [[ $FORCE_BOOTSCRIPT_UPDATE == yes ]]; then cat <<-EOF >> "${destination}"/DEBIAN/postinst