Merge pull request #20560 from turris-cz/antfs-drop

Remove package: kmod-fs-antfs and its dependency antfs-mount
This commit is contained in:
Eneas U de Queiroz 2023-02-23 10:21:23 -03:00 committed by GitHub
commit 4f07ac43e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 114 deletions

View File

@ -1,44 +0,0 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=antfs
PKG_RELEASE:=2
PKG_SOURCE_URL:=https://github.com/klukonin/antfs.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2020-02-10
PKG_SOURCE_VERSION:=b41ba529f6b64b429527e09a06ce0326d5456c05
PKG_MIRROR_HASH:=dae039c0fe5bf1a2c8c1cca4211d607a4d6f56fc41b38444e2234b40d710d9db
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=LICENSE
include $(INCLUDE_DIR)/package.mk
define KernelPackage/fs-antfs
SUBMENU:=Filesystems
TITLE:=AVM NTFS Read/Write Driver
FILES:=$(PKG_BUILD_DIR)/antfs.ko
AUTOLOAD:=$(call AutoLoad,30,antfs,1)
DEPENDS:=+kmod-nls-base @LINUX_5_10
endef
define KernelPackage/fs-antfs/description
Kernel module for NTFS Filesytem
endef
MAKE_OPTS:= \
ARCH="$(LINUX_KARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
M="$(PKG_BUILD_DIR)"
define Build/Compile
$(MAKE) -C "$(LINUX_DIR)" \
$(MAKE_OPTS) \
CONFIG_ANTFS_FS=m \
CONFIG_ANTFS_SYMLINKS=y \
ANTFS_VERSION=07.19-$(call version_abbrev,$(PKG_SOURCE_VERSION)) \
modules
endef
$(eval $(call KernelPackage,fs-antfs))

View File

@ -1,40 +0,0 @@
--- a/file.c
+++ b/file.c
@@ -625,6 +625,9 @@ static int antfs_readpages(struct file *
unsigned page_idx = nr_pages;
pgoff_t page_idx_to_init;
bool do_init_page = false;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
+ DEFINE_READAHEAD(rac, file, mapping, 0);
+#endif
if (page_offs & (buffer_len - 1)) {
/* If initialized size is not on buffer boundary, walk
@@ -660,8 +663,13 @@ static int antfs_readpages(struct file *
}
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
+ mpage_readahead(&rac, antfs_get_block);
+ err = 0;
+#else
err = mpage_readpages(mapping, pages, nr_pages,
antfs_get_block);
+#endif
if (!err && do_init_page) {
/* Initialize stuff past initialized_size with zero. */
page = grab_cache_page(mapping, page_idx_to_init);
--- a/libntfs-3g/misc.c
+++ b/libntfs-3g/misc.c
@@ -38,7 +38,11 @@ void *ntfs_malloc(size_t size)
return kmalloc(size, GFP_KERNEL);
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
+ return __vmalloc(size, GFP_KERNEL);
+#else
return __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);
+#endif
}
/**

View File

@ -1,28 +0,0 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=antfs-mount
PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk
define Package/antfs-mount
SECTION:=utils
CATEGORY:=Utilities
SUBMENU:=Filesystem
TITLE:=NTFS mount script for AVM NTFS driver
PKGARCH:=all
DEPENDS:=+kmod-fs-antfs
endef
define Build/Configure
endef
define Build/Compile
endef
define Package/antfs-mount/install
$(INSTALL_DIR) $(1)/sbin
$(INSTALL_BIN) ./files/mount.ntfs $(1)/sbin
endef
$(eval $(call BuildPackage,antfs-mount))

View File

@ -1,2 +0,0 @@
#!/bin/sh
mount -t antfs "$@"