proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-14 20:24:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move the daemons from /usr/lib/fwupd to /usr/libexec/fwupd

Browse Source 
This is supported since debian policy version 4.1.5 (FHS 3.0)
This commit is contained in:
Laurent Bigonville 2020-01-05 19:54:16 +01:00 committed by Mario Limonciello
parent 022d4fa708
commit 81e359199b
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/debian/fwupd.install
View File

@ -8,11 +8,11 @@ usr/share/icons/*
usr/share/polkit-1/* usr/share/polkit-1/*
usr/share/locale usr/share/locale
usr/share/metainfo/* usr/share/metainfo/*
usr/lib/*/fwupd usr/libexec/fwupd/fwupd
usr/lib/*/fwupdagent usr/libexec/fwupd/fwupdagent
usr/lib/*/fwupdoffline usr/libexec/fwupd/fwupdoffline
usr/lib/*/fwupdtool usr/libexec/fwupd/fwupdtool
usr/lib/*/fwupdtpmevlog usr/libexec/fwupd/fwupdtpmevlog
usr/share/man/man1/* usr/share/man/man1/*
lib/systemd/system/* lib/systemd/system/*
lib/systemd/system-preset/* lib/systemd/system-preset/*

2
contrib/debian/gen_signing_json
View File

@ -12,7 +12,7 @@ OUT="$DIR/files.json"
BINARY=$(find debian/tmp -name '*.efi' | xargs basename) BINARY=$(find debian/tmp -name '*.efi' | xargs basename)
# Actually needs full path within the binary deb # Actually needs full path within the binary deb
BINARY="usr/lib/${SOURCE}/efi/${BINARY}" BINARY="usr/libexec/${SOURCE}/efi/${BINARY}"
rm -f $OUT rm -f $OUT

4
contrib/debian/lintian/fwupd
View File

@ -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_upower.so
fwupd: library-not-linked-against-libc usr/lib/*/fwupd-plugins-3/libfu_plugin_uefi_recovery.so fwupd: library-not-linked-against-libc usr/lib/*/fwupd-plugins-3/libfu_plugin_uefi_recovery.so
#EFI applications are PE executables #EFI applications are PE executables
fwupd: executable-not-elf-or-script usr/lib/fwupd/efi/*.efi fwupd: executable-not-elf-or-script usr/libexec/fwupd/efi/*.efi
fwupd: portable-executable-missing-security-features usr/lib/fwupd/efi/*.efi SafeSEH 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 fwupd: library-not-linked-against-libc usr/lib/*/fwupd-plugins-3/libfu_plugin_modem_manager.so

12
contrib/debian/rules
View File

@ -49,16 +49,16 @@ override_dh_auto_configure:
else \ else \
export FLASHROM="-Dplugin_flashrom=false"; \ export FLASHROM="-Dplugin_flashrom=false"; \
fi; \ 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: override_dh_install:
find debian/tmp/usr -type f -name "*a" -print | xargs rm -f 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 sed -i 's,wheel,sudo,' ./debian/tmp/usr/share/polkit-1/rules.d/org.freedesktop.fwupd.rules
dh_install dh_install
#install the EFI binaries if needed #install the EFI binaries if needed
if [ -d debian/tmp/usr/lib/fwupd/efi/ ]; then \ if [ -d debian/tmp/usr/libexec/fwupd/efi/ ]; then \
dh_install -pfwupd usr/lib/fwupd/efi ;\ dh_install -pfwupd usr/libexec/fwupd/efi ;\
dh_install -pfwupd usr/lib/fwupd/fwupdate; \ dh_install -pfwupd usr/libexec/fwupd/fwupdate; \
fi fi
#if build with meson subproject in CI need to install this too #if build with meson subproject in CI need to install this too
if [ ! -z "$$CI" ] && [ -f debian/tmp/usr/lib/xb-tool ]; then \ if [ ! -z "$$CI" ] && [ -f debian/tmp/usr/lib/xb-tool ]; then \
@ -103,9 +103,9 @@ override_dh_auto_test:
override_dh_builddeb: override_dh_builddeb:
dh_builddeb dh_builddeb
ifeq (ubuntu,$(SB_STYLE)) 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) ;\ 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 ;\ echo $(deb_version) > debian/fwupd-images/$(deb_version)/version ;\
tar -C debian/fwupd-images -czvf ../$(tar_name) . ;\ tar -C debian/fwupd-images -czvf ../$(tar_name) . ;\
dpkg-distaddfile $(tar_name) raw-uefi - ;\ dpkg-distaddfile $(tar_name) raw-uefi - ;\

2
contrib/debian/signing-template/fwupd-SIGNARCH-signed.install
View File

@ -1 +1 @@
*.efi.signed /usr/lib/fwupd/efi *.efi.signed /usr/libexec/fwupd/efi

6
contrib/debian/signing-template/rules
View File

@ -4,12 +4,12 @@
PACKAGE_NAME := fwupd PACKAGE_NAME := fwupd
SIG_PKG_NAME := fwupd-SIGNARCH-signed SIG_PKG_NAME := fwupd-SIGNARCH-signed
SIGNATURE_DIR := debian/signatures/$(PACKAGE_NAME) 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 $@ dh $@
override_dh_auto_build: override_dh_auto_build:
cp /usr/lib/fwupd/efi/$(BINARY) . cp /usr/libexec/fwupd/efi/$(BINARY) .
sbattach --attach $(SIGNATURE_DIR)/usr/lib/fwupd/efi/$(BINARY).sig $(BINARY) sbattach --attach $(SIGNATURE_DIR)/usr/libexec/fwupd/efi/$(BINARY).sig $(BINARY)
mv $(BINARY) $(BINARY).signed mv $(BINARY) $(BINARY).signed