Skip to content

Commit

Permalink
(#22447) libsystemd: correct required_conan_version, add v255.2
Browse files Browse the repository at this point in the history
* libsystemd: correct required_conan_version, add v255.2

* libsystemd: apply patches correctly
  • Loading branch information
valgur authored Jan 22, 2024
1 parent 3d501da commit ca3339b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
7 changes: 7 additions & 0 deletions recipes/libsystemd/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"255.2":
url: "https://github.com/systemd/systemd-stable/archive/v255.2.tar.gz"
sha256: "ba7354a742dc9a8bb7dbeaa40cbf7cf2ca84f506d5b7ae5ab8d14c8eecb7aca0"
"255":
url: "https://github.com/systemd/systemd-stable/archive/v255.tar.gz"
sha256: "a3eb766ee96eb9f4cc25c2a6c933f3299e1b7ae22e72507dade0a5c86d92534f"
Expand Down Expand Up @@ -30,6 +33,10 @@ sources:
url: "https://github.com/systemd/systemd-stable/archive/v246.16.tar.gz"
sha256: "b69f9940d65870f090269a28f1047a633d4b80d0001e091d53a031dd40a822d2"
patches:
"255.2":
- patch_file: "patches/251.15/0001-Remove-dependency-from-coreutils.patch"
patch_description: "allow to build in environments without 'realpath --relative-to' by replacing it with conan-specific build variable"
patch_type: "conan"
"255":
- patch_file: "patches/251.15/0001-Remove-dependency-from-coreutils.patch"
patch_description: "allow to build in environments without 'realpath --relative-to' by replacing it with conan-specific build variable"
Expand Down
2 changes: 1 addition & 1 deletion recipes/libsystemd/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from conan.tools.meson import Meson, MesonToolchain
from conan.tools.scm import Version

required_conan_version = ">=1.53.0"
required_conan_version = ">=1.60.0"


class LibsystemdConan(ConanFile):
Expand Down
2 changes: 2 additions & 0 deletions recipes/libsystemd/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"255.2":
folder: all
"255":
folder: all
"253.14":
Expand Down

0 comments on commit ca3339b

Please sign in to comment.