[arch-commits] Commit in (4 files)

[Sébastien Luttringer]

    Date: Saturday, May 16, 2015 @ 00:59:48
  Author: seblu
Revision: 133551

Preliminary work to drbd-utils

Added:
  drbd-utils/
Modified:
  drbd-utils/trunk/PKGBUILD
Deleted:
  drbd-utils/trunk/drbd.service
  drbd/

--------------+
 PKGBUILD     |   45 +++++++++++++++++++++------------------------
 drbd.service |   19 -------------------
 2 files changed, 21 insertions(+), 43 deletions(-)

Modified: drbd-utils/trunk/PKGBUILD
===================================================================
--- drbd/trunk/PKGBUILD	2015-05-14 15:02:10 UTC (rev 133437)
+++ drbd-utils/trunk/PKGBUILD	2015-05-15 22:59:48 UTC (rev 133551)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Sébastien Luttringer
 
-pkgname=drbd
-pkgver=8.4.3
+pkgname=drbd-utils
+pkgver=8.9.2
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Userland tools for Distributed Replicated Block Device'
@@ -9,16 +9,16 @@
 url='http://www.drbd.org'
 license=('GPL2')
 depends=('perl' 'bash')
-source=("http://oss.linbit.com/drbd/8.4/$pkgname-$pkgver.tar.gz"
-        "$pkgname.service")
+makedepends=('libxslt' 'systemd')
+replaces=('drbd')
+source=("http://oss.linbit.com/drbd/$pkgname-$pkgver.tar.gz")
 backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
-md5sums=('0c54a69603fa28b41de5fb33e03fd9e8'
-         '7dc909b5895c0b5289d3ee0581d7d333')
+md5sums=('bf720ad7ee3dff9946f7a9c94713b9ff')
 
-prepare() {
-  # fix hardcoded path in udev rules
-  sed -i 's,/sbin/drbdadm,/usr/bin/drbdadm,' $pkgname-$pkgver/scripts/drbd.rules
-}
+#prepare() {
+#  # fix hardcoded path in udev rules
+#  sed -i 's,/sbin/drbdadm,/usr/bin/drbdadm,' $pkgname-$pkgver/scripts/drbd.rules
+#}
 
 build() {
   cd $pkgname-$pkgver
@@ -27,16 +27,15 @@
     --localstatedir=/var \
     --sysconfdir=/etc \
     --sbindir=/usr/bin \
+    --libdir=/usr/lib \
     --with-distro=generic \
-    --with-utils \
     --with-bashcompletion \
     --with-udev \
-    --without-km \
     --without-rgmanager \
     --without-pacemaker \
     --without-heartbeat \
-    --without-xen \
-    --without-legacy_utils
+    --with-initscripttype=systemd \
+    --without-xen
   make
 }
 
@@ -43,25 +42,23 @@
 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 /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
-  # 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: drbd-utils/trunk/drbd.service
===================================================================
--- drbd/trunk/drbd.service	2015-05-14 15:02:10 UTC (rev 133437)
+++ drbd-utils/trunk/drbd.service	2015-05-15 22:59:48 UTC (rev 133551)
@@ -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