mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
96727397ef
Recent envtools update to 2023.07.02 has introduced a breakage when trying to parallel build with the following error: /bin/sh: line 1: scripts/basic/fixdep: No such file or directory Luckily it can easily be reproduced locally via a simple script so it was not hard to bisect it down to upstream commit [1]. However, its not that commits fault, it just uncovered an issue with the way we have been building envtools for a long time, maybe even from the package introduction. The issue is that we are trying to build envtools as one of the U-Boot no-dot-config-targets but envtools was newer a valid target for it but since we were creating the config headers that were not actually used it was actually building all this time. Since the blamed commit [1] a tool called printinitialenv is built and now a proper config is actually required in order for prerequisites to get built properly. So, in order to properly fix this (Hopefully for good) lets stop pretending that envtools are a valid no-dot-config-targets target and use the tools-only defconfig which is meant exactly for just building the tools. This will make a minimal config for the U-Boot sandbox target and then envtools will build just fine in parallel mode (I tested with 32 threads). We do hovewer need to override the ARCH passed by OpenWrt and set it to sandbox as otherwise U-Boot will not find the required headers because the ARCH is being overriden to an incorrect one. [1]40b77f2a3aFixes:9db0330052("uboot-envtools: update to 2023.07.02") Signed-off-by: Robert Marko <robert.marko@sartura.hr>
88 lines
2.3 KiB
Makefile
88 lines
2.3 KiB
Makefile
#
|
|
# 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:=2023.07.02
|
|
PKG_RELEASE:=2
|
|
|
|
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:=6b6a48581c14abb0f95bd87c1af4d740922406d7b801002a9f94727fdde021d5
|
|
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_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))
|