Skip to content

Commit

Permalink
Use standard macros for cross-distro compatibility
Browse files Browse the repository at this point in the history
%_initddir is compatible accross RHEL/SLE12, so just use it

Change-Id: I3214c3ee2290b0102ada7fa6d152510e601a2420
Partial-Bug: #1488627
  • Loading branch information
dirkmueller committed Sep 8, 2015
1 parent 1e1e37a commit 4c161b7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions common/rpm/contrail-database.spec
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ popd
install -D -m 755 %{_distropkgdir}/supervisord_contrail_database.initd %{buildroot}%{_initddir}/supervisor-database
%endif

install -D -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/supervisor-database
install -D -m 755 %{SOURCE1} %{buildroot}%{_initddir}/supervisor-database
install -D -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/contrail/supervisord_database.conf
install -D -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/rc.d/init.d/contrail-database
install -D -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/rc.d/init.d/kafka
install -D -m 755 %{SOURCE3} %{buildroot}%{_initddir}/contrail-database
install -D -m 755 %{SOURCE4} %{buildroot}%{_initddir}/kafka


pushd %{buildroot}
Expand Down Expand Up @@ -187,9 +187,9 @@ fi
%{_initddir}/supervisor-database
%endif
%doc
%{_sysconfdir}/rc.d/init.d/contrail-database
%{_sysconfdir}/rc.d/init.d/kafka
%{_sysconfdir}/rc.d/init.d/supervisor-database
%{_initddir}/contrail-database
%{_initddir}/kafka
%{_initddir}/supervisor-database
%config(noreplace) %{_sysconfdir}/contrail/supervisord_database.conf

%changelog
Expand Down
2 changes: 1 addition & 1 deletion common/rpm/contrail-vrouter-init.spec
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ contrail vrouter init packages provides init files
install -d -m 755 %{buildroot}%{_opt_bin}
install -d -m 755 %{buildroot}%{_contrailetc}
install -d -m 755 %{buildroot}%{_supervisordir}
install -d -m 755 %{buildroot}/etc/rc.d/init.d
install -d -m 755 %{buildroot}/%{_initddir}
install -d -m 777 %{buildroot}/var/log/contrail
pushd %{_builddir}/..
install -p -m 644 %{_nodemgr_config}/contrail-vrouter-nodemgr.ini %{buildroot}%{_supervisordir}
Expand Down

0 comments on commit 4c161b7

Please sign in to comment.