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

trivial: enable libjcat from Debian & Ubuntu distro builds

Browse Source
This commit is contained in:
Mario Limonciello 2020-04-02 12:22:33 -05:00 committed by Mario Limonciello
parent 508fb380d0
commit 22306055e3
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/ci/dependencies.xml
View File

@ -641,6 +641,16 @@
<distro id="fedora">
<package>libjcat-devel</package>
</distro>
<distro id="debian">
<control />
<package variant="x86_64" />
<package variant="s390x" />
<package variant="i386" />
</distro>
<distro id="ubuntu">
<control />
<package variant="x86_64" />
</distro>
</dependency>
<dependency type="build" id="libarchive-dev">
<distro id="centos">

13
contrib/debian/rules
View File

@ -46,9 +46,6 @@ override_dh_auto_configure:
else \
export UEFI="-Dplugin_uefi=false -Dplugin_redfish=false -Dplugin_nvme=false"; \
fi; \
if [ ! -z "$$CI" ]; then \
export CI="-Dlibjcat:introspection=false $$CI"; \
fi; \
dh_auto_configure -- $$UEFI $$DELL $$FLASHROM $$CI -Dplugin_dummy=true -Dgtkdoc=true
override_dh_install:
@ -59,16 +56,6 @@ override_dh_install:
if [ -d debian/tmp/usr/libexec/fwupd/efi/ ]; then \
dh_install -pfwupd usr/libexec/fwupd/efi ;\
fi
#libjcat built as a subproject for CI
if [ ! -z "$$CI" ]; then \
dh_install -plibfwupd-dev usr/include/libjcat-1; \
dh_install -plibfwupd2 usr/lib/*/libjcat.so.*; \
dh_install -plibfwupd-dev usr/lib/*/libjcat.so; \
dh_install -plibfwupd-dev usr/lib/*/pkgconfig/jcat.pc; \
dh_install -plibfwupd-dev usr/libexec/jcat-tool; \
dh_install -plibfwupd-dev usr/share/gir-1.0/Jcat*; \
dh_install -pfwupd-tests usr/libexec/installed-tests/libjcat; \
fi
dh_missing -a --fail-missing
#this is placed in fwupd-tests