Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libsystemd: correct required_conan_version, add v255.2 #22447

Merged
merged 2 commits into from
Jan 22, 2024
Merged

libsystemd: correct required_conan_version, add v255.2 #22447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f357ce1
libsystemd: correct required_conan_version, add v255.2
valgur Jan 19, 2024
6574964
libsystemd: apply patches correctly
valgur Jan 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions recipes/libsystemd/all/conandata.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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