[arch-commits] Commit in nilfs-utils/repos (6 files)

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


    Date: Thursday, September 18, 2014 @ 23:19:49
  Author: dan
Revision: 222055

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  nilfs-utils/repos/testing-i686/PKGBUILD
    (from rev 222054, nilfs-utils/trunk/PKGBUILD)
  nilfs-utils/repos/testing-x86_64/PKGBUILD
    (from rev 222054, nilfs-utils/trunk/PKGBUILD)
Deleted:
  nilfs-utils/repos/testing-i686/0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch
  nilfs-utils/repos/testing-i686/PKGBUILD
  nilfs-utils/repos/testing-x86_64/0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch
  nilfs-utils/repos/testing-x86_64/PKGBUILD

-----------------------------------------------------------------------------+
 /PKGBUILD                                                                   |   54 ++++++++++
 testing-i686/0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch   |   35 ------
 testing-i686/PKGBUILD                                                       |   30 -----
 testing-x86_64/0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch |   35 ------
 testing-x86_64/PKGBUILD                                                     |   30 -----
 5 files changed, 54 insertions(+), 130 deletions(-)

Deleted: testing-i686/0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch
===================================================================
--- testing-i686/0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch	2014-09-18 21:19:35 UTC (rev 222054)
+++ testing-i686/0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch	2014-09-18 21:19:49 UTC (rev 222055)
@@ -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
-

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2014-09-18 21:19:35 UTC (rev 222054)
+++ testing-i686/PKGBUILD	2014-09-18 21:19:49 UTC (rev 222055)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
-
-pkgname=nilfs-utils
-pkgver=2.2.1
-pkgrel=2
-pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
-arch=('i686' 'x86_64')
-url="http://nilfs.sourceforge.net/"
-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')
-
-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
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" sbindir=/usr/bin install LDCONFIG=/bin/true
-}

Copied: nilfs-utils/repos/testing-i686/PKGBUILD (from rev 222054, nilfs-utils/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2014-09-18 21:19:49 UTC (rev 222055)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+
+pkgname=nilfs-utils
+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/"
+license=('GPL2' 'LGPL2.1')
+backup=('etc/nilfs_cleanerd.conf')
+depends=('util-linux')
+source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
+md5sums=('17033394c30515c41c8ae08f83d1cbbe')
+
+build() {
+  cd $pkgname-$pkgver
+  sed -i -e 's#root_sbindir=/sbin#root_sbindir=/usr/bin#' configure
+  ./configure --sbindir=/usr/bin --with-libmount
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" sbindir=/usr/bin install LDCONFIG=/bin/true
+}

Deleted: testing-x86_64/0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch
===================================================================
--- testing-x86_64/0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch	2014-09-18 21:19:35 UTC (rev 222054)
+++ testing-x86_64/0001-libmount-don-t-base-GC-startup-on-no-mtab-context.patch	2014-09-18 21:19:49 UTC (rev 222055)
@@ -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
-

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2014-09-18 21:19:35 UTC (rev 222054)
+++ testing-x86_64/PKGBUILD	2014-09-18 21:19:49 UTC (rev 222055)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
-
-pkgname=nilfs-utils
-pkgver=2.2.1
-pkgrel=2
-pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
-arch=('i686' 'x86_64')
-url="http://nilfs.sourceforge.net/"
-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')
-
-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
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" sbindir=/usr/bin install LDCONFIG=/bin/true
-}

Copied: nilfs-utils/repos/testing-x86_64/PKGBUILD (from rev 222054, nilfs-utils/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2014-09-18 21:19:49 UTC (rev 222055)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+
+pkgname=nilfs-utils
+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/"
+license=('GPL2' 'LGPL2.1')
+backup=('etc/nilfs_cleanerd.conf')
+depends=('util-linux')
+source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
+md5sums=('17033394c30515c41c8ae08f83d1cbbe')
+
+build() {
+  cd $pkgname-$pkgver
+  sed -i -e 's#root_sbindir=/sbin#root_sbindir=/usr/bin#' configure
+  ./configure --sbindir=/usr/bin --with-libmount
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" sbindir=/usr/bin install LDCONFIG=/bin/true
+}




More information about the arch-commits mailing list