[arch-commits] Commit in drbd/repos (12 files)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Sun May 12 23:31:07 UTC 2013
Date: Monday, May 13, 2013 @ 01:31:07
Author: seblu
Revision: 90502
archrelease: copy trunk to community-i686, community-x86_64
Added:
drbd/repos/community-i686/01-remove-old-sanity-check.diff
(from rev 90501, drbd/trunk/01-remove-old-sanity-check.diff)
drbd/repos/community-i686/PKGBUILD
(from rev 90501, drbd/trunk/PKGBUILD)
drbd/repos/community-i686/drbd.service
(from rev 90501, drbd/trunk/drbd.service)
drbd/repos/community-x86_64/01-remove-old-sanity-check.diff
(from rev 90501, drbd/trunk/01-remove-old-sanity-check.diff)
drbd/repos/community-x86_64/PKGBUILD
(from rev 90501, drbd/trunk/PKGBUILD)
drbd/repos/community-x86_64/drbd.service
(from rev 90501, drbd/trunk/drbd.service)
Deleted:
drbd/repos/community-i686/01-remove-old-sanity-check.diff
drbd/repos/community-i686/PKGBUILD
drbd/repos/community-i686/drbd.service
drbd/repos/community-x86_64/01-remove-old-sanity-check.diff
drbd/repos/community-x86_64/PKGBUILD
drbd/repos/community-x86_64/drbd.service
--------------------------------------------------+
/01-remove-old-sanity-check.diff | 48 +++++++
/PKGBUILD | 134 +++++++++++++++++++++
/drbd.service | 38 +++++
community-i686/01-remove-old-sanity-check.diff | 24 ---
community-i686/PKGBUILD | 63 ---------
community-i686/drbd.service | 19 --
community-x86_64/01-remove-old-sanity-check.diff | 24 ---
community-x86_64/PKGBUILD | 63 ---------
community-x86_64/drbd.service | 19 --
9 files changed, 220 insertions(+), 212 deletions(-)
Deleted: community-i686/01-remove-old-sanity-check.diff
===================================================================
--- community-i686/01-remove-old-sanity-check.diff 2013-05-12 23:28:16 UTC (rev 90501)
+++ community-i686/01-remove-old-sanity-check.diff 2013-05-12 23:31:07 UTC (rev 90502)
@@ -1,24 +0,0 @@
-From: Lars Ellenberg <lars.ellenberg at linbit.com>
-Date: Thu, 3 Nov 2011 09:40:43 +0000 (+0100)
-Subject: build: remove old sanity check to allow build against linux 3.1
-X-Git-Url: http://git.drbd.org/gitweb.cgi?p=drbd-8.3.git;a=commitdiff_plain;h=790c26b09519b9e02b3a7cf7897fb17c2ae339bf
-
-build: remove old sanity check to allow build against linux 3.1
----
-
-diff --git a/drbd/Makefile b/drbd/Makefile
-index 0985340..7a09603 100644
---- a/drbd/Makefile
-+++ b/drbd/Makefile
-@@ -90,11 +90,6 @@ else
- endif
- endif
-
-- KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3)
-- ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
-- $(error "won't compile with this kernel version")
-- endif
--
- .PHONY: drbd.o default all greeting clean kbuild install dep tags
-
- drbd.o: greeting kbuild
Copied: drbd/repos/community-i686/01-remove-old-sanity-check.diff (from rev 90501, drbd/trunk/01-remove-old-sanity-check.diff)
===================================================================
--- community-i686/01-remove-old-sanity-check.diff (rev 0)
+++ community-i686/01-remove-old-sanity-check.diff 2013-05-12 23:31:07 UTC (rev 90502)
@@ -0,0 +1,24 @@
+From: Lars Ellenberg <lars.ellenberg at linbit.com>
+Date: Thu, 3 Nov 2011 09:40:43 +0000 (+0100)
+Subject: build: remove old sanity check to allow build against linux 3.1
+X-Git-Url: http://git.drbd.org/gitweb.cgi?p=drbd-8.3.git;a=commitdiff_plain;h=790c26b09519b9e02b3a7cf7897fb17c2ae339bf
+
+build: remove old sanity check to allow build against linux 3.1
+---
+
+diff --git a/drbd/Makefile b/drbd/Makefile
+index 0985340..7a09603 100644
+--- a/drbd/Makefile
++++ b/drbd/Makefile
+@@ -90,11 +90,6 @@ else
+ endif
+ endif
+
+- KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3)
+- ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
+- $(error "won't compile with this kernel version")
+- endif
+-
+ .PHONY: drbd.o default all greeting clean kbuild install dep tags
+
+ drbd.o: greeting kbuild
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-05-12 23:28:16 UTC (rev 90501)
+++ community-i686/PKGBUILD 2013-05-12 23:31:07 UTC (rev 90502)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=drbd
-pkgver=8.4.2
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Userland tools for Distributed Replicated Block Device'
-url='http://www.drbd.org'
-license=('GPL2')
-depends=('perl' 'bash')
-source=("http://oss.linbit.com/drbd/8.4/$pkgname-$pkgver.tar.gz"
- "$pkgname.service")
-backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
-md5sums=('b081f1046adda1d51ba351c40a8b1107'
- 'afbb345094db49b0a474c0b4e51c0acd')
-
-build() {
- cd $pkgname-$pkgver
- # fix hardcoded path in udev rules
- sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' scripts/drbd.rules
- ./configure \
- --prefix=/usr \
- --localstatedir=/var \
- --sysconfdir=/etc \
- --with-distro=generic \
- --with-utils \
- --with-bashcompletion \
- --with-udev \
- --without-km \
- --without-rgmanager \
- --without-pacemaker \
- --without-heartbeat \
- --without-xen \
- --without-legacy_utils
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- # move forced /sbin binaries
- cd "$pkgdir"
- mv sbin/* usr/sbin
- rmdir sbin
- # move udev files
- mv etc/udev usr/lib
- # move bash completion
- install -dm 755 usr/share/bash-completion
- mv etc/bash_completion.d usr/share/bash-completion/completions
- # remove /var/lock
- rmdir var/lock
- # remove embeded init stuff
- rm -r etc/init.d
- # autoload module
- install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf
- echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf
- # systemd
- install -Dm 644 "$srcdir/$pkgname.service" \
- "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: drbd/repos/community-i686/PKGBUILD (from rev 90501, drbd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-05-12 23:31:07 UTC (rev 90502)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=drbd
+pkgver=8.4.2
+pkgrel=2
+arch=('i686' 'x86_64')
+pkgdesc='Userland tools for Distributed Replicated Block Device'
+url='http://www.drbd.org'
+license=('GPL2')
+depends=('perl' 'bash')
+source=("http://oss.linbit.com/drbd/8.4/$pkgname-$pkgver.tar.gz"
+ "$pkgname.service")
+backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
+md5sums=('b081f1046adda1d51ba351c40a8b1107'
+ '7dc909b5895c0b5289d3ee0581d7d333')
+
+prepare() {
+ # fix hardcoded path in udev rules
+ sed -i 's,/sbin/drbdadm,/usr/bin/drbdadm,' $pkgname-$pkgver/scripts/drbd.rules
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --localstatedir=/var \
+ --sysconfdir=/etc \
+ --sbindir=/usr/bin \
+ --with-distro=generic \
+ --with-utils \
+ --with-bashcompletion \
+ --with-udev \
+ --without-km \
+ --without-rgmanager \
+ --without-pacemaker \
+ --without-heartbeat \
+ --without-xen \
+ --without-legacy_utils
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ # move forced /sbin binaries
+ cd "$pkgdir"
+ mv sbin/* usr/bin
+ rmdir sbin
+ # move udev files
+ mv etc/udev usr/lib
+ # move bash completion
+ install -dm 755 usr/share/bash-completion
+ mv etc/bash_completion.d usr/share/bash-completion/completions
+ # remove /var/lock
+ rmdir var/lock
+ # remove embeded init stuff
+ rm -r etc/init.d
+ # autoload module
+ install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf
+ echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf
+ # systemd
+ install -Dm 644 "$srcdir/$pkgname.service" \
+ "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/drbd.service
===================================================================
--- community-i686/drbd.service 2013-05-12 23:28:16 UTC (rev 90501)
+++ community-i686/drbd.service 2013-05-12 23:31:07 UTC (rev 90502)
@@ -1,19 +0,0 @@
-[Unit]
-Description=Distributed Replicated Block Device
-After=systemd-modules-load.service network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-
-# load config
-ExecStart=/usr/sbin/drbdadm adjust all
-# user interruptible version of wait-connect all
-ExecStart=/usr/sbin/drbdadm wait-con-int
-# become primary if configured
-ExecStart=/usr/sbin/drbdadm sh-b-pri all
-# disconnect and detach all resources
-ExecStop=/usr/sbin/drbdadm down all
-
-[Install]
-WantedBy=multi-user.target
Copied: drbd/repos/community-i686/drbd.service (from rev 90501, drbd/trunk/drbd.service)
===================================================================
--- community-i686/drbd.service (rev 0)
+++ community-i686/drbd.service 2013-05-12 23:31:07 UTC (rev 90502)
@@ -0,0 +1,19 @@
+[Unit]
+Description=Distributed Replicated Block Device
+After=systemd-modules-load.service network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+
+# load config
+ExecStart=/usr/bin/drbdadm adjust all
+# user interruptible version of wait-connect all
+ExecStart=/usr/bin/drbdadm wait-con-int
+# become primary if configured
+ExecStart=/usr/bin/drbdadm sh-b-pri all
+# disconnect and detach all resources
+ExecStop=/usr/bin/drbdadm down all
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/01-remove-old-sanity-check.diff
===================================================================
--- community-x86_64/01-remove-old-sanity-check.diff 2013-05-12 23:28:16 UTC (rev 90501)
+++ community-x86_64/01-remove-old-sanity-check.diff 2013-05-12 23:31:07 UTC (rev 90502)
@@ -1,24 +0,0 @@
-From: Lars Ellenberg <lars.ellenberg at linbit.com>
-Date: Thu, 3 Nov 2011 09:40:43 +0000 (+0100)
-Subject: build: remove old sanity check to allow build against linux 3.1
-X-Git-Url: http://git.drbd.org/gitweb.cgi?p=drbd-8.3.git;a=commitdiff_plain;h=790c26b09519b9e02b3a7cf7897fb17c2ae339bf
-
-build: remove old sanity check to allow build against linux 3.1
----
-
-diff --git a/drbd/Makefile b/drbd/Makefile
-index 0985340..7a09603 100644
---- a/drbd/Makefile
-+++ b/drbd/Makefile
-@@ -90,11 +90,6 @@ else
- endif
- endif
-
-- KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3)
-- ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
-- $(error "won't compile with this kernel version")
-- endif
--
- .PHONY: drbd.o default all greeting clean kbuild install dep tags
-
- drbd.o: greeting kbuild
Copied: drbd/repos/community-x86_64/01-remove-old-sanity-check.diff (from rev 90501, drbd/trunk/01-remove-old-sanity-check.diff)
===================================================================
--- community-x86_64/01-remove-old-sanity-check.diff (rev 0)
+++ community-x86_64/01-remove-old-sanity-check.diff 2013-05-12 23:31:07 UTC (rev 90502)
@@ -0,0 +1,24 @@
+From: Lars Ellenberg <lars.ellenberg at linbit.com>
+Date: Thu, 3 Nov 2011 09:40:43 +0000 (+0100)
+Subject: build: remove old sanity check to allow build against linux 3.1
+X-Git-Url: http://git.drbd.org/gitweb.cgi?p=drbd-8.3.git;a=commitdiff_plain;h=790c26b09519b9e02b3a7cf7897fb17c2ae339bf
+
+build: remove old sanity check to allow build against linux 3.1
+---
+
+diff --git a/drbd/Makefile b/drbd/Makefile
+index 0985340..7a09603 100644
+--- a/drbd/Makefile
++++ b/drbd/Makefile
+@@ -90,11 +90,6 @@ else
+ endif
+ endif
+
+- KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3)
+- ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
+- $(error "won't compile with this kernel version")
+- endif
+-
+ .PHONY: drbd.o default all greeting clean kbuild install dep tags
+
+ drbd.o: greeting kbuild
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-05-12 23:28:16 UTC (rev 90501)
+++ community-x86_64/PKGBUILD 2013-05-12 23:31:07 UTC (rev 90502)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=drbd
-pkgver=8.4.2
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Userland tools for Distributed Replicated Block Device'
-url='http://www.drbd.org'
-license=('GPL2')
-depends=('perl' 'bash')
-source=("http://oss.linbit.com/drbd/8.4/$pkgname-$pkgver.tar.gz"
- "$pkgname.service")
-backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
-md5sums=('b081f1046adda1d51ba351c40a8b1107'
- 'afbb345094db49b0a474c0b4e51c0acd')
-
-build() {
- cd $pkgname-$pkgver
- # fix hardcoded path in udev rules
- sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' scripts/drbd.rules
- ./configure \
- --prefix=/usr \
- --localstatedir=/var \
- --sysconfdir=/etc \
- --with-distro=generic \
- --with-utils \
- --with-bashcompletion \
- --with-udev \
- --without-km \
- --without-rgmanager \
- --without-pacemaker \
- --without-heartbeat \
- --without-xen \
- --without-legacy_utils
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- # move forced /sbin binaries
- cd "$pkgdir"
- mv sbin/* usr/sbin
- rmdir sbin
- # move udev files
- mv etc/udev usr/lib
- # move bash completion
- install -dm 755 usr/share/bash-completion
- mv etc/bash_completion.d usr/share/bash-completion/completions
- # remove /var/lock
- rmdir var/lock
- # remove embeded init stuff
- rm -r etc/init.d
- # autoload module
- install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf
- echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf
- # systemd
- install -Dm 644 "$srcdir/$pkgname.service" \
- "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: drbd/repos/community-x86_64/PKGBUILD (from rev 90501, drbd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-05-12 23:31:07 UTC (rev 90502)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=drbd
+pkgver=8.4.2
+pkgrel=2
+arch=('i686' 'x86_64')
+pkgdesc='Userland tools for Distributed Replicated Block Device'
+url='http://www.drbd.org'
+license=('GPL2')
+depends=('perl' 'bash')
+source=("http://oss.linbit.com/drbd/8.4/$pkgname-$pkgver.tar.gz"
+ "$pkgname.service")
+backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
+md5sums=('b081f1046adda1d51ba351c40a8b1107'
+ '7dc909b5895c0b5289d3ee0581d7d333')
+
+prepare() {
+ # fix hardcoded path in udev rules
+ sed -i 's,/sbin/drbdadm,/usr/bin/drbdadm,' $pkgname-$pkgver/scripts/drbd.rules
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --localstatedir=/var \
+ --sysconfdir=/etc \
+ --sbindir=/usr/bin \
+ --with-distro=generic \
+ --with-utils \
+ --with-bashcompletion \
+ --with-udev \
+ --without-km \
+ --without-rgmanager \
+ --without-pacemaker \
+ --without-heartbeat \
+ --without-xen \
+ --without-legacy_utils
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ # move forced /sbin binaries
+ cd "$pkgdir"
+ mv sbin/* usr/bin
+ rmdir sbin
+ # move udev files
+ mv etc/udev usr/lib
+ # move bash completion
+ install -dm 755 usr/share/bash-completion
+ mv etc/bash_completion.d usr/share/bash-completion/completions
+ # remove /var/lock
+ rmdir var/lock
+ # remove embeded init stuff
+ rm -r etc/init.d
+ # autoload module
+ install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf
+ echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf
+ # systemd
+ install -Dm 644 "$srcdir/$pkgname.service" \
+ "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/drbd.service
===================================================================
--- community-x86_64/drbd.service 2013-05-12 23:28:16 UTC (rev 90501)
+++ community-x86_64/drbd.service 2013-05-12 23:31:07 UTC (rev 90502)
@@ -1,19 +0,0 @@
-[Unit]
-Description=Distributed Replicated Block Device
-After=systemd-modules-load.service network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-
-# load config
-ExecStart=/usr/sbin/drbdadm adjust all
-# user interruptible version of wait-connect all
-ExecStart=/usr/sbin/drbdadm wait-con-int
-# become primary if configured
-ExecStart=/usr/sbin/drbdadm sh-b-pri all
-# disconnect and detach all resources
-ExecStop=/usr/sbin/drbdadm down all
-
-[Install]
-WantedBy=multi-user.target
Copied: drbd/repos/community-x86_64/drbd.service (from rev 90501, drbd/trunk/drbd.service)
===================================================================
--- community-x86_64/drbd.service (rev 0)
+++ community-x86_64/drbd.service 2013-05-12 23:31:07 UTC (rev 90502)
@@ -0,0 +1,19 @@
+[Unit]
+Description=Distributed Replicated Block Device
+After=systemd-modules-load.service network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+
+# load config
+ExecStart=/usr/bin/drbdadm adjust all
+# user interruptible version of wait-connect all
+ExecStart=/usr/bin/drbdadm wait-con-int
+# become primary if configured
+ExecStart=/usr/bin/drbdadm sh-b-pri all
+# disconnect and detach all resources
+ExecStop=/usr/bin/drbdadm down all
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list