Repository navigation
Makefile: fix the systemdsystemunitdir lookup - #28
Merged
otavio merged 1 commit intoNov 12, 2026
Merged
Conversation
Commit aa43445 ("install systemd services based on pkg-config system variables") assigns systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd); but in Make '$(' starts a variable reference, not a shell command, so pkg-config never runs. The value ends up as ';', the emptiness check passes, and the units are installed as "$(DESTDIR);/easysplash-*.service". Run pkg-config through $(shell ...), and use ?= so a packager can still set the directory explicitly. Also fix the abort path: a tab-indented $(error ...) outside a rule is parsed as a recipe line ("recipe commences before first target"), and the call had an extra ')'. Tested with make -n install-service: - SYSTEMD=1 with pkg-config: units go to systemd.pc's systemdsystemunitdir - SYSTEMD=1 systemdsystemunitdir=...: the given directory is used - SYSTEMD=1 without systemd.pc: "Could not find systemd.pc file. Aborting." - SYSTEMD=0: unchanged Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br>
lucianogdittgen
added a commit
to lucianogdittgen/meta-ossystems-base
that referenced
this pull request
Nov 12, 2026
Brings the systemd unit fixes (easysplash.enable=0 boot parameter, RemainAfterExit, no start in containers) and the cargo dependency upgrade (gstreamer-rs 0.20); crates regenerated with update_crates. Upstream's Makefile no longer finds the unit dir (OSSystems/EasySplash#28), so pass systemdsystemunitdir. Tested: bitbake easysplash and both animations on qemuarm; buildhistory shows only the expected deltas. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br>
lucianogdittgen
added a commit
to lucianogdittgen/meta-ossystems-base
that referenced
this pull request
Nov 12, 2026
Brings the systemd unit fixes (easysplash.enable=0 boot parameter, RemainAfterExit, no start in containers), the cargo dependency upgrade (gstreamer-rs 0.20; crates regenerated with update_crates) and the Makefile fix for the systemdsystemunitdir lookup (OSSystems/EasySplash#28). The recipe still passes systemdsystemunitdir explicitly so the unit directory does not come from pkg-config. Tested: bitbake easysplash and both animations on qemuarm; buildhistory shows only the expected deltas. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br>
lucianogdittgen
added a commit
to lucianogdittgen/meta-ossystems-base
that referenced
this pull request
Nov 13, 2026
Brings the systemd unit fixes (easysplash.enable=0 boot parameter, RemainAfterExit, no start in containers), the cargo dependency upgrade (gstreamer-rs 0.20; crates regenerated with update_crates) and the Makefile fix for the systemdsystemunitdir lookup (OSSystems/EasySplash#28). The recipe still passes systemdsystemunitdir explicitly so the unit directory does not come from pkg-config. Tested: bitbake easysplash and both animations on qemuarm; buildhistory shows only the expected deltas. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 7f36037)
lucianogdittgen
added a commit
to lucianogdittgen/meta-ossystems-base
that referenced
this pull request
Nov 13, 2026
Brings the systemd unit fixes (easysplash.enable=0 boot parameter, RemainAfterExit, no start in containers), the cargo dependency upgrade (gstreamer-rs 0.20; crates regenerated with update_crates) and the Makefile fix for the systemdsystemunitdir lookup (OSSystems/EasySplash#28). The recipe still passes systemdsystemunitdir explicitly so the unit directory does not come from pkg-config. Tested: bitbake easysplash and both animations on qemuarm; buildhistory shows only the expected deltas. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br> (cherry picked from commit 7f36037)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Since aa43445 (#23),
make install-service SYSTEMD=1installs the units to the wrong place:In Make,
$(starts a variable reference, not a shell command, so pkg-config never runs. The value becomes;, the emptiness check passes, and the units land at"$(DESTDIR);/easysplash-start.service".This change:
$(shell $(PKG_CONFIG) ...), using?=so packagers (e.g. the Yocto recipe) can still passsystemdsystemunitdir=explicitly$(error ...)outside a rule is parsed as a recipe line ("recipe commences before first target"), and the call had an extra)Tested with
make -n install-service:SYSTEMD=1, pkg-config finds systemd.pc$(DESTDIR);/…service$(DESTDIR)/usr/lib/systemd/system/…serviceSYSTEMD=1 systemdsystemunitdir=/lib/systemd/systemSYSTEMD=1, no systemd.pc$(DESTDIR);/…serviceCould not find systemd.pc file. Aborting.SYSTEMD=0Found while upgrading the meta-ossystems-base recipe to 84f31ef; the recipe works around it by passing
systemdsystemunitdir=${systemd_system_unitdir}.