From 91b9547161ce2474b62e2b2f24399c1590d0fd38 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 20 Sep 2019 02:20:34 +0100 Subject: [PATCH 1/6] dosfstools: update to dosfstools-4.1 --- packages/sysutils/dosfstools/package.mk | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/sysutils/dosfstools/package.mk b/packages/sysutils/dosfstools/package.mk index f6c78c5034..8286da9e8f 100644 --- a/packages/sysutils/dosfstools/package.mk +++ b/packages/sysutils/dosfstools/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="dosfstools" -PKG_VERSION="3.0.28" -PKG_SHA256="ee95913044ecf2719b63ea11212917649709a6e53209a72d622135aaa8517ee2" +PKG_VERSION="4.1" +PKG_SHA256="e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/dosfstools/dosfstools" PKG_URL="https://github.com/dosfstools/dosfstools/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" @@ -13,6 +13,7 @@ PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_INIT="toolchain dosfstools" PKG_LONGDESC="dosfstools contains utilities for making and checking MS-DOS FAT filesystems." +PKG_CONFIGURE_OPTS_TARGET="--enable-compat-symlinks" PKG_MAKE_OPTS_TARGET="PREFIX=/usr" PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr" @@ -32,16 +33,16 @@ make_host() { makeinstall_init() { mkdir -p $INSTALL/usr/sbin - cp fsck.fat $INSTALL/usr/sbin + cp ../.install_pkg/usr/sbin/fsck.fat $INSTALL/usr/sbin ln -sf fsck.fat $INSTALL/usr/sbin/fsck.msdos ln -sf fsck.fat $INSTALL/usr/sbin/fsck.vfat } makeinstall_host() { mkdir -p $TOOLCHAIN/sbin - cp mkfs.fat $TOOLCHAIN/sbin + cp src/mkfs.fat $TOOLCHAIN/sbin ln -sf mkfs.fat $TOOLCHAIN/sbin/mkfs.vfat - cp fsck.fat $TOOLCHAIN/sbin + cp src/fsck.fat $TOOLCHAIN/sbin ln -sf fsck.fat $TOOLCHAIN/sbin/fsck.vfat - cp fatlabel $TOOLCHAIN/sbin + cp src/fatlabel $TOOLCHAIN/sbin } From d5cf40ff130a787a71cc9b4cf32ab88862eec671 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 20 Sep 2019 18:17:04 +0100 Subject: [PATCH 2/6] e2fsprogs: update to e2fsprogs-1.45.3 --- packages/sysutils/e2fsprogs/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk index c0b54b6645..1a87982268 100644 --- a/packages/sysutils/e2fsprogs/package.mk +++ b/packages/sysutils/e2fsprogs/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="e2fsprogs" -PKG_VERSION="1.45.2" -PKG_SHA256="4952c9ae91e36d762e13cc5b9e8f7eeb5453e4aee4cd9b7402e73f2d4e65e009" +PKG_VERSION="1.45.3" +PKG_SHA256="90d10066b815e27b0b4875f0d5e396c663e0bf55aa3ca10868978d10c6ffe595" PKG_LICENSE="GPL" PKG_SITE="http://e2fsprogs.sourceforge.net/" PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/$PKG_NAME/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" From 5ce2a0bf78b23de518b73dfee708b760f222e37d Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 23 Sep 2019 04:22:56 +0100 Subject: [PATCH 3/6] dosfstools: drop pre-4.0.0 build workarounds --- packages/sysutils/dosfstools/package.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/packages/sysutils/dosfstools/package.mk b/packages/sysutils/dosfstools/package.mk index 8286da9e8f..1b7297fa02 100644 --- a/packages/sysutils/dosfstools/package.mk +++ b/packages/sysutils/dosfstools/package.mk @@ -21,16 +21,6 @@ make_init() { : # reuse make_target() } -pre_build_host() { - mkdir -p $PKG_BUILD/.$HOST_NAME - cp -RP $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME -} - -make_host() { - cd $PKG_BUILD/.$HOST_NAME - make PREFIX=/usr -} - makeinstall_init() { mkdir -p $INSTALL/usr/sbin cp ../.install_pkg/usr/sbin/fsck.fat $INSTALL/usr/sbin From 97a6b1e063cedf3e53bbf13dd96dc7a74c5afc43 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 23 Sep 2019 04:47:44 +0100 Subject: [PATCH 4/6] busybox: disable mkfs.vfat for target, use full-fat dosfstools --- packages/sysutils/busybox/config/busybox-target.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/busybox/config/busybox-target.conf b/packages/sysutils/busybox/config/busybox-target.conf index 6be2607bc6..9ee8e1b507 100644 --- a/packages/sysutils/busybox/config/busybox-target.conf +++ b/packages/sysutils/busybox/config/busybox-target.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.31.0 -# Wed Jun 12 00:53:01 2019 +# Mon Sep 23 04:46:37 2019 # CONFIG_HAVE_DOT_CONFIG=y @@ -645,7 +645,7 @@ CONFIG_IONICE=y # CONFIG_FEATURE_MINIX2 is not set # CONFIG_MKFS_REISER is not set # CONFIG_MKDOSFS is not set -CONFIG_MKFS_VFAT=y +# CONFIG_MKFS_VFAT is not set CONFIG_MKSWAP=y CONFIG_FEATURE_MKSWAP_UUID=y CONFIG_MORE=y From 8b8fa8b2a11e493b4148e9f502198561e00297d7 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 14 Jan 2020 02:27:09 +0000 Subject: [PATCH 5/6] e2fsprogs: disable automagic udev/systemd/crond detection --- packages/sysutils/e2fsprogs/package.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk index 1a87982268..82e9f287c1 100644 --- a/packages/sysutils/e2fsprogs/package.mk +++ b/packages/sysutils/e2fsprogs/package.mk @@ -20,6 +20,9 @@ fi PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN/ \ --bindir=$TOOLCHAIN/bin \ + --with-udev-rules-dir=no \ + --with-crond-dir=no \ + --with-systemd-unit-dir=no \ --sbindir=$TOOLCHAIN/sbin \ --enable-verbose-makecmds \ --disable-symlink-install \ @@ -41,6 +44,9 @@ PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN/ \ pre_configure() { PKG_CONFIGURE_OPTS_INIT="BUILD_CC=$HOST_CC \ + --with-udev-rules-dir=no \ + --with-crond-dir=no \ + --with-systemd-unit-dir=no \ --enable-verbose-makecmds \ --enable-symlink-install \ --enable-symlink-build \ From 6f80a632669516e4a7e6f088532362de1cc92ebd Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 14 Jan 2020 04:01:30 +0000 Subject: [PATCH 6/6] e2fsprogs: remove unrecognized option --- packages/sysutils/e2fsprogs/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk index 82e9f287c1..388a85c42f 100644 --- a/packages/sysutils/e2fsprogs/package.mk +++ b/packages/sysutils/e2fsprogs/package.mk @@ -35,7 +35,6 @@ PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN/ \ --disable-fsck \ --disable-e2initrd-helper \ --enable-tls \ - --disable-uuid \ --disable-uuidd \ --disable-nls \ --disable-rpath \