enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable MESA on bionic (#1895)

Browse Source 
Also enable xfce4 power manager on some boards

Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
This commit is contained in:
Igor Pečovnik 2020-04-17 21:29:06 +02:00 committed by GitHub
parent ce7dec8719
commit cc98ba3c0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/boards/README.md
View File

@ -17,3 +17,4 @@
| KERNEL_TARGET | legacy,current,dev |
| FULL_DESKTOP | yes/no = install Office, Thunderbird, ... |
| DESKTOP_AUTOLOGIN | yes/no |
| PACKAGE_LIST_DESKTOP_BOARD | space delimited packages to be installed on this boards desktop build |

1
config/boards/bananapim64.conf
View File

@ -4,3 +4,4 @@ BOARDFAMILY="sun50iw1"
BOOTCONFIG_DEFAULT="sun50iw1p1_config"
BOOTCONFIG="bananapi_m64_defconfig"
KERNEL_TARGET="current,dev"
PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"

1
config/boards/lime-a64.conf
View File

@ -5,3 +5,4 @@ BOOTCONFIG_DEFAULT="sun50iw1p1_config"
BOOTCONFIG="a64-olinuxino_defconfig"
KERNEL_TARGET="current,dev"
FULL_DESKTOP="yes"
PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"

1
config/boards/orangepiwin.conf
View File

@ -4,3 +4,4 @@ BOARDFAMILY="sun50iw1"
BOOTCONFIG_DEFAULT="sun50iw1p1_config"
BOOTCONFIG="orangepi_win_defconfig"
KERNEL_TARGET="current,dev"
PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"

1
config/boards/pine64.conf
View File

@ -4,3 +4,4 @@ BOARDFAMILY="sun50iw1"
BOOTCONFIG="pine64_plus_defconfig"
KERNEL_TARGET="legacy,current,dev"
FULL_DESKTOP="yes"
PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"

1
config/boards/pinebook-a64.conf
View File

@ -5,3 +5,4 @@ BOOTCONFIG="pinebook_defconfig"
DESKTOP_AUTOLOGIN="no"
KERNEL_TARGET="current,dev"
FULL_DESKTOP="yes"
PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"

1
config/boards/teres-a64.conf
View File

@ -5,3 +5,4 @@ BOOTCONFIG="teres_i_defconfig"
DESKTOP_AUTOLOGIN="no"
KERNEL_TARGET="current,dev"
FULL_DESKTOP="yes"
PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"

18
lib/makeboarddeb.sh
View File

@ -160,15 +160,15 @@ create_board_package()
EOF
# if [[ $RELEASE == bionic ]]; then
# cat <<-EOF >> "${destination}"/DEBIAN/postinst
# # temporally disable acceleration in Bionic due to broken mesa packages
# echo 'Section "Device"
# Identifier "Default Device"
# Option "AccelMethod" "none"
# EndSection' >> /etc/X11/xorg.conf.d/01-armbian-defaults.conf
# EOF
# fi
if [[ $RELEASE == bionic ]]; then
cat <<-EOF >> "${destination}"/DEBIAN/postinst
# temporally disable acceleration 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