Skip to content

Commit

Permalink
fix: Use /usr/lib/ rather than /lib in packaging code (#5970)
Browse files Browse the repository at this point in the history
Support for unmerged /usr was removed from systemd a while ago:
https://lists.freedesktop.org/archives/systemd-devel/2022-September/048352.html

Furthermore, Debian tooling will now throw lintian errors if files
continue to reference /lib. Since it is no longer supported in upstream
systemd, there is no reason for it to be supported in upstream
cloud-init code that uses systemd.
  • Loading branch information
TheRealFalcon authored Jan 14, 2025
1 parent 6cdf51a commit 0547349
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions setup_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ def pkg_config_read(library: str, var: str) -> str:
fallbacks = {
"systemd": {
"systemdsystemconfdir": "/etc/systemd/system",
"systemdsystemunitdir": "/lib/systemd/system",
"systemdsystemgeneratordir": "/lib/systemd/system-generators",
"systemdsystemunitdir": "/usr/lib/systemd/system",
"systemdsystemgeneratordir": "/usr/lib/systemd/system-generators",
},
"udev": {
"udevdir": "/lib/udev",
"udevdir": "/usr/lib/udev",
},
}
cmd = ["pkg-config", f"--variable={var}", library]
Expand Down

0 comments on commit 0547349

Please sign in to comment.