From 911230097be322ff16df9b8ba72193b36b7a15dc Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 7 Apr 2021 04:44:34 +0200 Subject: [PATCH 1/5] "Right" --- udev/rules.d/91-mountsd.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/udev/rules.d/91-mountsd.rules b/udev/rules.d/91-mountsd.rules index c73184d..ac225fe 100644 --- a/udev/rules.d/91-mountsd.rules +++ b/udev/rules.d/91-mountsd.rules @@ -27,7 +27,7 @@ KERNEL=="sd*", ENV{DEVTYPE}=="disk", ENV{ID_DRIVE_FLASH_SD}="1", ENV{ID_DRIVE_ME # Match ENV{ID_FS_USAGE}=="filesystem" for all selected devices ENV{ID_FS_USAGE}=="filesystem", ACTION=="add|change", ENV{UDISKS_SYSTEM}="0", ENV{UDISKS_AUTO}="0", ENV{UDISKS_NAME}="mount_sdcard_dev-%k", MODE="0660", ENV{MOUNTSD_ACTIVE}="1", TAG+="systemd", ENV{SYSTEMD_WANTS}="mount-sd@%k.service" # When above detected and assigned devices are removed -ENV{MOUNTSD_ACTIVE}=="1", ACTION=="remove", ENV{MOUNTSD_ACTIVE}="0", ENV{UDISKS_NAME}="mount_sdcard_removed", ENV{SYSTEMD_WANTS}="", ENV{SYSTEMD_USER_WANTS}="", RUN{program}+="/bin/systemctl stop mount-sd@%k.service" +ENV{MOUNTSD_ACTIVE}=="1", ACTION=="remove", ENV{MOUNTSD_ACTIVE}="0", ENV{UDISKS_NAME}="mount_sdcard_removed", ENV{SYSTEMD_WANTS}="", ENV{SYSTEMD_USER_WANTS}="", RUN{program}+="/usr/bin/systemctl stop mount-sd@%k.service" LABEL="mountsd_end" From f3c759fb6c4263e397422d773200132da4d2012d Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 7 Apr 2021 23:52:26 +0200 Subject: [PATCH 2/5] Update mount-sdcard.spec --- rpm/mount-sdcard.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/mount-sdcard.spec b/rpm/mount-sdcard.spec index c775e9c..66912cc 100644 --- a/rpm/mount-sdcard.spec +++ b/rpm/mount-sdcard.spec @@ -9,7 +9,7 @@ Version: 1.6.0 # - An optional third field might be used by downstream packagers, who alter the package but want to # retain the exact version number. It shall consist of the packager's name appended with a natural # number greater than zero, e.g "joe8". -Release: 1.sfosABC +Release: 1.sfos340 Group: System/Base Distribution: SailfishOS Vendor: olf @@ -29,7 +29,7 @@ Requires: udisks2 # Better use direct dependencies on specific versions than indirect ones (here: the line above # versus the one below) in general, but ultimately decided not to do so in this special case # (for commonality across release versions): -Requires: sailfish-version >= 3.2.1 +Requires: sailfish-version >= 3.4.0 # Omit anti-dependency on future, untested SFOS versions, until a known conflict exists: # Requires: sailfish-version < 4.9.9 From e9744ffa7d767fccb8a0794817a12b4796eecaf3 Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 3 Jun 2021 00:28:41 +0200 Subject: [PATCH 3/5] Update mount-sdcard.spec --- rpm/mount-sdcard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/mount-sdcard.spec b/rpm/mount-sdcard.spec index 40f0b2b..bb8203f 100644 --- a/rpm/mount-sdcard.spec +++ b/rpm/mount-sdcard.spec @@ -31,7 +31,7 @@ Requires: udisks2 # (for commonality across release versions): Requires: sailfish-version >= 3.4.0 # Omit anti-dependency on future, untested SFOS versions, until a known conflict exists: -# Requires: sailfish-version < 4.9.9 +# Requires: sailfish-version < 9.9.9 %description %{summary} From 5b813bcfc08242a99a3643a46eb41a8142b9734c Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 16 Feb 2023 14:50:55 +0100 Subject: [PATCH 4/5] Update mount-sdcard.spec --- rpm/mount-sdcard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/mount-sdcard.spec b/rpm/mount-sdcard.spec index 8b729dd..53e6fcf 100644 --- a/rpm/mount-sdcard.spec +++ b/rpm/mount-sdcard.spec @@ -9,7 +9,7 @@ Version: 1.8.2 # - An optional third field might be used by downstream packagers, who alter the package but want to # retain the exact version number. It should consist of the packager's name appended with a natural # number greater than zero as the packaging release number, e.g "joe8". -Release: 1.sfosABC +Release: 1.sfos340 Group: System/Base Distribution: SailfishOS Vendor: olf From 07208d0cb3c677af35a04c3253f7074257df035a Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 22 Feb 2023 01:30:56 +0100 Subject: [PATCH 5/5] Update mount-sdcard.spec --- rpm/mount-sdcard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/mount-sdcard.spec b/rpm/mount-sdcard.spec index cab3da5..61a6081 100644 --- a/rpm/mount-sdcard.spec +++ b/rpm/mount-sdcard.spec @@ -32,7 +32,7 @@ Requires: udisks2 # (for commonality across release versions): Requires: sailfish-version >= 3.4.0 # Omit anti-dependency on future, untested SFOS versions, until a known conflict exists: -# Requires: sailfish-version < 9.9.9 +# Requires: sailfish-version < 99.99.99 %description %{summary}, USB-attached storage etc.