ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2025-04-19 16:40:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Makefiles: real.remove_canary_files-extract_patch_rebuild_what_changed updated so that it wipes things correctly

Browse Source 
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
This commit is contained in:
Thierry Laurion 2025-04-08 15:14:09 -04:00
parent 2c13d63a85
commit 039ec8ae7a
No known key found for this signature in database
GPG Key ID: 9A53E1BB3FF00461
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -906,6 +906,29 @@ define overwrite_canary_if_coreboot_git
echo "INFO: Recreating .canary file for 'build/${CONFIG_TARGET_ARCH}/coreboot-$(CONFIG_COREBOOT_VERSION)' with placeholder."; \
echo BOGUS_COMMIT_ID > "build/${CONFIG_TARGET_ARCH}/coreboot-$(CONFIG_COREBOOT_VERSION)/.canary"; \
echo "NOTE: If a patch fails to apply, some files might need to be deleted manually to resolve conflicts."; \
echo "INFO: Reversing patches dynamically in reverse order."; \
failed_patches=""; \
for patch in $(shell ls patches/coreboot-$(CONFIG_COREBOOT_VERSION)/*.patch | sort -r); do \
echo "INFO: Reversing patch file: $$patch"; \
if ! ( git apply --reverse --verbose --reject --binary --directory build/${CONFIG_TARGET_ARCH}/coreboot-$(CONFIG_COREBOOT_VERSION) < $$patch ); then \
echo "WARNING: Failed to reverse patch file: $$patch"; \
failed_patches="$$failed_patches $$patch"; \
fi; \
done; \
if [ -r patches/coreboot-$(CONFIG_COREBOOT_VERSION).patch ]; then \
echo "INFO: Reversing main patch file patches/coreboot-$(CONFIG_COREBOOT_VERSION).patch."; \
if ! ( git apply --reverse --verbose --reject --binary --directory build/${CONFIG_TARGET_ARCH}/coreboot-$(CONFIG_COREBOOT_VERSION) < patches/coreboot-$(CONFIG_COREBOOT_VERSION).patch ); then \
echo "WARNING: Failed to reverse main patch file patches/coreboot-$(CONFIG_COREBOOT_VERSION).patch"; \
failed_patches="$$failed_patches patches/coreboot-$(CONFIG_COREBOOT_VERSION).patch"; \
fi; \
fi; \
if [ -n "$$failed_patches" ]; then \
echo "WARNING: The following patches failed to reverse: $$failed_patches"; \
else \
echo "INFO: All patches reversed successfully."; \
fi; \
echo "INFO: Removing .patched file to allow reapplication of patches."; \
rm -f "build/${CONFIG_TARGET_ARCH}/coreboot-$(CONFIG_COREBOOT_VERSION)/.patched"; \
else \
echo "INFO: Coreboot directory or .git not found, skipping .canary overwrite."; \
fi