meson.build: release version 0.4.6

udev rules: fix detection of community firmware
`!=` doesn't seem to be the exact inverse of `==`. To prove this I added the following to the udev rules. On a system with the community firmware both COMM_FW and NOT_COMM_FW were set to true, with the quectel firmware only NOT_COMM_FW was true. ATTRS{serial}=="community_fw", ENV{COMM_FW}="true" ATTRS{serial}!="community_fw", ENV{NOT_COMM_FW}="true"
2025-08-30 07:42:23 +02:00 · 2022-11-01 15:26:17 +01:00 · 2022-10-24 19:07:00 -04:00 · 2022-09-19 02:09:51 +02:00 · 2022-09-19 02:08:13 +02:00 · 2022-07-26 12:27:59 +02:00
9 changed files with 19 additions and 243 deletions
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,122 +0,0 @@
-eg25-manager (0.4.3-1) unstable; urgency=medium
-
-  * New upstream version 0.4.3
-  * d/control: build-depend on `scdoc`
-    This is required for building the manpages. Also bump Standards-Version,
-    no other changes needed.
-  * d/watch: fix watch file
-
- -- Arnaud Ferraris <arnaud.ferraris@gmail.com>  Sat, 19 Feb 2022 15:20:14 +0100
-
-eg25-manager (0.4.2-1) unstable; urgency=medium
-
-  * d/gbp.conf: update for current Mobian workflow
-  * New upstream version 0.4.2
-
- -- Arnaud Ferraris <arnaud.ferraris@collabora.com>  Wed, 08 Dec 2021 18:24:38 +0100
-
-eg25-manager (0.4.1-1) unstable; urgency=medium
-
-  * New upstream version 0.4.1
-  * debian: drop distro-specific systemd service.
-  * d/copyright: add missing entries
-
- -- Arnaud Ferraris <arnaud.ferraris@collabora.com>  Fri, 08 Oct 2021 11:02:27 +0200
-
-eg25-manager (0.4.0-1) unstable; urgency=medium
-
-  [ undef ]
-  * d/service: Use systemd to sandbox eg25-manager.
-  * d/salsa-ci: Add Mobian's CI
-
-  [ Arnaud Ferraris ]
-  * New upstream version 0.4.0
-  * d/eg25-manager.service: be less restrictive.
-  * d/control: add libcurl as build dependency
-
- -- Arnaud Ferraris <arnaud.ferraris@gmail.com>  Wed, 01 Sep 2021 00:44:04 +0200
-
-eg25-manager (0.3.0-1) unstable; urgency=medium
-
-  * New upstream version 0.3.0
-
- -- Arnaud Ferraris <arnaud.ferraris@collabora.com>  Fri, 28 May 2021 13:58:33 +0200
-
-eg25-manager (0.2.1-1) unstable; urgency=medium
-
-  * New upstream version 0.2.1
-
- -- Arnaud Ferraris <arnaud.ferraris@gmail.com>  Sun, 21 Feb 2021 16:41:31 +0100
-
-eg25-manager (0.2.0-1) unstable; urgency=medium
-
-  * New upstream version 0.2.0
-  * d/gbp.conf: enable multimaint-merge
-  * d/eg25-manager.service: remove deprecated -g option
-
- -- Arnaud Ferraris <arnaud.ferraris@gmail.com>  Sat, 20 Feb 2021 22:26:19 +0100
-
-eg25-manager (0.1.2-1) unstable; urgency=medium
-
-  * New upstream release 0.1.2
-  * d/eg25-manager.service: enable GNSS management
-
- -- Arnaud Ferraris <arnaud.ferraris@gmail.com>  Thu, 14 Jan 2021 00:09:23 +0100
-
-eg25-manager (0.1.1-1) unstable; urgency=medium
-
-  * d/control: build-depend on gudev
-  * New upstream release 0.1.1
-
- -- Arnaud Ferraris <arnaud.ferraris@gmail.com>  Fri, 18 Dec 2020 01:42:06 +0100
-
-eg25-manager (0.1.0-1) unstable; urgency=medium
-
-  * New upstream release 0.1.0
-
- -- Arnaud Ferraris <arnaud.ferraris@gmail.com>  Mon, 14 Dec 2020 16:45:20 +0100
-
-eg25-manager (0.0.6-1) unstable; urgency=medium
-
-  * New upstream release 0.0.6
-  * d/patches: drop upstreamed patches
-
- -- Arnaud Ferraris <arnaud.ferraris@gmail.com>  Fri, 11 Dec 2020 15:11:26 +0100
-
-eg25-manager (0.0.5-2) unstable; urgency=medium
-
-  * d/patches: fix crash on modem recovery
-
- -- Arnaud Ferraris <arnaud.ferraris@gmail.com>  Fri, 11 Dec 2020 14:33:14 +0100
-
-eg25-manager (0.0.5-1) unstable; urgency=medium
-
-  * New upstream release 0.0.5
-
- -- Arnaud Ferraris <arnaud.ferraris@gmail.com>  Fri, 11 Dec 2020 13:38:41 +0100
-
-eg25-manager (0.0.4-1) unstable; urgency=medium
-
-  * d/control: build only on arm64.
-  * d/service: restart daemon on failure
-  * d/control: build-depend on libusb-1.0
-
- -- Arnaud Ferraris <arnaud.ferraris@gmail.com>  Fri, 11 Dec 2020 12:51:41 +0100
-
-eg25-manager (0.0.3-1) unstable; urgency=medium
-
-  * New upstream release 0.0.3
-
- -- Arnaud Ferraris <arnaud.ferraris@gmail.com>  Thu, 10 Dec 2020 21:34:26 +0100
-
-eg25-manager (0.0.2-1) unstable; urgency=medium
-
-  * New upstream release 0.0.2
-
- -- Arnaud Ferraris <arnaud.ferraris@gmail.com>  Thu, 10 Dec 2020 19:50:50 +0100
-
-eg25-manager (0.0.1-1) unstable; urgency=medium
-
-  * Initial Debian packaging
-
- -- Arnaud Ferraris <arnaud.ferraris@gmail.com>  Thu, 10 Dec 2020 15:19:15 +0100
--- a/debian/control
+++ b/debian/control
@@ -1,29 +0,0 @@
-Source: eg25-manager
-Section: libs
-Priority: optional
-Maintainer: Arnaud Ferraris <arnaud.ferraris@gmail.com>
-Standards-Version: 4.6.0
-Rules-Requires-Root: no
-Build-Depends: debhelper-compat (= 13),
-               libcurl-dev | libcurl4-nss-dev,
-               libglib2.0-dev,
-               libgpiod-dev,
-               libgudev-1.0-dev,
-               libmm-glib-dev,
-               libusb-1.0-0-dev,
-               meson,
-               scdoc <!nodoc>,
-Homepage: https://gitlab.com/mobian1/devices/eg25-manager
-Vcs-Git: https://gitlab.com/mobian1/devices/eg25-manager.git
-Vcs-Browser: https://gitlab.com/mobian1/devices/eg25-manager
-
-Package: eg25-manager
-Architecture: arm64
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         modemmanager,
-Conflicts: pinephone-modem-scripts,
-Replaces: pinephone-modem-scripts,
-Description: Manager daemon for the Quectel EG25 mobile broadband modem
- A set of scripts for the PinePhone modem, allowing to power on/off the modem,
- and configure its audio interface to work properly with the A64 audio codec.
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,67 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: eg25-manager
-Upstream-Contact: Arnaud Ferraris <arnaud.ferraris@gmail.com>
-Source: https://gitlab.com/mobian1/devices/eg25-manager
-
-Files: *
-Copyright: 2020 Arnaud Ferraris <arnaud.ferraris@gmail.com>
-License: GPL-3.0-or-later
-
-Files: src/gnss.*
-Copyright: 2021 Dylan Van Assche <me@dylanvanassche.be>
-License: GPL-3.0-or-later
-
-Files: src/mm-iface.c
-Copyright: 2019 Purism SPC
-           2020 Arnaud Ferraris <arnaud.ferraris@gmail.com>
-License: GPL-3.0-or-later
-
-Files: src/ofono-iface.c
-Copyright: 2020 Oliver Smith <ollieparanoid@postmarketos.org>
-           2021 Bhushan Shah <bshah@kde.org>
-License: GPL-3.0-or-later
-
-Files: src/suspend.c
-Copyright: 2012 Red Hat, Inc
-           2020 Arnaud Ferraris <arnaud.ferraris@gmail.com>
-License: GPL-3.0-or-later
-
-Files: src/toml.*
-Copyright: 2017-2019 CK Tan
-License: MIT
-
-License: GPL-3.0-or-later
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <https://www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the GNU General Public License
- version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
-
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,10 +0,0 @@
-[DEFAULT]
-debian-branch = mobian
-debian-tag = mobian/%(version)s
-upstream-branch = master
-upstream-tag = %(version)s
-pristine-tar = True
-multimaint-merge = True
-
-[tag]
-sign-tags = True
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-%:
-	dh $@
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +0,0 @@
-3.0 (quilt)
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +0,0 @@
-version=4
-https://gitlab.com/mobian1/devices/@PACKAGE@/-/tags?sort=updated_desc \
-    .*/archive/\d\S+/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
--- a/meson.build
+++ b/meson.build
@@ -8,7 +8,7 @@
 project (
  'eg25-manager',
  'c',
-  version : '0.4.3',
+  version : '0.4.6',
  license : 'GPLv3+',
  meson_version : '>= 0.58.0',
  default_options :
--- a/udev/80-modem-eg25.rules
+++ b/udev/80-modem-eg25.rules
@@ -1,4 +1,18 @@
-ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTR{power/control}="auto"
-ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTR{power/autosuspend_delay_ms}="3000"
-ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTR{power/wakeup}="enabled"
-ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTR{power/persist}="0"
+ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ENV{DEVTYPE}=="usb_device", GOTO="eg25_start"
+GOTO="eg25_end"
+
+# Default attributes values
+LABEL="eg25_start"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTR{power/control}="auto"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTR{power/autosuspend_delay_ms}="3000"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTR{power/wakeup}="enabled"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTR{power/persist}="0"
+
+# power/control needs to be "on" for the community-maintained firmware
+ATTRS{serial}=="community_fw", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTR{power/control}="on"
+
+# Special trick for the PinePhone Pro: set power/persist to 1 *only* with the community FW
+# We can identify the PPP by looking for the string "pinephone-pro" in the device tree "compatible" property
+ATTRS{serial}=="community_fw", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", PROGRAM=="/bin/grep pine64,pinephone-pro /proc/device-tree/compatible", ATTR{power/persist}="1"
+
+LABEL="eg25_end"
Author	SHA1	Message	Date
Arnaud Ferraris	e7790f941c	meson.build: release version 0.4.6	2022-11-01 15:26:17 +01:00
ArenM	6b41ae6b3b	udev rules: fix detection of community firmware `!=` doesn't seem to be the exact inverse of `==`. To prove this I added the following to the udev rules. On a system with the community firmware both COMM_FW and NOT_COMM_FW were set to true, with the quectel firmware only NOT_COMM_FW was true. ATTRS{serial}=="community_fw", ENV{COMM_FW}="true" ATTRS{serial}!="community_fw", ENV{NOT_COMM_FW}="true"	2022-10-24 19:07:00 -04:00
Arnaud Ferraris	5b4f9bcc12	meson.build: release version 0.4.5	2022-09-19 02:09:51 +02:00
joerg	2218a908ab	replace DRIVER w/ DRIVERS in 80-modem-eg25.rules	2022-09-19 02:08:13 +02:00
Arnaud Ferraris	be6a924f8d	meson.build: release version 0.4.4	2022-07-26 12:27:59 +02:00
Arnaud Ferraris	34472a5cff	udev: allow different attribute values for the community firmware When using the community-maintained firmware, some attributes need to be set with different values than what works best with the stock firmware: this is the case of the `power/control` attribute which should be set to "on". Similarly, on the PPP `power/persist` should be set to "1". This commit reworks the udev rules so we can differentiate between firmwares and host devices.	2022-06-30 02:02:50 +02:00