intial debian branch commit

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..1200300
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+.PHONY: default xseg clean distclean build
+
+default: xseg
+
+build: xseg
+
+xseg:
+       make -C xseg XSEG_DOMAIN_TARGET="user"
+
+clean:
+       make -C xseg clean
+       rm ./config.mk
+
+distclean:
+       make -C xseg distclean

diff --git a/debian/README b/debian/README
new file mode 100644 (file)
index 0000000..3d94a95
--- /dev/null
+++ b/debian/README
@@ -0,0 +1,5 @@
+The Debian Package archipelagos
+------------------------------
+
+Comments regarding the Package
+

diff --git a/debian/archipelagos.default b/debian/archipelagos.default
new file mode 100644 (file)
index 0000000..86cdc0a
--- /dev/null
+++ b/debian/archipelagos.default
@@ -0,0 +1,28 @@
+#XSEG_HOME="/home/philipgian/archip/xseg"
+#MODULES_DIR="${XSEG_HOME}/lib/kernel"
+
+SPEC="segdev:xsegbd:512:1024:12"
+REQS=512
+PORTS=512
+
+IMAGES="/srv/archip/blocks"
+MAPS="/srv/archip/maps"
+
+PITHOS="/srv/pithos/data/blocks"
+PITHOSMAPS="/srv/pithos/data/maps"
+
+DEVICE_PREFIX="/dev/xsegbd"
+XSEGBD_SYSFS="/sys/bus/xsegbd/"
+
+CHRDEV_NAME="/dev/segdev"
+CHRDEV_MAJOR=60
+
+BPORT=0
+MPORT=1
+MBPORT=2
+VTOOL=3
+VPORT_START=204
+VPORT_END=403
+
+NR_OPS=128
+

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..38ecd53
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+archipelagos (0.1.1-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Filippos Giannakos <philipgian@grnet.gr>  Thu, 25 Oct 2012 12:04:57 +0300

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..4f2e03b
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,12 @@
+Source: archipelagos
+Section: otherosfs
+Priority: extra
+Maintainer: Filippos Giannakos <philipgian@grnet.gr>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.9.1
+
+Package: archipelagos
+Architecture: amd64
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, libgcrypt11(>=1.4.5-2), libst1(>=1.9-3), librados2(>=0.48.2)
+Description:  Provides archipelagos infrastructure
+ Extended Description here

diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..400a8d7
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,31 @@
+This package was debianized by Filippos Giannakos <philipgian@grnet.gr> on
+
+Upstream Author(s):
+
+    Filippos Giannakos < philipgian@grnet.gr >
+
+Copyright:
+
+    Copyright (C) 2010 GRNET SA
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2012, Filippos Giannakos <philipgian@grnet.gr> and
+is licensed under the GPL, see above.

diff --git a/debian/dirs b/debian/dirs
new file mode 100644 (file)
index 0000000..527b78f
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/lib

diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644 (file)
index 0000000..3715fb4
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+sign-tags = False
+pristine-tar = False
+
+[git-buildpackage]
+export-dir = ../build-area/
+tarball-dir = ../tarballs/

diff --git a/debian/install b/debian/install
new file mode 100644 (file)
index 0000000..bbd3eec
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,28 @@
+#file directory without starting /
+#FILL ME 
+#
+xseg/lib/user/libxseg.so usr/lib
+xseg/lib/user/libxseg.so.0 usr/lib
+xseg/lib/user/libxseg.so.0.0.1 usr/lib
+#xseg/lib/user/xseg_posix.so usr/lib
+#xseg/lib/user/xseg_pthread.so usr/lib
+#xseg/lib/user/xseg_segdev.so usr/lib
+
+xseg/peers/user/st-vlmcd usr/bin
+xseg/peers/user/mt-mapperd usr/bin
+xseg/peers/user/pfiled usr/bin
+xseg/peers/user/mt-sosd usr/bin
+xseg/peers/user/xseg usr/bin
+xseg/peers/user/vlmc-xseg usr/bin
+xseg/tools/vlmc usr/bin
+
+#vlmc ganeti ext storage scripts 
+xseg/tools/ext_scripts/attach usr/share/ganeti/extstorage/vlmc
+xseg/tools/ext_scripts/create usr/share/ganeti/extstorage/vlmc
+xseg/tools/ext_scripts/detach usr/share/ganeti/extstorage/vlmc
+xseg/tools/ext_scripts/grow usr/share/ganeti/extstorage/vlmc
+xseg/tools/ext_scripts/parameters.list usr/share/ganeti/extstorage/vlmc
+xseg/tools/ext_scripts/remove usr/share/ganeti/extstorage/vlmc
+xseg/tools/ext_scripts/verify usr/share/ganeti/extstorage/vlmc
+xseg/tools/ext_scripts/vlmc_wrapper.py usr/share/ganeti/extstorage/vlmc
+

diff --git a/debian/links b/debian/links
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..3cb7212
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+%:
+       dh $@
+
+

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

diff --git a/xseg/Makefile b/xseg/Makefile
index ed200a9..07a643e 100644 (file)
--- a/xseg/Makefile
+++ b/xseg/Makefile
@@ -34,9 +34,9 @@ $(XSEG_CLEAN_TARGETS):
                make -C $$f/$(@:clean-%=%) TARGET=$@ clean || true; \
                echo " "; \
        done
-       rm -f ./config.mk
        @echo " "
 
 distclean: $(XSEG_CLEAN_TARGETS)
        rm -f lib/user/*.so* lib/user/*.a
        rm -f lib/kernel/*.ko
+       rm -f $(XSEG_HOME)/config.mk

diff --git a/xseg/base.mk b/xseg/base.mk
index 40d6bbd..2199261 100644 (file)
--- a/xseg/base.mk
+++ b/xseg/base.mk
@@ -29,7 +29,7 @@ export CFLAGS=-Wall $(COPTS) $(CSTD)
 #endif
 
 ifeq (,$(XSEG_HOME))
-export XSEG_HOME=.
+export XSEG_HOME=$(CURDIR)
 endif
 
 CONFIG=./config.mk

diff --git a/xseg/tools/vlmc b/xseg/tools/vlmc
index ee12c5e..4b451b0 100755 (executable)
--- a/xseg/tools/vlmc
+++ b/xseg/tools/vlmc
@@ -14,14 +14,13 @@ def vlmc_create(args):
         print >> sys.stderr, "At least one of the size/snap args must be provided"
         sys.exit(-1)
 
-    cmd = [XSEG_HOME + "/peers/user/vlmc-xseg", "%s" % SPEC, "create", "--name", "%s" % name]
+    cmd = ["vlmc-xseg", "%s" % SPEC, "create", "--name", "%s" % name]
     if snap != None:
             cmd.extend(["--snap", "%s" % snap])
     if size != None:
             cmd.extend(["--size", "%s" % size])
     cmd.extend(["-mp", "%s" % MPORT])
     cmd.extend(["-p", "%s" % VTOOL])
-    os.environ['LD_LIBRARY_PATH'] = XSEG_HOME + "/lib:" + XSEG_HOME + "/lib/user"
 
     try:
         check_call(cmd, shell=False, env=os.environ);
@@ -40,10 +39,9 @@ def vlmc_list(args):
 
 def vlmc_remove(args):
     name = args.name[0]
-    cmd = [XSEG_HOME + "/peers/user/vlmc-xseg", "%s" % SPEC, "remove", "--name", "%s" % name]
+    cmd = ["vlmc-xseg", "%s" % SPEC, "remove", "--name", "%s" % name]
     cmd.extend(["-mp", "%s" % MPORT])
     cmd.extend(["-p", "%s" % VTOOL])
-    os.environ['LD_LIBRARY_PATH'] = XSEG_HOME + "/lib:" + XSEG_HOME + "/lib/user"
 
     try:
         check_call(cmd, shell=False, env=os.environ);
@@ -162,7 +160,7 @@ def loadrc(rc):
     #FIXME
     try:
         if rc == None:
-            execfile(os.path.expanduser("~/.xsegrc"), globals())
+            execfile(os.path.expanduser("/etc/default/archipelagos"), globals())
         else:
             execfile(rc, globals())
     except: