package/bayer2rgb-neon: bump to latest commit

[buildroot-mgba.git] / Makefile

diff --git a/Makefile b/Makefile
index 2e1eff2f3c15558a26b78edfae5206bd721fa7cc..ac625152c6782266962f4cedcdb4b0891207da92 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -90,9 +90,9 @@ all:
 .PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2023.05-rc2
+export BR2_VERSION := 2024.02-git
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1685305000
+BR2_VERSION_EPOCH = 1701677000
 
 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -227,8 +227,6 @@ LEGAL_MANIFEST_CSV_HOST = $(LEGAL_INFO_DIR)/host-manifest.csv
 LEGAL_WARNINGS = $(LEGAL_INFO_DIR)/.warnings
 LEGAL_REPORT = $(LEGAL_INFO_DIR)/README
 
-CPE_UPDATES_DIR = $(BASE_DIR)/cpe-updates
-
 BR2_CONFIG = $(CONFIG_DIR)/.config
 
 # Pull in the user's configuration file
@@ -353,7 +351,7 @@ export HOSTARCH := $(shell LC_ALL=C $(HOSTCC_NOCCACHE) -v 2>&1 | \
 
 # When adding a new host gcc version in Config.in,
 # update the HOSTCC_MAX_VERSION variable:
-HOSTCC_MAX_VERSION := 9
+HOSTCC_MAX_VERSION := 11
 
 HOSTCC_VERSION := $(shell V=$$($(HOSTCC_NOCCACHE) --version | \
        sed -n -r 's/^.* ([0-9]*)\.([0-9]*)\.([0-9]*)[ ]*.*/\1 \2/p'); \
@@ -594,8 +592,13 @@ world: target-post-image
 .PHONY: prepare-sdk
 prepare-sdk: world
        @$(call MESSAGE,"Rendering the SDK relocatable")
-       PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath host
-       PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath staging
+       PARALLEL_JOBS=$(PARALLEL_JOBS) \
+               PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \
+               $(TOPDIR)/support/scripts/fix-rpath host
+       PARALLEL_JOBS=$(PARALLEL_JOBS) \
+               PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \
+               $(TOPDIR)/support/scripts/fix-rpath staging
+       $(call ppd-fixup-paths,$(BASE_DIR))
        $(INSTALL) -m 755 $(TOPDIR)/support/misc/relocate-sdk.sh $(HOST_DIR)/relocate-sdk.sh
        mkdir -p $(HOST_DIR)/share/buildroot
        echo $(HOST_DIR) > $(HOST_DIR)/share/buildroot/sdk-location
@@ -712,7 +715,7 @@ STAGING_DIR_FILES_LISTS = $(sort $(wildcard $(BUILD_DIR)/*/.files-list-staging.t
 .PHONY: host-finalize
 host-finalize: $(PACKAGES) $(HOST_DIR) $(HOST_DIR_SYMLINK)
        @$(call MESSAGE,"Finalizing host directory")
-       $(call per-package-rsync,$(sort $(PACKAGES)),host,$(HOST_DIR))
+       $(call per-package-rsync,$(sort $(PACKAGES)),host,$(HOST_DIR),copy)
 
 .PHONY: staging-finalize
 staging-finalize: $(STAGING_DIR_SYMLINK)
@@ -720,7 +723,7 @@ staging-finalize: $(STAGING_DIR_SYMLINK)
 .PHONY: target-finalize
 target-finalize: $(PACKAGES) $(TARGET_DIR) host-finalize
        @$(call MESSAGE,"Finalizing target directory")
-       $(call per-package-rsync,$(sort $(PACKAGES)),target,$(TARGET_DIR))
+       $(call per-package-rsync,$(sort $(PACKAGES)),target,$(TARGET_DIR),copy)
        $(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep))
        rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \
                $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \
@@ -765,7 +768,9 @@ endif
        ln -sf ../usr/lib/os-release $(TARGET_DIR)/etc
 
        @$(call MESSAGE,"Sanitizing RPATH in target tree")
-       PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath target
+       PARALLEL_JOBS=$(PARALLEL_JOBS) \
+               PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) \
+               $(TOPDIR)/support/scripts/fix-rpath target
 
 # For a merged /usr, ensure that /lib, /bin and /sbin and their /usr
 # counterparts are appropriately setup as symlinks ones to the others.
@@ -831,7 +836,7 @@ legal-info-clean:
 .PHONY: legal-info-prepare
 legal-info-prepare: $(LEGAL_INFO_DIR)
        @$(call MESSAGE,"Buildroot $(BR2_VERSION_FULL) Collecting legal info")
-       @$(call legal-license-file,buildroot,buildroot,support/legal-info/buildroot.hash,COPYING,COPYING,HOST)
+       @$(call legal-license-file,HOST,buildroot,buildroot,COPYING,COPYING,support/legal-info/buildroot.hash)
        @$(call legal-manifest,TARGET,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,DEPENDENCIES WITH LICENSES)
        @$(call legal-manifest,HOST,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,DEPENDENCIES WITH LICENSES)
        @$(call legal-manifest,HOST,buildroot,$(BR2_VERSION_FULL),GPL-2.0+,COPYING,not saved,not saved)
@@ -927,14 +932,6 @@ pkg-stats:
                --html $(O)/pkg-stats.html \
                --nvd-path $(DL_DIR)/buildroot-nvd
 
-.PHONY: missing-cpe
-missing-cpe:
-       $(Q)mkdir -p $(CPE_UPDATES_DIR)
-       $(Q)cd "$(CONFIG_DIR)" ; \
-       $(TOPDIR)/support/scripts/gen-missing-cpe \
-               --nvd-path $(DL_DIR)/buildroot-nvd \
-               --output $(CPE_UPDATES_DIR)
-
 else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
 # Some subdirectories are also package names. To avoid that "make linux"
@@ -1105,8 +1102,7 @@ show-vars:
 clean:
        rm -rf $(BASE_TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) $(HOST_DIR_SYMLINK) \
                $(BUILD_DIR) $(BASE_DIR)/staging \
-               $(LEGAL_INFO_DIR) $(GRAPHS_DIR) $(PER_PACKAGE_DIR) $(CPE_UPDATES_DIR) \
-               $(O)/pkg-stats.*
+               $(LEGAL_INFO_DIR) $(GRAPHS_DIR) $(PER_PACKAGE_DIR) $(O)/pkg-stats.*
 
 .PHONY: distclean
 distclean: clean
@@ -1191,7 +1187,6 @@ help:
        @echo '  legal-info             - generate info about license compliance'
        @echo '  show-info              - generate info about packages, as a JSON blurb'
        @echo '  pkg-stats              - generate info about packages as JSON and HTML'
-       @echo '  missing-cpe            - generate XML snippets for missing CPE identifiers'
        @echo '  printvars              - dump internal variables selected with VARS=...'
        @echo '  show-vars              - dump all internal variables as a JSON blurb; use VARS=...'
        @echo '                           to limit the list to variables names matching that pattern'
@@ -1263,4 +1258,7 @@ include docs/manual/manual.mk
 
 .PHONY: $(noconfig_targets)
 
+# .WAIT was introduced in make 4.4. For older make, define it as phony.
+.PHONY: .WAIT
+
 endif #umask / $(CURDIR) / $(O)