File obs-server-2.9-0011-dist-Make-fillup-file-location-and-name-configurable.patch of Package obs-server
From 93723335d36ed94de8c6070716ff7d44da7486c1 Mon Sep 17 00:00:00 2001 From: Oleg Girko <ol@infoserver.lv> Date: Tue, 28 Jun 2016 18:43:08 +0100 Subject: [PATCH] [dist] Make fillup file location and name configurable. This change introduces OBS_FILLUP_DIR and OBS_FILLUP_FILE configuratoin variables that specify location and name of instaled fillup file instead of using hardcoded ones. Signed-off-by: Oleg Girko <ol@infoserver.lv> --- Makefile.include | 2 ++ dist/Makefile | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.include b/Makefile.include index 71da21a83b..6725715dbf 100644 --- a/Makefile.include +++ b/Makefile.include @@ -8,6 +8,8 @@ OBS_BACKEND_DATA_DIR=/srv/obs OBS_DOCUMENT_ROOT=/srv/www/obs OBS_API_PREFIX=$(OBS_DOCUMENT_ROOT)/api OBS_APIDOCS_PREFIX=$(OBS_DOCUMENT_ROOT)/docs +OBS_FILLUP_DIR=/var/adm/fillup-templates +OBS_FILLUP_FILE=sysconfig.obs-server # TODO: find fix for RH in spec/Makefile # This here is preparation for multi distro support diff --git a/dist/Makefile b/dist/Makefile index 46b5c7c2a7..664c4d8921 100644 --- a/dist/Makefile +++ b/dist/Makefile @@ -60,10 +60,11 @@ install_logrotate: system_dirs $(LOGROTATE_CONFIGS:%=$(DESTDIR)/etc/logrotate.d/%) install_fillups: system_dirs - $(INSTALL) -m 0644 sysconfig.obs-server $(DESTDIR)/var/adm/fillup-templates/ + $(INSTALL) -m 0644 sysconfig.obs-server \ + $(DESTDIR)$(OBS_FILLUP_DIR)/$(OBS_FILLUP_FILE) sed -i \ -e 's|/srv/obs|$(OBS_BACKEND_DATA_DIR)|g' \ - $(DESTDIR)/var/adm/fillup-templates/sysconfig.obs-server + $(DESTDIR)$(OBS_FILLUP_DIR)/$(OBS_FILLUP_FILE) install_slp: system_dirs $(INSTALL) -m 644 obs.source_server.reg $(DESTDIR)/etc/slp.reg.d/ @@ -90,7 +91,7 @@ system_dirs: $(INSTALL) -d -m 755 $(DESTDIR)/etc/cron.d/ $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)/ $(INSTALL) -d -m 755 $(DESTDIR)$(SBINDIR)/ - $(INSTALL) -d -m 755 $(DESTDIR)/var/adm/fillup-templates + $(INSTALL) -d -m 755 $(DESTDIR)$(OBS_FILLUP_DIR) $(INSTALL) -d -m 755 $(DESTDIR)/usr/share/doc/packages/obs-devel $(INSTALL) -d -m 755 $(DESTDIR)/usr/lib/obs/tests/appliance $(INSTALL) -d -m 755 $(DESTDIR)$(UNITDIR) -- 2.20.1