From 81e359199b42ddefb7dc7097a75875ec0ab8e1d0 Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Sun, 5 Jan 2020 19:54:16 +0100 Subject: [PATCH] Move the daemons from /usr/lib/fwupd to /usr/libexec/fwupd This is supported since debian policy version 4.1.5 (FHS 3.0) --- contrib/debian/fwupd.install | 10 +++++----- contrib/debian/gen_signing_json | 2 +- contrib/debian/lintian/fwupd | 4 ++-- contrib/debian/rules | 12 ++++++------ .../signing-template/fwupd-SIGNARCH-signed.install | 2 +- contrib/debian/signing-template/rules | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/debian/fwupd.install b/contrib/debian/fwupd.install index dd31791be..09173ed9c 100644 --- a/contrib/debian/fwupd.install +++ b/contrib/debian/fwupd.install @@ -8,11 +8,11 @@ usr/share/icons/* usr/share/polkit-1/* usr/share/locale usr/share/metainfo/* -usr/lib/*/fwupd -usr/lib/*/fwupdagent -usr/lib/*/fwupdoffline -usr/lib/*/fwupdtool -usr/lib/*/fwupdtpmevlog +usr/libexec/fwupd/fwupd +usr/libexec/fwupd/fwupdagent +usr/libexec/fwupd/fwupdoffline +usr/libexec/fwupd/fwupdtool +usr/libexec/fwupd/fwupdtpmevlog usr/share/man/man1/* lib/systemd/system/* lib/systemd/system-preset/* diff --git a/contrib/debian/gen_signing_json b/contrib/debian/gen_signing_json index 93f49c414..3b894351d 100755 --- a/contrib/debian/gen_signing_json +++ b/contrib/debian/gen_signing_json @@ -12,7 +12,7 @@ OUT="$DIR/files.json" BINARY=$(find debian/tmp -name '*.efi' | xargs basename) # Actually needs full path within the binary deb -BINARY="usr/lib/${SOURCE}/efi/${BINARY}" +BINARY="usr/libexec/${SOURCE}/efi/${BINARY}" rm -f $OUT diff --git a/contrib/debian/lintian/fwupd b/contrib/debian/lintian/fwupd index d09a559f7..b262ba053 100644 --- a/contrib/debian/lintian/fwupd +++ b/contrib/debian/lintian/fwupd @@ -6,6 +6,6 @@ fwupd binary: systemd-service-file-missing-install-key lib/systemd/system/system fwupd: library-not-linked-against-libc usr/lib/*/fwupd-plugins-3/libfu_plugin_upower.so fwupd: library-not-linked-against-libc usr/lib/*/fwupd-plugins-3/libfu_plugin_uefi_recovery.so #EFI applications are PE executables -fwupd: executable-not-elf-or-script usr/lib/fwupd/efi/*.efi -fwupd: portable-executable-missing-security-features usr/lib/fwupd/efi/*.efi SafeSEH +fwupd: executable-not-elf-or-script usr/libexec/fwupd/efi/*.efi +fwupd: portable-executable-missing-security-features usr/libexec/fwupd/efi/*.efi SafeSEH fwupd: library-not-linked-against-libc usr/lib/*/fwupd-plugins-3/libfu_plugin_modem_manager.so diff --git a/contrib/debian/rules b/contrib/debian/rules index c6b781334..568e7a940 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -49,16 +49,16 @@ override_dh_auto_configure: else \ export FLASHROM="-Dplugin_flashrom=false"; \ fi; \ - dh_auto_configure -- $$UEFI $$DELL $$FLASHROM $$CI -Dplugin_dummy=true -Dgtkdoc=true --libexecdir=/usr/lib + dh_auto_configure -- $$UEFI $$DELL $$FLASHROM $$CI -Dplugin_dummy=true -Dgtkdoc=true override_dh_install: find debian/tmp/usr -type f -name "*a" -print | xargs rm -f sed -i 's,wheel,sudo,' ./debian/tmp/usr/share/polkit-1/rules.d/org.freedesktop.fwupd.rules dh_install #install the EFI binaries if needed - if [ -d debian/tmp/usr/lib/fwupd/efi/ ]; then \ - dh_install -pfwupd usr/lib/fwupd/efi ;\ - dh_install -pfwupd usr/lib/fwupd/fwupdate; \ + if [ -d debian/tmp/usr/libexec/fwupd/efi/ ]; then \ + dh_install -pfwupd usr/libexec/fwupd/efi ;\ + dh_install -pfwupd usr/libexec/fwupd/fwupdate; \ fi #if build with meson subproject in CI need to install this too if [ ! -z "$$CI" ] && [ -f debian/tmp/usr/lib/xb-tool ]; then \ @@ -103,9 +103,9 @@ override_dh_auto_test: override_dh_builddeb: dh_builddeb ifeq (ubuntu,$(SB_STYLE)) - if [ -d debian/tmp/usr/lib/fwupd/efi/ ]; then \ + if [ -d debian/tmp/usr/libexec/fwupd/efi/ ]; then \ mkdir -p debian/fwupd-images/$(deb_version) ;\ - cp debian/tmp/usr/lib/fwupd/efi/fwupd*.efi debian/fwupd-images/$(deb_version) ;\ + cp debian/tmp/usr/libexec/fwupd/efi/fwupd*.efi debian/fwupd-images/$(deb_version) ;\ echo $(deb_version) > debian/fwupd-images/$(deb_version)/version ;\ tar -C debian/fwupd-images -czvf ../$(tar_name) . ;\ dpkg-distaddfile $(tar_name) raw-uefi - ;\ diff --git a/contrib/debian/signing-template/fwupd-SIGNARCH-signed.install b/contrib/debian/signing-template/fwupd-SIGNARCH-signed.install index b5bfe5ba3..d113c93f8 100644 --- a/contrib/debian/signing-template/fwupd-SIGNARCH-signed.install +++ b/contrib/debian/signing-template/fwupd-SIGNARCH-signed.install @@ -1 +1 @@ -*.efi.signed /usr/lib/fwupd/efi +*.efi.signed /usr/libexec/fwupd/efi diff --git a/contrib/debian/signing-template/rules b/contrib/debian/signing-template/rules index 5874a1926..252939ff7 100755 --- a/contrib/debian/signing-template/rules +++ b/contrib/debian/signing-template/rules @@ -4,12 +4,12 @@ PACKAGE_NAME := fwupd SIG_PKG_NAME := fwupd-SIGNARCH-signed SIGNATURE_DIR := debian/signatures/$(PACKAGE_NAME) -BINARY := $(shell find /usr/lib/fwupd/efi -name '*.efi' | xargs basename) +BINARY := $(shell find /usr/libexec/fwupd/efi -name '*.efi' | xargs basename) %: dh $@ override_dh_auto_build: - cp /usr/lib/fwupd/efi/$(BINARY) . - sbattach --attach $(SIGNATURE_DIR)/usr/lib/fwupd/efi/$(BINARY).sig $(BINARY) + cp /usr/libexec/fwupd/efi/$(BINARY) . + sbattach --attach $(SIGNATURE_DIR)/usr/libexec/fwupd/efi/$(BINARY).sig $(BINARY) mv $(BINARY) $(BINARY).signed