From 9351355d356d220193b230f1048e0ea9befadad0 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Sun, 11 May 2025 22:26:25 +0200 Subject: [PATCH] samsung-a6lte: split downstream into separate package (MR 6491) --- .../device-samsung-a6lte-downstream/APKBUILD | 97 +++++++++++ ...sung-a6lte-downstream-openrc.post-install} | 0 ...vice-samsung-a6lte-downstream.post-install | 7 + .../deviceinfo | 32 ++++ ...etworkManager-conf.d-swlan0-unmanaged.conf | 0 ...workManager-conf.d-wlan0-preserve-mac.conf | 0 .../etc-conf.d-samsungipcd | 1 + .../etc-init.d-hciattach-ttySAC0 | 0 .../etc-init.d-udev-settle | 0 .../etc-init.d-wlan0-up | 0 .../etc-lightdm-lightdm.conf | 164 ++++++++++++++++++ .../usr-libexec-samsungipcd-voicecall.sh | 0 ...alsa-ucm2-conf.d-Universal7870-I-HiFi.conf | 0 ...onf.d-Universal7870-I-Universal7870-I.conf | 0 ...ucm2-conf.d-Universal7870-I-VoiceCall.conf | 0 ...replumber-wireplumber.conf.d-headroom.conf | 0 .../linux-samsung-a6lte-downstream}/APKBUILD | 7 +- .../config-samsung-a6lte.aarch64 | 0 .../decon-fb-colors.patch | 0 .../disable-boot-mode-check.patch | 0 .../firmware-paths-fix.patch | 0 .../fix-addrconf_rt_table-nullptr-deref.patch | 0 ...cc10-extern_YYLOC_global_declaration.patch | 0 ...ve-Sun-Solaris-style-flag-on-section.patch | 0 .../uncomment-rfcomm-in-makefile.patch | 0 .../zram-zs-create-pool-null.patch | 0 device/testing/device-samsung-a6lte/APKBUILD | 91 +--------- .../testing/device-samsung-a6lte/deviceinfo | 4 +- 28 files changed, 315 insertions(+), 88 deletions(-) create mode 100644 device/archived/device-samsung-a6lte-downstream/APKBUILD rename device/{testing/device-samsung-a6lte/device-samsung-a6lte-downstream-quirks-openrc.post-install => archived/device-samsung-a6lte-downstream/device-samsung-a6lte-downstream-openrc.post-install} (100%) create mode 100644 device/archived/device-samsung-a6lte-downstream/device-samsung-a6lte-downstream.post-install create mode 100644 device/archived/device-samsung-a6lte-downstream/deviceinfo rename device/{testing/device-samsung-a6lte => archived/device-samsung-a6lte-downstream}/etc-NetworkManager-conf.d-swlan0-unmanaged.conf (100%) rename device/{testing/device-samsung-a6lte => archived/device-samsung-a6lte-downstream}/etc-NetworkManager-conf.d-wlan0-preserve-mac.conf (100%) create mode 100644 device/archived/device-samsung-a6lte-downstream/etc-conf.d-samsungipcd rename device/{testing/device-samsung-a6lte => archived/device-samsung-a6lte-downstream}/etc-init.d-hciattach-ttySAC0 (100%) rename device/{testing/device-samsung-a6lte => archived/device-samsung-a6lte-downstream}/etc-init.d-udev-settle (100%) rename device/{testing/device-samsung-a6lte => archived/device-samsung-a6lte-downstream}/etc-init.d-wlan0-up (100%) create mode 100644 device/archived/device-samsung-a6lte-downstream/etc-lightdm-lightdm.conf rename device/{testing/device-samsung-a6lte => archived/device-samsung-a6lte-downstream}/usr-libexec-samsungipcd-voicecall.sh (100%) rename device/{testing/device-samsung-a6lte => archived/device-samsung-a6lte-downstream}/usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf (100%) rename device/{testing/device-samsung-a6lte => archived/device-samsung-a6lte-downstream}/usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf (100%) rename device/{testing/device-samsung-a6lte => archived/device-samsung-a6lte-downstream}/usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf (100%) rename device/{testing/device-samsung-a6lte => archived/device-samsung-a6lte-downstream}/usr-share-wireplumber-wireplumber.conf.d-headroom.conf (100%) rename device/{testing/linux-samsung-a6lte => archived/linux-samsung-a6lte-downstream}/APKBUILD (94%) rename device/{testing/linux-samsung-a6lte => archived/linux-samsung-a6lte-downstream}/config-samsung-a6lte.aarch64 (100%) rename device/{testing/linux-samsung-a6lte => archived/linux-samsung-a6lte-downstream}/decon-fb-colors.patch (100%) rename device/{testing/linux-samsung-a6lte => archived/linux-samsung-a6lte-downstream}/disable-boot-mode-check.patch (100%) rename device/{testing/linux-samsung-a6lte => archived/linux-samsung-a6lte-downstream}/firmware-paths-fix.patch (100%) rename device/{testing/linux-samsung-a6lte => archived/linux-samsung-a6lte-downstream}/fix-addrconf_rt_table-nullptr-deref.patch (100%) rename device/{testing/linux-samsung-a6lte => archived/linux-samsung-a6lte-downstream}/gcc10-extern_YYLOC_global_declaration.patch (100%) rename device/{testing/linux-samsung-a6lte => archived/linux-samsung-a6lte-downstream}/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch (100%) rename device/{testing/linux-samsung-a6lte => archived/linux-samsung-a6lte-downstream}/uncomment-rfcomm-in-makefile.patch (100%) rename device/{testing/linux-samsung-a6lte => archived/linux-samsung-a6lte-downstream}/zram-zs-create-pool-null.patch (100%) diff --git a/device/archived/device-samsung-a6lte-downstream/APKBUILD b/device/archived/device-samsung-a6lte-downstream/APKBUILD new file mode 100644 index 000000000..147eae752 --- /dev/null +++ b/device/archived/device-samsung-a6lte-downstream/APKBUILD @@ -0,0 +1,97 @@ +# Archived: Downstream port, only for testing. Use mainline port! +# Reference: +pkgname=device-samsung-a6lte-downstream +pkgdesc="Samsung Galaxy A6 2018 (Downstream)" +pkgver=1 +pkgrel=0 +url="https://postmarketos.org" +license="MIT" +arch="aarch64" +options="!check !archcheck" +depends=" + alsa-utils + bluez-deprecated + bootmac + firmware-samsung-a6lte + linux-samsung-a6lte-downstream + mkbootimg + msm-fb-refresher + pipewire-pulse + postmarketos-base + samsungipcd + util-linux +" +replaces=" + bootmac + lightdm +" +makedepends="devicepkg-dev" +install="$pkgname.post-install" +source=" + deviceinfo + etc-conf.d-samsungipcd + etc-init.d-hciattach-ttySAC0 + etc-init.d-udev-settle + etc-init.d-wlan0-up + etc-lightdm-lightdm.conf + etc-NetworkManager-conf.d-swlan0-unmanaged.conf + etc-NetworkManager-conf.d-wlan0-preserve-mac.conf + usr-libexec-samsungipcd-voicecall.sh + usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf + usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf + usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf + usr-share-wireplumber-wireplumber.conf.d-headroom.conf +" +subpackages=" + $pkgname-openrc +" + +# pulseaudio does not seem to work on this device. Will use pipewire-pulse instead. + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname + + install -Dm644 etc-conf.d-samsungipcd "$pkgdir"/etc/conf.d/samsungipcd + install -Dm644 etc-lightdm-lightdm.conf "$pkgdir"/etc/lightdm/lightdm.conf + install -Dm755 usr-libexec-samsungipcd-voicecall.sh "$pkgdir"/usr/libexec/samsungipcd/voicecall.sh + install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/HiFi.conf + install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/Universal7870-I.conf + install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/VoiceCall.conf + install -Dm644 usr-share-wireplumber-wireplumber.conf.d-headroom.conf "$pkgdir"/usr/share/wireplumber/wireplumber.conf.d/headroom.conf + + install -Dm644 etc-NetworkManager-conf.d-swlan0-unmanaged.conf "$pkgdir"/etc/NetworkManager/conf.d/swlan0-unmanaged.conf + install -Dm644 etc-NetworkManager-conf.d-wlan0-preserve-mac.conf "$pkgdir"/etc/NetworkManager/conf.d/wlan0-preserve-mac.conf + # we run bootmac ourselves and don't want it to trigger from the udev rule + # so remove the rule + install -Dm755 /dev/null "$pkgdir"/usr/lib/udev/rules.d/90-bootmac.rules +} + +openrc() { + install_if="$pkgname=$pkgver-r$pkgrel openrc" + replaces="udev-init-scripts-openrc" + install="$subpkgname.post-install" + + install -Dm755 etc-init.d-wlan0-up "$subpkgdir"/etc/init.d/wlan0-up + install -Dm755 etc-init.d-udev-settle "$subpkgdir"/etc/init.d/udev-settle + install -Dm755 etc-init.d-hciattach-ttySAC0 "$subpkgdir"/etc/init.d/hciattach-ttySAC0 +} + +sha512sums=" +d8c2c2bd086b3db854de9ea0d4fc36e62bc8e1887d064748a65fe1b1e8ab2790edcbb287ed3102544d2d6be8f08477e6b46363b8ee6ab83e69835105c07f10df deviceinfo +3e5bb764529010d2b6b1f2759a7799f665d140aebcee2dd63433e68cd4282e09b5d3b34fb7c21e737595b406501e7f02ece4592651c60e4c2b9419de4aedb438 etc-conf.d-samsungipcd +f9716fc70bf3508d2f9e83d908f1c13103403f01ebb784acec6cdf3e959e92b63c75e49b0120abe1ada5a50d768dcf30b8472630da1172fc826485e97024d85e etc-init.d-hciattach-ttySAC0 +203b832a7080d5f1351c5e024e444f9fe509f6e0fd4b376a60c7d73359b7e356863a4f15caf9b2e4e733dc44d2971722083e7c69ca94a012eb004b4b8ded9d09 etc-init.d-udev-settle +7caddfe4659c969a33adcc27a760bc78d4f70ca4b7a4a5ec28a6411c12f3e6dd6d427b59f75976a737a5fe0f09806f8b6d65798f6358bd1e1954ad2a28fbfdc8 etc-init.d-wlan0-up +861270c6bc0b2a3e6cd389c21c8c895e62de8cf8bec6fcf23c178f8cbaae855d62b0ee98692671ab4f518d84cb43dd0b2fe46f5a609f65af6a6c06e0fdbb6d0c etc-lightdm-lightdm.conf +ef24527b13e48a9153643f3713167d3d08486e7de8b4c94d7c446ff380396115890573d8cd4aa5448766d9e779e189833a83e7921081679bd348c3f8a59410af etc-NetworkManager-conf.d-swlan0-unmanaged.conf +5c3a692f22a29fca792c114c6d94ff1bf0d6921f068f207a2894a8f99c73dcc319e7c803ed7adfe64eb3e60088f37e2a2730118b2ed57aa01b35415664085567 etc-NetworkManager-conf.d-wlan0-preserve-mac.conf +abe1c4a2f59fe862cebef75c54b8806bd86ce06aeb15d8c0699ab1338c9d575cb72a4d5b099f94272b1d9c9c3f4960af209a9e058ea9e57733b7d905dad0d33f usr-libexec-samsungipcd-voicecall.sh +2169590d10d6123575d43e8ff7dc0d2ba824f8266d9fa75a5b59a4cc5753e47e327368b777082930d6b7a7aed6f57fa6ac2c5a2e816e1e12cd1032a8bb1822b5 usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf +dc528deb556906adfb89b02b6faa04a8b21358706bb60e2fa51c8a3c909b680fcc02fa425b0cb5d6273595f27dfc9b640e1a8d455657fd6b47652af9e8ec295a usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf +3e74de3504f134a2726ee87740c5803bbd578352674d1d7de8b9460e57553100e9c4d322143ee83d3d584884c52eef47762bed41814ff1fca8cd9c4552f39b73 usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf +be561f0573c73bdcf37fbd8e4659e92577a0818aafb75d73e7cbf1dd8980f29313170703074ee0cc9cc5b5a07cd7ac8ced07dfdc77b0b31a0cd34d66ae0473a4 usr-share-wireplumber-wireplumber.conf.d-headroom.conf +" diff --git a/device/testing/device-samsung-a6lte/device-samsung-a6lte-downstream-quirks-openrc.post-install b/device/archived/device-samsung-a6lte-downstream/device-samsung-a6lte-downstream-openrc.post-install similarity index 100% rename from device/testing/device-samsung-a6lte/device-samsung-a6lte-downstream-quirks-openrc.post-install rename to device/archived/device-samsung-a6lte-downstream/device-samsung-a6lte-downstream-openrc.post-install diff --git a/device/archived/device-samsung-a6lte-downstream/device-samsung-a6lte-downstream.post-install b/device/archived/device-samsung-a6lte-downstream/device-samsung-a6lte-downstream.post-install new file mode 100644 index 000000000..93541d50a --- /dev/null +++ b/device/archived/device-samsung-a6lte-downstream/device-samsung-a6lte-downstream.post-install @@ -0,0 +1,7 @@ +#!/bin/sh + +# Create mount point and /efs mount point in fstab +if ! grep -q /efs /etc/fstab; then + mkdir -p /efs + echo "/dev/disk/by-partlabel/EFS /efs auto ro 0 0" >> /etc/fstab +fi diff --git a/device/archived/device-samsung-a6lte-downstream/deviceinfo b/device/archived/device-samsung-a6lte-downstream/deviceinfo new file mode 100644 index 000000000..5ff690102 --- /dev/null +++ b/device/archived/device-samsung-a6lte-downstream/deviceinfo @@ -0,0 +1,32 @@ +# Reference: +# Please use double quotes only. You can source this file in shell +# scripts. + +deviceinfo_format_version="0" +deviceinfo_name="Samsung Galaxy A6 2018" +deviceinfo_manufacturer="Samsung" +deviceinfo_codename="samsung-a6lte-downstream" +deviceinfo_year="2018" +deviceinfo_arch="aarch64" + +# Device related +deviceinfo_chassis="handset" +deviceinfo_keyboard="false" +deviceinfo_external_storage="true" +deviceinfo_screen_width="720" +deviceinfo_screen_height="1480" + +# Bootloader related +deviceinfo_flash_method="heimdall-bootimg" +deviceinfo_kernel_cmdline="androidboot.selinux=permissive androidboot.selinux=permissive" +deviceinfo_generate_bootimg="true" +deviceinfo_bootimg_qcdt="true" +deviceinfo_bootimg_dtb_second="false" +deviceinfo_flash_pagesize="2048" +deviceinfo_flash_offset_base="0x10000000" +deviceinfo_flash_offset_kernel="0x00008000" +deviceinfo_flash_offset_ramdisk="0x01000000" +deviceinfo_flash_offset_second="0x00f00000" +deviceinfo_flash_offset_tags="0x00000100" +deviceinfo_flash_heimdall_partition_kernel="BOOT" +deviceinfo_flash_heimdall_partition_rootfs="SYSTEM" diff --git a/device/testing/device-samsung-a6lte/etc-NetworkManager-conf.d-swlan0-unmanaged.conf b/device/archived/device-samsung-a6lte-downstream/etc-NetworkManager-conf.d-swlan0-unmanaged.conf similarity index 100% rename from device/testing/device-samsung-a6lte/etc-NetworkManager-conf.d-swlan0-unmanaged.conf rename to device/archived/device-samsung-a6lte-downstream/etc-NetworkManager-conf.d-swlan0-unmanaged.conf diff --git a/device/testing/device-samsung-a6lte/etc-NetworkManager-conf.d-wlan0-preserve-mac.conf b/device/archived/device-samsung-a6lte-downstream/etc-NetworkManager-conf.d-wlan0-preserve-mac.conf similarity index 100% rename from device/testing/device-samsung-a6lte/etc-NetworkManager-conf.d-wlan0-preserve-mac.conf rename to device/archived/device-samsung-a6lte-downstream/etc-NetworkManager-conf.d-wlan0-preserve-mac.conf diff --git a/device/archived/device-samsung-a6lte-downstream/etc-conf.d-samsungipcd b/device/archived/device-samsung-a6lte-downstream/etc-conf.d-samsungipcd new file mode 100644 index 000000000..4e744c06b --- /dev/null +++ b/device/archived/device-samsung-a6lte-downstream/etc-conf.d-samsungipcd @@ -0,0 +1 @@ +IPC_DEVICE_NAME="herolte" diff --git a/device/testing/device-samsung-a6lte/etc-init.d-hciattach-ttySAC0 b/device/archived/device-samsung-a6lte-downstream/etc-init.d-hciattach-ttySAC0 similarity index 100% rename from device/testing/device-samsung-a6lte/etc-init.d-hciattach-ttySAC0 rename to device/archived/device-samsung-a6lte-downstream/etc-init.d-hciattach-ttySAC0 diff --git a/device/testing/device-samsung-a6lte/etc-init.d-udev-settle b/device/archived/device-samsung-a6lte-downstream/etc-init.d-udev-settle similarity index 100% rename from device/testing/device-samsung-a6lte/etc-init.d-udev-settle rename to device/archived/device-samsung-a6lte-downstream/etc-init.d-udev-settle diff --git a/device/testing/device-samsung-a6lte/etc-init.d-wlan0-up b/device/archived/device-samsung-a6lte-downstream/etc-init.d-wlan0-up similarity index 100% rename from device/testing/device-samsung-a6lte/etc-init.d-wlan0-up rename to device/archived/device-samsung-a6lte-downstream/etc-init.d-wlan0-up diff --git a/device/archived/device-samsung-a6lte-downstream/etc-lightdm-lightdm.conf b/device/archived/device-samsung-a6lte-downstream/etc-lightdm-lightdm.conf new file mode 100644 index 000000000..e29030da1 --- /dev/null +++ b/device/archived/device-samsung-a6lte-downstream/etc-lightdm-lightdm.conf @@ -0,0 +1,164 @@ +# +# General configuration +# +# start-default-seat = True to always start one seat if none are defined in the configuration +# greeter-user = User to run greeter as +# minimum-display-number = Minimum display number to use for X servers +# minimum-vt = First VT to run displays on +# lock-memory = True to prevent memory from being paged to disk +# user-authority-in-system-dir = True if session authority should be in the system location +# guest-account-script = Script to be run to setup guest account +# logind-check-graphical = True to on start seats that are marked as graphical by logind +# log-directory = Directory to log information to +# run-directory = Directory to put running state in +# cache-directory = Directory to cache to +# sessions-directory = Directory to find sessions +# remote-sessions-directory = Directory to find remote sessions +# greeters-directory = Directory to find greeters +# backup-logs = True to move add a .old suffix to old log files when opening new ones +# dbus-service = True if LightDM provides a D-Bus service to control it +# +[LightDM] +#start-default-seat=true +#greeter-user=lightdm +#minimum-display-number=0 +#minimum-vt=7 +#lock-memory=true +#user-authority-in-system-dir=false +#guest-account-script=guest-account +# Next line: elogind reports that the session CanGraphical=no. Let lightdm ignore that bogus status. +logind-check-graphical=false +#log-directory=/var/log/lightdm +#run-directory=/var/run/lightdm +#cache-directory=/var/cache/lightdm +#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions +#remote-sessions-directory=/usr/share/lightdm/remote-sessions +#greeters-directory=$XDG_DATA_DIRS/lightdm/greeters:$XDG_DATA_DIRS/xgreeters +#backup-logs=true +#dbus-service=true + +# +# Seat configuration +# +# Seat configuration is matched against the seat name glob in the section, for example: +# [Seat:*] matches all seats and is applied first. +# [Seat:seat0] matches the seat named "seat0". +# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client". +# +# type = Seat type (local, xremote) +# pam-service = PAM service to use for login +# pam-autologin-service = PAM service to use for autologin +# pam-greeter-service = PAM service to use for greeters +# xserver-command = X server command to run (can also contain arguments e.g. X -special-option) +# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option) +# xserver-config = Config file to pass to X server +# xserver-layout = Layout to pass to X server +# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server +# xserver-share = True if the X server is shared for both greeter and session +# xserver-hostname = Hostname of X server (only for type=xremote) +# xserver-display-number = Display number of X server (only for type=xremote) +# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true) +# xdmcp-port = XDMCP UDP/IP port to communicate on +# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf) +# greeter-session = Session to load for greeter +# greeter-hide-users = True to hide the user list +# greeter-allow-guest = True if the greeter should show a guest login option +# greeter-show-manual-login = True if the greeter should offer a manual login option +# greeter-show-remote-login = True if the greeter should offer a remote login option +# user-session = Session to load for users +# allow-user-switching = True if allowed to switch users +# allow-guest = True if guest login is allowed +# guest-session = Session to load for guests (overrides user-session) +# session-wrapper = Wrapper script to run session with +# greeter-wrapper = Wrapper script to run greeter with +# guest-wrapper = Wrapper script to run guest sessions with +# display-setup-script = Script to run when starting a greeter session (runs as root) +# display-stopped-script = Script to run after stopping the display server (runs as root) +# greeter-setup-script = Script to run when starting a greeter (runs as root) +# session-setup-script = Script to run when starting a user session (runs as root) +# session-cleanup-script = Script to run when quitting a user session (runs as root) +# autologin-guest = True to log in as guest by default +# autologin-user = User to log in with by default (overrides autologin-guest) +# autologin-user-timeout = Number of seconds to wait before loading default user +# autologin-session = Session to load for automatic login (overrides user-session) +# autologin-in-background = True if autologin session should not be immediately activated +# exit-on-failure = True if the daemon should exit if this seat fails +# +[Seat:*] +#type=local +#pam-service=lightdm +#pam-autologin-service=lightdm-autologin +#pam-greeter-service=lightdm-greeter +#xserver-command=X +#xmir-command=Xmir +#xserver-config= +#xserver-layout= +#xserver-allow-tcp=false +#xserver-share=true +#xserver-hostname= +#xserver-display-number= +#xdmcp-manager= +#xdmcp-port=177 +#xdmcp-key= +#greeter-session=example-gtk-gnome +#greeter-hide-users=false +#greeter-allow-guest=true +#greeter-show-manual-login=false +#greeter-show-remote-login=true +#user-session=default +#allow-user-switching=true +#allow-guest=false +#guest-session= +#session-wrapper=lightdm-session +#greeter-wrapper= +#guest-wrapper= +#display-setup-script= +#display-stopped-script= +#greeter-setup-script= +#session-setup-script= +#session-cleanup-script= +#autologin-guest=false +#autologin-user= +#autologin-user-timeout=0 +#autologin-in-background=false +#autologin-session= +#exit-on-failure=false + +# +# XDMCP Server configuration +# +# enabled = True if XDMCP connections should be allowed +# port = UDP/IP port to listen for connections on +# listen-address = Host/address to listen for XDMCP connections (use all addresses if not present) +# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf) +# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset) +# +# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn. Alternatively +# it can be a word and the first 7 characters are used as the key. +# +[XDMCPServer] +#enabled=false +#port=177 +#listen-address= +#key= +#hostname= + +# +# VNC Server configuration +# +# enabled = True if VNC connections should be allowed +# command = Command to run Xvnc server with +# port = TCP/IP port to listen for connections on +# listen-address = Host/address to listen for VNC connections (use all addresses if not present) +# width = Width of display to use +# height = Height of display to use +# depth = Color depth of display to use +# +[VNCServer] +#enabled=false +#command=Xvnc +#port=5900 +#listen-address= +#width=1024 +#height=768 +#depth=8 diff --git a/device/testing/device-samsung-a6lte/usr-libexec-samsungipcd-voicecall.sh b/device/archived/device-samsung-a6lte-downstream/usr-libexec-samsungipcd-voicecall.sh similarity index 100% rename from device/testing/device-samsung-a6lte/usr-libexec-samsungipcd-voicecall.sh rename to device/archived/device-samsung-a6lte-downstream/usr-libexec-samsungipcd-voicecall.sh diff --git a/device/testing/device-samsung-a6lte/usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf b/device/archived/device-samsung-a6lte-downstream/usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf similarity index 100% rename from device/testing/device-samsung-a6lte/usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf rename to device/archived/device-samsung-a6lte-downstream/usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf diff --git a/device/testing/device-samsung-a6lte/usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf b/device/archived/device-samsung-a6lte-downstream/usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf similarity index 100% rename from device/testing/device-samsung-a6lte/usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf rename to device/archived/device-samsung-a6lte-downstream/usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf diff --git a/device/testing/device-samsung-a6lte/usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf b/device/archived/device-samsung-a6lte-downstream/usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf similarity index 100% rename from device/testing/device-samsung-a6lte/usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf rename to device/archived/device-samsung-a6lte-downstream/usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf diff --git a/device/testing/device-samsung-a6lte/usr-share-wireplumber-wireplumber.conf.d-headroom.conf b/device/archived/device-samsung-a6lte-downstream/usr-share-wireplumber-wireplumber.conf.d-headroom.conf similarity index 100% rename from device/testing/device-samsung-a6lte/usr-share-wireplumber-wireplumber.conf.d-headroom.conf rename to device/archived/device-samsung-a6lte-downstream/usr-share-wireplumber-wireplumber.conf.d-headroom.conf diff --git a/device/testing/linux-samsung-a6lte/APKBUILD b/device/archived/linux-samsung-a6lte-downstream/APKBUILD similarity index 94% rename from device/testing/linux-samsung-a6lte/APKBUILD rename to device/archived/linux-samsung-a6lte-downstream/APKBUILD index 983c23945..15f297ebe 100644 --- a/device/testing/linux-samsung-a6lte/APKBUILD +++ b/device/archived/linux-samsung-a6lte-downstream/APKBUILD @@ -1,9 +1,10 @@ +# Archived: Downstream port, only for testing. Use mainline port! # Reference: # Kernel config based on the stock Android one -pkgname=linux-samsung-a6lte +pkgname=linux-samsung-a6lte-downstream pkgver=3.18.140 -pkgrel=6 +pkgrel=0 pkgdesc="Samsung Galaxy A6 2018 kernel fork" arch="aarch64" _carch="arm64" @@ -74,7 +75,7 @@ package() { } sha512sums=" -c2cc5190c480de4ac2d376827c5c56a542c6644d3dbeb47956d0b90c5570b246872ecedbf5655ac5564c9f61190d23567a4c496bb4235c46f6bd7a6d8addcc68 linux-samsung-a6lte-981969320c1cdc214cf8a1a357fab642f401a5d1.tar.gz +c2cc5190c480de4ac2d376827c5c56a542c6644d3dbeb47956d0b90c5570b246872ecedbf5655ac5564c9f61190d23567a4c496bb4235c46f6bd7a6d8addcc68 linux-samsung-a6lte-downstream-981969320c1cdc214cf8a1a357fab642f401a5d1.tar.gz 82ca91133a27967d164c5e38545bfe84055c0ec7dde738038ba8258a05d518e07b16a2ba7b9c1b7dda28236dbdc62def3cfb643ae695bca88498714b6fd25e56 config-samsung-a6lte.aarch64 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch 3f65a690e48f913fcb980718fae4dc03c29a6dc86eecb1e2af644488ad415de326a61d840399fb69915cbc5d56d5586f2df2287b3e7323a2927ae73a3b1b1373 zram-zs-create-pool-null.patch diff --git a/device/testing/linux-samsung-a6lte/config-samsung-a6lte.aarch64 b/device/archived/linux-samsung-a6lte-downstream/config-samsung-a6lte.aarch64 similarity index 100% rename from device/testing/linux-samsung-a6lte/config-samsung-a6lte.aarch64 rename to device/archived/linux-samsung-a6lte-downstream/config-samsung-a6lte.aarch64 diff --git a/device/testing/linux-samsung-a6lte/decon-fb-colors.patch b/device/archived/linux-samsung-a6lte-downstream/decon-fb-colors.patch similarity index 100% rename from device/testing/linux-samsung-a6lte/decon-fb-colors.patch rename to device/archived/linux-samsung-a6lte-downstream/decon-fb-colors.patch diff --git a/device/testing/linux-samsung-a6lte/disable-boot-mode-check.patch b/device/archived/linux-samsung-a6lte-downstream/disable-boot-mode-check.patch similarity index 100% rename from device/testing/linux-samsung-a6lte/disable-boot-mode-check.patch rename to device/archived/linux-samsung-a6lte-downstream/disable-boot-mode-check.patch diff --git a/device/testing/linux-samsung-a6lte/firmware-paths-fix.patch b/device/archived/linux-samsung-a6lte-downstream/firmware-paths-fix.patch similarity index 100% rename from device/testing/linux-samsung-a6lte/firmware-paths-fix.patch rename to device/archived/linux-samsung-a6lte-downstream/firmware-paths-fix.patch diff --git a/device/testing/linux-samsung-a6lte/fix-addrconf_rt_table-nullptr-deref.patch b/device/archived/linux-samsung-a6lte-downstream/fix-addrconf_rt_table-nullptr-deref.patch similarity index 100% rename from device/testing/linux-samsung-a6lte/fix-addrconf_rt_table-nullptr-deref.patch rename to device/archived/linux-samsung-a6lte-downstream/fix-addrconf_rt_table-nullptr-deref.patch diff --git a/device/testing/linux-samsung-a6lte/gcc10-extern_YYLOC_global_declaration.patch b/device/archived/linux-samsung-a6lte-downstream/gcc10-extern_YYLOC_global_declaration.patch similarity index 100% rename from device/testing/linux-samsung-a6lte/gcc10-extern_YYLOC_global_declaration.patch rename to device/archived/linux-samsung-a6lte-downstream/gcc10-extern_YYLOC_global_declaration.patch diff --git a/device/testing/linux-samsung-a6lte/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch b/device/archived/linux-samsung-a6lte-downstream/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch similarity index 100% rename from device/testing/linux-samsung-a6lte/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch rename to device/archived/linux-samsung-a6lte-downstream/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch diff --git a/device/testing/linux-samsung-a6lte/uncomment-rfcomm-in-makefile.patch b/device/archived/linux-samsung-a6lte-downstream/uncomment-rfcomm-in-makefile.patch similarity index 100% rename from device/testing/linux-samsung-a6lte/uncomment-rfcomm-in-makefile.patch rename to device/archived/linux-samsung-a6lte-downstream/uncomment-rfcomm-in-makefile.patch diff --git a/device/testing/linux-samsung-a6lte/zram-zs-create-pool-null.patch b/device/archived/linux-samsung-a6lte-downstream/zram-zs-create-pool-null.patch similarity index 100% rename from device/testing/linux-samsung-a6lte/zram-zs-create-pool-null.patch rename to device/archived/linux-samsung-a6lte-downstream/zram-zs-create-pool-null.patch diff --git a/device/testing/device-samsung-a6lte/APKBUILD b/device/testing/device-samsung-a6lte/APKBUILD index af664d91f..0341bc6ca 100644 --- a/device/testing/device-samsung-a6lte/APKBUILD +++ b/device/testing/device-samsung-a6lte/APKBUILD @@ -1,7 +1,7 @@ # Reference: pkgname=device-samsung-a6lte pkgdesc="Samsung Galaxy A6 2018" -pkgver=7 +pkgver=8 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -10,8 +10,13 @@ options="!check !archcheck" depends=" alsa-utils bootmac + dtbtool-exynos + firmware-samsung-a6lte + linux-postmarketos-exynos7870 + mesa-dri-simpledrm mkbootimg postmarketos-base + samsungipcd util-linux " replaces=" @@ -22,29 +27,8 @@ install="$pkgname.post-install" source=" deviceinfo etc-conf.d-samsungipcd - etc-init.d-hciattach-ttySAC0 - etc-init.d-udev-settle - etc-init.d-wlan0-up etc-lightdm-lightdm.conf - etc-NetworkManager-conf.d-swlan0-unmanaged.conf - etc-NetworkManager-conf.d-wlan0-preserve-mac.conf - usr-libexec-samsungipcd-voicecall.sh - usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf - usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf - usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf - usr-share-wireplumber-wireplumber.conf.d-headroom.conf " -subpackages=" - $pkgname-openrc - $pkgname-kernel-downstream:kernel_downstream - $pkgname-kernel-mainline:kernel_mainline - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-downstream-quirks:downstream_quirks - $pkgname-downstream-quirks-openrc:downstream_quirks_openrc -" - -# pulseaudio does not seem to work on this device. Will use pipewire-pulse instead. -# (For downstream kernel, mainline does not have audio yet and I'd like to run Phosh) build() { devicepkg_build $startdir $pkgname @@ -52,72 +36,13 @@ build() { package() { devicepkg_package $startdir $pkgname + install -Dm644 etc-conf.d-samsungipcd "$pkgdir"/etc/conf.d/samsungipcd install -Dm644 etc-lightdm-lightdm.conf "$pkgdir"/etc/lightdm/lightdm.conf - install -Dm755 usr-libexec-samsungipcd-voicecall.sh "$pkgdir"/usr/libexec/samsungipcd/voicecall.sh - install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/HiFi.conf - install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/Universal7870-I.conf - install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/VoiceCall.conf - install -Dm644 usr-share-wireplumber-wireplumber.conf.d-headroom.conf "$pkgdir"/usr/share/wireplumber/wireplumber.conf.d/headroom.conf -} - -openrc() { - install_if="$pkgname=$pkgver-r$pkgrel openrc" - install -Dm755 etc-init.d-wlan0-up "$subpkgdir"/etc/init.d/wlan0-up -} - -kernel_downstream() { - pkgdesc="Working: display, touchscreen, wifi, bluetooth, audio, cellular" - depends="linux-samsung-a6lte msm-fb-refresher pipewire-pulse" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline() { - pkgdesc="Close-to-mainline WIP. Working: display, touchscreen, wifi, bluetooth" - depends="dtbtool-exynos linux-postmarketos-exynos7870 mesa-dri-simpledrm" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -# samsungipcd is technically not a firmware package, but it does use the firmware stored on the on-device RADIO partition -# so it makes sense to have it here rather than in the main depends list -nonfree_firmware() { - pkgdesc="Wifi firmware & kill-switch for the cellular modem" - depends="firmware-samsung-a6lte samsungipcd" - mkdir "$subpkgdir" -} - -downstream_quirks() { - pkgdesc="Hacks to make the downstream kernel work" - depends="bluez-deprecated" - install_if="$pkgname-kernel-downstream" - replaces="bootmac" - install -Dm644 etc-NetworkManager-conf.d-swlan0-unmanaged.conf "$pkgdir"/etc/NetworkManager/conf.d/swlan0-unmanaged.conf - install -Dm644 etc-NetworkManager-conf.d-wlan0-preserve-mac.conf "$pkgdir"/etc/NetworkManager/conf.d/wlan0-preserve-mac.conf - # we run bootmac ourselves and don't want it to trigger from the udev rule - # so remove the rule - install -Dm755 /dev/null "$subpkgdir"/usr/lib/udev/rules.d/90-bootmac.rules -} - -downstream_quirks_openrc() { - install_if="$pkgname-downstream-quirks=$pkgver-r$pkgrel openrc" - replaces="udev-init-scripts-openrc" - install="$subpkgname.post-install" - install -Dm755 etc-init.d-udev-settle "$subpkgdir"/etc/init.d/udev-settle - install -Dm755 etc-init.d-hciattach-ttySAC0 "$subpkgdir"/etc/init.d/hciattach-ttySAC0 } sha512sums=" -4dc62ad42527dd0ff687c4279e94c37d534de8a29e8ea42e69cc29fc65dc96604bfd32a3e848135c37a4a86d9d78b5da9adce7fd9230814748b6324058ea32df deviceinfo +ba1624f1fe963d7c1ec7a89ded5eaf694acbdcd85684f478c37cb3eb610e779f33f5adddf60a6018c88de0f29b58524938de3c64a5e8cbadb2764ca05955b06d deviceinfo 3e5bb764529010d2b6b1f2759a7799f665d140aebcee2dd63433e68cd4282e09b5d3b34fb7c21e737595b406501e7f02ece4592651c60e4c2b9419de4aedb438 etc-conf.d-samsungipcd -f9716fc70bf3508d2f9e83d908f1c13103403f01ebb784acec6cdf3e959e92b63c75e49b0120abe1ada5a50d768dcf30b8472630da1172fc826485e97024d85e etc-init.d-hciattach-ttySAC0 -203b832a7080d5f1351c5e024e444f9fe509f6e0fd4b376a60c7d73359b7e356863a4f15caf9b2e4e733dc44d2971722083e7c69ca94a012eb004b4b8ded9d09 etc-init.d-udev-settle -7caddfe4659c969a33adcc27a760bc78d4f70ca4b7a4a5ec28a6411c12f3e6dd6d427b59f75976a737a5fe0f09806f8b6d65798f6358bd1e1954ad2a28fbfdc8 etc-init.d-wlan0-up 861270c6bc0b2a3e6cd389c21c8c895e62de8cf8bec6fcf23c178f8cbaae855d62b0ee98692671ab4f518d84cb43dd0b2fe46f5a609f65af6a6c06e0fdbb6d0c etc-lightdm-lightdm.conf -ef24527b13e48a9153643f3713167d3d08486e7de8b4c94d7c446ff380396115890573d8cd4aa5448766d9e779e189833a83e7921081679bd348c3f8a59410af etc-NetworkManager-conf.d-swlan0-unmanaged.conf -5c3a692f22a29fca792c114c6d94ff1bf0d6921f068f207a2894a8f99c73dcc319e7c803ed7adfe64eb3e60088f37e2a2730118b2ed57aa01b35415664085567 etc-NetworkManager-conf.d-wlan0-preserve-mac.conf -abe1c4a2f59fe862cebef75c54b8806bd86ce06aeb15d8c0699ab1338c9d575cb72a4d5b099f94272b1d9c9c3f4960af209a9e058ea9e57733b7d905dad0d33f usr-libexec-samsungipcd-voicecall.sh -2169590d10d6123575d43e8ff7dc0d2ba824f8266d9fa75a5b59a4cc5753e47e327368b777082930d6b7a7aed6f57fa6ac2c5a2e816e1e12cd1032a8bb1822b5 usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf -dc528deb556906adfb89b02b6faa04a8b21358706bb60e2fa51c8a3c909b680fcc02fa425b0cb5d6273595f27dfc9b640e1a8d455657fd6b47652af9e8ec295a usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf -3e74de3504f134a2726ee87740c5803bbd578352674d1d7de8b9460e57553100e9c4d322143ee83d3d584884c52eef47762bed41814ff1fca8cd9c4552f39b73 usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf -be561f0573c73bdcf37fbd8e4659e92577a0818aafb75d73e7cbf1dd8980f29313170703074ee0cc9cc5b5a07cd7ac8ced07dfdc77b0b31a0cd34d66ae0473a4 usr-share-wireplumber-wireplumber.conf.d-headroom.conf " diff --git a/device/testing/device-samsung-a6lte/deviceinfo b/device/testing/device-samsung-a6lte/deviceinfo index bec5ef9cb..31e022c38 100644 --- a/device/testing/device-samsung-a6lte/deviceinfo +++ b/device/testing/device-samsung-a6lte/deviceinfo @@ -21,7 +21,7 @@ deviceinfo_flash_method="heimdall-bootimg" deviceinfo_kernel_cmdline="androidboot.selinux=permissive androidboot.selinux=permissive" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="true" -deviceinfo_bootimg_qcdt_type_mainline="exynos" +deviceinfo_bootimg_qcdt_type="exynos" deviceinfo_bootimg_dtb_second="false" deviceinfo_flash_pagesize="2048" deviceinfo_flash_offset_base="0x10000000" @@ -33,4 +33,4 @@ deviceinfo_flash_heimdall_partition_kernel="BOOT" deviceinfo_flash_heimdall_partition_rootfs="SYSTEM" # Kernel related -deviceinfo_dtb_mainline="exynos/exynos7870-a6lte" +deviceinfo_dtb="exynos/exynos7870-a6lte"