diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-20 19:43:31 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-21 06:30:45 +0100 |
| commit | 8ce250ffe64941b4f425b3b9f8a66066c0a070e9 (patch) | |
| tree | c4e44300914ad14562d00ebdd88a3194d0d632c3 | |
| parent | ab4af3c76286dad7f5ea320c30023cb19abb4caa (diff) | |
| download | ptxdist-8ce250ffe64941b4f425b3b9f8a66066c0a070e9.tar.gz ptxdist-8ce250ffe64941b4f425b3b9f8a66066c0a070e9.tar.xz | |
systemd: update to the latest revision of the v241 stable branch
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/host-systemd.make | 4 | ||||
| -rw-r--r-- | rules/systemd.make | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/rules/host-systemd.make b/rules/host-systemd.make index ace824a58..eb1a708eb 100644 --- a/rules/host-systemd.make +++ b/rules/host-systemd.make @@ -131,8 +131,8 @@ $(STATEDIR)/host-systemd.install: @rm -rf $(HOST_SYSTEMD_PKGDIR) @install -vD -m755 $(HOST_SYSTEMD_DIR)-build/systemd-hwdb \ $(HOST_SYSTEMD_PKGDIR)/bin/systemd-hwdb - @install -vD -m755 $(HOST_SYSTEMD_DIR)-build/src/shared/libsystemd-shared-$(HOST_SYSTEMD_VERSION).so \ - $(HOST_SYSTEMD_PKGDIR)/lib/libsystemd-shared-$(HOST_SYSTEMD_VERSION).so + @install -vD -m755 $(HOST_SYSTEMD_DIR)-build/src/shared/libsystemd-shared-$(firstword $(subst -, ,$(SYSTEMD_VERSION))).so \ + $(HOST_SYSTEMD_PKGDIR)/lib/libsystemd-shared-$(firstword $(subst -, ,$(SYSTEMD_VERSION))).so @$(call touch) # vim: syntax=make diff --git a/rules/systemd.make b/rules/systemd.make index d3a6b72b1..d7eefb003 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -17,11 +17,13 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd # # Paths and names # -SYSTEMD_VERSION := 241 -SYSTEMD_MD5 := c5953c24c850b44fcf714326e567dc37 +SYSTEMD_VERSION := 241-7-ga09c170122cf +SYSTEMD_MD5 := 8727ee060d128457965e1be937e0cdd2 SYSTEMD := systemd-$(SYSTEMD_VERSION) SYSTEMD_SUFFIX := tar.gz -SYSTEMD_URL := https://github.com/systemd/systemd/archive/v$(SYSTEMD_VERSION).$(SYSTEMD_SUFFIX) +SYSTEMD_URL := \ + https://github.com/systemd/systemd/archive/v$(SYSTEMD_VERSION).$(SYSTEMD_SUFFIX) \ + https://github.com/systemd/systemd-stable/archive/v$(SYSTEMD_VERSION).$(SYSTEMD_SUFFIX) SYSTEMD_SOURCE := $(SRCDIR)/$(SYSTEMD).$(SYSTEMD_SUFFIX) SYSTEMD_DIR := $(BUILDDIR)/$(SYSTEMD) SYSTEMD_LICENSE := GPL-2.0-or-later AND LGPL-2.1-only @@ -165,6 +167,7 @@ SYSTEMD_CONF_OPT := \ -Dutmp=false \ -Dvalgrind=false \ -Dvconsole=$(call ptx/truefalse,PTXCONF_SYSTEMD_VCONSOLE) \ + -Dversion-tag=$(SYSTEMD_VERSION) -Dwheel-group=false \ -Dxkbcommon=false \ -Dxz=$(call ptx/truefalse,PTXCONF_SYSTEMD_XZ) \ @@ -290,7 +293,7 @@ $(STATEDIR)/systemd.targetinstall: # # @$(call install_lib, systemd, 0, 0, 0644, libsystemd) - @$(call install_lib, systemd, 0, 0, 0644, systemd/libsystemd-shared-$(SYSTEMD_VERSION)) + @$(call install_lib, systemd, 0, 0, 0644, systemd/libsystemd-shared-$(firstword $(subst -, ,$(SYSTEMD_VERSION)))) @$(call install_lib, systemd, 0, 0, 0644, libnss_myhostname) @$(call install_lib, systemd, 0, 0, 0644, libnss_systemd) |