From b10eb7f900382065ab0c89b022780feae62fb1d0 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Mon, 9 Apr 2007 10:51:22 +0000 Subject: [PATCH 1/5] Initialize branch FC-6 for vblade --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 0856b9648b2fe31a1e39810ef25f96da20813cb5 Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Mon, 9 Apr 2007 15:07:58 +0000 Subject: [PATCH 2/5] - Forced CFLAGS on build Wed Apr 04 2007 Patrick "Jima" Laughton 14-1 - Initial Fedora RPM BZ#235236 --- sources | 1 + vblade-makefile.patch | 21 ++++++++++ vblade.conf | 2 + vblade.init | 94 +++++++++++++++++++++++++++++++++++++++++++ vblade.spec | 81 +++++++++++++++++++++++++++++++++++++ 5 files changed, 199 insertions(+) create mode 100644 vblade-makefile.patch create mode 100644 vblade.conf create mode 100644 vblade.init create mode 100644 vblade.spec diff --git a/sources b/sources index e69de29..ebdd1f4 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +c5c7ed7b859d6d74575dd9facd82e2a1 vblade-14.tgz diff --git a/vblade-makefile.patch b/vblade-makefile.patch new file mode 100644 index 0000000..f12ac90 --- /dev/null +++ b/vblade-makefile.patch @@ -0,0 +1,21 @@ +--- vblade-14/makefile.orig 2006-09-21 08:29:27.000000000 -0500 ++++ vblade-14/makefile 2007-03-30 12:27:26.000000000 -0500 +@@ -3,7 +3,7 @@ + # see README for others + PLATFORM=linux + +-prefix = /usr ++prefix = ${DESTDIR}/usr + sbindir = ${prefix}/sbin + sharedir = ${prefix}/share + mandir = ${sharedir}/man +@@ -35,6 +35,6 @@ + rm -f $O vblade + + install : vblade vbladed +- install vblade ${sbindir}/ +- install vbladed ${sbindir}/ +- install vblade.8 ${mandir}/man8/ ++ install -D -m 755 vblade ${sbindir}/vblade ++ install -D -m 755 vbladed ${sbindir}/vbladed ++ install -D -m 644 vblade.8 ${mandir}/man8/vblade.8 diff --git a/vblade.conf b/vblade.conf new file mode 100644 index 0000000..e8b93ec --- /dev/null +++ b/vblade.conf @@ -0,0 +1,2 @@ +# network_device shelf slot file/disk/partition mac[,mac[,mac]] +#eth0 0 0 /dev/sdb 00:11:22:33:44:55 diff --git a/vblade.init b/vblade.init new file mode 100644 index 0000000..7974a8c --- /dev/null +++ b/vblade.init @@ -0,0 +1,94 @@ +#!/bin/sh +# +# Init script for vblade (ATA over Ethernet daemon) +# +# chkconfig: - 30 70 +# description: vblade AoE daemon +# +# processname: vblade +# config: /etc/vblade.conf +# +# Shamelessly hacked together from other init scripts (sshd, mostly) +# + +# source function library +. /etc/rc.d/init.d/functions + +RETVAL=0 +prog=vblade + +spawn_vblade() { + ALLOWMACS="" + [ -n "$5" ] && ALLOWMACS="-m $5" + ID="$1-e$2.$3" + PID_FILE=/var/run/$prog/${ID}.pid + $prog $ALLOWMACS $2 $3 $1 $4 >> /var/log/$prog.log 2>&1 & + pid=$! + RETVAL=$? + echo $pid > $PID_FILE + echo -n $"$4 (e$2.$3@$1) [pid $pid]" + [ "$RETVAL" = 0 ] && success || failure + echo +} + +start() { + echo $"Starting up $prog: " + if [ `grep -vc '^#\|^$' /etc/$prog.conf` ] + then + grep -v '^#' /etc/$prog.conf | sed -e 's/ / /g' -e 's/ / /g' | while read line + do + spawn_vblade $line + done + touch /var/lock/subsys/$prog + else + echo -n "empty $prog.conf?" + passed + echo + fi +} + +stop() { + echo -n $"Shutting down $prog: " + for pidfile in `ls /var/run/$prog/*.pid` + do + kill -9 `cat $pidfile` + rm -f $pidfile + done + success + echo + rm -f /var/lock/subsys/$prog +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + reload) + # yes, this sucks, but the vblade processes die on SIGHUP + stop + start + ;; + condrestart) + if [ -f /var/lock/subsys/$prog ]; then + stop + # avoid race + sleep 3 + start + fi + ;; + status) + status $prog + RETVAL=$? + ;; + *) + echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" + RETVAL=1 +esac +exit $RETVAL diff --git a/vblade.spec b/vblade.spec new file mode 100644 index 0000000..23fbd61 --- /dev/null +++ b/vblade.spec @@ -0,0 +1,81 @@ +Name: vblade +Version: 14 +Release: 2%{?dist} +Summary: Virtual EtherDrive (R) blade daemon + +Group: System Environment/Base +License: GPL +URL: http://sourceforge.net/projects/aoetools/ +Source0: http://dl.sf.net/aoetools/%{name}-%{version}.tgz +Source1: %{name}.init +Source2: %{name}.conf +Patch0: %{name}-makefile.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires(post): /sbin/chkconfig +Requires(post): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service + + +%description +The vblade is the virtual EtherDrive (R) blade, a program that makes a +seekable file available over an ethernet local area network (LAN) via +the ATA over Ethernet (AoE) protocol. + +The seekable file is typically a block device like /dev/md0 but even +regular files will work. When vblade exports the block storage over +AoE it becomes a storage target. Another host on the same LAN can +access the storage if it has a compatible aoe kernel driver. + + +%prep +%setup -q +%patch0 -p1 + + +%build +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name} +install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +if [ "$1" = "2" ]; then # if we're being upgraded + /sbin/service %{name} condrestart >/dev/null 2>&1 || : +else # if we're being installed + /sbin/chkconfig --add %{name} +fi + +%preun +if [ "$1" = "0" ]; then # execute this only if we are NOT doing an upgrade + /sbin/service %{name} stop >/dev/null 2>&1 || : + /sbin/chkconfig --del %{name} +fi + + +%files +%defattr(-,root,root,-) +%doc COPYING HACKING NEWS README +%config(noreplace) %{_sysconfdir}/%{name}.conf +%{_initrddir}/%{name} +%{_sbindir}/vblade +%{_sbindir}/vbladed +%{_mandir}/man8/vblade.8* + + +%changelog +* Sat Apr 07 2007 Patrick "Jima" Laughton 14-2 +- Forced CFLAGS on build + +* Wed Apr 04 2007 Patrick "Jima" Laughton 14-1 +- Initial Fedora RPM From c544bf6a9e52dca4279a73361722b17896e36a8b Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Wed, 22 Aug 2007 19:18:51 +0000 Subject: [PATCH 3/5] - Add missing /var/run/vblade/ - License clarification --- vblade.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/vblade.spec b/vblade.spec index 23fbd61..f02ef91 100644 --- a/vblade.spec +++ b/vblade.spec @@ -1,10 +1,10 @@ Name: vblade Version: 14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual EtherDrive (R) blade daemon Group: System Environment/Base -License: GPL +License: GPLv2 URL: http://sourceforge.net/projects/aoetools/ Source0: http://dl.sf.net/aoetools/%{name}-%{version}.tgz Source1: %{name}.init @@ -41,6 +41,7 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/var/run/%{name} install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name} install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf @@ -67,6 +68,7 @@ fi %defattr(-,root,root,-) %doc COPYING HACKING NEWS README %config(noreplace) %{_sysconfdir}/%{name}.conf +%dir /var/run/%{name} %{_initrddir}/%{name} %{_sbindir}/vblade %{_sbindir}/vbladed @@ -74,6 +76,10 @@ fi %changelog +* Wed Aug 22 2007 Patrick "Jima" Laughton 14-3 +- Add missing /var/run/vblade/ +- License clarification + * Sat Apr 07 2007 Patrick "Jima" Laughton 14-2 - Forced CFLAGS on build From cb049415f245caa786133ebc0ff736fcc666b844 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:16 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 852af0f..3c50255 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vblade -# $Id$ +# $Id: Makefile,v 1.1 2007/04/09 10:51:08 jwboyer Exp $ NAME := vblade SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a190564dc0f1a40b6fe4c8e659b7c98fd5b896c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:54:36 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 3c50255..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vblade -# $Id: Makefile,v 1.1 2007/04/09 10:51:08 jwboyer Exp $ -NAME := vblade -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6