From 54826d2ff946a49a88ecbc22ddb834e1bea3aa3a Mon Sep 17 00:00:00 2001 From: Links Date: Thu, 14 Apr 2022 12:29:16 +0200 Subject: [PATCH] make sure to not use ipv6 (not supported by stock kernel) adaopt to debian SID --- userpatches/customize-image.sh | 18 +++++++++++++----- userpatches/overlay/boot/boot.cmd | 2 +- .../etc/lightdm/lightdm.conf.d/80-XDMCP.conf | 2 +- userpatches/overlay/etc/pulse/default.pa | 12 ++++++------ userpatches/overlay/etc/pulse/system.pa | 1 + userpatches/overlay/etc/xinetd.d/Xvnc | 4 ++-- userpatches/overlay/root/gpio_setup.sh | 7 +++++-- 7 files changed, 29 insertions(+), 17 deletions(-) diff --git a/userpatches/customize-image.sh b/userpatches/customize-image.sh index 6bf14a4..b265ace 100644 --- a/userpatches/customize-image.sh +++ b/userpatches/customize-image.sh @@ -26,13 +26,12 @@ Main() { #touch /root/.no_rootfs_resize apt-get install -y quisk tigervnc-standalone-server socat ser2net gdb-minimal gdbserver strace e2fsprogs xfce4-battery-plugin xfce4-power-manager libqt5sql5-sqlite xinetd - apt-get install -y gstreamer1.0-plugins-good gstreamer1.0-plugins-base gstreamer1.0-pulseaudio gstreamer1.0-alsa + apt-get install -y gstreamer1.0-tools gstreamer1.0-plugins-good gstreamer1.0-plugins-base gstreamer1.0-pulseaudio gstreamer1.0-alsa apt-get install -y nano htop curl ncdu gpg dtrx localepurge mtr-tiny screen iotop git wget net-tools sudo file bash-completion psmisc dnsutils software-properties-common apt-transport-https xauth aptitude fzf - apt-get install -y bluez-alsa-utils + apt-get install -y bluez-alsa-utils bluez bluez-tools + apt-get install -y lightdm slick-greeter - wget https://physics.princeton.edu/pulsar/k1jt/wsjtx_2.5.4_armhf.deb -O /root/wsjtx_2.5.4_armhf.deb - - apt install -y /root/wsjtx_2.5.4_armhf.deb + apt-get install -y wsjtx cp /tmp/overlay/extracted/sun8i-r16-x6100.dtb /boot/ cp /tmp/overlay/extracted/sun8i-r16-x6100.dts /boot/ @@ -72,6 +71,15 @@ Main() { systemctl enable x6100_app.service systemctl enable lightdm_x6100.service + # disable not needed services + systemctl disable smbd.service + + # fix bluetooth.service startup + mkdir -p /var/lib/bluetooth + + # fix upower.service startup + sed -i 's/PrivateUsers=yes/#PrivateUsers=yes/g' /lib/systemd/system/upower.service + case $RELEASE in stretch) # your code here diff --git a/userpatches/overlay/boot/boot.cmd b/userpatches/overlay/boot/boot.cmd index 10f4c92..df5e7f8 100644 --- a/userpatches/overlay/boot/boot.cmd +++ b/userpatches/overlay/boot/boot.cmd @@ -72,7 +72,7 @@ if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi -setenv bootargs "root=${rootdev} rootwait ${consoleargs} net.ifnames=0 panic=10 fbcon=rotate:3 video=VGA:480x800 ubootpart=${partuuid} ubootsource=${devtype} loglevel=${verbosity} ${bootargs_extra}" +setenv bootargs "root=${rootdev} rootwait ${consoleargs} net.ifnames=0 ipv6.disable=1 panic=10 fbcon=rotate:3 video=VGA:480x800 ubootpart=${partuuid} ubootsource=${devtype} loglevel=${verbosity} ${bootargs_extra}" if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory swapaccount=1"; fi diff --git a/userpatches/overlay/etc/lightdm/lightdm.conf.d/80-XDMCP.conf b/userpatches/overlay/etc/lightdm/lightdm.conf.d/80-XDMCP.conf index fe934c1..89bb7f9 100644 --- a/userpatches/overlay/etc/lightdm/lightdm.conf.d/80-XDMCP.conf +++ b/userpatches/overlay/etc/lightdm/lightdm.conf.d/80-XDMCP.conf @@ -1,4 +1,4 @@ [XDMCPServer] enabled=true port=177 -listen-address=localhost \ No newline at end of file +listen-address=127.0.0.1 \ No newline at end of file diff --git a/userpatches/overlay/etc/pulse/default.pa b/userpatches/overlay/etc/pulse/default.pa index e6d543a..ec87c7d 100644 --- a/userpatches/overlay/etc/pulse/default.pa +++ b/userpatches/overlay/etc/pulse/default.pa @@ -72,13 +72,13 @@ load-module module-jackdbus-detect channels=2 .endif ### Automatically load driver modules for Bluetooth hardware -.ifexists module-bluetooth-policy.so -load-module module-bluetooth-policy -.endif +#.ifexists module-bluetooth-policy.so +#load-module module-bluetooth-policy +#.endif -.ifexists module-bluetooth-discover.so -load-module module-bluetooth-discover -.endif +#.ifexists module-bluetooth-discover.so +#load-module module-bluetooth-discover +#.endif ### Load several protocols .ifexists module-esound-protocol-unix.so diff --git a/userpatches/overlay/etc/pulse/system.pa b/userpatches/overlay/etc/pulse/system.pa index a0402b0..c6f8496 100644 --- a/userpatches/overlay/etc/pulse/system.pa +++ b/userpatches/overlay/etc/pulse/system.pa @@ -59,3 +59,4 @@ load-module module-position-event-sounds ### Enable bluetooth bluez-alsa is used by X6100 APP #load-module module-bluetooth-policy #load-module module-bluetooth-discover + diff --git a/userpatches/overlay/etc/xinetd.d/Xvnc b/userpatches/overlay/etc/xinetd.d/Xvnc index 89990a3..f6f8b07 100644 --- a/userpatches/overlay/etc/xinetd.d/Xvnc +++ b/userpatches/overlay/etc/xinetd.d/Xvnc @@ -4,10 +4,10 @@ service xvnc_1 disable = no protocol = tcp socket_type = stream -# bind = 127.0.0.1 + bind = 0.0.0.0 port = 5900 wait = yes user = root server = /usr/bin/Xvnc - server_args = :1 -inetd -query localhost -geometry 1600x900 -depth 16 -once -fp /usr/share/fonts/X11/misc -DisconnectClients=0 -NeverShared -SecurityTypes None + server_args = :1 -inetd -query localhost -geometry 1600x900 -depth 24 -once -fp /usr/share/fonts/X11/misc -DisconnectClients=0 -NeverShared -SecurityTypes None } \ No newline at end of file diff --git a/userpatches/overlay/root/gpio_setup.sh b/userpatches/overlay/root/gpio_setup.sh index 742371f..d73b7bd 100755 --- a/userpatches/overlay/root/gpio_setup.sh +++ b/userpatches/overlay/root/gpio_setup.sh @@ -48,13 +48,16 @@ if [ "$ACTION" == "start" ] ; then else #KEYPAD OFF gpio_set 143 0 - gpio_un 143 #RF OFF gpio_set 138 0 - gpio_un 138 #WIFI OFF gpio_set 357 1 + + # disable exports + sleep 1 + gpio_un 138 + gpio_un 143 gpio_un 357 fi