packages: bump gptfdisk, pciutils, i2c-tools, mtd-utils, dosfstools, btrfs-progs, kexec-tools

Medium-wave bumps to latest upstream, validated together by a local
kvm_x86_64 image build (produces a working recovery ISO).

  - gptfdisk 0.8.8 -> 1.0.10 (SourceForge).  Refresh the cross-compile
    patch for the restructured Makefile; drop add-onie-partition-types
    (the ONIE GUID type codes are upstream in 1.0.10's parttypes.cc).
  - pciutils 3.2.1 -> 3.15.0 (kernel.org).  Refresh the ONIE Makefile
    patch; libpci SONAME stays .3 so PCIUTILS_LIBS is unchanged.  Fix the
    build HOST: pciutils' config parser reads HOST=onie-$(ARCH)-linux as
    OS "onie" (unsupported) and fails to generate config.mk -- use the
    canonical HOST=$(ARCH)-linux.
  - i2c-tools 3.1.1 -> 4.4.  jdelvare.nerim.net is dead -> kernel.org
    (.tar.bz2 -> .tar.gz).  Rework the 3 patches for the 4.x layout
    (eepromer/ -> eeprog/, static libi2c, include/i2c/smbus.h).
  - mtd-utils 1.5.2 -> 2.3.1 (infraroot.at).  Switch the git-snapshot
    scheme to a release tarball and the hand-rolled build to autotools
    ./configure; --without-crypto (UBIFS auth unused, as before).
  - dosfstools 3.0.26 -> 4.2.  daniel-baumann.ch is dead -> the upstream
    GitHub release dist tarball; autotools build with --without-iconv
    and --enable-compat-symlinks (drops the obsolete remove-local-support
    patch).
  - btrfs-progs v4.9.1 -> v7.0 (kernel.org kdave).  --disable-zstd/
    libudev/python (deps not in the sysroot); update the installed tool
    + libbtrfs SONAME lists; preset ac_cv_func_{malloc,realloc}_0_nonnull
    so the cross build does not link the missing rpl_malloc/rpl_realloc.
  - kexec-tools 2.0.22 -> 2.0.32 (kernel.org).  Drop both local patches
    (device-tree sorting and aarch64 support are upstream).

Signed-off-by: Brad House <bhouse@nexthop.ai>
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: bhouse-nexthop

build-config/make/btrfs-progs.make

@@ -9,7 +9,7 @@
 # This is a makefile fragment that defines the build of btrfs-progs
 #
 
-BTRFSPROGS_VERSION		= v4.9.1
+BTRFSPROGS_VERSION		= v7.0
 BTRFSPROGS_TARBALL		= btrfs-progs-$(BTRFSPROGS_VERSION).tar.xz
 BTRFSPROGS_TARBALL_URLS		+= $(ONIE_MIRROR) \
 				   https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs
@@ -37,11 +37,10 @@ PHONY += btrfs-progs btrfs-progs-download btrfs-progs-source \
 	 btrfs-progs-configure btrfs-progs-build btrfs-progs-install \
 	 btrfs-progs-clean btrfs-progs-download-clean
 
-BTRFSPROGS_LIBS = libbtrfs.so libbtrfs.so.0 libbtrfs.so.0.1
-BTRFSPROGS_SBIN = btrfs mkfs.btrfs btrfs-debug-tree btrfs-map-logical \
-		  btrfs-image btrfs-zero-log btrfs-find-root btrfstune \
-		  btrfs-show-super btrfs-select-super btrfs-convert \
-		  btrfsck
+BTRFSPROGS_LIBS = libbtrfs.so.0.1.5 libbtrfs.so libbtrfs.so.0 libbtrfs.so.0.1
+BTRFSPROGS_SBIN = btrfs mkfs.btrfs btrfs-map-logical \
+		  btrfs-image btrfs-find-root btrfstune \
+		  btrfs-select-super btrfsck
 
 btrfs-progs: $(BTRFSPROGS_STAMP)
 
@@ -81,6 +80,12 @@ $(BTRFSPROGS_CONFIGURE_STAMP): $(E2FSPROGS_BUILD_STAMP) \
 		--disable-documentation				\
 		--disable-backtrace				\
 		--disable-convert				\
+		--disable-zstd					\
+		--disable-libudev				\
+		--disable-python				\
+		--with-crypto=builtin				\
+		ac_cv_func_malloc_0_nonnull=yes			\
+		ac_cv_func_realloc_0_nonnull=yes		\
 		CC=$(CROSSPREFIX)gcc				\
 		CFLAGS="$(ONIE_CFLAGS)"				\
 		$(ONIE_PKG_CONFIG)

build-config/make/dosfstools.make

@@ -9,29 +9,35 @@
 # This is a makefile fragment that defines the build of dosfstools
 #
 
-DOSFSTOOLS_VERSION		= 3.0.26
-DOSFSTOOLS_TARBALL		= dosfstools-$(DOSFSTOOLS_VERSION).tar.xz
-DOSFSTOOLS_TARBALL_URLS		+= $(ONIE_MIRROR) http://daniel-baumann.ch/files/software/dosfstools
+DOSFSTOOLS_VERSION		= 4.2
+DOSFSTOOLS_TARBALL		= dosfstools-$(DOSFSTOOLS_VERSION).tar.gz
+DOSFSTOOLS_TARBALL_URLS		+= $(ONIE_MIRROR) https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION)
 DOSFSTOOLS_BUILD_DIR		= $(USER_BUILDDIR)/dosfstools
 DOSFSTOOLS_DIR			= $(DOSFSTOOLS_BUILD_DIR)/dosfstools-$(DOSFSTOOLS_VERSION)
 
 DOSFSTOOLS_SRCPATCHDIR		= $(PATCHDIR)/dosfstools
 DOSFSTOOLS_DOWNLOAD_STAMP		= $(DOWNLOADDIR)/dosfstools-download
 DOSFSTOOLS_SOURCE_STAMP		= $(USER_STAMPDIR)/dosfstools-source
 DOSFSTOOLS_PATCH_STAMP		= $(USER_STAMPDIR)/dosfstools-patch
+DOSFSTOOLS_CONFIGURE_STAMP	= $(USER_STAMPDIR)/dosfstools-configure
 DOSFSTOOLS_BUILD_STAMP		= $(USER_STAMPDIR)/dosfstools-build
 DOSFSTOOLS_INSTALL_STAMP	= $(STAMPDIR)/dosfstools-install
 DOSFSTOOLS_STAMP		= $(DOSFSTOOLS_SOURCE_STAMP) \
 				  $(DOSFSTOOLS_PATCH_STAMP) \
+				  $(DOSFSTOOLS_CONFIGURE_STAMP) \
 				  $(DOSFSTOOLS_BUILD_STAMP) \
 				  $(DOSFSTOOLS_INSTALL_STAMP)
 
+# As of 4.x dosfstools installs three programs (mkfs.fat, fsck.fat and
+# fatlabel).  The legacy program names (dosfsck, mkdosfs, ...) are
+# provided as compatibility symlinks via --enable-compat-symlinks.
 DOSFSTOOLS_PROGRAMS	= fsck.fat dosfsck fsck.msdos fsck.vfat \
 				mkfs.fat mkdosfs mkfs.msdos mkfs.vfat \
 				fatlabel dosfslabel
 
 PHONY += dosfstools dosfstools-download dosfstools-source dosfstools-patch \
-	dosfstools-build dosfstools-install dosfstools-clean dosfstools-download-clean
+	dosfstools-configure dosfstools-build dosfstools-install \
+	dosfstools-clean dosfstools-download-clean
 
 dosfstools: $(DOSFSTOOLS_STAMP)
 
@@ -59,25 +65,36 @@ $(DOSFSTOOLS_PATCH_STAMP): $(DOSFSTOOLS_SRCPATCHDIR)/* $(DOSFSTOOLS_SOURCE_STAMP
 	$(Q) $(SCRIPTDIR)/apply-patch-series $(DOSFSTOOLS_SRCPATCHDIR)/series $(DOSFSTOOLS_DIR)
 	$(Q) touch $@
 
+dosfstools-configure: $(DOSFSTOOLS_CONFIGURE_STAMP)
+$(DOSFSTOOLS_CONFIGURE_STAMP): $(DOSFSTOOLS_PATCH_STAMP) | $(DEV_SYSROOT_INIT_STAMP)
+	$(Q) rm -f $@ && eval $(PROFILE_STAMP)
+	$(Q) echo "====  Configure dosfstools-$(DOSFSTOOLS_VERSION) ===="
+	$(Q) cd $(DOSFSTOOLS_DIR) && PATH='$(CROSSBIN):$(PATH)'	\
+		$(DOSFSTOOLS_DIR)/configure			\
+		--prefix=/usr					\
+		--host=$(TARGET)				\
+		--without-iconv					\
+		--enable-compat-symlinks			\
+		CC=$(CROSSPREFIX)gcc				\
+		CFLAGS="$(ONIE_CFLAGS)"				\
+		LDFLAGS="$(ONIE_LDFLAGS)"			\
+		$(ONIE_PKG_CONFIG)
+	$(Q) touch $@
+
 ifndef MAKE_CLEAN
 DOSFSTOOLS_NEW_FILES = $(shell test -d $(DOSFSTOOLS_DIR) && test -f $(DOSFSTOOLS_BUILD_STAMP) && \
-	              find -L $(DOSFSTOOLS_DIR) -newer $(DOSFSTOOLS_BUILD_STAMP) -type f \
+		              find -L $(DOSFSTOOLS_DIR) -newer $(DOSFSTOOLS_BUILD_STAMP) -type f \
 			\! -name filelist-rpm -print -quit)
 endif
 
-DOSFSTOOLS_MAKE_VARS = \
-	CC=$(CROSSPREFIX)gcc LD=$(CROSSPREFIX)ld \
-	CFLAGS="$(ONIE_CFLAGS)" LDFLAGS="$(ONIE_LDFLAGS)" \
-	DESTDIR=$(DEV_SYSROOT) PREFIX=/usr
-
 dosfstools-build: $(DOSFSTOOLS_BUILD_STAMP)
-$(DOSFSTOOLS_BUILD_STAMP): $(DOSFSTOOLS_PATCH_STAMP) $(DOSFSTOOLS_NEW_FILES) \
+$(DOSFSTOOLS_BUILD_STAMP): $(DOSFSTOOLS_CONFIGURE_STAMP) $(DOSFSTOOLS_NEW_FILES) \
 				| $(DEV_SYSROOT_INIT_STAMP)
 	$(Q) rm -f $@ && eval $(PROFILE_STAMP)
 	$(Q) echo "====  Building dosfstools-$(DOSFSTOOLS_VERSION) ===="
-	$(Q) PATH='$(CROSSBIN):$(PATH)'	$(MAKE) -C $(DOSFSTOOLS_DIR) $(DOSFSTOOLS_MAKE_VARS)
-	$(Q) PATH='$(CROSSBIN):$(PATH)'	$(MAKE) -C $(DOSFSTOOLS_DIR) $(DOSFSTOOLS_MAKE_VARS) \
-		install-symlinks
+	$(Q) PATH='$(CROSSBIN):$(PATH)'	$(MAKE) -C $(DOSFSTOOLS_DIR)
+	$(Q) PATH='$(CROSSBIN):$(PATH)'	$(MAKE) -C $(DOSFSTOOLS_DIR) \
+		DESTDIR=$(DEV_SYSROOT) install
 	$(Q) touch $@
 
 dosfstools-install: $(DOSFSTOOLS_INSTALL_STAMP)

build-config/make/gptfdisk.make

@@ -9,7 +9,7 @@
 # This is a makefile fragment that defines the build of gptfdisk
 #
 
-GPTFDISK_VERSION		= 0.8.8
+GPTFDISK_VERSION		= 1.0.10
 GPTFDISK_TARBALL		= gptfdisk-$(GPTFDISK_VERSION).tar.gz
 GPTFDISK_TARBALL_URLS		+= $(ONIE_MIRROR) http://sourceforge.net/projects/gptfdisk/files/gptfdisk/$(GPTFDISK_VERSION)/
 GPTFDISK_BUILD_DIR		= $(USER_BUILDDIR)/gptfdisk

build-config/make/i2ctools.make

@@ -11,9 +11,9 @@
 # This is a makefile fragment that defines the build of i2ctools
 #
 
-I2CTOOLS_VERSION	= 3.1.1
-I2CTOOLS_TARBALL	= i2c-tools-$(I2CTOOLS_VERSION).tar.bz2
-I2CTOOLS_TARBALL_URLS	+= $(ONIE_MIRROR) http://jdelvare.nerim.net/mirror/i2c-tools
+I2CTOOLS_VERSION	= 4.4
+I2CTOOLS_TARBALL	= i2c-tools-$(I2CTOOLS_VERSION).tar.gz
+I2CTOOLS_TARBALL_URLS	+= $(ONIE_MIRROR) https://mirrors.edge.kernel.org/pub/software/utils/i2c-tools
 I2CTOOLS_BUILD_DIR	= $(MBUILDDIR)/i2c-tools
 I2CTOOLS_DIR		= $(I2CTOOLS_BUILD_DIR)/i2c-tools-$(I2CTOOLS_VERSION)
 
@@ -65,8 +65,8 @@ $(I2CTOOLS_PATCH_STAMP): $(I2CTOOLS_SRCPATCHDIR)/* $(MACHINE_I2CTOOLS_PATCHDIR_F
 	$(Q) rm -f $@ && eval $(PROFILE_STAMP)
 	$(Q) echo "==== Patching i2ctools ===="
 	$(Q) mkdir -p $(I2CTOOLS_DIR)/sys_eeprom
-	$(Q) cp $(I2CTOOLS_DIR)/eepromer/24cXX.c $(I2CTOOLS_DIR)/sys_eeprom/24cXX.c
-	$(Q) cp $(I2CTOOLS_DIR)/eepromer/24cXX.h $(I2CTOOLS_DIR)/sys_eeprom/24cXX.h
+	$(Q) cp $(I2CTOOLS_DIR)/eeprog/24cXX.c $(I2CTOOLS_DIR)/sys_eeprom/24cXX.c
+	$(Q) cp $(I2CTOOLS_DIR)/eeprog/24cXX.h $(I2CTOOLS_DIR)/sys_eeprom/24cXX.h
 	$(Q) mkdir -p $(I2CTOOLS_PATCHDIR)
 	$(Q) cp $(I2CTOOLS_SRCPATCHDIR)/* $(I2CTOOLS_PATCHDIR)
 ifneq ($(MACHINE_I2CTOOLS_PATCHDIR),)

build-config/make/kexec-tools.make

@@ -9,7 +9,7 @@
 # This is a makefile fragment that defines the build of kexec-tools
 #
 
-KEXEC_VERSION		= 2.0.22
+KEXEC_VERSION		= 2.0.32
 KEXEC_TARBALL		= kexec-tools-$(KEXEC_VERSION).tar.xz
 KEXEC_TARBALL_URLS	+= $(ONIE_MIRROR) \
 			   https://www.kernel.org/pub/linux/utils/kernel/kexec

build-config/make/mtdutils.make

@@ -10,26 +10,28 @@
 # This is a makefile fragment that defines the build of mtdutils
 #
 
-MTDUTILS_VERSION	= 1.5.2
-MTDUTILS_COMMIT		= e4c8885bddac201ba0ef88560d6444f39e1ff870
-MTDUTILS_TARBALL	= mtd-utils-$(MTDUTILS_VERSION).tar.gz
-MTDUTILS_TARBALL_URLS	+= $(ONIE_MIRROR) http://git.infradead.org/mtd-utils.git/snapshot
+MTDUTILS_VERSION	= 2.3.1
+MTDUTILS_TARBALL	= mtd-utils-$(MTDUTILS_VERSION).tar.bz2
+MTDUTILS_TARBALL_URLS	+= $(ONIE_MIRROR) https://infraroot.at/pub/mtd
 MTDUTILS_BUILD_DIR	= $(USER_BUILDDIR)/mtd-utils
-MTDUTILS_DIR		= $(MTDUTILS_BUILD_DIR)/mtd-utils-e4c8885
+MTDUTILS_DIR		= $(MTDUTILS_BUILD_DIR)/mtd-utils-$(MTDUTILS_VERSION)
 
 MTDUTILS_DOWNLOAD_STAMP	= $(DOWNLOADDIR)/mtdutils-$(MTDUTILS_VERSION)-download
 MTDUTILS_SOURCE_STAMP	= $(USER_STAMPDIR)/mtdutils-source
+MTDUTILS_CONFIGURE_STAMP	= $(USER_STAMPDIR)/mtdutils-configure
 MTDUTILS_BUILD_STAMP	= $(USER_STAMPDIR)/mtdutils-build
 MTDUTILS_INSTALL_STAMP	= $(STAMPDIR)/mtdutils-install
 MTDUTILS_STAMP		= $(MTDUTILS_SOURCE_STAMP) \
+			  $(MTDUTILS_CONFIGURE_STAMP) \
 			  $(MTDUTILS_BUILD_STAMP) \
 			  $(MTDUTILS_INSTALL_STAMP)
 
-MTDBINS = mkfs.jffs2 mkfs.ubifs ubinize ubiformat ubinfo mtdinfo 
+MTDBINS = mkfs.jffs2 mkfs.ubifs ubinize ubiformat ubinfo mtdinfo
 UBIBINS = ubiattach ubimkvol ubidetach ubirmvol
 
-PHONY += mtdutils mtdutils-download mtdutils-source mtdutils-build \
-	 mtdutils-install mtdutils-clean mtdutils-download-clean
+PHONY += mtdutils mtdutils-download mtdutils-source mtdutils-configure \
+	 mtdutils-build mtdutils-install mtdutils-clean mtdutils-download-clean \
+	 mtdutils-configure-help
 
 mtdutils: $(MTDUTILS_STAMP)
 
@@ -39,8 +41,7 @@ $(MTDUTILS_DOWNLOAD_STAMP): $(PROJECT_STAMP)
 	$(Q) rm -f $@ && eval $(PROFILE_STAMP)
 	$(Q) echo "==== Getting upstream mtdutils ===="
 	$(Q) $(SCRIPTDIR)/fetch-package $(DOWNLOADDIR) $(UPSTREAMDIR) \
-		$(MTDUTILS_COMMIT).tar.gz $(MTDUTILS_TARBALL_URLS)
-	$(Q) cd $(DOWNLOADDIR) && ln -fs $(MTDUTILS_COMMIT).tar.gz $(MTDUTILS_TARBALL)
+		$(MTDUTILS_TARBALL) $(MTDUTILS_TARBALL_URLS)
 	$(Q) touch $@
 
 SOURCE += $(MTDUTILS_SOURCE_STAMP)
@@ -51,29 +52,66 @@ $(MTDUTILS_SOURCE_STAMP): $(USER_TREE_STAMP) | $(MTDUTILS_DOWNLOAD_STAMP)
 	$(Q) $(SCRIPTDIR)/extract-package $(MTDUTILS_BUILD_DIR) $(DOWNLOADDIR)/$(MTDUTILS_TARBALL)
 	$(Q) touch $@
 
+mtdutils-configure-help: $(UTILLINUX_BUILD_STAMP) $(LZO_BUILD_STAMP) \
+				$(ZLIB_BUILD_STAMP) \
+				$(MTDUTILS_SOURCE_STAMP) | $(DEV_SYSROOT_INIT_STAMP)
+	$(Q) echo "====  Configure help for mtd-utils-$(MTDUTILS_VERSION) ===="
+	$(Q) cd $(MTDUTILS_DIR) && PATH='$(CROSSBIN):$(PATH)'	\
+		$(MTDUTILS_DIR)/configure --help
+
+# mtd-utils 2.x uses an autotools (./configure) build.
+#
+# Optional dependencies:
+#   - zlib, lzo, libuuid (util-linux) are provided by ONIE and enabled
+#     (UBIFS/JFFS2 support).
+#   - crypto (UBIFS authentication) is disabled: ONIE does not need it and
+#     the prior 1.5.2 build did not use it.
+#   - zstd is NOT provided by ONIE, so ZSTD compression is disabled.
+#   - selinux is NOT provided by ONIE, so SELinux support is disabled.
+#   - xattr is disabled to match the prior 1.5.2 build (WITHOUT_XATTR=1).
+#   - The unit/test programs are disabled (--without-tests); they are not
+#     installed and pull in extra dependencies (pthread, clock_gettime).
+mtdutils-configure: $(MTDUTILS_CONFIGURE_STAMP)
+$(MTDUTILS_CONFIGURE_STAMP): $(UTILLINUX_BUILD_STAMP) $(LZO_BUILD_STAMP) \
+				$(ZLIB_BUILD_STAMP) \
+				$(MTDUTILS_SOURCE_STAMP) | $(DEV_SYSROOT_INIT_STAMP)
+	$(Q) rm -f $@ && eval $(PROFILE_STAMP)
+	$(Q) echo "====  Configure mtd-utils-$(MTDUTILS_VERSION) ===="
+	$(Q) cd $(MTDUTILS_DIR) && PATH='$(CROSSBIN):$(PATH)'	\
+		$(MTDUTILS_DIR)/configure			\
+		--prefix=/usr					\
+		--host=$(TARGET)				\
+		--with-zlib					\
+		--with-lzo					\
+		--with-ubifs					\
+		--with-jffs					\
+		--without-crypto				\
+		--without-zstd					\
+		--without-xattr					\
+		--without-selinux				\
+		--without-tests					\
+		--without-lsmtd					\
+		--disable-unit-tests				\
+		--disable-ubihealthd				\
+		CC=$(CROSSPREFIX)gcc				\
+		CFLAGS="$(ONIE_CFLAGS)"				\
+		LDFLAGS="$(ONIE_LDFLAGS)"			\
+		$(ONIE_PKG_CONFIG)
+	$(Q) touch $@
+
 ifndef MAKE_CLEAN
 MTDUTILS_NEW_FILES = $(shell test -d $(MTDUTILS_DIR) && test -f $(MTDUTILS_BUILD_STAMP) && \
-	              find -L $(MTDUTILS_DIR) -newer $(MTDUTILS_BUILD_STAMP) -type f -print -quit)
+		      find -L $(MTDUTILS_DIR) -newer $(MTDUTILS_BUILD_STAMP) -type f -print -quit)
 endif
 
 mtdutils-build: $(MTDUTILS_BUILD_STAMP)
-$(MTDUTILS_BUILD_STAMP): $(MTDUTILS_NEW_FILES) $(UTILLINUX_BUILD_STAMP) \
-			 $(LZO_BUILD_STAMP) $(ZLIB_BUILD_STAMP) \
-			 $(MTDUTILS_SOURCE_STAMP) | $(DEV_SYSROOT_INIT_STAMP)
+$(MTDUTILS_BUILD_STAMP): $(MTDUTILS_NEW_FILES) $(MTDUTILS_CONFIGURE_STAMP)
 	$(Q) rm -f $@ && eval $(PROFILE_STAMP)
+	$(Q) echo "====  Building mtd-utils-$(MTDUTILS_VERSION) ===="
 	$(Q) PATH='$(CROSSBIN):$(PATH)'				\
-	    $(MAKE) -C $(MTDUTILS_DIR)				\
-		PREFIX=$(DEV_SYSROOT)/usr			\
-		CROSS=$(CROSSPREFIX)				\
-		CFLAGS="-g $(ONIE_CFLAGS)"			\
-                WITHOUT_XATTR=1
+	    $(MAKE) -C $(MTDUTILS_DIR) DESTDIR=$(DEV_SYSROOT)
 	$(Q) PATH='$(CROSSBIN):$(PATH)'				\
-	    $(MAKE) -C $(MTDUTILS_DIR)				\
-		PREFIX=$(DEV_SYSROOT)/usr			\
-		CROSS=$(CROSSPREFIX)				\
-		CFLAGS="-g $(ONIE_CFLAGS)"			\
-                WITHOUT_XATTR=1                                 \
-                install
+	    $(MAKE) -C $(MTDUTILS_DIR) DESTDIR=$(DEV_SYSROOT) install
 	$(Q) touch $@
 
 mtdutils-install: $(MTDUTILS_INSTALL_STAMP)
@@ -101,8 +139,7 @@ mtdutils-clean:
 
 DOWNLOAD_CLEAN += mtdutils-download-clean
 mtdutils-download-clean:
-	$(Q) rm -f $(MTDUTILS_DOWNLOAD_STAMP) $(DOWNLOADDIR)/$(MTDUTILS_COMMIT).tar.gz \
-		   $(DOWNLOADDIR)/$(MTDUTILS_TARBALL)
+	$(Q) rm -f $(MTDUTILS_DOWNLOAD_STAMP) $(DOWNLOADDIR)/$(MTDUTILS_TARBALL)
 
 #-------------------------------------------------------------------------------
 #

build-config/make/pciutils.make

@@ -9,7 +9,7 @@
 # This is a makefile fragment that defines the build of pciutils
 #
 
-PCIUTILS_VERSION		= 3.2.1
+PCIUTILS_VERSION		= 3.15.0
 PCIUTILS_TARBALL		= pciutils-$(PCIUTILS_VERSION).tar.xz
 PCIUTILS_TARBALL_URLS		+= $(ONIE_MIRROR) https://www.kernel.org/pub/software/utils/pciutils
 PCIUTILS_BUILD_DIR		= $(USER_BUILDDIR)/pciutils
@@ -70,9 +70,9 @@ $(PCIUTILS_BUILD_STAMP): $(PCIUTILS_PATCH_STAMP) $(PCIUTILS_NEW_FILES) $(ZLIB_BU
 	$(Q) rm -f $@ && eval $(PROFILE_STAMP)
 	$(Q) echo "====  Building pciutils-$(PCIUTILS_VERSION) ===="
 	$(Q) PATH='$(CROSSBIN):$(PATH)'	$(MAKE) -C $(PCIUTILS_DIR) lib/libpci.so.$(PCIUTILS_VERSION) CROSS_COMPILE=$(CROSSPREFIX) \
-		HOST=onie-$(ARCH)-linux ZLIB=yes DNS=no SHARED=yes LIBKMOD=no PREFIX=/usr DESTDIR=$(DEV_SYSROOT)
+		HOST=$(ARCH)-linux ZLIB=yes DNS=no SHARED=yes LIBKMOD=no PREFIX=/usr DESTDIR=$(DEV_SYSROOT)
 	$(Q) PATH='$(CROSSBIN):$(PATH)'	$(MAKE) -C $(PCIUTILS_DIR) install-lib CROSS_COMPILE=$(CROSSPREFIX) \
-		HOST=onie-$(ARCH)-linux ZLIB=yes DNS=no SHARED=yes LIBKMOD=no PREFIX=/usr DESTDIR=$(DEV_SYSROOT)
+		HOST=$(ARCH)-linux ZLIB=yes DNS=no SHARED=yes LIBKMOD=no PREFIX=/usr DESTDIR=$(DEV_SYSROOT)
 	$(Q) touch $@
 
 pciutils-install: $(PCIUTILS_INSTALL_STAMP)

patches/dosfstools/remove-local-support.patch

@@ -1,2 +1,10 @@
-# This series applies on GIT commit 277b73b04cda1663511bb28ce9221d7b9561385b
-remove-local-support.patch
+# This series applies on dosfstools release v4.2
+#
+# No patches required.
+#
+# The former remove-local-support.patch (which stubbed out the gettext/
+# locale/iconv support that uClibc handles poorly) was dropped for 4.x.
+# dosfstools 4.x switched to an autotools build and gates iconv behind
+# --with-iconv/--without-iconv. We configure with --without-iconv, which
+# compiles charconv.c with its built-in CP850 table and no iconv/gettext
+# dependency, achieving the same result without source patching.