Angel Pons submitted this change.

View Change

Approvals:
  build bot (Jenkins): Verified
  David Hendricks: Looks good to me, approved
  Angel Pons: Looks good to me, approved

manibuilder: Add libjaylink where possible, disable where not

Change-Id: I2f7aebe602ebdb0a4748640e281b9a92146f0ca8
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/33338
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M util/manibuilder/Dockerfile.debian-debootstrap
M util/manibuilder/Dockerfile.fedora
M util/manibuilder/Dockerfile.ubuntu-debootstrap
M util/manibuilder/Makefile
4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/util/manibuilder/Dockerfile.debian-debootstrap b/util/manibuilder/Dockerfile.debian-debootstrap
index c6648e8..ce201f8 100644
--- a/util/manibuilder/Dockerfile.debian-debootstrap
+++ b/util/manibuilder/Dockerfile.debian-debootstrap
@@ -5,8 +5,9 @@
 	apt-get -qq update && \
 	apt-get -qq upgrade && \
 	apt-get -qq dist-upgrade && \
-	apt-get -qqy install gcc make git doxygen ccache \
+	apt-get -qqy install gcc make git doxygen ccache pkg-config \
 		libpci-dev libusb-dev libftdi-dev libusb-1.0-0-dev && \
+	{ apt-get -qqy install libjaylink-dev || true; } && \
 	apt-get clean
 
 USER mani
diff --git a/util/manibuilder/Dockerfile.fedora b/util/manibuilder/Dockerfile.fedora
index 927e487..319039b 100644
--- a/util/manibuilder/Dockerfile.fedora
+++ b/util/manibuilder/Dockerfile.fedora
@@ -3,7 +3,8 @@
 RUN \
 	useradd -p locked -m mani && \
 	dnf install -q -y git gcc ccache make \
-		pciutils-devel libusb-devel libusbx-devel libftdi-devel && \
+		pciutils-devel libusb-devel libusbx-devel libftdi-devel \
+		libjaylink-devel && \
 	dnf clean -q -y all
 
 USER mani
diff --git a/util/manibuilder/Dockerfile.ubuntu-debootstrap b/util/manibuilder/Dockerfile.ubuntu-debootstrap
index f50047c..fe3ad1e 100644
--- a/util/manibuilder/Dockerfile.ubuntu-debootstrap
+++ b/util/manibuilder/Dockerfile.ubuntu-debootstrap
@@ -18,8 +18,9 @@
 	apt-get -qq update && \
 	apt-get -qq upgrade && \
 	apt-get -qq dist-upgrade && \
-	apt-get -qqy install gcc make git doxygen ccache \
+	apt-get -qqy install gcc make git doxygen ccache pkg-config \
 		libpci-dev libusb-dev libftdi-dev libusb-1.0-0-dev && \
+	{ apt-get -qqy install libjaylink-dev || true; } && \
 	apt-get clean
 
 USER mani
diff --git a/util/manibuilder/Makefile b/util/manibuilder/Makefile
index deff683..66b9f25 100644
--- a/util/manibuilder/Makefile
+++ b/util/manibuilder/Makefile
@@ -51,8 +51,11 @@
 djgpp\:6.1.0: CC=ccache i586-pc-msdosdjgpp-gcc
 djgpp\:6.1.0: STRIP=i586-pc-msdosdjgpp-strip
 djgpp\:6.1.0: LIBS_BASE=../
-djgpp\:6.1.0: MAKEARGS+=strip
+djgpp\:6.1.0: MAKEARGS+=strip CONFIG_JLINK_SPI=no
 $(ANITA_TAGS): MAKECMD=gmake
+$(ANITA_TAGS): MAKEARGS+=CONFIG_JLINK_SPI=no
+$(filter alpine% centos%,$(MULTIARCH_TAGS)): MAKEARGS+=CONFIG_JLINK_SPI=no
+$(filter %-xenial %-stretch,$(MULTIARCH_TAGS)): MAKEARGS+=CONFIG_JLINK_SPI=no
 $(ALL_TAGS): export QUIET_SETUP=$(QUIET_TEST)
 $(ALL_TAGS): %: %-check-build
 	$(QUIET_TEST)docker rm -f mani_$(call ident,$*) >/dev/null 2>&1 || true

To view, visit change 33338. To unsubscribe, or for help writing mail filters, visit settings.