From 0d22968acd2e0321afd768099bdc03064ec2a517 Mon Sep 17 00:00:00 2001 From: John Sullivan Date: Fri, 25 Sep 2020 00:44:17 -0700 Subject: [PATCH 1/3] New package: atinout-0.9.1 --- srcpkgs/atinout/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/atinout/template diff --git a/srcpkgs/atinout/template b/srcpkgs/atinout/template new file mode 100644 index 00000000000..e292bf9c9c7 --- /dev/null +++ b/srcpkgs/atinout/template @@ -0,0 +1,14 @@ +# Template file for 'atinout' +pkgname=atinout +version=0.9.1 +revision=1 +build_style=gnu-makefile +short_desc="Send AT commands to modem and print responses" +maintainer="John Sullivan " +license="GPL-3.0-or-later" +homepage="http://atinout.sourceforge.net" +distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/v${version}/${pkgname}-${version}.tar.gz" +checksum=4d15c8288aca414e11cd304686b172696104c5e42bf776300311c005634854a2 + +# Disable -Werror (GCC9+ turns switch fallthrough into error) +CFLAGS="-W -Wall -Wextra -DVERSION=\\\"${version}\\\" -g" From 435dee9de8921b320fbd4a01248ace711e276af8 Mon Sep 17 00:00:00 2001 From: John Sullivan Date: Fri, 5 Feb 2021 21:31:03 -0800 Subject: [PATCH 2/3] New package: pinephone-utils-0.1 --- .../patches/vendor/modem-rules.patch | 8 +++++ srcpkgs/pinephone-utils/template | 32 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 srcpkgs/pinephone-utils/patches/vendor/modem-rules.patch create mode 100644 srcpkgs/pinephone-utils/template diff --git a/srcpkgs/pinephone-utils/patches/vendor/modem-rules.patch b/srcpkgs/pinephone-utils/patches/vendor/modem-rules.patch new file mode 100644 index 00000000000..2157c2184d0 --- /dev/null +++ b/srcpkgs/pinephone-utils/patches/vendor/modem-rules.patch @@ -0,0 +1,8 @@ +--- device/main/device-pine64-pinephone/90-modem-eg25.rules 2021-01-27 07:11:44.000000000 -0800 ++++ srcpkgs/pinephone-utils/files/90-modem-eg25.rules 2020-09-25 01:37:55.390496779 -0700 +@@ -3,5 +3,3 @@ + SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="01", SYMLINK+="EG25.NMEA", MODE="0660" + SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="02", SYMLINK+="EG25.AT", MODE="0660" + SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="03", SYMLINK+="EG25.MODEM", MODE="0660" +- +-ACTION=="add", SUBSYSTEM=="tty", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="02", RUN+="/usr/bin/pinephone_setup-modem '%E{DEVNAME}'" diff --git a/srcpkgs/pinephone-utils/template b/srcpkgs/pinephone-utils/template new file mode 100644 index 00000000000..d2059e54281 --- /dev/null +++ b/srcpkgs/pinephone-utils/template @@ -0,0 +1,32 @@ +# Template file for 'pinephone-utils' +pkgname=pinephone-utils +version=0.1 +revision=1 +archs="aarch64*" +create_wrksrc=yes +depends="alsa-ucm-conf" +short_desc="Scripts/configs for managing pinephone hardware" +maintainer="John Sullivan " +license="MIT" +homepage="https://postmarketos.org/" + +_commit_pmos=c48037d5ed307d865903ef3aecd302f1fa4417f8 +_pmos_device='device/main/device-pine64-pinephone' +_pmos_checkout="pmaports-${_commit_pmos}-$(echo ${_pmos_device} | tr '/' '-')/${_pmos_device}" + +distfiles="https://gitlab.com/postmarketOS/pmaports/-/archive/${_commit_pmos}/pmaports-${_commit_pmos}.tar.gz?path=${_pmos_device}>pmos-scripts.tar.gz" +checksum="d73200da438b6a5641ccd0e73f778cad07301c83b5bbf7286722c74a98675d2e" + +do_patch() { + patch "${_pmos_checkout}/90-modem-eg25.rules" -slNp1 -i "${PATCHESDIR}/vendor/modem-rules.patch" + sed -i 's/postmarketOS/void/' "${_pmos_checkout}/setup-modem.sh" +} + +do_install() { + vinstall "${_pmos_checkout}/90-modem-eg25.rules" 644 usr/lib/udev/rules.d + vinstall "${_pmos_checkout}/00_alsa_pinephone_dshare.conf" 644 etc/alsa/conf.d "00-alsa-pinephone-dshare.conf" + vbin "${_pmos_checkout}/setup-modem.sh" "pinephone-setup-modem.sh" + + vmkdir usr/share/alsa/ucm2 + vcopy "${_pmos_checkout}/ucm" usr/share/alsa/ucm2/PinePhone +} From 0593f2eba4ca2a4bfdd2720a20eb098e1aaa3207 Mon Sep 17 00:00:00 2001 From: John Sullivan Date: Fri, 5 Feb 2021 21:32:10 -0800 Subject: [PATCH 3/3] pinephone-base: get utilities from pinephone-utils --- srcpkgs/pinephone-base/files/90-modem-eg25.rules | 5 ----- srcpkgs/pinephone-base/template | 8 ++------ 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 srcpkgs/pinephone-base/files/90-modem-eg25.rules diff --git a/srcpkgs/pinephone-base/files/90-modem-eg25.rules b/srcpkgs/pinephone-base/files/90-modem-eg25.rules deleted file mode 100644 index cd0031422cb..00000000000 --- a/srcpkgs/pinephone-base/files/90-modem-eg25.rules +++ /dev/null @@ -1,5 +0,0 @@ -SUBSYSTEMS=="usb", ENV{.LOCAL_ifNum}="$attr{bInterfaceNumber}" - -SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="01", SYMLINK+="EG25.NMEA", MODE="0660" -SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="02", SYMLINK+="EG25.AT", MODE="0660" -SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="03", SYMLINK+="EG25.MODEM", MODE="0660" diff --git a/srcpkgs/pinephone-base/template b/srcpkgs/pinephone-base/template index 6c750a92bd5..a4741e24cb7 100644 --- a/srcpkgs/pinephone-base/template +++ b/srcpkgs/pinephone-base/template @@ -1,15 +1,11 @@ # Template file for 'pinephone-base' pkgname=pinephone-base -version=0.1 +version=0.2 revision=1 archs="aarch64*" build_style=meta -depends="pinephone-kernel pinephone-uboot" +depends="pinephone-kernel pinephone-uboot pinephone-utils" short_desc="Void Linux PinePhone platform package" maintainer="John Sullivan " license="Public Domain" homepage="https://www.voidlinux.org" - -do_install() { - vinstall "${FILESDIR}/90-modem-eg25.rules" 644 usr/lib/udev/rules.d -}