Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RFC: OMG! They ACTUALLY Made config.sh USEFUL?! (Recursive Patching UNLOCKED!) #68

Closed
wants to merge 7 commits into from

Conversation

taalojarvi
Copy link
Contributor

@taalojarvi taalojarvi commented Jun 28, 2024

This pull request introduces two improvements to the patching script (config.sh):

Unified Script & LTS Build Handling:

  • Unifies config.sh across LTS and non-LTS builds. Previously, a separate script (config-lts.sh) existed for LTS builds that omitted a specific patch.
  • Patches can be skipped for LTS builds by appending "_skip_lts" to the patch filename

Improved Patch Management:

  • Moves all patches to a dedicated subdirectory within the project structure.
  • Updates config.sh to recursively apply patches from this subdirectory.
  • Removes the redundant config-lts.sh script and all references to it.

Benefits

  • Simplifies script maintenance by having a single config.sh script.
  • Provides a more robust and flexible way to manage patches.

Detailed build log available here.

… them

Signed-off-by: taalojarvi <sreedevan05@gmail.com>
Comparing the two config scripts, the only difference is that for LTS builds, a patch is omitted.

Assuming the patch does not apply, detect if the build targets LTS branch (through ENV we created in a previous PR, and gracefully proceed to build if true.

While we are at it, remove config-lts.sh and all mentions of it.

Signed-off-by: taalojarvi <sreedevan05@gmail.com>
Added logic to skip applying patches with "_skip_lts" in their filename.
This ensures that patches that are not intended for LTS builds can be safely skipped.

TODO: Expand the conditional check to cover skipping patches based on build type [LTS / main].

Signed-off-by: taalojarvi <sreedevan05@gmail.com>
…nal.patch` as _skip_lts

Signed-off-by: taalojarvi <sreedevan05@gmail.com>
@taalojarvi
Copy link
Contributor Author

taalojarvi commented Jul 1, 2024

Added a commit to address the previous test's failure.

EDIT: Apologies on the mess. Slightly sleep deprived today.

Introduces a check for the IS_LTS environment variable to conditionally apply patches based on build type.
Patches containing "_skip_lts" will now be applied during non-LTS builds, even if the filename suggests skipping.

Signed-off-by: taalojarvi <sreedevan05@gmail.com>
Nevuly and others added 2 commits October 6, 2024 23:01
Error Logs:
:: Synchronizing package databases...
 core downloading...
 extra downloading...
 archlinuxcn downloading...
error: target not found: llvm-git
error: target not found: llvm-libs-git
error: target not found: clang-git
error: target not found: lld-git

 * llvm-git, llvm-libs-git, clang-git, lld-git is aur packages, It can't install with pacman.
 * They support at official packages, So change it.

Signed-off-by: Yang Jeong Hun <onyxclover9931@gmail.com>
Signed-off-by: taalojarvi <sreedevan05@gmail.com>
…der-file_skip_lts.patch` to patches

Signed-off-by: taalojarvi <sreedevan05@gmail.com>
@taalojarvi
Copy link
Contributor Author

Added a few commits to address build failures.

Locietta added a commit that referenced this pull request Nov 8, 2024
RFC: OMG! They ACTUALLY Made config.sh USEFUL?! (Recursive Patching UNLOCKED!) #68

Changes to the PR:
* use sub-folder in `patches/` to indicate MAIN/LTS spesific patches, instead of add "skip_lts" in patch's name

Co-authored-by: taalojarvi <sreedevan05@gmail.com>
Locietta added a commit that referenced this pull request Nov 8, 2024
RFC: OMG! They ACTUALLY Made config.sh USEFUL?! (Recursive Patching UNLOCKED!) #68

Changes to the PR:
* use sub-folder in `patches/` to indicate MAIN/LTS spesific patches, instead of add "skip_lts" in patch's name

Co-authored-by: taalojarvi <sreedevan05@gmail.com>
Locietta added a commit that referenced this pull request Nov 8, 2024
RFC: OMG! They ACTUALLY Made config.sh USEFUL?! (Recursive Patching UNLOCKED!) #68

Changes to the PR:
* use sub-folder in `patches/` to indicate MAIN/LTS spesific patches, instead of add "skip_lts" in patch's name
* Add `-lts` CLI option for manual override (for testing locally)

Co-authored-by: taalojarvi <sreedevan05@gmail.com>
Locietta added a commit that referenced this pull request Nov 8, 2024
RFC: OMG! They ACTUALLY Made config.sh USEFUL?! (Recursive Patching UNLOCKED!) #68

Changes to the PR:
* use sub-folder in `patches/` to indicate MAIN/LTS spesific patches, instead of add "skip_lts" in patch's name
* Add `-lts` CLI option for manual override (for testing locally)

Co-authored-by: taalojarvi <sreedevan05@gmail.com>
@Locietta
Copy link
Owner

Locietta commented Nov 8, 2024

Merged as 37eb8d1.

@Locietta Locietta closed this Nov 8, 2024
@taalojarvi taalojarvi deleted the patch-tweaks branch November 22, 2024 05:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants