diff --git a/bin/jessie-desktop.tgz b/bin/jessie-desktop.tgz deleted file mode 100644 index d9eeab6ae1..0000000000 Binary files a/bin/jessie-desktop.tgz and /dev/null differ diff --git a/bin/xenial-desktop.tgz b/bin/xenial-desktop.tgz deleted file mode 100644 index 2757450d0d..0000000000 Binary files a/bin/xenial-desktop.tgz and /dev/null differ diff --git a/config/desktop/.config/autostart/pasystray.desktop b/config/desktop/.config/autostart/pasystray.desktop new file mode 100644 index 0000000000..4a9b03defd --- /dev/null +++ b/config/desktop/.config/autostart/pasystray.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=0.9.4 +Type=Application +Name=Pulse audio pasystray +Comment=pasystray +Exec=pasystray +OnlyShowIn=XFCE; +StartupNotify=false +Terminal=false +Hidden=false + diff --git a/config/desktop/.config/xfce4/desktop/icons.screen0-1904x1033.rc b/config/desktop/.config/xfce4/desktop/icons.screen0-1904x1033.rc new file mode 100644 index 0000000000..21580e3985 --- /dev/null +++ b/config/desktop/.config/xfce4/desktop/icons.screen0-1904x1033.rc @@ -0,0 +1,16 @@ +[Donate] +row=3 +col=0 + +[Support] +row=2 +col=0 + +[File System] +row=1 +col=0 + +[Home] +row=0 +col=0 + diff --git a/config/desktop/.config/xfce4/desktop/icons.screen0-1904x1064.rc b/config/desktop/.config/xfce4/desktop/icons.screen0-1904x1064.rc new file mode 100644 index 0000000000..2b183d3170 --- /dev/null +++ b/config/desktop/.config/xfce4/desktop/icons.screen0-1904x1064.rc @@ -0,0 +1,8 @@ +[File System] +row=1 +col=0 + +[Home] +row=0 +col=0 + diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml new file mode 100644 index 0000000000..c3d5d2a09d --- /dev/null +++ b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml new file mode 100644 index 0000000000..e3fcab0ea0 --- /dev/null +++ b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml new file mode 100644 index 0000000000..5419e665b8 --- /dev/null +++ b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml new file mode 100644 index 0000000000..8ae3899590 --- /dev/null +++ b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new file mode 100644 index 0000000000..1fa44b60a6 --- /dev/null +++ b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml new file mode 100644 index 0000000000..7128c99a6a --- /dev/null +++ b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml new file mode 100644 index 0000000000..ddc1693f93 --- /dev/null +++ b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml new file mode 100644 index 0000000000..01ed193328 --- /dev/null +++ b/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/desktop/.local/share/keyrings/Default_keyring.keyring b/config/desktop/.local/share/keyrings/Default_keyring.keyring new file mode 100644 index 0000000000..81bf34841b --- /dev/null +++ b/config/desktop/.local/share/keyrings/Default_keyring.keyring @@ -0,0 +1,6 @@ +[keyring] +display-name=Default keyring +ctime=1473189692 +mtime=0 +lock-on-idle=false +lock-after=false diff --git a/config/desktop/.local/share/keyrings/default b/config/desktop/.local/share/keyrings/default new file mode 100644 index 0000000000..5b1003763f --- /dev/null +++ b/config/desktop/.local/share/keyrings/default @@ -0,0 +1 @@ +Default_keyring diff --git a/config/desktop/Desktop/Support.desktop b/config/desktop/Desktop/Support.desktop new file mode 100644 index 0000000000..6d55fa244c --- /dev/null +++ b/config/desktop/Desktop/Support.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Version=1.0 +Type=Link +Name=Support +Comment= +Icon=system-help +URL=http://forum.armbian.com diff --git a/config/desktop/Desktop/paypal.desktop b/config/desktop/Desktop/paypal.desktop new file mode 100644 index 0000000000..3705190079 --- /dev/null +++ b/config/desktop/Desktop/paypal.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Version=1.0 +Type=Link +Name=Donate +Comment= +Icon=/usr/share/icons/Vibrancy-Colors/apps/64/web-paypal.png +URL=https://www.armbian.com/donate +GenericName=Support development diff --git a/desktop.sh b/desktop.sh index 62c8fae860..03f1f2476f 100644 --- a/desktop.sh +++ b/desktop.sh @@ -24,8 +24,8 @@ install_desktop () cp $SRC/lib/bin/icons/${RELEASE}.png $CACHEDIR/$SDCARD/usr/share/pixmaps # install default desktop settings - chroot $CACHEDIR/$SDCARD /bin/bash -c "tar xfz /tmp/bin/$RELEASE-desktop.tgz -C /etc/skel/" - chroot $CACHEDIR/$SDCARD /bin/bash -c "tar xfz /tmp/bin/$RELEASE-desktop.tgz -C /root/" + cp -R $SRC/lib/config/desktop/. $CACHEDIR/$SDCARD/etc/skel + cp -R $SRC/lib/config/desktop/. $CACHEDIR/$SDCARD/root # install wallpapers d=$CACHEDIR/$SDCARD/usr/share/backgrounds/xfce/ diff --git a/scripts/brcm40183-patch b/scripts/brcm40183-patch index 3fce03652d..33c853771e 100644 --- a/scripts/brcm40183-patch +++ b/scripts/brcm40183-patch @@ -47,10 +47,10 @@ else # Different port for mainline if [ `uname -r | grep -v '^3.4.' ` ]; then PORT="ttyS2"; fi - + # reset port /usr/bin/brcm_bt_reset /dev/$PORT - + # Start patching /bin/echo -en "" > /dev/$PORT # pull down RTS on UART log_action_begin_msg "Start pushing firmware to device and waiting max. 60sec to complete" @@ -61,6 +61,7 @@ else 0) log_action_end_msg 0 # Enable interfaces hciattach /dev/$PORT any + rfkill unblock all ;; *) log_action_end_msg 1 /bin/echo "Check /tmp/brcm40183.firmware for messages." diff --git a/scripts/brcm40183-patch.service b/scripts/brcm40183-patch.service index 0240758cbc..50b5fbd143 100644 --- a/scripts/brcm40183-patch.service +++ b/scripts/brcm40183-patch.service @@ -12,6 +12,7 @@ ExecStartPre=/usr/bin/brcm_bt_reset /dev/${PORT} ExecStartPre=/bin/echo -en "" > /dev/${PORT} ExecStartPre=/usr/bin/brcm_patchram_plus -d --patchram /lib/firmware/ap6210/bcm20710a1.hcd --no2bytes --tosleep 1000 --bd_addr ${MAC_ADDR} /dev/${PORT} ExecStart=/usr/bin/hciattach -n /dev/${PORT} any +ExecStart=/usr/bin/rfkill unblock all [Install] WantedBy=bluetooth.target diff --git a/scripts/firstrun b/scripts/firstrun index 0fd569550a..5964eaba2e 100644 --- a/scripts/firstrun +++ b/scripts/firstrun @@ -172,7 +172,7 @@ case "$1" in # tweaks # enable BT on cubietruck - [[ "$BOARD" == "cubietruck" ]] && update-rc.d brcm40183-patch defaults + [[ "$BOARD" == "cubietruck" ]] && systemctl enable brcm40183-patch && service brcm40183-patch start # enable BT on Banana M2+, NanoPi Air or NanoPi M1 Plus [[ "$BOARD" == "bananapim2plus" || "$BOARD" == "nanopiair" || "$BOARD" == "nanopim1plus" ]] && update-rc.d ap6212-bluetooth defaults # enable BT on Solidrun i.MX boards