Skip to content

Commit 9ebe586

Browse files
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # package/root/usr/local/sbin/install_i3_desktop.sh # package/root/usr/local/sbin/install_mate_desktop.sh # package/root/var/lib/alsa/asound.state.pine64 # simpleimage/make_rootfs.sh
2 parents 9e4d176 + f2ff08e commit 9ebe586

File tree

11 files changed

+113
-136
lines changed

11 files changed

+113
-136
lines changed

blobs/pine64pinebook.dts

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2518,7 +2518,7 @@
25182518
pmu_irq_id = <0x40>;
25192519
pmu_chg_ic_temp = <0x0>;
25202520
pmu_battery_rdc = <0x79>;
2521-
pmu_battery_cap = <0x12c0>;
2521+
pmu_battery_cap = <0x27dc>;
25222522
pmu_runtime_chgcur = <0x708>;
25232523
pmu_suspend_chgcur = <0x5dc>;
25242524
pmu_shutdown_chgcur = <0x5dc>;
@@ -2563,25 +2563,8 @@
25632563
pmu_bat_para30 = <0x64>;
25642564
pmu_bat_para31 = <0x64>;
25652565
pmu_bat_para32 = <0x64>;
2566-
pmu_bat_temp_enable = <0x0>;
25672566
pmu_bat_charge_ltf = <0x8d5>;
25682567
pmu_bat_charge_htf = <0x184>;
2569-
pmu_bat_temp_para1 = <0x1d2a>;
2570-
pmu_bat_temp_para2 = <0x1180>;
2571-
pmu_bat_temp_para3 = <0xdbe>;
2572-
pmu_bat_temp_para4 = <0xae2>;
2573-
pmu_bat_temp_para5 = <0x8af>;
2574-
pmu_bat_temp_para6 = <0x6fc>;
2575-
pmu_bat_temp_para7 = <0x5a8>;
2576-
pmu_bat_temp_para8 = <0x3c9>;
2577-
pmu_bat_temp_para9 = <0x298>;
2578-
pmu_bat_temp_para10 = <0x1d2>;
2579-
pmu_bat_temp_para11 = <0x189>;
2580-
pmu_bat_temp_para12 = <0x14d>;
2581-
pmu_bat_temp_para13 = <0x11b>;
2582-
pmu_bat_temp_para14 = <0xf2>;
2583-
pmu_bat_temp_para15 = <0xb3>;
2584-
pmu_bat_temp_para16 = <0x86>;
25852568
pmu_powkey_off_time = <0x1770>;
25862569
pmu_powkey_off_func = <0x0>;
25872570
pmu_powkey_off_en = <0x1>;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export VDPAU_DRIVER=sunxi

package/root/etc/X11/xorg.conf.d/40-pine64-fbturbo.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ Section "Device"
33
Driver "fbturbo"
44
Option "fbdev" "/dev/fb0"
55
Option "Backlight" "lcd0"
6+
67
Option "SwapbuffersWait" "true"
78
EndSection
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# if you want slight energy savings experiment with rtw_power_mgnt=2 instead
1+
# Disable secondary interface and power management.
22
options 8723bs if2name=p2p0 rtw_power_mgnt=0
33
options 8723cs if2name=p2p0 rtw_power_mgnt=0
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Auto load the sndcodec driver (Audio jack, speakers) when not commented.
2+
#sunxi_codec
3+
#sunxi_i2s
4+
#sunxi_sndcodec
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
DESKTOP="$1"
6+
7+
if [ -z "$DESKTOP" ]; then
8+
echo "Usage: $0 <mate|i3>"
9+
exit 1
10+
fi
11+
12+
DISTRO=""
13+
if hash apt-get 2>/dev/null; then
14+
DISTRO=debian
15+
fi
16+
17+
if [ -z "$DISTRO" ]; then
18+
echo "This script requires a Debian based Linux distribution."
19+
exit 1
20+
fi
21+
22+
if [ "$(id -u)" -ne "0" ]; then
23+
echo "This script requires root."
24+
exit 1
25+
fi
26+
27+
# Default packages.
28+
PACKAGES=(
29+
xserver-xorg-video-fbturbo
30+
libvdpau-sunxi1
31+
vdpauinfo
32+
)
33+
34+
# Add packages based on desktop selection.
35+
case $DESKTOP in
36+
mate)
37+
PACKAGES+=(
38+
ubuntu-mate-core
39+
ubuntu-mate-desktop
40+
ubuntu-mate-lightdm-theme
41+
ubuntu-mate-wallpapers-xenial
42+
lightdm
43+
)
44+
;;
45+
46+
i3|i3wm)
47+
PACKAGES+=(
48+
xserver-xorg-input-all
49+
xfonts-base
50+
slim
51+
rxvt-unicode-lite
52+
i3
53+
i3status
54+
i3lock
55+
suckless-tools
56+
network-manager
57+
pulseaudio
58+
)
59+
;;
60+
61+
*)
62+
echo "Error: unsupported desktop environment $DESKTOP"
63+
exit 2
64+
;;
65+
esac
66+
67+
# Install.
68+
apt -y update
69+
apt -y --no-install-recommends install ${PACKAGES[@]}
70+
71+
# Kill parport module loading, not available on arm64.
72+
if [ -e "/etc/modules-load.d/cups-filters.conf" ]; then
73+
echo "" >/etc/modules-load.d/cups-filters.conf
74+
fi
75+
76+
# Disable Pulseaudio timer scheduling which does not work with sndhdmi driver.
77+
if [ -e "/etc/pulse/default.pa" ]; then
78+
sed -i 's/load-module module-udev-detect$/& tsched=0/g' /etc/pulse/default.pa
79+
fi
80+
81+
# Desktop dependent post installation.
82+
case $DESKTOP in
83+
i3|i3wm)
84+
if [ ! -d /usr/share/slim/themes/pine64 ]; then
85+
cp -ra /usr/share/slim/themes/default /usr/share/slim/themes/pine64
86+
wget -O /usr/share/slim/themes/pine64/background.png \
87+
https://github.com/longsleep/build-pine64-image/raw/master/bootlogo/bootlogo-pine64-1366x768.png
88+
sed -i "s/^current_theme(.*)/current_theme pine64/g" /etc/slim.conf
89+
fi
90+
;;
91+
92+
*)
93+
;;
94+
esac
95+
96+
echo
97+
echo "Done - $DESKTOP installed - you should reboot now."

package/root/usr/local/sbin/install_i3_desktop.sh

Lines changed: 0 additions & 47 deletions
This file was deleted.

package/root/usr/local/sbin/install_mate_desktop.sh

Lines changed: 0 additions & 65 deletions
This file was deleted.

package/root/usr/local/sbin/mplayer-play.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,8 @@ if [ ! -w /dev/disp ]; then
2020
exit 1
2121
fi
2222

23-
export VDPAU_DRIVER=sunxi
23+
if [ -z "VDPAU_DRIVER" ]; then
24+
export VDPAU_DRIVER=sunxi
25+
fi
26+
2427
exec mplayer -vo vdpau -vc ffmpeg12vdpau,ffh264vdpau,ffhevcvdpau, "$@"

package/root/var/lib/alsa/asound.state.pine64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,15 +222,15 @@ state.audiocodec {
222222
control.15 {
223223
iface MIXER
224224
name 'speaker volume'
225-
value 24
225+
value 23
226226
comment {
227227
access 'read write'
228228
type INTEGER
229229
count 1
230230
range '0 - 31'
231231
dbmin -4800
232232
dbmax -150
233-
dbvalue.0 -1200
233+
dbvalue.0 -1350
234234
}
235235
}
236236
control.16 {

0 commit comments

Comments
 (0)