Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -57,36 +57,43 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_time
|
||||
|
||||
# Hooks to collect statistics about installed files
|
||||
|
||||
# This hook will be called before the target installation of a
|
||||
# package. We store in a file named .br_filelist_before the list of
|
||||
# files currently installed in the target. Note that the MD5 is also
|
||||
# stored, in order to identify if the files are overwritten.
|
||||
define step_pkg_size_start
|
||||
(cd $(TARGET_DIR) ; find . -type f -print0 | xargs -0 md5sum) | sort > \
|
||||
$($(PKG)_DIR)/.br_filelist_before
|
||||
endef
|
||||
|
||||
# This hook will be called after the target installation of a
|
||||
# package. We store in a file named .br_filelist_after the list of
|
||||
# files (and their MD5) currently installed in the target. We then do
|
||||
# a diff with the .br_filelist_before to compute the list of files
|
||||
# installed by this package.
|
||||
define step_pkg_size_end
|
||||
(cd $(TARGET_DIR); find . -type f -print0 | xargs -0 md5sum) | sort > \
|
||||
$($(PKG)_DIR)/.br_filelist_after
|
||||
comm -13 $($(PKG)_DIR)/.br_filelist_before $($(PKG)_DIR)/.br_filelist_after | \
|
||||
while read hash file ; do \
|
||||
echo "$(1),$${file}" >> $(BUILD_DIR)/packages-file-list.txt ; \
|
||||
done
|
||||
# The suffix is typically empty for the target variant, for legacy backward
|
||||
# compatibility.
|
||||
# $(1): package name
|
||||
# $(2): base directory to search in
|
||||
# $(3): suffix of file (optional)
|
||||
define step_pkg_size_inner
|
||||
@touch $(BUILD_DIR)/packages-file-list$(3).txt
|
||||
$(SED) '/^$(1),/d' $(BUILD_DIR)/packages-file-list$(3).txt
|
||||
cd $(2); \
|
||||
find . \( -type f -o -type l \) \
|
||||
-newer $($(PKG)_DIR)/.stamp_built \
|
||||
-exec printf '$(1),%s\n' {} + \
|
||||
>> $(BUILD_DIR)/packages-file-list$(3).txt
|
||||
endef
|
||||
|
||||
define step_pkg_size
|
||||
$(if $(filter install-target,$(2)),\
|
||||
$(if $(filter start,$(1)),$(call step_pkg_size_start,$(3))) \
|
||||
$(if $(filter end,$(1)),$(call step_pkg_size_end,$(3))))
|
||||
$(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(TARGET_DIR))))
|
||||
$(if $(filter install-staging,$(2)),\
|
||||
$(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(STAGING_DIR),-staging)))
|
||||
$(if $(filter install-host,$(2)),\
|
||||
$(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(HOST_DIR),-host)))
|
||||
endef
|
||||
GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size
|
||||
|
||||
# Relies on step_pkg_size, so must be after
|
||||
define check_bin_arch
|
||||
$(if $(filter end-install-target,$(1)-$(2)),\
|
||||
support/scripts/check-bin-arch -p $(3) \
|
||||
-l $(BUILD_DIR)/packages-file-list.txt \
|
||||
$(foreach i,$($(PKG)_BIN_ARCH_EXCLUDE),-i "$(i)") \
|
||||
-r $(TARGET_READELF) \
|
||||
-a $(BR2_READELF_ARCH_NAME))
|
||||
endef
|
||||
|
||||
GLOBAL_INSTRUMENTATION_HOOKS += check_bin_arch
|
||||
|
||||
# This hook checks that host packages that need libraries that we build
|
||||
# have a proper DT_RPATH or DT_RUNPATH tag
|
||||
define check_host_rpath
|
||||
@@ -421,10 +428,10 @@ ifdef $(3)_OVERRIDE_SRCDIR
|
||||
$(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR)
|
||||
endif
|
||||
|
||||
$(2)_BASE_NAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1))
|
||||
$(2)_RAW_BASE_NAME = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME))
|
||||
$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME)
|
||||
$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME)
|
||||
$(2)_BASENAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1))
|
||||
$(2)_BASENAME_RAW = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME))
|
||||
$(2)_DL_DIR = $$(DL_DIR)
|
||||
$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASENAME)
|
||||
|
||||
ifndef $(2)_SUBDIR
|
||||
ifdef $(3)_SUBDIR
|
||||
@@ -453,7 +460,7 @@ ifndef $(2)_SOURCE
|
||||
ifdef $(3)_SOURCE
|
||||
$(2)_SOURCE = $$($(3)_SOURCE)
|
||||
else ifdef $(2)_VERSION
|
||||
$(2)_SOURCE ?= $$($(2)_RAW_BASE_NAME).tar.gz
|
||||
$(2)_SOURCE ?= $$($(2)_BASENAME_RAW).tar.gz
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -503,6 +510,9 @@ ifeq ($$($(2)_SITE_METHOD),local)
|
||||
ifeq ($$($(2)_OVERRIDE_SRCDIR),)
|
||||
$(2)_OVERRIDE_SRCDIR = $$($(2)_SITE)
|
||||
endif
|
||||
ifeq ($$($(2)_OVERRIDE_SRCDIR),)
|
||||
$$(error $(1) has local site method, but `$(2)_SITE` is not defined)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifndef $(2)_LICENSE
|
||||
@@ -527,15 +537,18 @@ endif
|
||||
|
||||
$(2)_REDISTRIBUTE ?= YES
|
||||
|
||||
$(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_RAW_BASE_NAME)
|
||||
$(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_BASENAME_RAW)
|
||||
|
||||
# When a target package is a toolchain dependency set this variable to
|
||||
# 'NO' so the 'toolchain' dependency is not added to prevent a circular
|
||||
# dependency
|
||||
# dependency.
|
||||
# Similarly for the skeleton.
|
||||
$(2)_ADD_TOOLCHAIN_DEPENDENCY ?= YES
|
||||
$(2)_ADD_SKELETON_DEPENDENCY ?= YES
|
||||
|
||||
|
||||
ifeq ($(4),target)
|
||||
ifneq ($(1),skeleton)
|
||||
ifeq ($$($(2)_ADD_SKELETON_DEPENDENCY),YES)
|
||||
$(2)_DEPENDENCIES += skeleton
|
||||
endif
|
||||
ifeq ($$($(2)_ADD_TOOLCHAIN_DEPENDENCY),YES)
|
||||
@@ -598,6 +611,8 @@ $(2)_POST_INSTALL_IMAGES_HOOKS ?=
|
||||
$(2)_PRE_LEGAL_INFO_HOOKS ?=
|
||||
$(2)_POST_LEGAL_INFO_HOOKS ?=
|
||||
$(2)_TARGET_FINALIZE_HOOKS ?=
|
||||
$(2)_ROOTFS_PRE_CMD_HOOKS ?=
|
||||
$(2)_ROOTFS_POST_CMD_HOOKS ?=
|
||||
|
||||
# human-friendly targets and target sequencing
|
||||
$(1): $(1)-install
|
||||
@@ -631,7 +646,7 @@ else
|
||||
$(1)-install-images:
|
||||
endif
|
||||
|
||||
$(1)-install-host: $$($(2)_TARGET_INSTALL_HOST)
|
||||
$(1)-install-host: $$($(2)_TARGET_INSTALL_HOST)
|
||||
$$($(2)_TARGET_INSTALL_HOST): $$($(2)_TARGET_BUILD)
|
||||
|
||||
$(1)-build: $$($(2)_TARGET_BUILD)
|
||||
@@ -683,10 +698,6 @@ $(1)-legal-source: $$($(2)_TARGET_ACTUAL_SOURCE)
|
||||
endif # actual sources != sources
|
||||
endif # actual sources != ""
|
||||
|
||||
$(1)-source-check: PKG=$(2)
|
||||
$(1)-source-check:
|
||||
$$(foreach p,$$($(2)_ALL_DOWNLOADS),$$(call SOURCE_CHECK,$$(p))$$(sep))
|
||||
|
||||
$(1)-external-deps:
|
||||
@for p in $$($(2)_SOURCE) $$($(2)_PATCH) $$($(2)_EXTRA_DOWNLOADS) ; do \
|
||||
echo `basename $$$$p` ; \
|
||||
@@ -711,9 +722,6 @@ $(1)-rsync: $$($(2)_TARGET_RSYNC)
|
||||
$(1)-source:
|
||||
$(1)-legal-source:
|
||||
|
||||
$(1)-source-check:
|
||||
test -d $$($(2)_OVERRIDE_SRCDIR)
|
||||
|
||||
$(1)-external-deps:
|
||||
@echo "file://$$($(2)_OVERRIDE_SRCDIR)"
|
||||
endif
|
||||
@@ -727,6 +735,9 @@ $(1)-show-depends:
|
||||
$(1)-show-rdepends:
|
||||
@echo $$($(2)_RDEPENDENCIES)
|
||||
|
||||
$(1)-show-build-order: $$(patsubst %,%-show-build-order,$$($(2)_FINAL_ALL_DEPENDENCIES))
|
||||
$$(info $(1))
|
||||
|
||||
$(1)-graph-depends: graph-depends-requirements
|
||||
$(call pkg-graph-depends,$(1),--direct)
|
||||
|
||||
@@ -736,9 +747,6 @@ $(1)-graph-rdepends: graph-depends-requirements
|
||||
$(1)-all-source: $(1)-source
|
||||
$(1)-all-source: $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-source)
|
||||
|
||||
$(1)-all-source-check: $(1)-source-check
|
||||
$(1)-all-source-check: $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-source-check)
|
||||
|
||||
$(1)-all-external-deps: $(1)-external-deps
|
||||
$(1)-all-external-deps: $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-external-deps)
|
||||
|
||||
@@ -766,8 +774,6 @@ $(1)-rebuild: $(1)-clean-for-rebuild $(1)
|
||||
$(1)-clean-for-reconfigure: $(1)-clean-for-rebuild
|
||||
rm -f $$($(2)_TARGET_CONFIGURE)
|
||||
|
||||
$(1)-rebuild-depends: $$(foreach p,$$($(2)_FINAL_DEPENDENCIES),$$(p)-clean-for-rebuild) $(1)-rebuild
|
||||
|
||||
$(1)-reconfigure: $(1)-clean-for-reconfigure $(1)
|
||||
|
||||
# define the PKG variable for all targets, containing the
|
||||
@@ -823,7 +829,9 @@ endif
|
||||
endif
|
||||
|
||||
# legal-info: produce legally relevant info.
|
||||
$(1)-legal-info: PKG=$(2)
|
||||
$(1)-legal-info:
|
||||
@$$(call MESSAGE,"Collecting legal info")
|
||||
# Packages without a source are assumed to be part of Buildroot, skip them.
|
||||
$$(foreach hook,$$($(2)_PRE_LEGAL_INFO_HOOKS),$$(call $$(hook))$$(sep))
|
||||
ifneq ($$(call qstrip,$$($(2)_SOURCE)),)
|
||||
@@ -835,9 +843,9 @@ ifneq ($$(call qstrip,$$($(2)_SOURCE)),)
|
||||
# is that the license still applies to the files distributed as part
|
||||
# of the rootfs, even if the sources are not themselves redistributed.
|
||||
ifeq ($$(call qstrip,$$($(2)_LICENSE_FILES)),)
|
||||
@$$(call legal-warning-pkg,$$($(2)_RAW_BASE_NAME),cannot save license ($(2)_LICENSE_FILES not defined))
|
||||
$(Q)$$(call legal-warning-pkg,$$($(2)_BASENAME_RAW),cannot save license ($(2)_LICENSE_FILES not defined))
|
||||
else
|
||||
@$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAW_BASE_NAME),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep))
|
||||
$(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_BASENAME_RAW),$$($(2)_PKGDIR),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep))
|
||||
endif # license files
|
||||
|
||||
ifeq ($$($(2)_SITE_METHOD),local)
|
||||
@@ -914,6 +922,8 @@ ifneq ($$($(2)_USERS),)
|
||||
PACKAGES_USERS += $$($(2)_USERS)$$(sep)
|
||||
endif
|
||||
TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS)
|
||||
ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS)
|
||||
ROOTFS_POST_CMD_HOOKS += $$($(2)_ROOTFS_POST_CMD_HOOKS)
|
||||
|
||||
ifeq ($$($(2)_SITE_METHOD),svn)
|
||||
DL_TOOLS_DEPENDENCIES += svn
|
||||
@@ -936,7 +946,6 @@ DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE))
|
||||
$(1)-all-external-deps \
|
||||
$(1)-all-legal-info \
|
||||
$(1)-all-source \
|
||||
$(1)-all-source-check \
|
||||
$(1)-build \
|
||||
$(1)-clean-for-rebuild \
|
||||
$(1)-clean-for-reconfigure \
|
||||
@@ -961,8 +970,7 @@ DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE))
|
||||
$(1)-rsync \
|
||||
$(1)-show-depends \
|
||||
$(1)-show-version \
|
||||
$(1)-source \
|
||||
$(1)-source-check
|
||||
$(1)-source
|
||||
|
||||
ifneq ($$($(2)_SOURCE),)
|
||||
ifeq ($$($(2)_SITE),)
|
||||
|
||||
Reference in New Issue
Block a user