[arch-commits] Commit in nilfs-utils/trunk (2 files)

Dan McGee dan at archlinux.org
Thu Sep 18 21:19:35 UTC 2014


    Date: Thursday, September 18, 2014 @ 23:19:35
  Author: dan
Revision: 222054

upgpkg: nilfs-utils 2.2.2-1

Modified:
  nilfs-utils/trunk/PKGBUILD
Deleted:
  nilfs-utils/trunk/0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch

--------------------------------------------------------------+
 0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch |   35 ----------
 PKGBUILD                                                     |   11 +--
 2 files changed, 4 insertions(+), 42 deletions(-)

Deleted: 0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch
===================================================================
--- 0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch	2014-09-18 21:19:34 UTC (rev 222053)
+++ 0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch	2014-09-18 21:19:35 UTC (rev 222054)
@@ -1,35 +0,0 @@
-From 35afb7d8968dae29e315196ac3dfab7153e160c5 Mon Sep 17 00:00:00 2001
-From: Dan McGee <dan at archlinux.org>
-Date: Mon, 1 Sep 2014 14:39:27 -0500
-Subject: [PATCH] libmount: don't base GC startup on no-mtab context
-
-When mtab is a symlink to /proc/mounts, libmount uses /run/mount/utab to
-store filesystem-specific mount attributes, making this check
-unnecessary. Worse, it now breaks nilfs_cleanerd under systemd 216+
-since it always passes `-n` to the mount command.
-
-Signed-off-by: Dan McGee <dan at archlinux.org>
----
- sbin/mount/mount_libmount.c | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/sbin/mount/mount_libmount.c b/sbin/mount/mount_libmount.c
-index c518475..b901654 100644
---- a/sbin/mount/mount_libmount.c
-+++ b/sbin/mount/mount_libmount.c
-@@ -404,12 +404,6 @@ static int nilfs_update_mount_state(struct nilfs_mount_info *mi)
- 	rungc = gc_ok && !mi->new_attrs.nogc;
- 	old_attrs = (mi->mflags & MS_REMOUNT) ? &mi->old_attrs : NULL;
- 
--	if (mnt_context_is_nomtab(cxt)) {
--		if (rungc)
--			printf(_("%s not started\n"), NILFS_CLEANERD_NAME);
--		return 0;
--	}
--
- 	if (rungc) {
- 		if (mi->new_attrs.pp == ULONG_MAX)
- 			mi->new_attrs.pp = mi->old_attrs.pp;
--- 
-2.1.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-18 21:19:34 UTC (rev 222053)
+++ PKGBUILD	2014-09-18 21:19:35 UTC (rev 222054)
@@ -3,8 +3,8 @@
 # Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
 
 pkgname=nilfs-utils
-pkgver=2.2.1
-pkgrel=2
+pkgver=2.2.2
+pkgrel=1
 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
 arch=('i686' 'x86_64')
 url="http://nilfs.sourceforge.net/"
@@ -11,14 +11,11 @@
 license=('GPL2' 'LGPL2.1')
 backup=('etc/nilfs_cleanerd.conf')
 depends=('util-linux')
-source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2
-        0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch)
-md5sums=('a4e2ee5e64d57bd38e1ffcc5630bd4ec'
-         '48bed3723abefef0a6329610d60c4d44')
+source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
+md5sums=('17033394c30515c41c8ae08f83d1cbbe')
 
 build() {
   cd $pkgname-$pkgver
-  patch -Np1 < ../0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch
   sed -i -e 's#root_sbindir=/sbin#root_sbindir=/usr/bin#' configure
   ./configure --sbindir=/usr/bin --with-libmount
   make




More information about the arch-commits mailing list