PR#4335: Honor %{_sbindir} in make install - koji

koji

#4335 Honor %{_sbindir} in make install

Merged 2 days ago by mikem. Opened 2 months ago by mikem.

mikem/koji pr4324updates into master

Use make_with_dirs macro

Mike McLean • 2 days ago

52cecf0

Allow overriding sbin directory

Michel Lind • 2 days ago

18528e5

builder/Makefile

file modified

+3 -2

		`@@ -2,6 +2,7 @@`

		`BINFILES = kojid`
		`LIBEXECFILES = mergerepos`
		`+ SBINDIR ?= /usr/sbin`
		`SYSTEMDSYSTEMUNITDIR = $(shell pkg-config systemd --variable=systemdsystemunitdir)`

		`_default:`
		`@@ -19,8 +20,8 @@`
		`exit 1; \`
		`fi`

		`- mkdir -p $(DESTDIR)/usr/sbin`
		`- install -p -m 755 $(BINFILES) $(DESTDIR)/usr/sbin`
		`+ mkdir -p $(DESTDIR)$(SBINDIR)`
		`+ install -p -m 755 $(BINFILES) $(DESTDIR)$(SBINDIR)`

		`@if [ "$(PYVER_MAJOR)" -lt 3 ] ; then \`
		`mkdir -p $(DESTDIR)/usr/libexec/kojid; \`

koji.spec

file modified

+6 -11

		`@@ -385,11 +385,7 @@`

		`%install`
		`rm -rf $RPM_BUILD_ROOT`
		`- # The Makefiles hardcode /usr/sbin everywhere`
		`- %if "%{_sbindir}" == "%{_bindir}"`
		`- mkdir -p %{buildroot}%{_prefix}`
		`- ln -sf --relative %{buildroot}%{_bindir} %{buildroot}/usr/sbin`
		`- %endif`
		`+ %define make_with_dirs make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir}`

		`%if 0%{py2_support} < 2 && 0%{py3_support} < 2`
		`echo "At least one python must be built with full support"`
		`@@ -405,19 +401,19 @@`
		`%endif`
		`%if 0%{py2_support} == 1`
		`pushd plugins`
		`- make DESTDIR=$RPM_BUILD_ROOT KOJI_MINIMAL=1 PYTHON=%{__python2} install`
		`+ %{make_with_dirs} KOJI_MINIMAL=1 PYTHON=%{__python2} install`
		`popd`
		`%endif`
		`%if 0%{py2_support} > 1`
		`for D in builder plugins vm ; do`
		`pushd $D`
		`- make DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python2} install`
		`+ %{make_with_dirs} PYTHON=%{__python2} install`
		`popd`
		`done`
		`%endif`
		`%else`
		`%if 0%{py2_support}`
		`- make DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python2} install`
		`+ %{make_with_dirs} PYTHON=%{__python2} install`
		`%endif`
		`%endif`

		`@@ -430,13 +426,13 @@`
		`%endif`
		`%if 0%{py3_support} == 1`
		`pushd plugins`
		`- make DESTDIR=$RPM_BUILD_ROOT KOJI_MINIMAL=1 PYTHON=%{__python3} install`
		`+ %{make_with_dirs} KOJI_MINIMAL=1 PYTHON=%{__python3} install`
		`popd`
		`%endif`
		`%if 0%{py3_support} > 1`
		`for D in kojihub builder plugins util www vm schemas ; do`
		`pushd $D`
		`- make DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python3} install`
		`+ %{make_with_dirs} PYTHON=%{__python3} install`
		`popd`
		`done`

		`@@ -502,7 +498,6 @@`
		`rm -rf $RPM_BUILD_ROOT`

		`%files`
		`- %exclude /usr/sbin`
		`%config(noreplace) /etc/koji.conf`
		`%dir /etc/koji.conf.d`
		`%doc docs Authors COPYING LGPL`

util/Makefile

file modified

+3 -2

		`@@ -1,4 +1,5 @@`
		`BINFILES = kojira koji-gc koji-shadow koji-sweep-db koji-sidetag-cleanup`
		`+ SBINDIR ?= /usr/sbin`
		`SYSTEMDSYSTEMUNITDIR = $(shell pkg-config systemd --variable=systemdsystemunitdir)`

		`_default:`
		`@@ -15,8 +16,8 @@`
		`echo "ERROR: A destdir is required"; \`
		`exit 1; \`
		`fi`
		`- mkdir -p $(DESTDIR)/usr/sbin`
		`- install -p -m 755 $(BINFILES) $(DESTDIR)/usr/sbin`
		`+ mkdir -p $(DESTDIR)$(SBINDIR)`
		`+ install -p -m 755 $(BINFILES) $(DESTDIR)$(SBINDIR)`

		`mkdir -p $(DESTDIR)/etc/kojira`
		`install -p -m 644 kojira.conf $(DESTDIR)/etc/kojira/kojira.conf`

vm/Makefile

file modified

+3 -2

		`@@ -1,5 +1,6 @@`
		`BINFILES = kojivmd`
		`SHAREFILES = kojikamid`
		`+ SBINDIR ?= /usr/sbin`
		`SYSTEMDSYSTEMUNITDIR = $(shell pkg-config systemd --variable=systemdsystemunitdir)`

		`_default:`
		`@@ -18,8 +19,8 @@`
		`exit 1; \`
		`fi`

		`- mkdir -p $(DESTDIR)/usr/sbin`
		`- install -p -m 755 $(BINFILES) $(DESTDIR)/usr/sbin`
		`+ mkdir -p $(DESTDIR)$(SBINDIR)`
		`+ install -p -m 755 $(BINFILES) $(DESTDIR)$(SBINDIR)`

		`mkdir -p $(DESTDIR)/usr/share/kojivmd`
		`install -p -m 644 $(SHAREFILES) $(DESTDIR)/usr/share/kojivmd`