@@ -1,42 +1,38 @@
include $(TOPDIR)/rules.mk
-PKG_NAME:=exfat-utils
-PKG_VERSION:=1.0.1
+PKG_NAME:=exfatprogs
+PKG_VERSION:=1.0.2
PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0
-
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/$(PKG_NAME)/$(PKG_NAME)/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=7d4e95c3042b58601a581dc02f55eb4a726a2fb8db2e74a9619dbf3083997e06
+PKG_HASH:=e7f14f32dd67601ff42717f432093a400de878774796f6f1684fb9dbf0d499e1
+
+PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-
include $(INCLUDE_DIR)/package.mk
-CONFIGURE_ARGS += \
- --enable-shared \
- --disable-static
-
-define Package/exfat-utils/Default
+define Package/exfatprogs/Default
SECTION:=utils
CATEGORY:=Utilities
SUBMENU:=Filesystem
DEPENDS:=+libexfat
- URL:=https://github.com/exfat-utils/exfat-utils
+ URL:=https://github.com/exfatprogs/exfatprogs
endef
define Package/exfat-mkfs
- $(Package/exfat-utils/Default)
+ $(Package/exfatprogs/Default)
TITLE:=Utility for creating an exFAT File System
endef
define Package/exfat-fsck
- $(Package/exfat-utils/Default)
+ $(Package/exfatprogs/Default)
TITLE:=Utility for checking/repairing an exFAT File System
endef
@@ -48,6 +44,10 @@ define Package/libexfat
ABI_VERSION:=1
endef
+CONFIGURE_ARGS += \
+ --enable-shared \
+ --disable-static
+
define Package/libexfat/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) \
new file mode 100644
@@ -0,0 +1,45 @@
+From 860326c6aa86ef65693533d45ba158b324bb359b Mon Sep 17 00:00:00 2001
+From: James Hilliard <james.hilliard1@gmail.com>
+Date: Fri, 17 Apr 2020 13:10:49 -0600
+Subject: [PATCH] exfatprogs: add missing #include <sys/types.h>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+../include/libexfat.h:72:1: error: unknown type name ‘ssize_t’
+ ssize_t exfat_read(int fd, void *buf, size_t size, off_t offset);
+ ^
+../include/libexfat.h:72:52: error: unknown type name ‘off_t’
+ ssize_t exfat_read(int fd, void *buf, size_t size, off_t offset);
+ ^
+../include/libexfat.h:73:1: error: unknown type name ‘ssize_t’
+ ssize_t exfat_write(int fd, void *buf, size_t size, off_t offset);
+ ^
+../include/libexfat.h:73:53: error: unknown type name ‘off_t’
+ ssize_t exfat_write(int fd, void *buf, size_t size, off_t offset);
+ ^
+../include/libexfat.h:75:1: error: unknown type name ‘ssize_t’
+ ssize_t exfat_utf16_enc(const char *in_str, __u16 *out_str, size_t out_size);
+ ^
+../include/libexfat.h:76:1: error: unknown type name ‘ssize_t’
+ ssize_t exfat_utf16_dec(const __u16 *in_str, size_t in_len,
+ ^
+
+Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
+---
+ include/libexfat.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/libexfat.h b/include/libexfat.h
+index ed1fb4c..36c8bdd 100644
+--- a/include/libexfat.h
++++ b/include/libexfat.h
+@@ -6,6 +6,7 @@
+ #ifndef _LIBEXFAT_H
+
+ #include <stdbool.h>
++#include <sys/types.h>
+ #include <wchar.h>
+
+ #define KB (1024)
This release removes iconv dependency which needed nls.mk before. Switch from old name to new name in Makefile. Added missing header patch. Upstream backport. Fixed license information. Several other cleanups for consistency between packages. Signed-off-by: Rosen Penev <rosenp@gmail.com> --- package/utils/exfatprogs/Makefile | 30 ++++++------- .../exfatprogs/patches/010-ssize_t.patch | 45 +++++++++++++++++++ 2 files changed, 60 insertions(+), 15 deletions(-) create mode 100644 package/utils/exfatprogs/patches/010-ssize_t.patch