Update Buildroot to 2019.02.3 (#415)
* Update Buildroot to 2019-02.3 * Fix enter script * Update ova_defconfig * Fix network manager * Remove runc patches * Use same docker version * Fix build * Fix vmtools * Fix depens * Fix handling with tempfiles * Fix permission handling * Fix cp * Cleanup * Fix mounts
This commit is contained in:
Pascal Vizeli
@@ -63,13 +63,21 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_time
|
||||
# $(2): base directory to search in
|
||||
# $(3): suffix of file (optional)
|
||||
define step_pkg_size_inner
|
||||
@touch $(BUILD_DIR)/.files-list$(3).stat
|
||||
@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' {} + \
|
||||
LC_ALL=C find . \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \
|
||||
| LC_ALL=C sort > $(BUILD_DIR)/.files-list$(3).new
|
||||
LC_ALL=C comm -13 \
|
||||
$(BUILD_DIR)/.files-list$(3).stat \
|
||||
$(BUILD_DIR)/.files-list$(3).new \
|
||||
> $($(PKG)_BUILDDIR)/.files-list$(3).txt
|
||||
sed -r -e 's/^[^,]+/$(1)/' \
|
||||
$($(PKG)_BUILDDIR)/.files-list$(3).txt \
|
||||
>> $(BUILD_DIR)/packages-file-list$(3).txt
|
||||
mv $(BUILD_DIR)/.files-list$(3).new \
|
||||
$(BUILD_DIR)/.files-list$(3).stat
|
||||
endef
|
||||
|
||||
define step_pkg_size
|
||||
@@ -173,6 +181,7 @@ $(BUILD_DIR)/%/.stamp_extracted:
|
||||
$(BUILD_DIR)/%/.stamp_rsynced:
|
||||
@$(call step_start,rsync)
|
||||
@$(call MESSAGE,"Syncing from source dir $(SRCDIR)")
|
||||
@mkdir -p $(@D)
|
||||
$(foreach hook,$($(PKG)_PRE_RSYNC_HOOKS),$(call $(hook))$(sep))
|
||||
@test -d $(SRCDIR) || (echo "ERROR: $(SRCDIR) does not exist" ; exit 1)
|
||||
rsync -au --chmod=u=rwX,go=rX $(RSYNC_VCS_EXCLUSIONS) $($(PKG)_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS) $(call qstrip,$(SRCDIR))/ $(@D)
|
||||
@@ -238,6 +247,7 @@ $(BUILD_DIR)/%/.stamp_built::
|
||||
$(BUILD_DIR)/%/.stamp_host_installed:
|
||||
@$(call step_start,install-host)
|
||||
@$(call MESSAGE,"Installing to host directory")
|
||||
@mkdir -p $(HOST_DIR)
|
||||
$(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep))
|
||||
+$($(PKG)_INSTALL_CMDS)
|
||||
$(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep))
|
||||
@@ -267,22 +277,25 @@ $(BUILD_DIR)/%/.stamp_host_installed:
|
||||
$(BUILD_DIR)/%/.stamp_staging_installed:
|
||||
@$(call step_start,install-staging)
|
||||
@$(call MESSAGE,"Installing to staging directory")
|
||||
@mkdir -p $(STAGING_DIR)
|
||||
$(foreach hook,$($(PKG)_PRE_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep))
|
||||
+$($(PKG)_INSTALL_STAGING_CMDS)
|
||||
$(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep))
|
||||
$(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \
|
||||
$(call MESSAGE,"Fixing package configuration files") ;\
|
||||
$(SED) "s,$(BASE_DIR),@BASE_DIR@,g" \
|
||||
-e "s,$(STAGING_DIR),@STAGING_DIR@,g" \
|
||||
$(SED) "s,$(HOST_DIR),@HOST_DIR@,g" \
|
||||
-e "s,$(BASE_DIR),@BASE_DIR@,g" \
|
||||
-e "s,^\(exec_\)\?prefix=.*,\1prefix=@STAGING_DIR@/usr,g" \
|
||||
-e "s,-I/usr/,-I@STAGING_DIR@/usr/,g" \
|
||||
-e "s,-L/usr/,-L@STAGING_DIR@/usr/,g" \
|
||||
-e "s,@STAGING_DIR@,$(STAGING_DIR),g" \
|
||||
-e 's,@STAGING_DIR@,$$(dirname $$(readlink -e $$0))/../..,g' \
|
||||
-e 's,@HOST_DIR@,$$(dirname $$(readlink -e $$0))/../../../..,g' \
|
||||
-e "s,@BASE_DIR@,$(BASE_DIR),g" \
|
||||
$(addprefix $(STAGING_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ;\
|
||||
fi
|
||||
@$(call MESSAGE,"Fixing libtool files")
|
||||
$(Q)find $(STAGING_DIR)/usr/lib* -name "*.la" | xargs --no-run-if-empty \
|
||||
for la in $$(find $(STAGING_DIR)/usr/lib* -name "*.la"); do \
|
||||
cp -a "$${la}" "$${la}.fixed" && \
|
||||
$(SED) "s:$(BASE_DIR):@BASE_DIR@:g" \
|
||||
-e "s:$(STAGING_DIR):@STAGING_DIR@:g" \
|
||||
$(if $(TOOLCHAIN_EXTERNAL_INSTALL_DIR),\
|
||||
@@ -291,13 +304,21 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
|
||||
$(if $(TOOLCHAIN_EXTERNAL_INSTALL_DIR),\
|
||||
-e "s:@TOOLCHAIN_EXTERNAL_INSTALL_DIR@:$(TOOLCHAIN_EXTERNAL_INSTALL_DIR):g") \
|
||||
-e "s:@STAGING_DIR@:$(STAGING_DIR):g" \
|
||||
-e "s:@BASE_DIR@:$(BASE_DIR):g"
|
||||
-e "s:@BASE_DIR@:$(BASE_DIR):g" \
|
||||
"$${la}.fixed" && \
|
||||
if cmp -s "$${la}" "$${la}.fixed"; then \
|
||||
rm -f "$${la}.fixed"; \
|
||||
else \
|
||||
mv "$${la}.fixed" "$${la}"; \
|
||||
fi || exit 1; \
|
||||
done
|
||||
@$(call step_end,install-staging)
|
||||
$(Q)touch $@
|
||||
|
||||
# Install to images dir
|
||||
$(BUILD_DIR)/%/.stamp_images_installed:
|
||||
@$(call step_start,install-image)
|
||||
@mkdir -p $(BINARIES_DIR)
|
||||
$(foreach hook,$($(PKG)_PRE_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep))
|
||||
@$(call MESSAGE,"Installing to images directory")
|
||||
+$($(PKG)_INSTALL_IMAGES_CMDS)
|
||||
@@ -309,6 +330,7 @@ $(BUILD_DIR)/%/.stamp_images_installed:
|
||||
$(BUILD_DIR)/%/.stamp_target_installed:
|
||||
@$(call step_start,install-target)
|
||||
@$(call MESSAGE,"Installing to target")
|
||||
@mkdir -p $(TARGET_DIR)
|
||||
$(foreach hook,$($(PKG)_PRE_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep))
|
||||
+$($(PKG)_INSTALL_TARGET_CMDS)
|
||||
$(if $(BR2_INIT_SYSTEMD),\
|
||||
@@ -583,7 +605,9 @@ $(2)_DEPENDENCIES += host-skeleton
|
||||
endif
|
||||
|
||||
ifneq ($$(filter cvs git svn,$$($(2)_SITE_METHOD)),)
|
||||
$(2)_DOWNLOAD_DEPENDENCIES += $(BR2_TAR_HOST_DEPENDENCY)
|
||||
$(2)_DOWNLOAD_DEPENDENCIES += \
|
||||
$(BR2_GZIP_HOST_DEPENDENCY) \
|
||||
$(BR2_TAR_HOST_DEPENDENCY)
|
||||
endif
|
||||
|
||||
ifeq ($$(filter host-tar host-skeleton host-fakedate,$(1)),)
|
||||
@@ -591,12 +615,16 @@ $(2)_EXTRACT_DEPENDENCIES += $$(BR2_TAR_HOST_DEPENDENCY)
|
||||
endif
|
||||
|
||||
ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),)
|
||||
ifneq ($$(filter .xz .lzma,$$(suffix $$($(2)_SOURCE))),)
|
||||
$(2)_EXTRACT_DEPENDENCIES += $$(BR2_XZCAT_HOST_DEPENDENCY)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),)
|
||||
ifneq ($$(filter .lz,$$(suffix $$($(2)_SOURCE))),)
|
||||
$(2)_EXTRACT_DEPENDENCIES += $$(BR2_LZIP_HOST_DEPENDENCY)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($$(BR2_CCACHE),y)
|
||||
ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache,$(1)),)
|
||||
@@ -621,14 +649,17 @@ $(2)_FINAL_ALL_DEPENDENCIES = \
|
||||
$$($(2)_FINAL_DOWNLOAD_DEPENDENCIES) \
|
||||
$$($(2)_FINAL_EXTRACT_DEPENDENCIES) \
|
||||
$$($(2)_FINAL_PATCH_DEPENDENCIES))
|
||||
$(2)_FINAL_RECURSIVE_DEPENDENCIES = \
|
||||
$$(sort \
|
||||
$$(foreach p,\
|
||||
$$($(2)_FINAL_ALL_DEPENDENCIES),\
|
||||
$$(p)\
|
||||
$$($$(call UPPERCASE,$$(p))_FINAL_RECURSIVE_DEPENDENCIES)\
|
||||
)\
|
||||
)
|
||||
$(2)_FINAL_RECURSIVE_DEPENDENCIES = $$(sort \
|
||||
$$(if $$(filter undefined,$$(origin $(2)_FINAL_RECURSIVE_DEPENDENCIES__X)), \
|
||||
$$(eval $(2)_FINAL_RECURSIVE_DEPENDENCIES__X := \
|
||||
$$(foreach p, \
|
||||
$$($(2)_FINAL_ALL_DEPENDENCIES), \
|
||||
$$(p) \
|
||||
$$($$(call UPPERCASE,$$(p))_FINAL_RECURSIVE_DEPENDENCIES) \
|
||||
) \
|
||||
) \
|
||||
) \
|
||||
$$($(2)_FINAL_RECURSIVE_DEPENDENCIES__X))
|
||||
|
||||
$(2)_INSTALL_STAGING ?= NO
|
||||
$(2)_INSTALL_IMAGES ?= NO
|
||||
@@ -735,7 +766,7 @@ $$($(2)_TARGET_BUILD): $$($(2)_TARGET_CONFIGURE)
|
||||
$(1)-configure: $$($(2)_TARGET_CONFIGURE)
|
||||
$$($(2)_TARGET_CONFIGURE): | $$($(2)_FINAL_DEPENDENCIES)
|
||||
|
||||
$$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | dirs prepare
|
||||
$$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | prepare
|
||||
$$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | dependencies
|
||||
|
||||
ifeq ($$($(2)_OVERRIDE_SRCDIR),)
|
||||
|
||||
Reference in New Issue
Block a user