From 46e376c93514b63ca130075dc8b968c517f12ff7 Mon Sep 17 00:00:00 2001 From: Scott Mercer Date: Sun, 16 Mar 2025 23:50:33 -0400 Subject: [PATCH] uboot-tools: migrate uboot-envtools to uboot-tools Generalize and merge uboot-envtools package into uboot-tools package. Remove existing uboot-envtools package. Signed-off-by: Scott Mercer --- package/boot/uboot-envtools/Makefile | 90 ------------------- package/boot/uboot-tools/Makefile | 45 ++++++++++ .../patches/001-envtools-compile.patch} | 0 ...tools-env-use-run-to-store-lockfile.patch} | 0 .../uboot-envtools/files/apm821xx | 0 .../uboot-envtools/files/ath79 | 0 .../uboot-envtools/files/cns3xxx | 0 .../uboot-envtools/files/fw_defaults | 0 .../uboot-envtools/files/fw_loadenv | 0 .../uboot-envtools/files/fw_printsys | 0 .../uboot-envtools/files/fw_setsys | 0 .../uboot-envtools/files/imx_cortexa7 | 0 .../uboot-envtools/files/imx_cortexa9 | 0 .../uboot-envtools/files/ipq40xx | 0 .../uboot-envtools/files/ipq806x | 0 .../uboot-envtools/files/kirkwood | 0 .../uboot-envtools/files/lantiq | 0 .../uboot-envtools/files/layerscape | 0 .../uboot-envtools/files/mediatek_filogic | 0 .../uboot-envtools/files/mediatek_mt7622 | 0 .../uboot-envtools/files/mediatek_mt7623 | 0 .../uboot-envtools/files/mediatek_mt7629 | 0 .../uboot-envtools/files/mpc85xx | 0 .../uboot-envtools/files/mvebu | 0 .../uboot-envtools/files/mxs | 0 .../uboot-envtools/files/octeon | 0 .../uboot-envtools/files/oxnas | 0 .../uboot-envtools/files/pistachio | 0 .../uboot-envtools/files/qoriq | 0 .../uboot-envtools/files/qualcommax_ipq50xx | 0 .../uboot-envtools/files/qualcommax_ipq60xx | 0 .../uboot-envtools/files/qualcommax_ipq807x | 0 .../uboot-envtools/files/ramips | 0 .../uboot-envtools/files/realtek | 0 .../uboot-envtools/files/rockchip_armv8 | 0 .../uboot-envtools/files/uboot-envtools.sh | 0 36 files changed, 45 insertions(+), 90 deletions(-) delete mode 100644 package/boot/uboot-envtools/Makefile rename package/boot/{uboot-envtools/patches/001-compile.patch => uboot-tools/patches/001-envtools-compile.patch} (100%) rename package/boot/{uboot-envtools/patches/002-Revert-tools-env-use-run-to-store-lockfile.patch => uboot-tools/patches/002-envtools-revert-tools-env-use-run-to-store-lockfile.patch} (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/apm821xx (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/ath79 (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/cns3xxx (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/fw_defaults (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/fw_loadenv (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/fw_printsys (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/fw_setsys (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/imx_cortexa7 (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/imx_cortexa9 (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/ipq40xx (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/ipq806x (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/kirkwood (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/lantiq (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/layerscape (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/mediatek_filogic (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/mediatek_mt7622 (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/mediatek_mt7623 (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/mediatek_mt7629 (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/mpc85xx (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/mvebu (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/mxs (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/octeon (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/oxnas (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/pistachio (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/qoriq (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/qualcommax_ipq50xx (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/qualcommax_ipq60xx (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/qualcommax_ipq807x (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/ramips (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/realtek (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/rockchip_armv8 (100%) rename package/boot/{ => uboot-tools}/uboot-envtools/files/uboot-envtools.sh (100%) diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile deleted file mode 100644 index 5b52c3b3959..00000000000 --- a/package/boot/uboot-envtools/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# -# Copyright (C) 2006-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=uboot-envtools -PKG_DISTNAME:=u-boot -PKG_VERSION:=2025.01 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:= \ - https://ftp.denx.de/pub/u-boot \ - https://mirror.cyberbits.eu/u-boot \ - ftp://ftp.denx.de/pub/u-boot -PKG_HASH:=cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f -PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-$(PKG_VERSION) -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-$(PKG_VERSION) - -PKG_BUILD_DEPENDS:=fstools - -PKG_LICENSE:=GPL-2.0 GPL-2.0+ -PKG_LICENSE_FILES:=Licenses/README - -PKG_FLAGS:=nonshared - -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/uboot-envtools - SECTION:=utils - CATEGORY:=Utilities - SUBMENU:=Boot Loaders - TITLE:=read/modify U-Boot bootloader environment - URL:=http://www.denx.de/wiki/U-Boot -endef - -define Package/uboot-envtools/description - This package includes tools to read and modify U-Boot bootloader environment. -endef - -define Build/Configure - $(call Build/Compile/Default,tools-only_defconfig) -endef - -define Build/Compile - $(call Build/Compile/Default,envtools) -endef - -# We need to override the ARCH passed by buildsystem as otherwise the defconfig -# for tools-only wont match and the includes for sandbox will be dropped -MAKE_FLAGS += \ - ARCH="sandbox" \ - TARGET_CFLAGS="$(TARGET_CFLAGS)" \ - TARGET_LDFLAGS="$(TARGET_LDFLAGS)" - -define Package/uboot-envtools/conffiles -/etc/config/ubootenv -/etc/fw_env.config -/etc/fw_sys.config -endef - -define Package/uboot-envtools/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/env/fw_printenv $(1)/usr/sbin - $(LN) fw_printenv $(1)/usr/sbin/fw_setenv - $(INSTALL_BIN) ./files/fw_printsys $(1)/usr/sbin - $(INSTALL_BIN) ./files/fw_setsys $(1)/usr/sbin - $(INSTALL_BIN) ./files/fw_loadenv $(1)/usr/sbin - $(INSTALL_DIR) $(1)/etc/board.d - $(INSTALL_DATA) ./files/fw_defaults $(1)/etc/board.d/05_fw_defaults - $(INSTALL_DIR) $(1)/lib - $(INSTALL_DATA) ./files/uboot-envtools.sh $(1)/lib - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(if $(wildcard ./files/$(BOARD)_$(SUBTARGET)), \ - $(INSTALL_DATA) ./files/$(BOARD)_$(SUBTARGET) \ - $(1)/etc/uci-defaults/30_uboot-envtools, \ - $(if $(wildcard ./files/$(BOARD)), \ - $(INSTALL_DATA) ./files/$(BOARD) \ - $(1)/etc/uci-defaults/30_uboot-envtools \ - ) \ - ) -endef - -$(eval $(call BuildPackage,uboot-envtools)) diff --git a/package/boot/uboot-tools/Makefile b/package/boot/uboot-tools/Makefile index 03917bd9493..de738725f26 100644 --- a/package/boot/uboot-tools/Makefile +++ b/package/boot/uboot-tools/Makefile @@ -35,6 +35,26 @@ define Package/uboot-tools/description to work with the U-Boot bootloader, endef +define Package/uboot-envtools + SECTION:=utils + CATEGORY:=Utilities + SUBMENU:=Boot Loaders + PKG_FLAGS+=nonshared + TITLE:=read/modify U-Boot bootloader environment + URL:=http://www.denx.de/wiki/U-Boot +endef + +define Package/uboot-envtools/description + This package includes tools to read and modify U-Boot + bootloader environment. +endef + +define Package/uboot-envtools/conffiles + /etc/config/ubootenv + /etc/fw_env.config + /etc/fw_sys.config +endef + define Build/Configure $(MAKE) -C $(PKG_BUILD_DIR) tools-only_defconfig $(MAKE) -C $(PKG_BUILD_DIR) syncconfig @@ -46,4 +66,29 @@ MAKE_FLAGS += \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" define Build/Compile + $(call Build/Compile/Default,envtools) endef + +define Package/uboot-envtools/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/env/fw_printenv $(1)/usr/sbin + $(LN) fw_printenv $(1)/usr/sbin/fw_setenv + $(INSTALL_BIN) ./uboot-envtools/files/fw_printsys $(1)/usr/sbin + $(INSTALL_BIN) ./uboot-envtools/files/fw_setsys $(1)/usr/sbin + $(INSTALL_BIN) ./uboot-envtools/files/fw_loadenv $(1)/usr/sbin + $(INSTALL_DIR) $(1)/etc/board.d + $(INSTALL_DATA) ./uboot-envtools/files/fw_defaults $(1)/etc/board.d/05_fw_defaults + $(INSTALL_DIR) $(1)/lib + $(INSTALL_DATA) ./uboot-envtools/files/uboot-envtools.sh $(1)/lib + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(if $(wildcard ./uboot-envtools/files/$(BOARD)_$(SUBTARGET)), \ + $(INSTALL_DATA) ./uboot-envtools/files/$(BOARD)_$(SUBTARGET) \ + $(1)/etc/uci-defaults/30_uboot-envtools, \ + $(if $(wildcard ./uboot-envtools/files/$(BOARD)), \ + $(INSTALL_DATA) ./uboot-envtools/files/$(BOARD) \ + $(1)/etc/uci-defaults/30_uboot-envtools \ + ) \ + ) +endef + +$(eval $(call BuildPackage,uboot-envtools)) diff --git a/package/boot/uboot-envtools/patches/001-compile.patch b/package/boot/uboot-tools/patches/001-envtools-compile.patch similarity index 100% rename from package/boot/uboot-envtools/patches/001-compile.patch rename to package/boot/uboot-tools/patches/001-envtools-compile.patch diff --git a/package/boot/uboot-envtools/patches/002-Revert-tools-env-use-run-to-store-lockfile.patch b/package/boot/uboot-tools/patches/002-envtools-revert-tools-env-use-run-to-store-lockfile.patch similarity index 100% rename from package/boot/uboot-envtools/patches/002-Revert-tools-env-use-run-to-store-lockfile.patch rename to package/boot/uboot-tools/patches/002-envtools-revert-tools-env-use-run-to-store-lockfile.patch diff --git a/package/boot/uboot-envtools/files/apm821xx b/package/boot/uboot-tools/uboot-envtools/files/apm821xx similarity index 100% rename from package/boot/uboot-envtools/files/apm821xx rename to package/boot/uboot-tools/uboot-envtools/files/apm821xx diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-tools/uboot-envtools/files/ath79 similarity index 100% rename from package/boot/uboot-envtools/files/ath79 rename to package/boot/uboot-tools/uboot-envtools/files/ath79 diff --git a/package/boot/uboot-envtools/files/cns3xxx b/package/boot/uboot-tools/uboot-envtools/files/cns3xxx similarity index 100% rename from package/boot/uboot-envtools/files/cns3xxx rename to package/boot/uboot-tools/uboot-envtools/files/cns3xxx diff --git a/package/boot/uboot-envtools/files/fw_defaults b/package/boot/uboot-tools/uboot-envtools/files/fw_defaults similarity index 100% rename from package/boot/uboot-envtools/files/fw_defaults rename to package/boot/uboot-tools/uboot-envtools/files/fw_defaults diff --git a/package/boot/uboot-envtools/files/fw_loadenv b/package/boot/uboot-tools/uboot-envtools/files/fw_loadenv similarity index 100% rename from package/boot/uboot-envtools/files/fw_loadenv rename to package/boot/uboot-tools/uboot-envtools/files/fw_loadenv diff --git a/package/boot/uboot-envtools/files/fw_printsys b/package/boot/uboot-tools/uboot-envtools/files/fw_printsys similarity index 100% rename from package/boot/uboot-envtools/files/fw_printsys rename to package/boot/uboot-tools/uboot-envtools/files/fw_printsys diff --git a/package/boot/uboot-envtools/files/fw_setsys b/package/boot/uboot-tools/uboot-envtools/files/fw_setsys similarity index 100% rename from package/boot/uboot-envtools/files/fw_setsys rename to package/boot/uboot-tools/uboot-envtools/files/fw_setsys diff --git a/package/boot/uboot-envtools/files/imx_cortexa7 b/package/boot/uboot-tools/uboot-envtools/files/imx_cortexa7 similarity index 100% rename from package/boot/uboot-envtools/files/imx_cortexa7 rename to package/boot/uboot-tools/uboot-envtools/files/imx_cortexa7 diff --git a/package/boot/uboot-envtools/files/imx_cortexa9 b/package/boot/uboot-tools/uboot-envtools/files/imx_cortexa9 similarity index 100% rename from package/boot/uboot-envtools/files/imx_cortexa9 rename to package/boot/uboot-tools/uboot-envtools/files/imx_cortexa9 diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-tools/uboot-envtools/files/ipq40xx similarity index 100% rename from package/boot/uboot-envtools/files/ipq40xx rename to package/boot/uboot-tools/uboot-envtools/files/ipq40xx diff --git a/package/boot/uboot-envtools/files/ipq806x b/package/boot/uboot-tools/uboot-envtools/files/ipq806x similarity index 100% rename from package/boot/uboot-envtools/files/ipq806x rename to package/boot/uboot-tools/uboot-envtools/files/ipq806x diff --git a/package/boot/uboot-envtools/files/kirkwood b/package/boot/uboot-tools/uboot-envtools/files/kirkwood similarity index 100% rename from package/boot/uboot-envtools/files/kirkwood rename to package/boot/uboot-tools/uboot-envtools/files/kirkwood diff --git a/package/boot/uboot-envtools/files/lantiq b/package/boot/uboot-tools/uboot-envtools/files/lantiq similarity index 100% rename from package/boot/uboot-envtools/files/lantiq rename to package/boot/uboot-tools/uboot-envtools/files/lantiq diff --git a/package/boot/uboot-envtools/files/layerscape b/package/boot/uboot-tools/uboot-envtools/files/layerscape similarity index 100% rename from package/boot/uboot-envtools/files/layerscape rename to package/boot/uboot-tools/uboot-envtools/files/layerscape diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-tools/uboot-envtools/files/mediatek_filogic similarity index 100% rename from package/boot/uboot-envtools/files/mediatek_filogic rename to package/boot/uboot-tools/uboot-envtools/files/mediatek_filogic diff --git a/package/boot/uboot-envtools/files/mediatek_mt7622 b/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7622 similarity index 100% rename from package/boot/uboot-envtools/files/mediatek_mt7622 rename to package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7622 diff --git a/package/boot/uboot-envtools/files/mediatek_mt7623 b/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7623 similarity index 100% rename from package/boot/uboot-envtools/files/mediatek_mt7623 rename to package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7623 diff --git a/package/boot/uboot-envtools/files/mediatek_mt7629 b/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7629 similarity index 100% rename from package/boot/uboot-envtools/files/mediatek_mt7629 rename to package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7629 diff --git a/package/boot/uboot-envtools/files/mpc85xx b/package/boot/uboot-tools/uboot-envtools/files/mpc85xx similarity index 100% rename from package/boot/uboot-envtools/files/mpc85xx rename to package/boot/uboot-tools/uboot-envtools/files/mpc85xx diff --git a/package/boot/uboot-envtools/files/mvebu b/package/boot/uboot-tools/uboot-envtools/files/mvebu similarity index 100% rename from package/boot/uboot-envtools/files/mvebu rename to package/boot/uboot-tools/uboot-envtools/files/mvebu diff --git a/package/boot/uboot-envtools/files/mxs b/package/boot/uboot-tools/uboot-envtools/files/mxs similarity index 100% rename from package/boot/uboot-envtools/files/mxs rename to package/boot/uboot-tools/uboot-envtools/files/mxs diff --git a/package/boot/uboot-envtools/files/octeon b/package/boot/uboot-tools/uboot-envtools/files/octeon similarity index 100% rename from package/boot/uboot-envtools/files/octeon rename to package/boot/uboot-tools/uboot-envtools/files/octeon diff --git a/package/boot/uboot-envtools/files/oxnas b/package/boot/uboot-tools/uboot-envtools/files/oxnas similarity index 100% rename from package/boot/uboot-envtools/files/oxnas rename to package/boot/uboot-tools/uboot-envtools/files/oxnas diff --git a/package/boot/uboot-envtools/files/pistachio b/package/boot/uboot-tools/uboot-envtools/files/pistachio similarity index 100% rename from package/boot/uboot-envtools/files/pistachio rename to package/boot/uboot-tools/uboot-envtools/files/pistachio diff --git a/package/boot/uboot-envtools/files/qoriq b/package/boot/uboot-tools/uboot-envtools/files/qoriq similarity index 100% rename from package/boot/uboot-envtools/files/qoriq rename to package/boot/uboot-tools/uboot-envtools/files/qoriq diff --git a/package/boot/uboot-envtools/files/qualcommax_ipq50xx b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq50xx similarity index 100% rename from package/boot/uboot-envtools/files/qualcommax_ipq50xx rename to package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq50xx diff --git a/package/boot/uboot-envtools/files/qualcommax_ipq60xx b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq60xx similarity index 100% rename from package/boot/uboot-envtools/files/qualcommax_ipq60xx rename to package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq60xx diff --git a/package/boot/uboot-envtools/files/qualcommax_ipq807x b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq807x similarity index 100% rename from package/boot/uboot-envtools/files/qualcommax_ipq807x rename to package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq807x diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-tools/uboot-envtools/files/ramips similarity index 100% rename from package/boot/uboot-envtools/files/ramips rename to package/boot/uboot-tools/uboot-envtools/files/ramips diff --git a/package/boot/uboot-envtools/files/realtek b/package/boot/uboot-tools/uboot-envtools/files/realtek similarity index 100% rename from package/boot/uboot-envtools/files/realtek rename to package/boot/uboot-tools/uboot-envtools/files/realtek diff --git a/package/boot/uboot-envtools/files/rockchip_armv8 b/package/boot/uboot-tools/uboot-envtools/files/rockchip_armv8 similarity index 100% rename from package/boot/uboot-envtools/files/rockchip_armv8 rename to package/boot/uboot-tools/uboot-envtools/files/rockchip_armv8 diff --git a/package/boot/uboot-envtools/files/uboot-envtools.sh b/package/boot/uboot-tools/uboot-envtools/files/uboot-envtools.sh similarity index 100% rename from package/boot/uboot-envtools/files/uboot-envtools.sh rename to package/boot/uboot-tools/uboot-envtools/files/uboot-envtools.sh