ci: build Debian using libflashrom

The package is now in unstable in the 1.2-4 package.
This commit is contained in:
Mario Limonciello 2020-03-04 20:58:13 -06:00 committed by Mario Limonciello
parent ae422989f3
commit 16eea10554
3 changed files with 14 additions and 15 deletions

View File

@ -9,11 +9,11 @@ Package: *\n\
Pin: release a=unstable\n\
Pin-Priority: 800\n\
\n\
Package: lintian\n\
Package: libflashrom-dev\n\
Pin: release a=unstable\n\
Pin-Priority: 901\n\
\n\
Package: tpm-udev\n\
Package: libflashrom1\n\
Pin: release a=unstable\n\
Pin-Priority: 901\n'\
> /etc/apt/preferences

View File

@ -328,10 +328,19 @@
<package variant="x86_64" />
</distro>
</dependency>
<dependency type="build" id="flashrom-dev">
<dependency type="build" id="libflashrom-dev">
<distro id="fedora">
<package>flashrom-devel</package>
</distro>
<distro id="debian">
<control />
<package variant="x86_64" />
<package variant="i386" />
</distro>
<distro id="ubuntu">
<control />
<package variant="x86_64" />
</distro>
</dependency>
<dependency type="build" id="gcab">
<distro id="centos">

View File

@ -19,8 +19,10 @@ deb_version := $(shell dpkg-parsechangelog --show-field Version)
ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
SB_STYLE := ubuntu
tar_name := fwupd_$(deb_version)_$(DEB_HOST_ARCH).tar.gz
export FLASHROM=-Dplugin_flashrom=false
else
TMPLDIR := debian/fwupd-$(DEB_HOST_ARCH)-signed-template/usr/share/code-signing/fwupd-$(DEB_HOST_ARCH)-signed-template
export FLASHROM=-Dplugin_flashrom=true
endif
%:
@ -44,11 +46,6 @@ override_dh_auto_configure:
else \
export UEFI="-Dplugin_uefi=false -Dplugin_redfish=false -Dplugin_nvme=false"; \
fi; \
if [ ! -z "$$CI" ]; then \
export FLASHROM="-Dplugin_flashrom=true"; \
else \
export FLASHROM="-Dplugin_flashrom=false"; \
fi; \
dh_auto_configure -- $$UEFI $$DELL $$FLASHROM $$CI -Dplugin_dummy=true -Dgtkdoc=true
override_dh_install:
@ -59,13 +56,6 @@ override_dh_install:
if [ -d debian/tmp/usr/libexec/fwupd/efi/ ]; then \
dh_install -pfwupd usr/libexec/fwupd/efi ;\
fi
if [ ! -z "$$CI" ] && [ -f debian/tmp/usr/sbin/flashrom ]; then \
dh_install -pfwupd usr/sbin/flashrom ;\
dh_install -plibfwupd2 usr/lib/*/libflashrom.so.*; \
dh_install -plibfwupd-dev usr/include/libflashrom.h; \
dh_install -plibfwupd-dev usr/lib/*/libflashrom.so; \
dh_install -plibfwupd-dev usr/lib/*/pkgconfig/flashrom.pc; \
fi
dh_missing -a --fail-missing
#this is placed in fwupd-tests