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

use resource linker for DSM6 #4578

Merged
merged 4 commits into from
Apr 30, 2021
Merged

Conversation

hgy59
Copy link
Contributor

@hgy59 hgy59 commented Apr 25, 2021

Motivation: This is the resource linker part of #4562
Linked issues: #4524, #4539

Checklist

  • Build rule all-supported completed successfully
  • Package upgrade completed successfully
  • New installation of package completed successfully

Remarks

  1. Revert SPK_LINKS Makefile variable and use SPK_USR_LOCAL_LINKS for DSM6 and DSM5.
  2. Adjust remaining packages to use SPK_USR_LOCAL_LINKS instead of SPK_LINKS

WIP:
Redesign DSM6 installer to use resource definitions for Links, FwPorts, SHARES similar to DSM7
Only keep creation of /usr/local/{package} link to avoid breaking already installed packages that lean on this

References

hgy59 and others added 4 commits April 25, 2021 12:14
- SPK_LINKS is not supported anymore, use SPK_USR_LOCAL_LINKS and/or SPK_COMMANDS
- adjust all packages with former SPK_LINKS (beets, borgbackup, rdiff-backup)
- resource workers for ports/links/shares are supported from DSM>=6.0
- keep the /usr/local/{package} link in DSM 6 for now, as not all dependent packages are redesigned
yes, here we can

Co-authored-by: Sebastian Schmidt <[email protected]>
@hgy59 hgy59 changed the title USE resource linker for DSM6 use resource linker for DSM6 Apr 25, 2021
@hgy59 hgy59 merged commit 35e4364 into SynoCommunity:master Apr 30, 2021
@hgy59 hgy59 deleted the dsm6_res_linker branch April 30, 2021 14:57
hgy59 added a commit to hgy59/spksrc that referenced this pull request Apr 30, 2021
- fixes SynoCommunity#4578 for packages without specific conf files
hgy59 added a commit that referenced this pull request Apr 30, 2021
- fixes #4578 for packages without specific conf files
@acolomb
Copy link
Contributor

acolomb commented Oct 18, 2021

Sorry to bump this old PR @hgy59. But I think this one introduced an error in the spksrc.service.mk Makefile.

In current master, some commands are included for the case of DSM < 6.0. But the line defining the target is within the DSM >= 6.0 conditional part only. So the commands belong to nowhere when on older DSM versions and the $@ special variable cannot work.

@echo "# List of commands to create links for" >> $@

What file is this output supposed to go to then?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants