Merge pull request #3779 from 5schatten/squashfs-tools

squashfs-tools: renamed squashfs / updated to release 4.4
This commit is contained in:
MilhouseVH 2019-09-05 20:12:52 +01:00 committed by GitHub
commit 15b91a1557
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 38 deletions

View File

@ -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
}

View File

@ -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
}

View File

@ -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 <unistd.h>
#include <stdio.h>
#include <stddef.h>
+#include <sys/sysmacros.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>

View File

@ -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"