Date: Monday, February 4, 2013 @ 15:42:03 Author: seblu Revision: 83703
archrelease: copy trunk to community-i686, community-x86_64 Added: drbd/repos/community-i686/01-remove-old-sanity-check.diff (from rev 83702, drbd/trunk/01-remove-old-sanity-check.diff) drbd/repos/community-i686/PKGBUILD (from rev 83702, drbd/trunk/PKGBUILD) drbd/repos/community-i686/drbd.service (from rev 83702, drbd/trunk/drbd.service) drbd/repos/community-x86_64/01-remove-old-sanity-check.diff (from rev 83702, drbd/trunk/01-remove-old-sanity-check.diff) drbd/repos/community-x86_64/PKGBUILD (from rev 83702, drbd/trunk/PKGBUILD) drbd/repos/community-x86_64/drbd.service (from rev 83702, 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.rc 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.rc drbd/repos/community-x86_64/drbd.service --------------------------------------------------+ community-i686/01-remove-old-sanity-check.diff | 48 +++---- community-i686/PKGBUILD | 129 ++++++++++----------- community-i686/drbd.rc | 58 --------- community-i686/drbd.service | 38 +++--- community-x86_64/01-remove-old-sanity-check.diff | 48 +++---- community-x86_64/PKGBUILD | 129 ++++++++++----------- community-x86_64/drbd.rc | 58 --------- community-x86_64/drbd.service | 38 +++--- 8 files changed, 210 insertions(+), 336 deletions(-) Deleted: community-i686/01-remove-old-sanity-check.diff =================================================================== --- community-i686/01-remove-old-sanity-check.diff 2013-02-04 14:41:52 UTC (rev 83702) +++ community-i686/01-remove-old-sanity-check.diff 2013-02-04 14:42:03 UTC (rev 83703) @@ -1,24 +0,0 @@ -From: Lars Ellenberg <lars.ellenb...@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 83702, 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-02-04 14:42:03 UTC (rev 83703) @@ -0,0 +1,24 @@ +From: Lars Ellenberg <lars.ellenb...@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-02-04 14:41:52 UTC (rev 83702) +++ community-i686/PKGBUILD 2013-02-04 14:42:03 UTC (rev 83703) @@ -1,67 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer <se...@aur.archlinux.org> - -pkgname=drbd -pkgver=8.3.13 -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.3/$pkgname-$pkgver.tar.gz" - "$pkgname.rc" - "$pkgname.service") -backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') -md5sums=('760a25459ef6b7262a2a3572c1561c5b' - '8902a2f7aca6245c27e9566a1509312c' - 'afbb345094db49b0a474c0b4e51c0acd') - -build() { - cd $pkgname-$pkgver - ./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 \ - --with-initdir=/etc/rc.d - #--with-legacy_utils \ - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - # move forced /sbin binaries - cd "$pkgdir" - mv sbin/* usr/sbin - rmdir sbin - # fix hardcoded path in udev rules - sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' etc/udev/rules.d/65-drbd.rules - # 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 - # autoload module - install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf - echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf - # setup initscript (replace) - cd "$srcdir" - install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" - # install systemd stuff - install -Dm 644 $pkgname.service \ - "$pkgdir/usr/lib/systemd/system/$pkgname.service" -} - -# vim:set ts=2 sw=2 ft=sh et: Copied: drbd/repos/community-i686/PKGBUILD (from rev 83702, drbd/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-02-04 14:42:03 UTC (rev 83703) @@ -0,0 +1,62 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <se...@archlinux.org> + +pkgname=drbd +pkgver=8.3.13 +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.3/$pkgname-$pkgver.tar.gz" + "$pkgname.service") +backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') +md5sums=('760a25459ef6b7262a2a3572c1561c5b' + 'afbb345094db49b0a474c0b4e51c0acd') + +build() { + cd $pkgname-$pkgver + ./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 \ + --with-initdir=/etc/rc.d + #--with-legacy_utils \ + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # move forced /sbin binaries + cd "$pkgdir" + mv sbin/* usr/sbin + rmdir sbin + # fix hardcoded path in udev rules + sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' etc/udev/rules.d/65-drbd.rules + # 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 + # 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.rc =================================================================== --- community-i686/drbd.rc 2013-02-04 14:41:52 UTC (rev 83702) +++ community-i686/drbd.rc 2013-02-04 14:42:03 UTC (rev 83703) @@ -1,58 +0,0 @@ -#!/bin/bash -# Written by Sébastien Luttringer - -. /etc/rc.conf -. /etc/rc.d/functions - -DRBDADM='/usr/sbin/drbdadm' -PROC_DRBD='/proc/drbd' - -check_config() { - # check if module is loaded - if [[ ! -e $PROC_DRBD ]]; then - echo "Missing $PROC_DRBD. Try to load drbd module!" - stat_fail - exit 1 - fi - # check if config is correct - if ! $DRBDADM dump &>/dev/null; then - echo 'Invalid configuration' - stat_fail - exit 1 - fi -} - -case "$1" in - start) - stat_busy 'Starting DRBD resources' - # check module and config - check_config - # load config - $DRBDADM adjust all 2>/dev/null || { stat_fail; exit 1; } - # user interruptible version of wait-connect all - $DRBDADM wait-con-int 2>/dev/null || { stat_fail; exit 1; } - # become primary if configured - $DRBDADM sh-b-pri all 2>/dev/nul l|| { stat_fail; exit 1; } - add_daemon drbd - stat_done - ;; - stop) - stat_busy 'Stopping DRBD resources' - # check module and config - check_config - # disconnect and detach all resources - $DRBDADM down all 2>/dev/null || { stat_fail; exit 1; } - rm_daemon drbd - stat_done - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - -exit 0 - -# vim:set ts=2 sw=2 ft=sh et: Deleted: community-i686/drbd.service =================================================================== --- community-i686/drbd.service 2013-02-04 14:41:52 UTC (rev 83702) +++ community-i686/drbd.service 2013-02-04 14:42:03 UTC (rev 83703) @@ -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 83702, drbd/trunk/drbd.service) =================================================================== --- community-i686/drbd.service (rev 0) +++ community-i686/drbd.service 2013-02-04 14:42:03 UTC (rev 83703) @@ -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/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 Deleted: community-x86_64/01-remove-old-sanity-check.diff =================================================================== --- community-x86_64/01-remove-old-sanity-check.diff 2013-02-04 14:41:52 UTC (rev 83702) +++ community-x86_64/01-remove-old-sanity-check.diff 2013-02-04 14:42:03 UTC (rev 83703) @@ -1,24 +0,0 @@ -From: Lars Ellenberg <lars.ellenb...@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 83702, 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-02-04 14:42:03 UTC (rev 83703) @@ -0,0 +1,24 @@ +From: Lars Ellenberg <lars.ellenb...@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-02-04 14:41:52 UTC (rev 83702) +++ community-x86_64/PKGBUILD 2013-02-04 14:42:03 UTC (rev 83703) @@ -1,67 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer <se...@aur.archlinux.org> - -pkgname=drbd -pkgver=8.3.13 -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.3/$pkgname-$pkgver.tar.gz" - "$pkgname.rc" - "$pkgname.service") -backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') -md5sums=('760a25459ef6b7262a2a3572c1561c5b' - '8902a2f7aca6245c27e9566a1509312c' - 'afbb345094db49b0a474c0b4e51c0acd') - -build() { - cd $pkgname-$pkgver - ./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 \ - --with-initdir=/etc/rc.d - #--with-legacy_utils \ - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - # move forced /sbin binaries - cd "$pkgdir" - mv sbin/* usr/sbin - rmdir sbin - # fix hardcoded path in udev rules - sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' etc/udev/rules.d/65-drbd.rules - # 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 - # autoload module - install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf - echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf - # setup initscript (replace) - cd "$srcdir" - install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" - # install systemd stuff - install -Dm 644 $pkgname.service \ - "$pkgdir/usr/lib/systemd/system/$pkgname.service" -} - -# vim:set ts=2 sw=2 ft=sh et: Copied: drbd/repos/community-x86_64/PKGBUILD (from rev 83702, drbd/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-02-04 14:42:03 UTC (rev 83703) @@ -0,0 +1,62 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <se...@archlinux.org> + +pkgname=drbd +pkgver=8.3.13 +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.3/$pkgname-$pkgver.tar.gz" + "$pkgname.service") +backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') +md5sums=('760a25459ef6b7262a2a3572c1561c5b' + 'afbb345094db49b0a474c0b4e51c0acd') + +build() { + cd $pkgname-$pkgver + ./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 \ + --with-initdir=/etc/rc.d + #--with-legacy_utils \ + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # move forced /sbin binaries + cd "$pkgdir" + mv sbin/* usr/sbin + rmdir sbin + # fix hardcoded path in udev rules + sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' etc/udev/rules.d/65-drbd.rules + # 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 + # 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.rc =================================================================== --- community-x86_64/drbd.rc 2013-02-04 14:41:52 UTC (rev 83702) +++ community-x86_64/drbd.rc 2013-02-04 14:42:03 UTC (rev 83703) @@ -1,58 +0,0 @@ -#!/bin/bash -# Written by Sébastien Luttringer - -. /etc/rc.conf -. /etc/rc.d/functions - -DRBDADM='/usr/sbin/drbdadm' -PROC_DRBD='/proc/drbd' - -check_config() { - # check if module is loaded - if [[ ! -e $PROC_DRBD ]]; then - echo "Missing $PROC_DRBD. Try to load drbd module!" - stat_fail - exit 1 - fi - # check if config is correct - if ! $DRBDADM dump &>/dev/null; then - echo 'Invalid configuration' - stat_fail - exit 1 - fi -} - -case "$1" in - start) - stat_busy 'Starting DRBD resources' - # check module and config - check_config - # load config - $DRBDADM adjust all 2>/dev/null || { stat_fail; exit 1; } - # user interruptible version of wait-connect all - $DRBDADM wait-con-int 2>/dev/null || { stat_fail; exit 1; } - # become primary if configured - $DRBDADM sh-b-pri all 2>/dev/nul l|| { stat_fail; exit 1; } - add_daemon drbd - stat_done - ;; - stop) - stat_busy 'Stopping DRBD resources' - # check module and config - check_config - # disconnect and detach all resources - $DRBDADM down all 2>/dev/null || { stat_fail; exit 1; } - rm_daemon drbd - stat_done - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - -exit 0 - -# vim:set ts=2 sw=2 ft=sh et: Deleted: community-x86_64/drbd.service =================================================================== --- community-x86_64/drbd.service 2013-02-04 14:41:52 UTC (rev 83702) +++ community-x86_64/drbd.service 2013-02-04 14:42:03 UTC (rev 83703) @@ -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 83702, drbd/trunk/drbd.service) =================================================================== --- community-x86_64/drbd.service (rev 0) +++ community-x86_64/drbd.service 2013-02-04 14:42:03 UTC (rev 83703) @@ -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/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