particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro: move binaries to /usr/libexec to follow Fedora packaging guidelines

Browse source 
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 <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2019-11-11 18:33:50 +01:00 • committed by Lars Karlitski
parent d87d9eb27b
commit 88c0cf4b27
4 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -6,10 +6,10 @@ build:
.PHONY: install .PHONY: install
install: install:
- mkdir -p /usr/lib/osbuild-composer - mkdir -p /usr/libexec/osbuild-composer
cp osbuild-composer /usr/lib/osbuild-composer/ cp osbuild-composer /usr/libexec/osbuild-composer/
cp osbuild-worker /usr/lib/osbuild-composer/ cp osbuild-worker /usr/libexec/osbuild-composer/
cp dnf-json /usr/lib/osbuild-composer/ cp dnf-json /usr/libexec/osbuild-composer/
- mkdir -p /etc/sysusers.d/ - mkdir -p /etc/sysusers.d/
cp distribution/osbuild-composer.conf /etc/sysusers.d/ cp distribution/osbuild-composer.conf /etc/sysusers.d/
systemd-sysusers osbuild-composer.conf systemd-sysusers osbuild-composer.conf

4
distribution/osbuild-composer.service
View file

@ -5,9 +5,9 @@ Requires=osbuild-composer.socket
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/lib/osbuild-composer/osbuild-composer ExecStart=/usr/libexec/osbuild-composer/osbuild-composer
StateDirectory=osbuild-composer StateDirectory=osbuild-composer
WorkingDirectory=/usr/lib/osbuild-composer/ WorkingDirectory=/usr/libexec/osbuild-composer/
User=_osbuild-composer User=_osbuild-composer
Restart=on-failure Restart=on-failure

2
distribution/osbuild-worker@.service
View file

@ -5,7 +5,7 @@ After=multi-user.target osbuild-composer.socket
[Service] [Service]
Type=simple Type=simple
PrivateTmp=true 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 CacheDirectory=osbuild-composer
Restart=on-failure Restart=on-failure
RestartSec=10s RestartSec=10s

9
golang-github-osbuild-composer.spec
View file

@ -43,9 +43,9 @@ done
%install %install
install -m 0755 -vd %{buildroot}%{_prefix}/lib/osbuild-composer install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer
install -m 0755 -vp _bin/* %{buildroot}%{_prefix}/lib/osbuild-composer/ install -m 0755 -vp _bin/* %{buildroot}%{_libexecdir}/osbuild-composer/
install -m 0644 -vp dnf-json %{buildroot}%{_prefix}/lib/osbuild-composer/ install -m 0644 -vp dnf-json %{buildroot}%{_libexecdir}/osbuild-composer/
install -m 0755 -vd %{buildroot}%{_unitdir} install -m 0755 -vd %{buildroot}%{_unitdir}
install -m 0644 -vp distribution/*.{service,socket} %{buildroot}%{_unitdir}/ install -m 0644 -vp distribution/*.{service,socket} %{buildroot}%{_unitdir}/
@ -71,7 +71,8 @@ export GOPATH=$(pwd)/_build:%{gopath}
%files %files
%license LICENSE %license LICENSE
%doc README.md %doc README.md
%{_prefix}/lib/osbuild-composer/* %{_libexecdir}/osbuild-composer
%{_libexecdir}/osbuild-composer/*
%{_unitdir}/*.{service,socket} %{_unitdir}/*.{service,socket}
%{_sysusersdir}/osbuild-composer.conf %{_sysusersdir}/osbuild-composer.conf