From 93e52959f5dce0dbc77122b251d5d30e8764cad2 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 28 May 2022 15:30:53 +0200
Subject: [PATCH] - u-boot: bump version to 2022.01; rework build

---
 package/nano/nano.mk     |  4 ++--
 package/tzdata/tzdata.mk |  4 ++--
 package/u-boot/u-boot.mk | 22 ++++++++++------------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index 4868cf89..143b40e6 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -29,11 +29,11 @@ NANO_CONF_OPTS = \
 	--without-slang \
 	--with-wordbounds
 
-define NANO_INSTALL_EDITOR_SH
+define NANO_INSTALL_PROFILE_D_SCRIPT
 	$(INSTALL) -d $(TARGET_sysconfdir)/profile.d
 	echo "export EDITOR=nano" > $(TARGET_sysconfdir)/profile.d/editor.sh
 endef
-NANO_PRE_FOLLOWUP_HOOKS += NANO_INSTALL_EDITOR_SH
+NANO_TARGET_FINALIZE_HOOKS += NANO_INSTALL_PROFILE_D_SCRIPT
 
 nano: | $(TARGET_DIR)
 	$(call PREPARE)
diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk
index 3ed28235..db521557 100644
--- a/package/tzdata/tzdata.mk
+++ b/package/tzdata/tzdata.mk
@@ -37,11 +37,11 @@ define TZDATA_INSTALL_TIMEZONE_FILES
 endef
 TZDATA_TARGET_FINALIZE_HOOKS += TZDATA_INSTALL_TIMEZONE_FILES
 
-define TZDATA_INSTALL_TZ_SH
+define TZDATA_INSTALL_PROFILE_D_SCRIPT
 	$(INSTALL) -d $(TARGET_sysconfdir)/profile.d
 	echo "export TZ=\$$(cat $(sysconfdir)/timezone)" > $(TARGET_sysconfdir)/profile.d/tz.sh
 endef
-TZDATA_TARGET_FINALIZE_HOOKS += TZDATA_INSTALL_TZ_SH
+TZDATA_TARGET_FINALIZE_HOOKS += TZDATA_INSTALL_PROFILE_D_SCRIPT
 
 tzdata: | $(TARGET_DIR)
 	$(call STARTUP)
diff --git a/package/u-boot/u-boot.mk b/package/u-boot/u-boot.mk
index 04446444..fb72c5f7 100644
--- a/package/u-boot/u-boot.mk
+++ b/package/u-boot/u-boot.mk
@@ -4,23 +4,21 @@
 #
 ################################################################################
 
-HOST_U_BOOT_VERSION = 2018.09
+HOST_U_BOOT_VERSION = 2022.01
 HOST_U_BOOT_DIR = u-boot-$(HOST_U_BOOT_VERSION)
 HOST_U_BOOT_SOURCE = u-boot-$(HOST_U_BOOT_VERSION).tar.bz2
 HOST_U_BOOT_SITE = ftp://ftp.denx.de/pub/u-boot
 
-$(DL_DIR)/$(HOST_U_BOOT_SOURCE):
-	$(download) $(HOST_U_BOOT_SITE)/$(HOST_U_BOOT_SOURCE)
-
 HOST_MKIMAGE = $(HOST_DIR)/bin/mkimage
 
-host-u-boot: $(DL_DIR)/$(HOST_U_BOOT_SOURCE) | $(HOST_DIR)
-	$(REMOVE)/$(PKG_DIR)
-	$(UNTAR)/$(PKG_SOURCE)
-	$(CHDIR)/$(PKG_DIR); \
+define HOST_U_BOOT_INSTALL_BINARY
+	$(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/tools/mkimage $(HOST_MKIMAGE)
+endef
+HOST_U_BOOT_PRE_FOLLOWUP_HOOKS += HOST_U_BOOT_INSTALL_BINARY
+
+host-u-boot: | $(HOST_DIR)
+	$(call PREPARE)
+	$(CHDIR)/$($(PKG)_DIR); \
 		$(MAKE) defconfig; \
-		$(MAKE) silentoldconfig; \
 		$(MAKE) tools-only
-	$(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/tools/mkimage $(HOST_MKIMAGE)
-	$(REMOVE)/$(PKG_DIR)
-	$(TOUCH)
+	$(call HOST_FOLLOWUP)