framework: add symlink creation support (#3852)

* PLIST cleanup: use documented types only (i.e. bin,lib,lnk,rsc) - replace types etc,shr,etc. by rsc - avoid types bin,lib for non strippable files * cross fixes - rmlint: install as executable - ddrescue: add compiler flags removed by patch (add optimization) - screen: remove chown from install, install without version postfix * Enhance framework for symlinks - add generation and removement of symlinks defined in Makefile - create folders for links on demand - make call_func of installer silent - fix error logs for unexisting INST_VARIABLES folder * update command line tools - define symlinks in Makefiles - remove service-setup.sh scripts used for link creation only - remove BETA from diyspk packages - use variable for optional description in synocli-disk and synocli-net - update tmux icon - make package icons square (detox, rmlint, testdisk) - use unique gnu icon (less, ddrescue) - ddrescue: remove pre DSM 6 install scripts (dsm-control.sh, installer.sh) * Update changelog of synocli-file and synocli-disk - add ddrescue to synocli-disk - move spk/ddrescue to diyspk/ddrescue - update symlink creation to work with /bin/sh on older DSM versions
SynoCommunity · Jan 23, 2020 · b883d56 · b883d56
1 parent 814a835
commit b883d56
Show file tree

Hide file tree

Showing 148 changed files with 500 additions and 941 deletions.
diff --git a/cross/adminer/PLIST b/cross/adminer/PLIST
@@ -1 +1 @@
-shr:share/adminer
+rsc:share/adminer
diff --git a/cross/alsa-lib/PLIST b/cross/alsa-lib/PLIST
@@ -5,4 +5,4 @@ lib:lib/alsa-lib/smixer/smixer-sbase.so
 lnk:lib/libasound.so
 lnk:lib/libasound.so.2
 lib:lib/libasound.so.2.0.0
-shr:share/alsa
+rsc:share/alsa
diff --git a/cross/alsa-utils/PLIST b/cross/alsa-utils/PLIST
@@ -14,5 +14,5 @@ bin:bin/iecset
 bin:bin/speaker-test
 bin:sbin/alsaconf
 bin:sbin/alsactl
-shr:share/alsa
-shr:share/sounds
+rsc:share/alsa
+rsc:share/sounds
diff --git a/cross/bicbucstriim/PLIST b/cross/bicbucstriim/PLIST
@@ -1 +1 @@
-shr:share/bbs
+rsc:share/bbs
diff --git a/cross/bitlbee/PLIST b/cross/bitlbee/PLIST
@@ -1,2 +1,2 @@
 bin:sbin/bitlbee
-shr:share/bitlbee/help.txt
+rsc:share/bitlbee/help.txt
diff --git a/cross/c_icap/PLIST b/cross/c_icap/PLIST
@@ -3,7 +3,7 @@ bin:bin/c-icap-client
 bin:bin/c-icap-config
 bin:bin/c-icap-libicapapi-config
 bin:bin/c-icap-stretch
-etc:etc/c-icap.magic
+rsc:etc/c-icap.magic
 lib:lib/c_icap/dnsbl_tables.so
 lib:lib/c_icap/srv_echo.so
 lib:lib/c_icap/srv_ex206.so

diff --git a/cross/cops/PLIST b/cross/cops/PLIST
@@ -1 +1 @@
-shr:share/cops
+rsc:share/cops
diff --git a/cross/coreutils/PLIST b/cross/coreutils/PLIST
@@ -99,4 +99,4 @@ bin:bin/wc
 bin:bin/who
 bin:bin/whoami
 bin:bin/yes
-libexec:libexec/coreutils/libstdbuf.so
+lib:libexec/coreutils/libstdbuf.so
diff --git a/cross/ddrescue/Makefile b/cross/ddrescue/Makefile
@@ -4,12 +4,13 @@ PKG_EXT = tar.lz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://download.savannah.gnu.org/releases/ddrescue
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
-SRC_DIR= $(WORK_DIR)/$(PKG_NAME)-$(PKG_VERS)/
 
 DEPENDS =
 
 HOMEPAGE = http://www.gnu.org/software/ddrescue/
 COMMENT = GNU ddrescue is a data recovery tool. It copies data from one file or block device (hard disc, cdrom, etc) to another, trying hard to rescue data in case of read errors.
 LICENSE = GNU GPL
 
+ADDITIONAL_CXXFLAGS = -Wall -W -O2
+
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/deluge/PLIST b/cross/deluge/PLIST
@@ -1 +1 @@
-shr:share/deluge
+rsc:share/deluge
diff --git a/cross/duply/PLIST b/cross/duply/PLIST
@@ -1 +1 @@
-share/duply/duply
+rsc:share/duply/duply
diff --git a/cross/e2fsprogs/PLIST b/cross/e2fsprogs/PLIST
@@ -3,8 +3,8 @@ rsc:bin/compile_et
 bin:bin/lsattr
 rsc:bin/mk_cmds
 bin:bin/uuidgen
-etc:etc/e2scrub.conf
-etc:etc/mke2fs.conf
+rsc:etc/e2scrub.conf
+rsc:etc/mke2fs.conf
 rsc:lib/e2fsprogs/e2scrub_all_cron
 lib:lib/e2initrd_helper
 bin:sbin/badblocks

diff --git a/cross/ejabberd/PLIST b/cross/ejabberd/PLIST
@@ -1,7 +1,7 @@
 bin:sbin/ejabberdctl
-etc:etc/ejabberd/ejabberd.cfg
-etc:etc/ejabberd/ejabberdctl.cfg
-etc:etc/ejabberd/inetrc
+rsc:etc/ejabberd/ejabberd.cfg
+rsc:etc/ejabberd/ejabberdctl.cfg
+rsc:etc/ejabberd/inetrc
 lib:lib/ejabberd/ebin/acl.beam
 lib:lib/ejabberd/ebin/adhoc.beam
 lib:lib/ejabberd/ebin/cache_tab.beam
@@ -205,47 +205,47 @@ lib:lib/ejabberd/priv/msgs/uk.msg
 lib:lib/ejabberd/priv/msgs/vi.msg
 lib:lib/ejabberd/priv/msgs/wa.msg
 lib:lib/ejabberd/priv/msgs/zh.msg
-shr:share/doc/ejabberd/COPYING
-shr:share/doc/ejabberd/dev.html
-shr:share/doc/ejabberd/discorus.png
-shr:share/doc/ejabberd/guide.html
-shr:share/doc/ejabberd/logo.png
-shr:share/doc/ejabberd/msrl-dit-deep.png
-shr:share/doc/ejabberd/msrl-dit-flat.png
-shr:share/doc/ejabberd/msrl-roster-deep.png
-shr:share/doc/ejabberd/msrl-roster-flat.png
-shr:share/doc/ejabberd/release_notes_0.9.1.txt
-shr:share/doc/ejabberd/release_notes_0.9.8.txt
-shr:share/doc/ejabberd/release_notes_0.9.txt
-shr:share/doc/ejabberd/release_notes_1.0.0.txt
-shr:share/doc/ejabberd/release_notes_1.1.0.txt
-shr:share/doc/ejabberd/release_notes_1.1.1.txt
-shr:share/doc/ejabberd/release_notes_1.1.2.txt
-shr:share/doc/ejabberd/release_notes_1.1.3.txt
-shr:share/doc/ejabberd/release_notes_1.1.4.txt
-shr:share/doc/ejabberd/release_notes_2.0.0.txt
-shr:share/doc/ejabberd/release_notes_2.0.1.txt
-shr:share/doc/ejabberd/release_notes_2.0.2.txt
-shr:share/doc/ejabberd/release_notes_2.0.3.txt
-shr:share/doc/ejabberd/release_notes_2.0.4.txt
-shr:share/doc/ejabberd/release_notes_2.0.5.txt
-shr:share/doc/ejabberd/release_notes_2.1.0.txt
-shr:share/doc/ejabberd/release_notes_2.1.10.txt
-shr:share/doc/ejabberd/release_notes_2.1.11.txt
-shr:share/doc/ejabberd/release_notes_2.1.12.txt
-shr:share/doc/ejabberd/release_notes_2.1.13.txt
-shr:share/doc/ejabberd/release_notes_2.1.1.txt
-shr:share/doc/ejabberd/release_notes_2.1.2.txt
-shr:share/doc/ejabberd/release_notes_2.1.3.txt
-shr:share/doc/ejabberd/release_notes_2.1.4.txt
-shr:share/doc/ejabberd/release_notes_2.1.5.txt
-shr:share/doc/ejabberd/release_notes_2.1.6.txt
-shr:share/doc/ejabberd/release_notes_2.1.7.txt
-shr:share/doc/ejabberd/release_notes_2.1.8.txt
-shr:share/doc/ejabberd/release_notes_2.1.9.txt
-shr:share/doc/ejabberd/webadmmain.png
-shr:share/doc/ejabberd/webadmmainru.png
-shr:share/doc/ejabberd/yozhikheader.png
-var:var/lib/ejabberd
-var:var/lock/ejabberdctl
-var:var/log/ejabberd
+rsc:share/doc/ejabberd/COPYING
+rsc:share/doc/ejabberd/dev.html
+rsc:share/doc/ejabberd/discorus.png
+rsc:share/doc/ejabberd/guide.html
+rsc:share/doc/ejabberd/logo.png
+rsc:share/doc/ejabberd/msrl-dit-deep.png
+rsc:share/doc/ejabberd/msrl-dit-flat.png
+rsc:share/doc/ejabberd/msrl-roster-deep.png
+rsc:share/doc/ejabberd/msrl-roster-flat.png
+rsc:share/doc/ejabberd/release_notes_0.9.1.txt
+rsc:share/doc/ejabberd/release_notes_0.9.8.txt
+rsc:share/doc/ejabberd/release_notes_0.9.txt
+rsc:share/doc/ejabberd/release_notes_1.0.0.txt
+rsc:share/doc/ejabberd/release_notes_1.1.0.txt
+rsc:share/doc/ejabberd/release_notes_1.1.1.txt
+rsc:share/doc/ejabberd/release_notes_1.1.2.txt
+rsc:share/doc/ejabberd/release_notes_1.1.3.txt
+rsc:share/doc/ejabberd/release_notes_1.1.4.txt
+rsc:share/doc/ejabberd/release_notes_2.0.0.txt
+rsc:share/doc/ejabberd/release_notes_2.0.1.txt
+rsc:share/doc/ejabberd/release_notes_2.0.2.txt
+rsc:share/doc/ejabberd/release_notes_2.0.3.txt
+rsc:share/doc/ejabberd/release_notes_2.0.4.txt
+rsc:share/doc/ejabberd/release_notes_2.0.5.txt
+rsc:share/doc/ejabberd/release_notes_2.1.0.txt
+rsc:share/doc/ejabberd/release_notes_2.1.10.txt
+rsc:share/doc/ejabberd/release_notes_2.1.11.txt
+rsc:share/doc/ejabberd/release_notes_2.1.12.txt
+rsc:share/doc/ejabberd/release_notes_2.1.13.txt
+rsc:share/doc/ejabberd/release_notes_2.1.1.txt
+rsc:share/doc/ejabberd/release_notes_2.1.2.txt
+rsc:share/doc/ejabberd/release_notes_2.1.3.txt
+rsc:share/doc/ejabberd/release_notes_2.1.4.txt
+rsc:share/doc/ejabberd/release_notes_2.1.5.txt
+rsc:share/doc/ejabberd/release_notes_2.1.6.txt
+rsc:share/doc/ejabberd/release_notes_2.1.7.txt
+rsc:share/doc/ejabberd/release_notes_2.1.8.txt
+rsc:share/doc/ejabberd/release_notes_2.1.9.txt
+rsc:share/doc/ejabberd/webadmmain.png
+rsc:share/doc/ejabberd/webadmmainru.png
+rsc:share/doc/ejabberd/yozhikheader.png
+rsc:var/lib/ejabberd
+rsc:var/lock/ejabberdctl
+rsc:var/log/ejabberd
diff --git a/cross/fengoffice/PLIST b/cross/fengoffice/PLIST
@@ -1 +1 @@
-shr:share/fengoffice
+rsc:share/fengoffice
diff --git a/cross/ffmpeg/PLIST b/cross/ffmpeg/PLIST
@@ -27,9 +27,9 @@ lib:lib/libswresample.so.3.5.100
 lnk:lib/libswscale.so
 lnk:lib/libswscale.so.5
 lib:lib/libswscale.so.5.5.100
-shr:share/ffmpeg/ffprobe.xsd
-shr:share/ffmpeg/libvpx-1080p50_60.ffpreset
-shr:share/ffmpeg/libvpx-1080p.ffpreset
-shr:share/ffmpeg/libvpx-360p.ffpreset
-shr:share/ffmpeg/libvpx-720p50_60.ffpreset
-shr:share/ffmpeg/libvpx-720p.ffpreset
+rsc:share/ffmpeg/ffprobe.xsd
+rsc:share/ffmpeg/libvpx-1080p50_60.ffpreset
+rsc:share/ffmpeg/libvpx-1080p.ffpreset
+rsc:share/ffmpeg/libvpx-360p.ffpreset
+rsc:share/ffmpeg/libvpx-720p50_60.ffpreset
+rsc:share/ffmpeg/libvpx-720p.ffpreset
diff --git a/cross/fritzctl/PLIST b/cross/fritzctl/PLIST
@@ -1 +1 @@
-bin/fritzctl
+bin:bin/fritzctl
diff --git a/cross/gateone/PLIST b/cross/gateone/PLIST
@@ -1 +1 @@
-shr:share/gateone
+rsc:share/gateone
diff --git a/cross/git/PLIST b/cross/git/PLIST
@@ -4,7 +4,7 @@ lnk:bin/git-receive-pack
 bin:bin/git-shell
 lnk:bin/git-upload-archive
 bin:bin/git-upload-pack
-etc:etc/gitconfig
-libexec:libexec/git-core/
+rsc:etc/gitconfig
+rsc:libexec/git-core/
 rsc:share/git-core/
 rsc:share/gitweb/
diff --git a/cross/imagemagick/PLIST b/cross/imagemagick/PLIST
@@ -14,7 +14,7 @@ rsc:bin/MagickWand-config
 lnk:bin/mogrify
 lnk:bin/montage
 lnk:bin/stream
-shr:etc/ImageMagick-6
+rsc:etc/ImageMagick-6
 lnk:lib/libMagick++-7.Q16HDRI.so
 lnk:lib/libMagick++-7.Q16HDRI.so.4
 lib:lib/libMagick++-7.Q16HDRI.so.4.0.0

diff --git a/cross/irssi/PLIST b/cross/irssi/PLIST
@@ -1,3 +1,3 @@
 bin:bin/irssi
-etc:etc/irssi.conf
-shr:share/irssi/themes
+rsc:etc/irssi.conf
+rsc:share/irssi/themes
diff --git a/cross/jappix/PLIST b/cross/jappix/PLIST
@@ -1 +1 @@
-shr:share/jappix
+rsc:share/jappix
diff --git a/spk/ddrescue/PLIST → cross/jpcre2/PLIST b/spk/ddrescue/PLIST → cross/jpcre2/PLIST
diff --git a/cross/jupp/PLIST b/cross/jupp/PLIST
@@ -4,5 +4,5 @@ lnk:bin/jpico
 lnk:bin/jstar
 lnk:bin/jupp
 lnk:bin/rjoe
-etc:etc/joe
-shr:share/man/man1
+rsc:etc/joe
+rsc:share/man/man1
diff --git a/cross/libcaca/PLIST b/cross/libcaca/PLIST
@@ -12,4 +12,4 @@ lnk:lib/libcaca.so.0
 lnk:lib/libcaca++.so.0
 lib:lib/libcaca.so.0.99.19
 lib:lib/libcaca++.so.0.99.19
-shr:share/libcaca/caca.txt
+rsc:share/libcaca/caca.txt
diff --git a/cross/libevent/PLIST b/cross/libevent/PLIST
@@ -1,4 +1,4 @@
-bin:bin/event_rpcgen.py
+rsc:bin/event_rpcgen.py
 lnk:lib/libevent.so
 lnk:lib/libevent-2.0.so.5
 lib:lib/libevent-2.0.so.5.1.9

diff --git a/cross/libwebsockets/PLIST b/cross/libwebsockets/PLIST
@@ -6,4 +6,4 @@ bin:bin/libwebsockets-test-server
 bin:bin/libwebsockets-test-server-extpoll
 lnk:lib/libwebsockets.so
 lib:lib/libwebsockets.so.12
-shr:share/libwebsockets-test-server
+rsc:share/libwebsockets-test-server
diff --git a/cross/mantisbt/PLIST b/cross/mantisbt/PLIST
@@ -1 +1 @@
-shr:share/mantisbt
+rsc:share/mantisbt
diff --git a/cross/mktemp/PLIST b/cross/mktemp/PLIST
@@ -1 +1 @@
-bin/mktemp
+bin:bin/mktemp
diff --git a/cross/museek+/PLIST b/cross/museek+/PLIST
@@ -1,2 +1,2 @@
 bin:bin/museekd
-shr:share/museek/museekd/config.xml.tmpl
+rsc:share/museek/museekd/config.xml.tmpl
diff --git a/cross/mutt/PLIST b/cross/mutt/PLIST
@@ -4,35 +4,35 @@ bin:bin/muttbug
 bin:bin/pgpewrap
 bin:bin/pgpring
 bin:bin/smime_keys
-etc:etc/mime.types
-etc:etc/mime.types.dist
-etc:etc/Muttrc
-shr:share/locale/bg/LC_MESSAGES/mutt.mo
-shr:share/locale/ca/LC_MESSAGES/mutt.mo
-shr:share/locale/cs/LC_MESSAGES/mutt.mo
-shr:share/locale/da/LC_MESSAGES/mutt.mo
-shr:share/locale/de/LC_MESSAGES/mutt.mo
-shr:share/locale/el/LC_MESSAGES/mutt.mo
-shr:share/locale/eo/LC_MESSAGES/mutt.mo
-shr:share/locale/es/LC_MESSAGES/mutt.mo
-shr:share/locale/et/LC_MESSAGES/mutt.mo
-shr:share/locale/eu/LC_MESSAGES/mutt.mo
-shr:share/locale/fr/LC_MESSAGES/mutt.mo
-shr:share/locale/ga/LC_MESSAGES/mutt.mo
-shr:share/locale/gl/LC_MESSAGES/mutt.mo
-shr:share/locale/hu/LC_MESSAGES/mutt.mo
-shr:share/locale/id/LC_MESSAGES/mutt.mo
-shr:share/locale/it/LC_MESSAGES/mutt.mo
-shr:share/locale/ja/LC_MESSAGES/mutt.mo
-shr:share/locale/ko/LC_MESSAGES/mutt.mo
-shr:share/locale/lt/LC_MESSAGES/mutt.mo
-shr:share/locale/nl/LC_MESSAGES/mutt.mo
-shr:share/locale/pl/LC_MESSAGES/mutt.mo
-shr:share/locale/pt_BR/LC_MESSAGES/mutt.mo
-shr:share/locale/ru/LC_MESSAGES/mutt.mo
-shr:share/locale/sk/LC_MESSAGES/mutt.mo
-shr:share/locale/sv/LC_MESSAGES/mutt.mo
-shr:share/locale/tr/LC_MESSAGES/mutt.mo
-shr:share/locale/uk/LC_MESSAGES/mutt.mo
-shr:share/locale/zh_CN/LC_MESSAGES/mutt.mo
-shr:share/locale/zh_TW/LC_MESSAGES/mutt.mo
+rsc:etc/mime.types
+rsc:etc/mime.types.dist
+rsc:etc/Muttrc
+rsc:share/locale/bg/LC_MESSAGES/mutt.mo
+rsc:share/locale/ca/LC_MESSAGES/mutt.mo
+rsc:share/locale/cs/LC_MESSAGES/mutt.mo
+rsc:share/locale/da/LC_MESSAGES/mutt.mo
+rsc:share/locale/de/LC_MESSAGES/mutt.mo
+rsc:share/locale/el/LC_MESSAGES/mutt.mo
+rsc:share/locale/eo/LC_MESSAGES/mutt.mo
+rsc:share/locale/es/LC_MESSAGES/mutt.mo
+rsc:share/locale/et/LC_MESSAGES/mutt.mo
+rsc:share/locale/eu/LC_MESSAGES/mutt.mo
+rsc:share/locale/fr/LC_MESSAGES/mutt.mo
+rsc:share/locale/ga/LC_MESSAGES/mutt.mo
+rsc:share/locale/gl/LC_MESSAGES/mutt.mo
+rsc:share/locale/hu/LC_MESSAGES/mutt.mo
+rsc:share/locale/id/LC_MESSAGES/mutt.mo
+rsc:share/locale/it/LC_MESSAGES/mutt.mo
+rsc:share/locale/ja/LC_MESSAGES/mutt.mo
+rsc:share/locale/ko/LC_MESSAGES/mutt.mo
+rsc:share/locale/lt/LC_MESSAGES/mutt.mo
+rsc:share/locale/nl/LC_MESSAGES/mutt.mo
+rsc:share/locale/pl/LC_MESSAGES/mutt.mo
+rsc:share/locale/pt_BR/LC_MESSAGES/mutt.mo
+rsc:share/locale/ru/LC_MESSAGES/mutt.mo
+rsc:share/locale/sk/LC_MESSAGES/mutt.mo
+rsc:share/locale/sv/LC_MESSAGES/mutt.mo
+rsc:share/locale/tr/LC_MESSAGES/mutt.mo
+rsc:share/locale/uk/LC_MESSAGES/mutt.mo
+rsc:share/locale/zh_CN/LC_MESSAGES/mutt.mo
+rsc:share/locale/zh_TW/LC_MESSAGES/mutt.mo
diff --git a/cross/ncurses/PLIST b/cross/ncurses/PLIST
@@ -20,8 +20,8 @@ lib:lib/libncurses.so.6.1
 lnk:lib/libpanel.so
 lnk:lib/libpanel.so.6
 lib:lib/libpanel.so.6.1
-shr:share/tabset/std
-shr:share/tabset/stdcrt
-shr:share/tabset/vt100
-shr:share/tabset/vt300
-shr:share/terminfo
+rsc:share/tabset/std
+rsc:share/tabset/stdcrt
+rsc:share/tabset/vt100
+rsc:share/tabset/vt300
+rsc:share/terminfo
diff --git a/cross/ncursesw/PLIST b/cross/ncursesw/PLIST
@@ -20,9 +20,9 @@ lib:lib/libncursesw.so.6.1
 lnk:lib/libpanelw.so
 lnk:lib/libpanelw.so.6
 lib:lib/libpanelw.so.6.1
-shr:share/tabset/std
-shr:share/tabset/stdcrt
-shr:share/tabset/vt100
-shr:share/tabset/vt300
-shr:share/terminfo
+rsc:share/tabset/std
+rsc:share/tabset/stdcrt
+rsc:share/tabset/vt100
+rsc:share/tabset/vt300
+rsc:share/terminfo
 
diff --git a/cross/nmap/PLIST b/cross/nmap/PLIST
@@ -1,4 +1,4 @@
 bin:bin/ndiff
 bin:bin/nmap
 bin:bin/nping
-shr:share/nmap
+rsc:share/nmap
diff --git a/cross/openldap/PLIST b/cross/openldap/PLIST
@@ -8,7 +8,7 @@ bin:bin/ldappasswd
 bin:bin/ldapsearch
 bin:bin/ldapurl
 bin:bin/ldapwhoami
-etc:etc/openldap/ldap.conf
+rsc:etc/openldap/ldap.conf
 lnk:lib/liblber-2.4.so.2
 lib:lib/liblber-2.4.so.2.10.3
 lnk:lib/liblber.so

diff --git a/cross/openssh/PLIST b/cross/openssh/PLIST
@@ -0,0 +1,15 @@
+bin:bin/scp
+bin:bin/sftp
+bin:bin/slogin
+bin:bin/ssh
+bin:bin/ssh-add
+bin:bin/ssh-agent
+bin:bin/ssh-keygen
+bin:bin/ssh-keyscan
+rsc:etc/moduli
+bin:etc/ssh_config
+bin:etc/sshd_config
+bin:libexec/sftp-server
+bin:libexec/ssh-keysign
+bin:libexec/ssh-pkcs11-helper
+bin:sbin/sshd
diff --git a/cross/owncloud/PLIST b/cross/owncloud/PLIST
@@ -1 +1 @@
-shr:share/owncloud
+rsc:share/owncloud