From ff78c71de2d9479e30ac71b0fbcbad17e852079c Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Fri, 4 Dec 2015 20:24:38 +0100 Subject: [PATCH] [dist] fixed hardlinking problem in SLE 11 --- dist/Makefile | 2 +- src/api/Makefile | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dist/Makefile b/dist/Makefile index a78543ad113..4d217c6324b 100644 --- a/dist/Makefile +++ b/dist/Makefile @@ -26,7 +26,7 @@ install_project_update: system_dirs install_logrotate: system_dirs - $(foreach config,$(LOGROTATE_CONFIGS),$(shell $(INSTALL) -m 755 $(config).logrotate $(DESTDIR)/etc/logrotate.d/$(config)) ) + $(foreach config,$(LOGROTATE_CONFIGS),$(shell $(INSTALL) -m 644 $(config).logrotate $(DESTDIR)/etc/logrotate.d/$(config)) ) install_fillups: system_dirs $(INSTALL) -m 0644 sysconfig.obs-server $(DESTDIR)/var/adm/fillup-templates/ diff --git a/src/api/Makefile b/src/api/Makefile index 8e8ff1af757..845efc7b4d6 100644 --- a/src/api/Makefile +++ b/src/api/Makefile @@ -56,9 +56,11 @@ build: config $(OBS_API_BUNDLER_OPTS) bundle config --local frozen 1 ;\ $(OBS_API_BUNDLER_OPTS) bundle config --local without test:assets:development # reinstall - $(INSTALL) config/database.yml.example $(DESTDIR)/srv/www/obs/api/config/database.yml + $(INSTALL) config/database.yml.example $(DESTDIR)$(OBS_API_PREFIX)/config/database.yml + # fixed hardlinking problem in SLE 11 + echo "# This is to prevent fdupes from hardlinking" >> $(DESTDIR)$(OBS_API_PREFIX)/config/database.yml : > $(DESTDIR)/srv/www/obs/api/log/production.log - sed -i -e 's,^api_version.*,api_version = "%version",' $(DESTDIR)/srv/www/obs/api/config/initializers/02_apiversion.rb + sed -i -e 's,^api_version.*,api_version = "%version",' $(DESTDIR)$(OBS_API_PREFIX)/config/initializers/02_apiversion.rb test_unit: ./script/api_test_in_spec.sh