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

SABnzbd: use cross/7zz and cross/unrar7 #6366

Merged
merged 16 commits into from
Jan 25, 2025
Merged
Prev Previous commit
Next Next commit
sabnzb: remove cross/busybox dependency
- remove cross/busybox: use cross/coreutils for nice and cross/ionice
- update cross/coreutils from v8.21 to v9.5 and limit tools to 'nice'
- remarks: DSM 6+ and SRM 1.3+ already have nice (but an older version)
hgy59 committed Jan 13, 2025
commit 91088939db47a62f7bca5f3bfa3a022912d14a39
16 changes: 11 additions & 5 deletions cross/coreutils/Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
PKG_NAME = coreutils
PKG_VERS = 8.21
PKG_VERS = 9.5
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://ftp.gnu.org/gnu/$(PKG_NAME)
PKG_DIST_SITE = https://ftp.gnu.org/gnu/coreutils
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS =

HOMEPAGE = https://www.gnu.org/s/coreutils/
COMMENT = Basic file, shell and text manipulation utilities of the GNU operating system
LICENSE = GPL
COMMENT = Basic file, shell and text manipulation utilities of the GNU operating system. We use 'nice' only.
LICENSE = GPLv3

GNU_CONFIGURE = 1
CONFIGURE_ARGS = --disable-nls

include ../../mk/spksrc.cross-cc.mk

# 32-bit archs require glibc >= 2.34 (i.e. DSM 7.2) to support 64 bit timestamps
ifneq ($(findstring $(ARCH),$(x64_ARCHS)),$(ARCH))
ifeq ($(call version_lt, $(TC_GLIBC), 2.34),1)
CONFIGURE_ARGS += --disable-year2038
endif
endif
101 changes: 0 additions & 101 deletions cross/coreutils/PLIST
Original file line number Diff line number Diff line change
@@ -1,102 +1 @@
bin:bin/[
bin:bin/base64
bin:bin/basename
bin:bin/cat
bin:bin/chcon
bin:bin/chgrp
bin:bin/chmod
bin:bin/chown
bin:bin/chroot
bin:bin/cksum
bin:bin/comm
bin:bin/cp
bin:bin/csplit
bin:bin/cut
bin:bin/date
bin:bin/dd
bin:bin/dir
bin:bin/dircolors
bin:bin/dirname
bin:bin/du
bin:bin/echo
bin:bin/env
bin:bin/expand
bin:bin/expr
bin:bin/factor
bin:bin/false
bin:bin/fmt
bin:bin/fold
bin:bin/groups
bin:bin/head
bin:bin/hostid
bin:bin/id
bin:bin/install
bin:bin/join
bin:bin/kill
bin:bin/link
bin:bin/ln
bin:bin/logname
bin:bin/ls
bin:bin/md5sum
bin:bin/mkdir
bin:bin/mkfifo
bin:bin/mknod
bin:bin/mktemp
bin:bin/mv
bin:bin/nice
bin:bin/nl
bin:bin/nohup
bin:bin/nproc
bin:bin/od
bin:bin/paste
bin:bin/pathchk
bin:bin/pinky
bin:bin/pr
bin:bin/printenv
bin:bin/printf
bin:bin/ptx
bin:bin/pwd
bin:bin/readlink
bin:bin/realpath
bin:bin/rm
bin:bin/rmdir
bin:bin/runcon
bin:bin/seq
bin:bin/sha1sum
bin:bin/sha224sum
bin:bin/sha256sum
bin:bin/sha384sum
bin:bin/sha512sum
bin:bin/shred
bin:bin/shuf
bin:bin/sleep
bin:bin/sort
bin:bin/split
bin:bin/stat
bin:bin/stdbuf
bin:bin/stty
bin:bin/sum
bin:bin/sync
bin:bin/tac
bin:bin/tail
bin:bin/tee
bin:bin/test
bin:bin/timeout
bin:bin/touch
bin:bin/tr
bin:bin/true
bin:bin/truncate
bin:bin/tsort
bin:bin/tty
bin:bin/uname
bin:bin/unexpand
bin:bin/uniq
bin:bin/unlink
bin:bin/uptime
bin:bin/users
bin:bin/vdir
bin:bin/wc
bin:bin/who
bin:bin/whoami
bin:bin/yes
lib:libexec/coreutils/libstdbuf.so
102 changes: 102 additions & 0 deletions cross/coreutils/PLIST.all
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
bin:bin/[
bin:bin/base64
bin:bin/basename
bin:bin/cat
bin:bin/chcon
bin:bin/chgrp
bin:bin/chmod
bin:bin/chown
bin:bin/chroot
bin:bin/cksum
bin:bin/comm
bin:bin/cp
bin:bin/csplit
bin:bin/cut
bin:bin/date
bin:bin/dd
bin:bin/dir
bin:bin/dircolors
bin:bin/dirname
bin:bin/du
bin:bin/echo
bin:bin/env
bin:bin/expand
bin:bin/expr
bin:bin/factor
bin:bin/false
bin:bin/fmt
bin:bin/fold
bin:bin/groups
bin:bin/head
bin:bin/hostid
bin:bin/id
bin:bin/install
bin:bin/join
bin:bin/kill
bin:bin/link
bin:bin/ln
bin:bin/logname
bin:bin/ls
bin:bin/md5sum
bin:bin/mkdir
bin:bin/mkfifo
bin:bin/mknod
bin:bin/mktemp
bin:bin/mv
bin:bin/nice
bin:bin/nl
bin:bin/nohup
bin:bin/nproc
bin:bin/od
bin:bin/paste
bin:bin/pathchk
bin:bin/pinky
bin:bin/pr
bin:bin/printenv
bin:bin/printf
bin:bin/ptx
bin:bin/pwd
bin:bin/readlink
bin:bin/realpath
bin:bin/rm
bin:bin/rmdir
bin:bin/runcon
bin:bin/seq
bin:bin/sha1sum
bin:bin/sha224sum
bin:bin/sha256sum
bin:bin/sha384sum
bin:bin/sha512sum
bin:bin/shred
bin:bin/shuf
bin:bin/sleep
bin:bin/sort
bin:bin/split
bin:bin/stat
bin:bin/stdbuf
bin:bin/stty
bin:bin/sum
bin:bin/sync
bin:bin/tac
bin:bin/tail
bin:bin/tee
bin:bin/test
bin:bin/timeout
bin:bin/touch
bin:bin/tr
bin:bin/true
bin:bin/truncate
bin:bin/tsort
bin:bin/tty
bin:bin/uname
bin:bin/unexpand
bin:bin/uniq
bin:bin/unlink
bin:bin/uptime
bin:bin/users
bin:bin/vdir
bin:bin/wc
bin:bin/who
bin:bin/whoami
bin:bin/yes
lib:libexec/coreutils/libstdbuf.so
6 changes: 3 additions & 3 deletions cross/coreutils/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
coreutils-8.21.tar.xz SHA1 3fba93c72fab62f3742fe50957d3a86d4cd08176
coreutils-8.21.tar.xz SHA256 adaa44bdab3fa5eb352e80d8a31fdbf957b78653d0c2cd30d63e161444288e18
coreutils-8.21.tar.xz MD5 065ba41828644eca5dd8163446de5d64
coreutils-9.5.tar.xz SHA1 867fed7ce2ee15c5150a355a5f3a3b50578cf78d
coreutils-9.5.tar.xz SHA256 cd328edeac92f6a665de9f323c93b712af1858bc2e0d88f3f7100469470a1b8a
coreutils-9.5.tar.xz MD5 e99adfa059a63db3503cc71f3d151e31
5 changes: 1 addition & 4 deletions spk/sabnzbd/Makefile
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ SPK_ICON = src/sabnzbd.png

PYTHON_PACKAGE = python311

DEPENDS = cross/busybox cross/par2cmdline-turbo cross/7za cross/sabnzbd
DEPENDS = cross/ionice cross/coreutils cross/par2cmdline-turbo cross/7za cross/sabnzbd
OPTIONAL_DEPENDS = cross/unrar7 cross/unrar

# python311 not supported
@@ -50,9 +50,6 @@ endif

POST_STRIP_TARGET = sabnzbd_extra_install

# Add nice and ionice commands
ENV += BUSYBOX_CONFIG="nice ionice"

SPK_COMMANDS = bin/7za

# [cryptography]
3 changes: 0 additions & 3 deletions spk/sabnzbd/src/service-setup.sh
Original file line number Diff line number Diff line change
@@ -40,7 +40,4 @@ service_postinst ()
mkdir -p "$(dirname ${LOG_FILE})"
fi
fi

# Install nice/ionice
${BIN}/busybox --install ${BIN}
}