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.

Sign up for GitHub

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

Jump to bottom

fix output of make dependency-list #6144

Merged
merged 8 commits into from
Jun 17, 2024
Merged

fix output of make dependency-list #6144

merged 8 commits into from
Jun 17, 2024

Conversation

hgy59
Copy link
Contributor

@hgy59 hgy59 commented Jun 14, 2024 •
edited
Loading

Description

Added some other fixes while on this topic

  • fix znc package to work with make dependency-list and make dependency-tree
  • fix package rename in prepare.sh
  • remove call of dependency-kernel-list

Type of change

  • Includes small framework changes

@hgy59
fix output of make dependency-list
f07b12f 
- avoid the make command and the list of all packages in the output
- this is a leftover of PR SynoCommunity#6002
@hgy59
remove global dependency-flat target
75606d9 
- dependency-flat is an internal target used dependency-list, dependency-tree and for some internal targets
@hgy59
Copy link
Contributor Author

hgy59 commented Jun 14, 2024

@th0ma7 this is another side effect of #6002

I assume you were working on the test targets when you temporarily added some outputs.

Found this while comparing the ffmpeg and imagemagick dependencies for #6143

@hgy59
exclude zsh-static in dependency-list and dependency-tree targets
3bb00af 
- targets cannot handle include of another spk Makefile
@hgy59 hgy59 requested a review from th0ma7 June 15, 2024 15:37
@th0ma7
Copy link
Contributor

th0ma7 commented Jun 16, 2024

@hgy59 sounds about right. But why are you also removing dependency-flat ?

@hgy59
Copy link
Contributor Author

hgy59 commented Jun 16, 2024

@hgy59 sounds about right. But why are you also removing dependency-flat ?

dependency-flat in the global Makefile does not produce an output like dependency-tree and dependency-list
dependency-flat is internally used by those (and other) targets.

@th0ma7
Copy link
Contributor

th0ma7 commented Jun 16, 2024

I just noticed what level of makefile this refered to, gotcha.

th0ma7
th0ma7 approved these changes Jun 16, 2024
View reviewed changes
Copy link
Contributor

@th0ma7 th0ma7 left a comment

Choose a reason for hiding this comment

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

LGTM

@hgy59
Copy link
Contributor Author

hgy59 commented Jun 16, 2024 •
edited
Loading

@th0ma7 just verified, dependency-flat indeed has output. It is similar to dependency-list but every entry on a single line.
This is harder to read than one line per package.

And found that dependency-flat contains duplicates.
It needs to be investigated whether it still leads to long-running prepare jobs on GitHub.
I thought this was fixed in #5807

@hgy59 hgy59 mentioned this pull request Jun 16, 2024
Merged
10 tasks
@hgy59
build-action: fix prepare
ac435b0 
- fix rename of spk names: remove only package with exact name from list
@hgy59
Merge branch 'master' of https://github.com/hgy59/spksrc into fix_mak…
0928885 
…e_dependency-list
@hgy59
remove dependency-kernel-list
5fc6228 
- this was introduced in SynoCommunity#5095
- BUT: we must not download kernel sources in prepare.sh, just as we don't do with toolchains
- if we want to optimize the download, we could cache the (extracted) kernel sources as we do for toolchains
  but since the cache is already at its limit, it is not possible to cache kernel sources without
  dropping other cached data.
@hgy59 hgy59 requested a review from th0ma7 June 16, 2024 19:36
@hgy59
Copy link
Contributor Author

hgy59 commented Jun 17, 2024

And found that dependency-flat contains duplicates.
It needs to be investigated whether it still leads to long-running prepare jobs on GitHub.

This is not an issue in prepare.sh, just with former make dependency-flat in the top folder.

@hgy59 hgy59 merged commit e5b2b44 into SynoCommunity:master Jun 17, 2024
17 checks passed
@hgy59 hgy59 deleted the fix_make_dependency-list branch June 17, 2024 05:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@th0ma7 th0ma7 Awaiting requested review from th0ma7

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hgy59 @th0ma7