Use installer resources for DSM6, update TCL package #4562

hgy59 · 2021-04-15T21:06:40Z

Motivation: Another Framework cleanup and a package update for TCL
Linked issues: #4524, #4539

Checklist

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

Remarks

Revert SPK_LINKS Makefile variable and use SPK_USR_LOCAL_LINKS for DSM6 and DSM5.
Update TCL and make use of SPK_LINKS obsolete, and add 64-bit support for amd64 archs
Adjust remaining packages to use SPK_USR_LOCAL_LINKS instead of SPK_LINKS
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

usr-local-linker for DSM6: redesign installer logs #4539 (comment)

publicarray · 2021-04-16T08:58:41Z

mk/spksrc.service.mk

@@ -182,6 +170,13 @@ ifneq ($(strip $(SERVICE_WIZARD_SHARE)),)
 '."data-share" = {"shares": [{"name": $$share, "permission":{"rw":[$$user]}} ] }' $@ 1<>$@


Something interesting to note:

Since 7.0-41201, package center will create a symlink under /var/packages/[package_id]/shares/ named by share folder pointing to share folder path.

I have to test shared folders with DSM6 anyway. I will look whether dsm6 resource worker will create such links too.

mk/spksrc.service.mk

mk/spksrc.service.installer

spk/rdiff-backup/Makefile

publicarray

LGTM

hgy59 · 2021-04-17T12:31:31Z

LGTM

I have to validate the SHARE_PATH (i.e. SERVICE_WIZARD_SHARE) still works for DSM 6

hgy59 · 2021-04-17T22:56:59Z

@publicarray I tend to redesign the shared folder handling for DSM6.

I did not succeed to mix full path (i.e /volume1/downloads) and shared folder name (i.e. downloads) with one installer.
Finally the breaking fact is that it is not possible to force back variables (i.e. wizard_shared_folder_name) into the enviroment so that the system uses it for the "data-share" resource definition.
I also tried to patch the conf/resource file with the share_name extracted from full path. The resource file exists at the final location in the postinst step and the patch was sucessful, but the installation failed and the name of the shared folder was not taken from the updated resource file (it still took the name from the wizard variable when I defined both).
I even tried to use /usr/syno/sbin/synopkghelper update ${package} data-share ignoring that for data-share resources the documentation says it is not updatable (only port-configs seem to be updatable). Unsurprising error Failed to update data-share of demoservice [0xD900 resource_api.cpp:331].
The synology dev docu says that the data-share resource worker activates resources at enable step but this seems to be wrong (just another example that this docu is worth nothing).

The shared folder processing in the sc framework (i.e. with /volumeX/share_name) was good for DSM<=5.
With the sc framework we are suffering again on the incomplete implementation of the DSM6 development guide.

When creating a folder under /volumeX we do not really get a DSM shared folder (this might be the cause for a lot of permission issues discussed here). Such folders are not displayed under shared folders and are deletable by the root user - shared folders cannot be deleted by root, but only within "Control Panel > Shared Folders".

IMHO we must migrate to "data-share" resource definitions for DSM6,
This includes the requirement to adjust all wizards for packages that use shared folders.

The benefit would be real shared folders. And we could define default access for sc-download group in the resource file too.

Just another evening spent on digging into the swamp of DSM. 😩

publicarray · 2021-04-18T00:00:34Z

@hgy59 I've pushed transmission package form dsm7-packages (feel free to remove it again). But I used this as my test package since I already did most of the work on it. In my tests it can install on a fresh dsm6 install (this branch) and can upgrade from an older version (master branch) of the transmission package on the dsm6. (both with the default settings/shared folder). I added a commit to set the wizard_download_dir variable when upgrading for the worker to succeed (wizard).

hgy59 · 2021-04-18T00:32:03Z

spk/transmission/src/wizard/install_uifile

+ "desc": "Download shared folder (using the volume chosen above)",
+ "subitems": [
+ {
+ "key": "wizard_download_dir",


Aaah, that is the trick, to use separate wizard variables for the volume and the share name!

but this should work in the demoservice too.

Only the folder name is used in the worker (not the full path), maybe we need to use basename before passing it on to jq --arg share [..]. I forgot about that too sorry.

Edit: Yes it works with the demoservice, I just messed up earlier (I still passed on the full path)

Example from documentation:

"data-share": { "shares": [{ "name": "music", "permission": { "ro": ["AudioStation"] } }] }

@hgy59 whichever way we go, (new wizards or patch to remove volumeX/ before passing the variable on) please remember to remove the if:

spksrc/spk/demoservice/Makefile

Lines 21 to 25 in 83f850f

include ../../mk/spksrc.common.mk

ifneq ($(call version_ge, ${TCVERSION}, 7.0),1)

# SERVICE_WIZARD_SHARE is not supported for DSM7 yet

SERVICE_WIZARD_SHARE = wizard_download_dir

endif

ymartin59

I do not appreciate such long PR with unrelated content.
Please split it into three distinct branches: links, tcl and transmission

hgy59 · 2021-04-25T10:08:30Z

so we gonna split this PR

hgy59 · 2021-05-14T18:03:31Z

@publicarray I would like to close this PR, as my work was merged with #4577 and #4578.
Just want to ask you, whether nothing is lost about your work for shared folders on transmission package here.

publicarray · 2021-05-22T02:54:20Z

Thanks @hgy59 I'll hopefully get to it early next month. Just busy with work ATM

(A quick rebase would show what is left over)

- 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]>

set using SERVICE_WIZARD_SHARE only disadvantage is that this does not support sub-folders currently [Transmission] fix empty volume, consistency with naming

* Remove busybox dep * transmission: remove unnecessary GROUP setting from service-setup.sh * transmission: set GROUP for backwards compatibility * Undo SPK_REV/CHANGELOG * Adjust wizard text * Remove now superfluous busybox configs

publicarray · 2021-07-20T22:38:00Z

The transmission stuff is in #4719 closing this one.

hgy59 changed the title ~~Use installer resources for DSM6~~ Use installer resources for DSM6, update TCL package Apr 15, 2021

hgy59 added dsm 6 framework update request to update existing package labels Apr 15, 2021

publicarray reviewed Apr 16, 2021

View reviewed changes

mk/spksrc.service.mk Show resolved Hide resolved

publicarray reviewed Apr 16, 2021

View reviewed changes

mk/spksrc.service.installer Outdated Show resolved Hide resolved

publicarray reviewed Apr 16, 2021

View reviewed changes

spk/rdiff-backup/Makefile Outdated Show resolved Hide resolved

publicarray approved these changes Apr 17, 2021

View reviewed changes

This comment has been minimized.

Sign in to view

hgy59 commented Apr 18, 2021

View reviewed changes

ymartin59 requested changes Apr 24, 2021

View reviewed changes

hgy59 marked this pull request as draft April 25, 2021 10:09

This was referenced Apr 25, 2021

Update tcl to v8.6.11 #4577

Merged

use resource linker for DSM6 #4578

Merged

hgy59 and others added 7 commits May 22, 2021 09:06

migrate SPK_LINKS to SPK_USR_LOCAL_LINKS

16d0d28

- 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)

Use resource definitions for DSM6

a19b24f

- 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

Update mk/spksrc.service.mk

3a46eb0

yes, here we can Co-authored-by: Sebastian Schmidt <[email protected]>

[Transmission] Acquire Shared folder resource/permissions

48dfd06

set using SERVICE_WIZARD_SHARE only disadvantage is that this does not support sub-folders currently [Transmission] fix empty volume, consistency with naming

Transmission: mentionnès -> mentionnés

e05045c

Transmission fix upgrade from dsm6

ed82109

hgy59 force-pushed the use_dsm_resources branch from f138aca to ed82109 Compare May 22, 2021 08:24

publicarray mentioned this pull request Jul 8, 2021

Transmission DSM7 support #4719

Merged

3 tasks

publicarray closed this Jul 20, 2021

hgy59 deleted the use_dsm_resources branch August 28, 2021 11:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use installer resources for DSM6, update TCL package #4562

Use installer resources for DSM6, update TCL package #4562

hgy59 commented Apr 15, 2021 •

edited

Loading

publicarray Apr 16, 2021

hgy59 Apr 16, 2021

publicarray left a comment

hgy59 commented Apr 17, 2021

hgy59 commented Apr 17, 2021

publicarray commented Apr 18, 2021 •

edited

Loading

This comment has been minimized.

hgy59 Apr 18, 2021

publicarray Apr 18, 2021 •

edited

Loading

publicarray Apr 18, 2021

publicarray Apr 18, 2021 •

edited

Loading

ymartin59 left a comment

hgy59 commented Apr 25, 2021

hgy59 commented May 14, 2021

publicarray commented May 22, 2021 •

edited

Loading

publicarray commented Jul 20, 2021

		@@ -182,6 +170,13 @@ ifneq ($(strip $(SERVICE_WIZARD_SHARE)),)
		'."data-share" = {"shares": [{"name": $$share, "permission":{"rw":[$$user]}} ] }' $@ 1<>$@

	include ../../mk/spksrc.common.mk
	ifneq ($(call version_ge, ${TCVERSION}, 7.0),1)
	# SERVICE_WIZARD_SHARE is not supported for DSM7 yet
	SERVICE_WIZARD_SHARE = wizard_download_dir
	endif

Use installer resources for DSM6, update TCL package #4562

Use installer resources for DSM6, update TCL package #4562

Conversation

hgy59 commented Apr 15, 2021 • edited Loading

Checklist

Remarks

References

publicarray Apr 16, 2021

Choose a reason for hiding this comment

hgy59 Apr 16, 2021

Choose a reason for hiding this comment

publicarray left a comment

Choose a reason for hiding this comment

hgy59 commented Apr 17, 2021

hgy59 commented Apr 17, 2021

publicarray commented Apr 18, 2021 • edited Loading

This comment has been minimized.

hgy59 Apr 18, 2021

Choose a reason for hiding this comment

publicarray Apr 18, 2021 • edited Loading

Choose a reason for hiding this comment

publicarray Apr 18, 2021

Choose a reason for hiding this comment

publicarray Apr 18, 2021 • edited Loading

Choose a reason for hiding this comment

ymartin59 left a comment

Choose a reason for hiding this comment

hgy59 commented Apr 25, 2021

hgy59 commented May 14, 2021

publicarray commented May 22, 2021 • edited Loading

publicarray commented Jul 20, 2021

hgy59 commented Apr 15, 2021 •

edited

Loading

publicarray commented Apr 18, 2021 •

edited

Loading

publicarray Apr 18, 2021 •

edited

Loading

publicarray Apr 18, 2021 •

edited

Loading

publicarray commented May 22, 2021 •

edited

Loading