From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 4 Jun 2011 21:04:45 +0000 (+0200)
Subject: build-essentials: Add support for systemd tmpfiles.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3d5a42141aefd9d249520ecc4434a60b6705c08;p=people%2Fms%2Fipfire-3.x.git

build-essentials: Add support for systemd tmpfiles.
---

diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm
index 67b5e89ae..3164b8e34 100644
--- a/pkgs/build-essentials/build-essentials.nm
+++ b/pkgs/build-essentials/build-essentials.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = build-essentials
 PKG_VER        = $(DISTRO_VERSION)
-PKG_REL        = 17
+PKG_REL        = 18
 PKG_EPOCH      = 1
 PKG_ARCH       = noarch
 
diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants
index e506d6a2d..19a5e8ab2 100644
--- a/pkgs/build-essentials/buildsystem/Constants
+++ b/pkgs/build-essentials/buildsystem/Constants
@@ -49,6 +49,7 @@ CONFIGURE_OPTIONS = \
 	--prefix=/usr
 
 SYSTEMD_UNIT_DIR = /lib/systemd/system
+SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d
 
 ###############################################################################
 #
@@ -149,6 +150,7 @@ PKG_DEFAULT_FILES += $(wildcard $(DIR_SOURCE)/default/*)
 PKG_PAM_FILES      = $(wildcard $(DIR_SOURCE)/*.pam)
 PKG_PAM_FILES     += $(wildcard $(DIR_SOURCE)/pam.d/*)
 PKG_SYSTEMD_FILES += $(wildcard $(DIR_SOURCE)/systemd/*)
+PKG_SYSTEMD_TMPFILES += $(wildcard $(DIR_SOURCE)/*.tmpfiles)
 
 ###############################################################################
 #
diff --git a/pkgs/build-essentials/buildsystem/Functions b/pkgs/build-essentials/buildsystem/Functions
index b4a629cd2..90776ff2d 100644
--- a/pkgs/build-essentials/buildsystem/Functions
+++ b/pkgs/build-essentials/buildsystem/Functions
@@ -69,6 +69,16 @@ define DO_INSTALL_SYSTEMD
 	$(foreach file,$(PKG_SYSTEMD_FILES),$(call __INSTALL_SYSTEMD,$(file)))
 endef
 
+define __INSTALL_SYSTEMD_TMPFILES
+	-mkdir -pv $(BUILDROOT)$(SYSTEMD_TMPFILES_DIR)
+	cd $(DIR_APP) && cp -vf $(1) $(BUILDROOT)$(SYSTEMD_TMPFILES_DIR)/$(subst .tmpfiles,.conf,$(notdir $(1)))
+
+endef
+
+define DO_INSTALL_SYSTEMD_TMPFILES
+	$(foreach file,$(PKG_SYSTEMD_TMPFILES),$(call __INSTALL_SYSTEMD_TMPFILES,$(file)))
+endef
+
 define __INSTALL_PAM
 	-mkdir -pv $(BUILDROOT)/etc/pam.d
 	cd $(DIR_APP) && cp -vf $(1) $(BUILDROOT)/etc/pam.d/$(subst .pam,,$(notdir $(1)))
@@ -142,6 +152,7 @@ define DO_INSTALL
 
 	$(DO_INSTALL_DEFAULT)
 	$(DO_INSTALL_SYSTEMD)
+	$(DO_INSTALL_SYSTEMD_TMPFILES)
 	$(DO_INSTALL_PAM)
 
 	@echo "#####################################################################"