Skip to content

Commit

Permalink
Merge pull request #1144 from tlaurion/fix_busybox_zlib_current_build
Browse files Browse the repository at this point in the history 
Fix current builds (zlib 1.2.11 cannot be downloaded, busybox patch not applied)
  • Loading branch information
@tlaurion
tlaurion authored Apr 1, 2022
2 parents dfbb0db + 981cb96 commit 303dc26
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion modules/zlib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ modules-$(CONFIG_ZLIB) += zlib
zlib_version := 1.2.11
zlib_dir := zlib-$(zlib_version)
zlib_tar := zlib-$(zlib_version).tar.gz
zlib_url := https://www.zlib.net/$(zlib_tar)
zlib_url := https://zlib.net/fossils/$(zlib_tar)
zlib_hash := c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1

zlib_configure := \
Expand Down
0 patches/busybox-1.28.0.patch → patches/busybox-1.32.0.patch
View file
File renamed without changes.

2 comments on commit 303dc26

@tlaurion
Copy link
Collaborator Author

@tlaurion tlaurion commented on 303dc26 Apr 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will have to push #1125.
To fix cache problems in CI causing coreboot 4.11 builds to fail, explained there: #1125 (comment)

Cache has been cleared by changing CACHE_VERSION project environment variable under CircleCI.
Reminder of the cause of the problem:
We change here a patch, so the bigger cache (whole cache) cannot be applied. So we get to the second cache, containing musl-cross and build/coreboot-* versions. But the package directory was not part of the cache, so as part of the current build system, the packages are redownloaded and the standard logic applied: extracting+patching. But here, coreboot 4.1 is the only version containing a file that is added per patches. So when CircleCI tries to use its cache, it fails trying to create a file already present in the destination directory and fails waiting user input to instruct on the good thing to do (revert patch?).

Solution is to add the packages directory in all cache so the global Makefile recipe can be applied without problem (not redownload the packages if existing, not reextracting it if extracted and not patching the destination directory since it is considered already done.)

@tlaurion
Copy link
Collaborator Author

@tlaurion tlaurion commented on 303dc26 Apr 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will kick this build once CircleCI caches are rebuilt properly (having digests being consistent...)
Next time a new patch is added, the second cache (packages+musl-cross-make+coreboot) will be useable.

Please sign in to comment.