From 241a2cbdb28ad18a645ea25ce3cb00c7eaabb5ec Mon Sep 17 00:00:00 2001 From: 5schatten Date: Wed, 28 Aug 2019 13:23:23 +0200 Subject: [PATCH 1/2] image: updated dependencies to use squashfs-tools --- packages/virtual/image/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/virtual/image/package.mk b/packages/virtual/image/package.mk index 12ecfaacfe..935387dff7 100644 --- a/packages/virtual/image/package.mk +++ b/packages/virtual/image/package.mk @@ -4,7 +4,7 @@ PKG_NAME="image" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" -PKG_DEPENDS_TARGET="toolchain squashfs:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware ${BOOTLOADER} busybox util-linux corefonts network misc-packages debug" +PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware ${BOOTLOADER} busybox util-linux corefonts network misc-packages debug" PKG_SECTION="virtual" PKG_LONGDESC="Root package used to build and create complete image" From 98459ad51fe3b09547d60a10c4c324d47a417103 Mon Sep 17 00:00:00 2001 From: 5schatten Date: Thu, 29 Aug 2019 23:26:12 +0200 Subject: [PATCH 2/2] squashfs-tools: renamed squashfs / updated to release 4.4 / cleaned up --- packages/sysutils/squashfs-tools/package.mk | 30 +++++++++++++++++++ packages/sysutils/squashfs/package.mk | 26 ---------------- .../patches/fix-compilation-issue.patch | 11 ------- 3 files changed, 30 insertions(+), 37 deletions(-) create mode 100644 packages/sysutils/squashfs-tools/package.mk delete mode 100644 packages/sysutils/squashfs/package.mk delete mode 100644 packages/sysutils/squashfs/patches/fix-compilation-issue.patch diff --git a/packages/sysutils/squashfs-tools/package.mk b/packages/sysutils/squashfs-tools/package.mk new file mode 100644 index 0000000000..bde69d3d00 --- /dev/null +++ b/packages/sysutils/squashfs-tools/package.mk @@ -0,0 +1,30 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="squashfs-tools" +PKG_VERSION="4.4" +PKG_SHA256="a7fa4845e9908523c38d4acf92f8a41fdfcd19def41bd5090d7ad767a6dc75c3" +PKG_LICENSE="GPL" +PKG_SITE="https://github.com/plougher/squashfs-tools" +PKG_URL="https://github.com/plougher/squashfs-tools/archive/${PKG_VERSION}.tar.gz" +PKG_DEPENDS_HOST="ccache:host zlib:host lzo:host xz:host zstd:host" +PKG_NEED_UNPACK="$(get_pkg_directory zlib) $(get_pkg_directory lzo) $(get_pkg_directory xz) $(get_pkg_directory zstd)" +PKG_LONGDESC="Tools for squashfs, a highly compressed read-only filesystem for Linux." +PKG_TOOLCHAIN="manual" + +make_host() { + make -C squashfs-tools \ + mksquashfs \ + XZ_SUPPORT=1 \ + LZO_SUPPORT=1 \ + ZSTD_SUPPORT=1 \ + XATTR_SUPPORT=0 \ + XATTR_DEFAULT=0 \ + INCLUDEDIR="-I. -I${TOOLCHAIN}/include" +} + +makeinstall_host() { + mkdir -p ${TOOLCHAIN}/bin + cp squashfs-tools/mksquashfs ${TOOLCHAIN}/bin +} diff --git a/packages/sysutils/squashfs/package.mk b/packages/sysutils/squashfs/package.mk deleted file mode 100644 index fee815d2a1..0000000000 --- a/packages/sysutils/squashfs/package.mk +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="squashfs" -PKG_VERSION="e38956b" -PKG_SHA256="d49241e238076ee56920c6aec31f0de7b41fe770d1b2c03d1714bbffb833a98f" -PKG_LICENSE="GPL" -PKG_SITE="https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git" -PKG_URL="https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git/snapshot/$PKG_VERSION.tar.gz" -PKG_DEPENDS_HOST="ccache:host zlib:host lzo:host xz:host zstd:host" -PKG_NEED_UNPACK="$(get_pkg_directory zlib) $(get_pkg_directory lzo) $(get_pkg_directory xz) $(get_pkg_directory zstd)" -PKG_LONGDESC="A compressed read-only filesystem for Linux." -PKG_TOOLCHAIN="manual" - -make_host() { - make -C squashfs-tools mksquashfs \ - XZ_SUPPORT=1 LZO_SUPPORT=1 ZSTD_SUPPORT=1 \ - XATTR_SUPPORT=0 XATTR_DEFAULT=0 \ - INCLUDEDIR="-I. -I$TOOLCHAIN/include" -} - -makeinstall_host() { - mkdir -p $TOOLCHAIN/bin - cp squashfs-tools/mksquashfs $TOOLCHAIN/bin -} diff --git a/packages/sysutils/squashfs/patches/fix-compilation-issue.patch b/packages/sysutils/squashfs/patches/fix-compilation-issue.patch deleted file mode 100644 index 7b50a51fa8..0000000000 --- a/packages/sysutils/squashfs/patches/fix-compilation-issue.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c ---- a/squashfs-tools/mksquashfs.c 2017-11-14 04:44:47.000000000 +0100 -+++ b/squashfs-tools/mksquashfs.c 2018-08-22 16:52:17.386482046 +0200 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - #include