Update buildroot 2020.02.01 (#622)
* Update buildroot 2020.02.01 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix LN * Fix wpa Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix lint Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * fix-network Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix script Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
Pascal Vizeli
@@ -46,12 +46,24 @@ INFLATE.tar = cat
|
||||
# suitable-extractor(filename): returns extractor based on suffix
|
||||
suitable-extractor = $(INFLATE$(suffix $(1)))
|
||||
|
||||
# extractor-dependency(filename): returns extractor for 'filename' if the
|
||||
# extractor is a dependency. If we build the extractor return nothing.
|
||||
# $(firstword) is used here because the extractor can have arguments, like
|
||||
# ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'.
|
||||
extractor-dependency = $(firstword $(INFLATE$(filter-out \
|
||||
$(EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS),$(suffix $(1)))))
|
||||
EXTRACTOR_PKG_DEPENDENCY.lzma = $(BR2_XZCAT_HOST_DEPENDENCY)
|
||||
EXTRACTOR_PKG_DEPENDENCY.xz = $(BR2_XZCAT_HOST_DEPENDENCY)
|
||||
EXTRACTOR_PKG_DEPENDENCY.lz = $(BR2_LZIP_HOST_DEPENDENCY)
|
||||
|
||||
# extractor-pkg-dependency(filename): returns a Buildroot package
|
||||
# dependency needed to extract file based on suffix
|
||||
extractor-pkg-dependency = $(EXTRACTOR_PKG_DEPENDENCY$(suffix $(1)))
|
||||
|
||||
# extractor-system-dependency(filename): returns the name of the tool
|
||||
# needed to extract 'filename', and is meant to be used with
|
||||
# DL_TOOLS_DEPENDENCIES, in order to check that the necesary tool is
|
||||
# provided by the system Buildroot runs on.
|
||||
#
|
||||
# $(firstword) is used here because the extractor can have arguments,
|
||||
# like ZCAT="gzip -d -c", and to check for the dependency we only want
|
||||
# 'gzip'.
|
||||
extractor-system-dependency = $(if $(EXTRACTOR_PKG_DEPENDENCY$(suffix $(1))),,\
|
||||
$(firstword $(INFLATE$(suffix $(1)))))
|
||||
|
||||
# check-deprecated-variable -- throw an error on deprecated variables
|
||||
# example:
|
||||
@@ -62,6 +74,105 @@ $$(error Package error: use $(2) instead of $(1). Please fix your .mk file)
|
||||
endif
|
||||
endef
|
||||
|
||||
# $(1): YES or NO
|
||||
define yesno-to-bool
|
||||
$(subst NO,false,$(subst YES,true,$(1)))
|
||||
endef
|
||||
|
||||
# json-info -- return package or filesystem metadata formatted as an entry
|
||||
# of a JSON dictionnary
|
||||
# $(1): upper-case package or filesystem name
|
||||
define json-info
|
||||
"$($(1)_NAME)": {
|
||||
"type": "$($(1)_TYPE)",
|
||||
$(if $(filter rootfs,$($(1)_TYPE)), \
|
||||
$(call _json-info-fs,$(1)), \
|
||||
$(call _json-info-pkg,$(1)), \
|
||||
)
|
||||
}
|
||||
endef
|
||||
|
||||
# _json-info-pkg, _json-info-pkg-details, _json-info-fs: private helpers
|
||||
# for json-info, above
|
||||
define _json-info-pkg
|
||||
$(if $($(1)_IS_VIRTUAL), \
|
||||
"virtual": true$(comma),
|
||||
"virtual": false$(comma)
|
||||
$(call _json-info-pkg-details,$(1)) \
|
||||
)
|
||||
"dependencies": [
|
||||
$(call make-comma-list,$(sort $($(1)_FINAL_ALL_DEPENDENCIES)))
|
||||
],
|
||||
"reverse_dependencies": [
|
||||
$(call make-comma-list,$(sort $($(1)_RDEPENDENCIES)))
|
||||
]
|
||||
endef
|
||||
|
||||
define _json-info-pkg-details
|
||||
"version": "$($(1)_DL_VERSION)",
|
||||
"licenses": "$($(1)_LICENSE)",
|
||||
"dl_dir": "$($(1)_DL_SUBDIR)",
|
||||
"install_target": $(call yesno-to-bool,$($(1)_INSTALL_TARGET)),
|
||||
"install_staging": $(call yesno-to-bool,$($(1)_INSTALL_STAGING)),
|
||||
"install_images": $(call yesno-to-bool,$($(1)_INSTALL_IMAGES)),
|
||||
"downloads": [
|
||||
$(foreach dl,$(sort $($(1)_ALL_DOWNLOADS)),
|
||||
{
|
||||
"source": "$(notdir $(dl))",
|
||||
"uris": [
|
||||
$(call make-comma-list,
|
||||
$(subst \|,|,
|
||||
$(call DOWNLOAD_URIS,$(dl),$(1))
|
||||
)
|
||||
)
|
||||
]
|
||||
},
|
||||
)
|
||||
],
|
||||
endef
|
||||
|
||||
define _json-info-fs
|
||||
"dependencies": [
|
||||
$(call make-comma-list,$(sort $($(1)_DEPENDENCIES)))
|
||||
]
|
||||
endef
|
||||
|
||||
# clean-json -- cleanup pseudo-json into clean json:
|
||||
# - remove commas before closing ] and }
|
||||
# - minify with $(strip)
|
||||
clean-json = $(strip \
|
||||
$(subst $(comma)},}, $(subst $(comma)$(space)},$(space)}, \
|
||||
$(subst $(comma)],], $(subst $(comma)$(space)],$(space)], \
|
||||
$(strip $(1)) \
|
||||
)))) \
|
||||
)
|
||||
|
||||
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
|
||||
# rsync the contents of per-package directories
|
||||
# $1: space-separated list of packages to rsync from
|
||||
# $2: 'host' or 'target'
|
||||
# $3: destination directory
|
||||
define per-package-rsync
|
||||
mkdir -p $(3)
|
||||
$(foreach pkg,$(1),\
|
||||
rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \
|
||||
$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \
|
||||
$(3)$(sep))
|
||||
endef
|
||||
|
||||
# prepares the per-package HOST_DIR and TARGET_DIR of the current
|
||||
# package, by rsync the host and target directories of the
|
||||
# dependencies of this package. The list of dependencies is passed as
|
||||
# argument, so that this function can be used to prepare with
|
||||
# different set of dependencies (download, extract, configure, etc.)
|
||||
#
|
||||
# $1: space-separated list of packages to rsync from
|
||||
define prepare-per-package-directory
|
||||
$(call per-package-rsync,$(1),host,$(HOST_DIR))
|
||||
$(call per-package-rsync,$(1),target,$(TARGET_DIR))
|
||||
endef
|
||||
endif
|
||||
|
||||
#
|
||||
# legal-info helper functions
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user