From d4e96df17dc16d54defff841286d92323e3ac178 Mon Sep 17 00:00:00 2001 From: Jan Jasper de Kroon Date: Thu, 10 Nov 2022 18:47:44 +0100 Subject: [PATCH] Revert "device/pine64-pinephone: add additional modem udev rule for new community firmware serial (MR 3240)" (MR 3632) This reverts commit f8df0939854d19bf0eee0e84ff20a4747264c63e. These are already handled by 80-modem-eg25.rules in eg25-manager. --- device/main/device-pine64-pinephone/90-modem-eg25.rules | 1 - device/main/device-pine64-pinephone/APKBUILD | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/device/main/device-pine64-pinephone/90-modem-eg25.rules b/device/main/device-pine64-pinephone/90-modem-eg25.rules index 5012ad162..31c855f91 100644 --- a/device/main/device-pine64-pinephone/90-modem-eg25.rules +++ b/device/main/device-pine64-pinephone/90-modem-eg25.rules @@ -7,4 +7,3 @@ SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProd ACTION=="add", SUBSYSTEM=="tty", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="02", RUN+="/usr/bin/pinephone_setup-modem '%E{DEVNAME}'" ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTRS{serial}=="0123456789ABCDEF", ATTR{power/control}="on" -ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTRS{serial}=="community_fw", ATTR{power/control}="on" diff --git a/device/main/device-pine64-pinephone/APKBUILD b/device/main/device-pine64-pinephone/APKBUILD index 4dd0e9d3d..d8fcb8684 100644 --- a/device/main/device-pine64-pinephone/APKBUILD +++ b/device/main/device-pine64-pinephone/APKBUILD @@ -4,8 +4,8 @@ # Co-Maintainer: Luca Weiss # Co-Maintainer: Dylan Van Assche pkgname=device-pine64-pinephone -pkgver=0.43 -pkgrel=2 +pkgver=0.44 +pkgrel=0 pkgdesc="PINE64 PinePhone" url="https://postmarketos.org" license="MIT" @@ -213,7 +213,7 @@ bac664c504d9a3adc6e3d25f24ac63cf7c449a82374544a5b56c259dc25af580897b9dc992865ac8 2d68ffe143f633a86670f30e45dbad1cc313f219f22b7cd3319ab44bb7209c20cb29f2ff2c60c92390154af9c9a6815c4186be555364cf31552005eba024c0e7 51_keyboard.gschema.override 9170da7ac869254644f2fc8d914102f2c16e917dbeb53e33b96c76936711d0540f55fa5c2526d73d5fe244500bc2728bc9d629e2524cf52c573d11e833aee666 60-flashlight.rules 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5 70-wifi-pm.rules -9cb52e3c5d63dde68296f4c1f9b691629182f82181a7f0877a72aad6870698ea9e7d628309970afbcce01041274054d304de1ee3faf8c1d101f7f8e988a43098 90-modem-eg25.rules +ed2636ae1380fcca221eede9ffcf071ffd52223fb1e11b8f55cfe5c7eaeb1dd1b4244dc1683f1113db1ccd780da03bcce4841a4d2f1a9721df21f64e9c2429b2 90-modem-eg25.rules ed0e03f7e1c0348c06be9a7922414469245604ce813bbf0c8910ef211cb993bbb0d0d4615c9c961d50712415f85d6b73e0cf02780ac784666aac56e4889341e4 UPower.conf 4a3e607a8e8249668195c472ba181149add65be515360b4d0f465b9c798e7bf8b2f2e431eb3e95cd8620c2a580779c665762f0386239b2fb2a64352e46702edb deviceinfo 348a1c4b82ffb8d2535b9a659f20d1ebd9a34a6eb8ead1016012c680de6cca401e1883319b2c0206063eb316f0dec274877fb66ee28869592ebea1f10b7b11da gpsd_device-hook.sh