diff --git a/README.md b/README.md index ed2cca0b..082a0a34 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# crypto-sdcard +# crypto-sdcard (regular edition) #### Configuration files for unlocking and mounting encrypted SD-cards, using udev, udisks2, polkit and systemd. -Note that for devices (e.g. Jolla 1 phones aka "sbj", but maybe also other older devices using Qualcomm SoCs as the Jolla C / Intex Aquafish (l500d), Inoi R7 (p4903), Jala Accione and Accione P), which need Qualcomm's `qcrypto` kernel module to be loaded in order to support modern cryptographic schemes as e.g. XTS, a [separate edition is provided](https://github.com/Olf0/crypto-sdcard/tree/qcrypto). +Note that for devices (e.g. Jolla 1 phones (aka "sbj"), but maybe also other older devices using Qualcomm SoCs as the Jolla C / Intex Aquafish (l500d), Inoi R7 (p4903), Jala Accione and Accione P), which need Qualcomm's `qcrypto` kernel module to be loaded in order to support modern cryptographic schemes as e.g. XTS (plus it is faster and more energy efficient), a [separate "qcrypto edition" is provided](https://github.com/Olf0/crypto-sdcard/tree/qcrypto). Extensively tested with systemd 225 (which includes udev), udisks2 2.7.5 and polkit 0.104 (e.g. SailfishOS 2.2 / 3.x, which provides aforementioned environment).
Built RPMs are available in the [release section](https://github.com/Olf0/crypto-sdcard/releases) and for easy installation under SailfishOS at [OpenRepos](https://openrepos.net/content/olf/crypto-sdcard). diff --git a/rpm/crypto-sdcard.spec b/rpm/crypto-sdcard.spec index 713ad0bc..d908d3bb 100644 --- a/rpm/crypto-sdcard.spec +++ b/rpm/crypto-sdcard.spec @@ -10,7 +10,7 @@ Version: 1.3.1 # - 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: 2.sfos340 +Release: 4.sfos340regular Group: System/Base Distribution: SailfishOS Vendor: olf @@ -34,6 +34,10 @@ Requires: sailfish-version >= 3.4.0 # Omit anti-dependency on future, untested SFOS versions, until a known conflict exists: # Requires: sailfish-version < 3.9.9 Requires: cryptsetup >= 1.4.0 +# Should not provide the file qcrypto.ko, check: find /lib/modules/ -name qcrypto.ko; rpm -qf $(find /lib/modules/ -name qcrypto.ko) +Conflicts: kernel-adaptation-sbj +# Conflicts: droid-hal-l500d +# Conflicts: XYZ Conflicts: crypto-sdcard_sbj %description