openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-28 23:43:42 +02:00
Code Issues Releases Wiki Activity

manibuilder: Add libjaylink where possible, disable where not

Browse Source 
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>
This commit is contained in:
Nico Huber 2019-03-05 16:12:14 +01:00 committed by Angel Pons
parent fc9c48969b
commit 08060b1672
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/manibuilder/Dockerfile.debian-debootstrap
View File

@ -5,8 +5,9 @@ RUN \
apt-get -qq update && \ apt-get -qq update && \
apt-get -qq upgrade && \ apt-get -qq upgrade && \
apt-get -qq dist-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 && \ libpci-dev libusb-dev libftdi-dev libusb-1.0-0-dev && \
{ apt-get -qqy install libjaylink-dev || true; } && \
apt-get clean apt-get clean
USER mani USER mani

3
util/manibuilder/Dockerfile.fedora
View File

@ -3,7 +3,8 @@ FROM manibase
RUN \ RUN \
useradd -p locked -m mani && \ useradd -p locked -m mani && \
dnf install -q -y git gcc ccache make \ 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 dnf clean -q -y all
USER mani USER mani

3
util/manibuilder/Dockerfile.ubuntu-debootstrap
View File

@ -18,8 +18,9 @@ RUN \
apt-get -qq update && \ apt-get -qq update && \
apt-get -qq upgrade && \ apt-get -qq upgrade && \
apt-get -qq dist-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 && \ libpci-dev libusb-dev libftdi-dev libusb-1.0-0-dev && \
{ apt-get -qqy install libjaylink-dev || true; } && \
apt-get clean apt-get clean
USER mani USER mani

5
util/manibuilder/Makefile
View File

@ -51,8 +51,11 @@ $(filter centos%,$(MULTIARCH_TAGS)) anita\:sparc: CC=cc
djgpp\:6.1.0: CC=ccache i586-pc-msdosdjgpp-gcc djgpp\:6.1.0: CC=ccache i586-pc-msdosdjgpp-gcc
djgpp\:6.1.0: STRIP=i586-pc-msdosdjgpp-strip djgpp\:6.1.0: STRIP=i586-pc-msdosdjgpp-strip
djgpp\:6.1.0: LIBS_BASE=../ 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): 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): export QUIET_SETUP=$(QUIET_TEST)
$(ALL_TAGS): %: %-check-build $(ALL_TAGS): %: %-check-build
$(QUIET_TEST)docker rm -f mani_$(call ident,$*) >/dev/null 2>&1 || true $(QUIET_TEST)docker rm -f mani_$(call ident,$*) >/dev/null 2>&1 || true