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

Sébastien Luttringer seblu at archlinux.org
Mon Jul 27 00:34:36 UTC 2015


    Date: Monday, July 27, 2015 @ 02:34:35
  Author: seblu
Revision: 137466

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

Added:
  drbd-utils/repos/community-i686/PKGBUILD
    (from rev 137465, drbd-utils/trunk/PKGBUILD)
  drbd-utils/repos/community-x86_64/PKGBUILD
    (from rev 137465, drbd-utils/trunk/PKGBUILD)
Deleted:
  drbd-utils/repos/community-i686/PKGBUILD
  drbd-utils/repos/community-i686/drbd.service
  drbd-utils/repos/community-x86_64/PKGBUILD
  drbd-utils/repos/community-x86_64/drbd.service

-------------------------------+
 /PKGBUILD                     |  130 ++++++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD       |   67 --------------------
 community-i686/drbd.service   |   19 -----
 community-x86_64/PKGBUILD     |   67 --------------------
 community-x86_64/drbd.service |   19 -----
 5 files changed, 130 insertions(+), 172 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-07-27 00:33:49 UTC (rev 137465)
+++ community-i686/PKGBUILD	2015-07-27 00:34:35 UTC (rev 137466)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=drbd
-pkgver=8.4.3
-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=('0c54a69603fa28b41de5fb33e03fd9e8'
-         '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:

Copied: drbd-utils/repos/community-i686/PKGBUILD (from rev 137465, drbd-utils/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-07-27 00:34:35 UTC (rev 137466)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=drbd-utils
+pkgver=8.9.3
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='Userland tools for Distributed Replicated Block Device'
+url='http://www.drbd.org'
+license=('GPL2')
+depends=('perl' 'bash')
+makedepends=('libxslt' 'systemd')
+conflicts=('drbd')
+replaces=('drbd')
+source=("http://oss.linbit.com/drbd/$pkgname-$pkgver.tar.gz")
+backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
+md5sums=('81ba3ac48786602b4eddd637654ba24c')
+
+#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 \
+    --libdir=/usr/lib \
+    --with-distro=generic \
+    --with-bashcompletion \
+    --with-udev \
+    --without-rgmanager \
+    --without-pacemaker \
+    --without-heartbeat \
+    --with-initscripttype=systemd \
+    --without-xen
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  cd "$pkgdir"
+
+  # move /lib files under /usr/lib
+  mv lib/drbd/* usr/lib/drbd
+  rmdir lib/drbd 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
+
+  # autoload module
+  install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf
+  echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf
+
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-i686/drbd.service
===================================================================
--- community-i686/drbd.service	2015-07-27 00:33:49 UTC (rev 137465)
+++ community-i686/drbd.service	2015-07-27 00:34:35 UTC (rev 137466)
@@ -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/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/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-07-27 00:33:49 UTC (rev 137465)
+++ community-x86_64/PKGBUILD	2015-07-27 00:34:35 UTC (rev 137466)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=drbd
-pkgver=8.4.3
-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=('0c54a69603fa28b41de5fb33e03fd9e8'
-         '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:

Copied: drbd-utils/repos/community-x86_64/PKGBUILD (from rev 137465, drbd-utils/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-07-27 00:34:35 UTC (rev 137466)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=drbd-utils
+pkgver=8.9.3
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='Userland tools for Distributed Replicated Block Device'
+url='http://www.drbd.org'
+license=('GPL2')
+depends=('perl' 'bash')
+makedepends=('libxslt' 'systemd')
+conflicts=('drbd')
+replaces=('drbd')
+source=("http://oss.linbit.com/drbd/$pkgname-$pkgver.tar.gz")
+backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
+md5sums=('81ba3ac48786602b4eddd637654ba24c')
+
+#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 \
+    --libdir=/usr/lib \
+    --with-distro=generic \
+    --with-bashcompletion \
+    --with-udev \
+    --without-rgmanager \
+    --without-pacemaker \
+    --without-heartbeat \
+    --with-initscripttype=systemd \
+    --without-xen
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  cd "$pkgdir"
+
+  # move /lib files under /usr/lib
+  mv lib/drbd/* usr/lib/drbd
+  rmdir lib/drbd 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
+
+  # autoload module
+  install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf
+  echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf
+
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/drbd.service
===================================================================
--- community-x86_64/drbd.service	2015-07-27 00:33:49 UTC (rev 137465)
+++ community-x86_64/drbd.service	2015-07-27 00:34:35 UTC (rev 137466)
@@ -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/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