Skip to content

Commit

Permalink
WiP: Transcient build test of flashrom against Dasharo/flashrom@5111246
Browse files Browse the repository at this point in the history
… to test https://github.com/Dasharo/flashrom/tree/kgpe-patch-rebase

Pointing to Dasharo/flashrom#11 so that CircleCI shows success where work is happening

Changes:
- "WARNERROR=no" is a env variable interpreted at compilation now, not a configuration option anymore
- To work around heads pkg-config, newer flashrom needs to have LIBS_BASE overriden to detect proper libusb and libpci as installed under heads/install
- INSTALL="$(INSTALL)" DESTDIR="$(INSTALL)" CFLAGS="-I$(INSTALL)/include/libusb-1.0 -I$(INSTALL)/include/pci" and LDFLAGS="-L$(INSTALL)/lib" needs to be passed as env variable  to build properly
- flashrom module now depends on libusb, since flashrom looks for pkg-config of installed libusb as prereq
  • Loading branch information
tlaurion committed Jan 23, 2023
1 parent 0752843 commit d0aab9a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1,104 deletions.
21 changes: 14 additions & 7 deletions modules/flashrom
Original file line number Diff line number Diff line change
@@ -1,33 +1,40 @@
modules-$(CONFIG_FLASHROM) += flashrom

flashrom_depends := pciutils $(musl_dep)
flashrom_depends := pciutils libusb $(musl_dep)

flashrom_version := b1f858f65b2abd276542650d8cb9e382da258967
flashrom_version := 5111246d8dab57249148e08509b58e9f82056521
flashrom_dir := flashrom-$(flashrom_version)
flashrom_tar := $(flashrom_dir).tar.gz
flashrom_url := https://github.com/flashrom/flashrom/archive/$(flashrom_version).tar.gz
flashrom_hash := 4873ad50f500629c244fc3fbee64b56403a82307d7f555dfa235336a200c336c
flashrom_url := https://github.com/Dasharo/flashrom/archive/$(flashrom_version).tar.gz
flashrom_hash := ed36cd80c468f99680092cc009520ab301922b97e63d96936ac0b44831f6573a

# Default options for flashrom
flashrom_cfg := \
WARNERROR=no \
CONFIG_NOTHING=yes \
CONFIG_INTERNAL=yes \
CONFIG_DUMMY=yes \
CONFIG_AST1100=yes \

ifeq "$(CONFIG_TARGET_ARCH)" "ppc64"
flashrom_cfg := \
WARNERROR=no \
CONFIG_NOTHING=yes \
CONFIG_LINUX_MTD=yes \
CONFIG_DUMMY=yes \
CONFIG_AST1100=yes
CONFIG_AST2400=yes
endif

flashrom_target := \
$(MAKE_JOBS) \
PREFIX="$(INSTALL)" \
INSTALL="$(INSTALL)" \
DESTDIR="$(INSTALL)" \
LIBS_BASE="$(INSTALL)" \
CFLAGS="-I$(INSTALL)/include/libusb-1.0 -I$(INSTALL)/include/pci" \
LDFLAGS="-L$(INSTALL)/lib" \
WARNERROR=no \
$(CROSS_TOOLS) \
#PREFIX="/" \
#DESTDIR="$(INSTALL)" \
$(flashrom_cfg)

flashrom_output := \
Expand Down
Loading

0 comments on commit d0aab9a

Please sign in to comment.