deps: PR opencomputeproject#1131 (util-linux 2.41.4, e2fsprogs 1.47.4, flashrom 1.7.0)

Squashed content of PR opencomputeproject#1131 (delta over opencomputeproject#1129), pulled in as a dependency.

Signed-off-by: Brad House <bhouse@nexthop.ai>

Author: bhouse-nexthop

.github/onie-build/Dockerfile

@@ -9,7 +9,8 @@
 # This image builds the generic kvm_x86_64 target with secure boot
 # enabled.  It includes the secure-boot tooling needed to exercise the SB
 # build path -- pesign, efitools, sbsigntool and gnupg2 (for key
-# generation and EFI signing).
+# generation and EFI signing) -- and meson/ninja, which flashrom 1.x
+# requires to build.
 FROM debian:13
 WORKDIR /onie
 
@@ -49,7 +50,9 @@ RUN apt-get update && apt-get install -y \
     libtool \
     libtool-bin \
     locales \
+    meson \
     mtools \
+    ninja-build \
     pesign \
     pkgconf \
     python3-all-dev \

build-config/make/e2fsprogs.make

@@ -9,7 +9,7 @@
 # This is a makefile fragment that defines the build of e2fsprogs
 #
 
-E2FSPROGS_VERSION		= 1.46.3
+E2FSPROGS_VERSION		= 1.47.4
 E2FSPROGS_TARBALL		= e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
 E2FSPROGS_TARBALL_URLS		+= $(ONIE_MIRROR) \
 				   https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)

build-config/make/flashrom.make

@@ -9,25 +9,32 @@
 # This is a makefile fragment that defines the build of flashrom
 #
 
-FLASHROM_VERSION		= 0.9.8
-FLASHROM_TARBALL		= flashrom-$(FLASHROM_VERSION).tar.bz2
-FLASHROM_TARBALL_URLS		+= $(ONIE_MIRROR) http://download.flashrom.org/releases/
+FLASHROM_VERSION		= 1.7.0
+FLASHROM_TARBALL		= flashrom-v$(FLASHROM_VERSION).tar.xz
+FLASHROM_TARBALL_URLS		+= $(ONIE_MIRROR) https://download.flashrom.org/releases/
 FLASHROM_BUILD_DIR		= $(USER_BUILDDIR)/flashrom
-FLASHROM_DIR			= $(FLASHROM_BUILD_DIR)/flashrom-$(FLASHROM_VERSION)
+FLASHROM_DIR			= $(FLASHROM_BUILD_DIR)/flashrom-v$(FLASHROM_VERSION)
+FLASHROM_MESON_BUILD		= $(FLASHROM_DIR)/onie-build
+FLASHROM_CROSS_FILE		= $(FLASHROM_DIR)/onie-cross.ini
 
-FLASHROM_SRCPATCHDIR		= $(PATCHDIR)/flashrom
 FLASHROM_DOWNLOAD_STAMP		= $(DOWNLOADDIR)/flashrom-download
 FLASHROM_SOURCE_STAMP		= $(USER_STAMPDIR)/flashrom-source
-FLASHROM_PATCH_STAMP		= $(USER_STAMPDIR)/flashrom-patch
 FLASHROM_BUILD_STAMP		= $(USER_STAMPDIR)/flashrom-build
 FLASHROM_INSTALL_STAMP		= $(STAMPDIR)/flashrom-install
 FLASHROM_STAMP			= $(FLASHROM_SOURCE_STAMP) \
-				  $(FLASHROM_PATCH_STAMP) \
 				  $(FLASHROM_BUILD_STAMP) \
 				  $(FLASHROM_INSTALL_STAMP)
 
 FLASHROM_PROGRAMS		= flashrom
 
+# flashrom 1.x builds with meson/ninja (the old Makefile was dropped after
+# 0.9.x).  Select the programmers ONIE needs: 'internal' for on-board chipset
+# flashing and 'nicintel_eeprom' to program the Intel NIC EEPROM (useful in
+# manufacturing to set the eth0 MAC).  Both rely only on libpci, so no extra
+# USB/FTDI/serial dependencies are pulled in.  A platform can override this to
+# enable additional programmers.
+FLASHROM_PROGRAMMERS		?= internal,nicintel_eeprom
+
 PHONY += flashrom flashrom-download flashrom-source flashrom-build \
 	 flashrom-install flashrom-clean flashrom-download-clean
 
@@ -50,39 +57,48 @@ $(FLASHROM_SOURCE_STAMP): $(USER_TREE_STAMP) $(FLASHROM_DOWNLOAD_STAMP)
 	$(Q) $(SCRIPTDIR)/extract-package $(FLASHROM_BUILD_DIR) $(DOWNLOADDIR)/$(FLASHROM_TARBALL)
 	$(Q) touch $@
 
-# Disable all flashrom methods, except for 'internal' by default.
-# Individual platforms can define FLASHROM_MAKE_CONFIG_PLATFORM to
-# enable support for specific flashing methods, for example:
-#
-#   FLASHROM_MAKE_CONFIG_PLATFORM = CONFIG_XYZ=yes
-#
-# See the Makefile in the flashrom source directory for the complete
-# list of CONFIG_XYZ variables.
-#
-# Note: Leaving the Intel NIC EEPROMs enabled, as that could be useful
-# in manufacturing to program the MAC address for eth0.
-FLASHROM_MAKE_CONFIG = \
-	CC=$(CROSSPREFIX)gcc CFLAGS="-Wall -Wshadow $(ONIE_CFLAGS)" \
-	LDFLAGS="$(ONIE_LDFLAGS)" \
-	PREFIX=/usr DESTDIR=$(DEV_SYSROOT) \
-	CONFIG_SERPROG=no CONFIG_RAYER_SPI=no CONFIG_PONY_SPI=no \
-	CONFIG_NIC3COM=no CONFIG_GFXNVIDIA=no CONFIG_SATASII=no \
-	CONFIG_ATAHPT=no CONFIG_ATAVIA=no CONFIG_FT2232_SPI=no \
-	CONFIG_USBBLASTER_SPI=no CONFIG_MSTARDDC_SPI=no CONFIG_PICKIT2_SPI=no \
-	CONFIG_DRKAISER=no CONFIG_NICREALTEK=no CONFIG_NICNATSEMI=no \
-	CONFIG_OGP_SPI=no CONFIG_BUSPIRATE_SPI=no CONFIG_DEDIPROG=no \
-	CONFIG_SATAMV=no CONFIG_IT8212=no CONFIG_PRINT_WIKI=no \
-	$(FLASHROM_MAKE_CONFIG_PLATFORM)
-
 flashrom-build: $(FLASHROM_BUILD_STAMP)
 $(FLASHROM_BUILD_STAMP): $(FLASHROM_SOURCE_STAMP) $(PCIUTILS_BUILD_STAMP) \
 				| $(DEV_SYSROOT_INIT_STAMP)
 	$(Q) rm -f $@ && eval $(PROFILE_STAMP)
 	$(Q) echo "====  Building flashrom-$(FLASHROM_VERSION) ===="
-	$(Q) PATH='$(CROSSBIN):$(PATH)'	$(MAKE) -C $(FLASHROM_DIR) \
-		$(FLASHROM_MAKE_CONFIG) all
-	$(Q) PATH='$(CROSSBIN):$(PATH)'	$(MAKE) -C $(FLASHROM_DIR) \
-		$(FLASHROM_MAKE_CONFIG) install
+	# Generate a meson cross file describing the ONIE cross toolchain.
+	# flashrom is only enabled for x86_64 (see arch/x86_64.make).
+	$(Q) { \
+		echo "[binaries]" ; \
+		echo "c = '$(CROSSPREFIX)gcc'" ; \
+		echo "ar = '$(CROSSPREFIX)ar'" ; \
+		echo "strip = '$(CROSSPREFIX)strip'" ; \
+		echo "pkgconfig = 'pkg-config'" ; \
+		echo "" ; \
+		echo "[host_machine]" ; \
+		echo "system = 'linux'" ; \
+		echo "cpu_family = 'x86_64'" ; \
+		echo "cpu = 'x86_64'" ; \
+		echo "endian = 'little'" ; \
+		echo "" ; \
+		echo "[properties]" ; \
+		echo "sys_root = '$(DEV_SYSROOT)'" ; \
+		echo "" ; \
+		echo "[built-in options]" ; \
+		echo "c_args = ['-Os']" ; \
+		echo "c_link_args = ['--sysroot=$(DEV_SYSROOT)']" ; \
+	} > $(FLASHROM_CROSS_FILE)
+	$(Q) rm -rf $(FLASHROM_MESON_BUILD)
+	$(Q) cd $(FLASHROM_DIR) && PATH='$(CROSSBIN):$(PATH)' $(ONIE_PKG_CONFIG) \
+		meson setup --cross-file $(FLASHROM_CROSS_FILE) --prefix=/usr \
+			-Dprogrammer=$(FLASHROM_PROGRAMMERS) \
+			-Dclassic_cli=enabled \
+			-Dtests=disabled \
+			-Dman-pages=disabled \
+			-Ddocumentation=disabled \
+			-Dich_descriptors_tool=disabled \
+			-Dbash_completion=disabled \
+			-Duse_git_version=disabled \
+			onie-build
+	$(Q) PATH='$(CROSSBIN):$(PATH)' ninja -C $(FLASHROM_MESON_BUILD)
+	$(Q) PATH='$(CROSSBIN):$(PATH)' DESTDIR=$(DEV_SYSROOT) \
+		ninja -C $(FLASHROM_MESON_BUILD) install
 	$(Q) touch $@
 
 flashrom-install: $(FLASHROM_INSTALL_STAMP)

build-config/make/util-linux.make

@@ -9,11 +9,11 @@
 # This is a makefile fragment that defines the build of some libraries
 # from the util-linux package.
 #
-UTILLINUX_MAJOR_VERSION = 2.37
-UTILLINUX_VERSION		= $(UTILLINUX_MAJOR_VERSION).2
+UTILLINUX_MAJOR_VERSION = 2.41
+UTILLINUX_VERSION		= $(UTILLINUX_MAJOR_VERSION).4
 UTILLINUX_TARBALL		= util-linux-$(UTILLINUX_VERSION).tar.xz
 UTILLINUX_TARBALL_URLS		+= $(ONIE_MIRROR) \
-					https://www.kernel.org/pub/linux/utils/util-linux/v$(UTILLINUX_VERSION)/
+					https://www.kernel.org/pub/linux/utils/util-linux/v$(UTILLINUX_MAJOR_VERSION)/
 
 ifneq ($(filter yes, $(EXT3_4_ENABLE) $(LVM2_ENABLE)),)
   UTILLINUX_FLAVOR	= util-linux

upstream/e2fsprogs-1.46.3.tar.xz.sha1

@@ -0,0 +1 @@
+e3c83517d8decc339e9fa0f5afe8246d3d0c6d82  e2fsprogs-1.47.4.tar.xz

upstream/e2fsprogs-1.47.4.tar.xz.sha1

@@ -0,0 +1 @@
+298b12b3e30035c0041ddd641ebd4658e234fd23  flashrom-v1.7.0.tar.xz

upstream/flashrom-0.9.8.tar.bz2.sha1

@@ -0,0 +1 @@
+0e61178c68875f33be327a7606429904d1663867  util-linux-2.41.4.tar.xz