Skip to contentSkip to conversation

package/nilfs-utils: bump to version 2.2.8

PATCH New Fabrice Fontaine 2 participants 2 messages Sep 18, 2019 – Sep 19, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/nilfs-utils: bump to version 2.2.8

- Change NILFS_UTILS_SITE to https://nilfs.sourceforge.io as this is the official site with the official tarballs
- Remove first and third patch (already in version)
- Drop fourth patch and host-pkgconf from dependencies, not needed since
https://github.com/nilfs-dev/nilfs-utils/commit/d5ce780856db5200917b69cd1049bd7b839ac6bb

---
 ...001-nilfs-utils-use-_POSIX_MAX_INPUT.patch |  32 ----
 ...001-nilfs_cleanerd-link-dynamically.patch} |   0
 ...mount.nilfs-drop-include-rpc-types.h.patch |  32 ----
 ..._CHECK_MODULES-for-libmount-and-libb.patch | 141 ------------------
 package/nilfs-utils/Config.in                 |   2 +-
 package/nilfs-utils/nilfs-utils.hash          |   2 +-
 package/nilfs-utils/nilfs-utils.mk            |   9 +-
 7 files changed, 7 insertions(+), 211 deletions(-)
 delete mode 100644 package/nilfs-utils/0001-nilfs-utils-use-_POSIX_MAX_INPUT.patch
 rename package/nilfs-utils/{0002-nilfs_cleanerd-link-dynamically.patch => 0001-nilfs_cleanerd-link-dynamically.patch} (100%)
 delete mode 100644 package/nilfs-utils/0003-mount.nilfs-drop-include-rpc-types.h.patch
 delete mode 100644 package/nilfs-utils/0004-autoconf-use-PKG_CHECK_MODULES-for-libmount-and-libb.patch
package/nilfs-utils/0001-nilfs-utils-use-_POSIX_MAX_INPUT.patch deleted +0 -32
deleted file mode 100644
index f14079a5c5..0000000000
@@ -1,32 +0,0 @@
-From c6e5a79b130ac33093c36f972be49454f506be7e Mon Sep 17 00:00:00 2001
-From: Kurt Van Dijck <[email protected]>
-Date: Thu, 28 Dec 2017 20:06:38 +0100
-Subject: [PATCH] nilfs-utils: use _POSIX_MAX_INPUT
-
-musl does provide _POSIX_MAX_INPUT, but no MAX_INPUT out of the box.
-This commit assigns _POSIX_MAX_INPUT to MAX_INPUT.
-
-Signed-off-by: Kurt Van Dijck <[email protected]>
----
- bin/rmcp.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/bin/rmcp.c b/bin/rmcp.c
-index 0140f56..6773912 100644
---- a/bin/rmcp.c
-+++ b/bin/rmcp.c
-@@ -47,6 +47,11 @@
- #include <limits.h>
- #endif	/* HAVE_LIMITS_H */
- 
-+/* define MAX_INPUT for musl */
-+#ifndef MAX_INPUT
-+#define MAX_INPUT _POSIX_MAX_INPUT
-+#endif
-+
- #include <errno.h>
- #include "nilfs.h"
- #include "parser.h"
--- 
-1.8.5.rc3
-
package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch renamed from package/nilfs-utils/0002-nilfs_cleanerd-link-dynamically.patch +0 -0
similarity index 100%
rename from package/nilfs-utils/0002-nilfs_cleanerd-link-dynamically.patch
rename to package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch
package/nilfs-utils/0003-mount.nilfs-drop-include-rpc-types.h.patch deleted +0 -32
deleted file mode 100644
index 9d54c40fcc..0000000000
@@ -1,32 +0,0 @@
-From a924a05ea6fd8c5284983a09d1ea8993124b6b77 Mon Sep 17 00:00:00 2001
-From: Kurt Van Dijck <[email protected]>
-Date: Thu, 28 Dec 2017 20:26:09 +0100
-Subject: [PATCH] mount.nilfs: drop include rpc/types.h
-
-rpc/types.h does not exist on low-footprint musl toolchains,
-and is only required for the boolean types, which musl provides
-elsewhere.
-This commit drops the include completely.
-
-Signed-off-by: Kurt Van Dijck <[email protected]>
----
- sbin/mount/sundries.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/sbin/mount/sundries.h b/sbin/mount/sundries.h
-index b3064a7..94d8ce4 100644
---- a/sbin/mount/sundries.h
-+++ b/sbin/mount/sundries.h
-@@ -15,9 +15,6 @@
- #include <signal.h>
- #include <stdarg.h>
- #include <stdlib.h>
--#if !defined(bool_t) && !defined(__GLIBC__)
--#include <rpc/types.h>
--#endif
- 
- extern int mount_quiet;
- 
--- 
-1.8.5.rc3
-
package/nilfs-utils/0004-autoconf-use-PKG_CHECK_MODULES-for-libmount-and-libb.patch deleted +0 -141

141 lines not on this page · raw message

package/nilfs-utils/Config.in +1 -1
index 7b239b1af5..30d7dba75d 100644
@@ -9,7 +9,7 @@ config BR2_PACKAGE_NILFS_UTILS
 	help
 	  Tools for creating and managing NILFS2 filesystems.
 
-	  https://github.com/nilfs-dev/nilfs-utils
+	  https://nilfs.sourceforge.io
 
 comment "nilfs-utils needs a toolchain w/ threads"
 	depends on BR2_USE_MMU
package/nilfs-utils/nilfs-utils.hash +1 -1
index 3383bfc9d8..ad6a57d8f5 100644
@@ -1,3 +1,3 @@
 # Locally calculated after checking pgp signature
-sha512	8a73b807bbdb2dc56b100ab8fbffe8129c9db31a6cbceecf267bdeb726fc13dd6844ce8ef96690bd7786709cb884881a3cd6d3cf24290248c5abc457976e9487  nilfs-utils-2.2.7.tar.gz
+sha512	3232390581f63de5ebe7b461b178a40dfbdaa4bc6aa96b218ea8182c5bf81b162a1e632a1c21d9f1e89fdba9393b4e268e001c335a99ce22f645a62ae3154783  nilfs-utils-2.2.8.tar.bz2
 sha512	4fc92d3998910acb108f81b1aee70a55a572b661a2766d0e57a55e48e2b737eea41415356cbd62593f26aec5797ab9fbb40211d7782b5834b4855ff1ce6ad5f7  COPYING
package/nilfs-utils/nilfs-utils.mk +5 -4
index d740589ee5..7335d87209 100644
@@ -4,15 +4,16 @@
 #
 ################################################################################
 
-NILFS_UTILS_VERSION = 2.2.7
-NILFS_UTILS_SITE = $(call github,nilfs-dev,nilfs-utils,v$(NILFS_UTILS_VERSION))
+NILFS_UTILS_VERSION = 2.2.8
+NILFS_UTILS_SOURCE = nilfs-utils-$(NILFS_UTILS_VERSION).tar.bz2
+NILFS_UTILS_SITE = https://nilfs.sourceforge.io/download
 NILFS_UTILS_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
 NILFS_UTILS_LICENSE_FILES = COPYING
 
 # need libuuid, libblkid, libmount
-NILFS_UTILS_DEPENDENCIES = host-pkgconf util-linux
+NILFS_UTILS_DEPENDENCIES = util-linux
 
-# we're fetching from github
+# We're patching sbin/cleanerd/Makefile.am
 NILFS_UTILS_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 package/nilfs-utils: bump to version 2.2.8

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

- Change NILFS_UTILS_SITE to https://nilfs.sourceforge.io as this is the official site with the official tarballs
- Remove first and third patch (already in version)
- Drop fourth patch and host-pkgconf from dependencies, not needed since
https://github.com/nilfs-dev/nilfs-utils/commit/d5ce780856db5200917b69cd1049bd7b839ac6bb

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard