From 88c0cf4b27c7e058ad8bd214512047274bbd964c Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Mon, 11 Nov 2019 18:33:50 +0100 Subject: [PATCH] distro: move binaries to /usr/libexec to follow Fedora packaging guidelines This makes no difference, so let's just put them where the Fedora guidelines say they should be. Also, make sure to own the containing directory. Signed-off-by: Tom Gundersen --- Makefile | 8 ++++---- distribution/osbuild-composer.service | 4 ++-- distribution/osbuild-worker@.service | 2 +- golang-github-osbuild-composer.spec | 9 +++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 0b6801e65..eaf77ae8d 100644 --- a/Makefile +++ b/Makefile @@ -6,10 +6,10 @@ build: .PHONY: install install: - - mkdir -p /usr/lib/osbuild-composer - cp osbuild-composer /usr/lib/osbuild-composer/ - cp osbuild-worker /usr/lib/osbuild-composer/ - cp dnf-json /usr/lib/osbuild-composer/ + - mkdir -p /usr/libexec/osbuild-composer + cp osbuild-composer /usr/libexec/osbuild-composer/ + cp osbuild-worker /usr/libexec/osbuild-composer/ + cp dnf-json /usr/libexec/osbuild-composer/ - mkdir -p /etc/sysusers.d/ cp distribution/osbuild-composer.conf /etc/sysusers.d/ systemd-sysusers osbuild-composer.conf diff --git a/distribution/osbuild-composer.service b/distribution/osbuild-composer.service index f37237e22..81fd12724 100644 --- a/distribution/osbuild-composer.service +++ b/distribution/osbuild-composer.service @@ -5,9 +5,9 @@ Requires=osbuild-composer.socket [Service] Type=simple -ExecStart=/usr/lib/osbuild-composer/osbuild-composer +ExecStart=/usr/libexec/osbuild-composer/osbuild-composer StateDirectory=osbuild-composer -WorkingDirectory=/usr/lib/osbuild-composer/ +WorkingDirectory=/usr/libexec/osbuild-composer/ User=_osbuild-composer Restart=on-failure diff --git a/distribution/osbuild-worker@.service b/distribution/osbuild-worker@.service index 27b98b791..32a3ffb74 100644 --- a/distribution/osbuild-worker@.service +++ b/distribution/osbuild-worker@.service @@ -5,7 +5,7 @@ After=multi-user.target osbuild-composer.socket [Service] Type=simple PrivateTmp=true -ExecStart=/usr/lib/osbuild-composer/osbuild-worker -C /var/lib/osbuild +ExecStart=/usr/libexec/osbuild-composer/osbuild-worker -C /var/lib/osbuild CacheDirectory=osbuild-composer Restart=on-failure RestartSec=10s diff --git a/golang-github-osbuild-composer.spec b/golang-github-osbuild-composer.spec index 14a9ad920..399b5ca89 100644 --- a/golang-github-osbuild-composer.spec +++ b/golang-github-osbuild-composer.spec @@ -43,9 +43,9 @@ done %install -install -m 0755 -vd %{buildroot}%{_prefix}/lib/osbuild-composer -install -m 0755 -vp _bin/* %{buildroot}%{_prefix}/lib/osbuild-composer/ -install -m 0644 -vp dnf-json %{buildroot}%{_prefix}/lib/osbuild-composer/ +install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer +install -m 0755 -vp _bin/* %{buildroot}%{_libexecdir}/osbuild-composer/ +install -m 0644 -vp dnf-json %{buildroot}%{_libexecdir}/osbuild-composer/ install -m 0755 -vd %{buildroot}%{_unitdir} install -m 0644 -vp distribution/*.{service,socket} %{buildroot}%{_unitdir}/ @@ -71,7 +71,8 @@ export GOPATH=$(pwd)/_build:%{gopath} %files %license LICENSE %doc README.md -%{_prefix}/lib/osbuild-composer/* +%{_libexecdir}/osbuild-composer +%{_libexecdir}/osbuild-composer/* %{_unitdir}/*.{service,socket} %{_sysusersdir}/osbuild-composer.conf