Add support for make install

diff --git a/debian/archipelago-kernel-dkms.install b/debian/archipelago-kernel-dkms.install
deleted file mode 100644 (file)
index f614006..0000000
--- a/debian/archipelago-kernel-dkms.install
+++ /dev/null
@@ -1,130 +0,0 @@
-debian/archipelago-kernel-dkms-files/Makefile usr/src/archipelago-kernel-dkms-0.1.1
-
-xseg/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg
-xseg/archipelago usr/src/archipelago-kernel-dkms-0.1.1/xseg
-xseg/base.mk usr/src/archipelago-kernel-dkms-0.1.1/xseg
-xseg/config.env usr/src/archipelago-kernel-dkms-0.1.1/xseg
-xseg/doc/components.rst usr/src/archipelago-kernel-dkms-0.1.1/xseg/doc
-xseg/doc/flow.txt usr/src/archipelago-kernel-dkms-0.1.1/xseg/doc
-xseg/drivers/kernel/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/drivers/kernel
-xseg/drivers/kernel/xseg_posix.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/drivers/kernel
-xseg/drivers/kernel/xseg_pthread.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/drivers/kernel
-xseg/drivers/kernel/xseg_segdev.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/drivers/kernel
-xseg/drivers/user/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/drivers/user
-xseg/drivers/user/xseg_posix.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/drivers/user
-xseg/drivers/user/xseg_pthread.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/drivers/user
-xseg/drivers/user/xseg_segdev.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/drivers/user
-xseg/drivers/xseg_posix.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/drivers
-xseg/drivers/xseg_pthread.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/drivers
-xseg/drivers/xseg_segdev.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/drivers
-xseg/envsetup usr/src/archipelago-kernel-dkms-0.1.1/xseg
-xseg/launch usr/src/archipelago-kernel-dkms-0.1.1/xseg
-
-xseg/lib/kernel/README usr/src/archipelago-kernel-dkms-0.1.1/xseg/lib/kernel
-xseg/lib/user/README usr/src/archipelago-kernel-dkms-0.1.1/xseg/lib/user
-xseg/peers/kernel/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/kernel
-xseg/peers/kernel/xsegbd.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/kernel
-xseg/peers/kernel/xsegbd.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/kernel
-
-xseg/peers/user/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/common.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/common.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/dummy.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/filed.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/mapperd.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/mapperd.py usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/monitor.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/mpeer.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/mpeer.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/mt-mapperd.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/mt-pfiled.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/mt-sosd.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/mt-vlmcd.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/peer.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/peer.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/pfiled.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/sosd.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/speer.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/speer.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/vlmc-tool.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/vlmcd.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-xseg/peers/user/xseg-tool.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/peers/user
-
-xseg/sys/domain.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys
-xseg/sys/kernel/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/kernel
-xseg/sys/kernel/_sysutil.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/kernel
-xseg/sys/kernel/segdev.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/kernel
-xseg/sys/kernel/segdev.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/kernel
-xseg/sys/kernel/segtest.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/kernel
-xseg/sys/kernel/segtool.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/kernel
-xseg/sys/kernel/xsegmod.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/kernel
-
-xseg/sys/user/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/user
-xseg/sys/user/_sysutil.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/user
-xseg/sys/user/make_symbol_map.sh usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/user
-
-xseg/sys/user/python/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/user/python
-xseg/sys/user/python/respond.py usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/user/python
-xseg/sys/user/python/send.py usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/user/python
-
-xseg/sys/user/python/xseg/__init__.py usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/user/python/xseg
-xseg/sys/user/xhash/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/user/xhash
-xseg/sys/user/xheap/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/user/xheap
-xseg/sys/user/xobj/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/user/xobj
-xseg/sys/user/xpool/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/user/xpool
-
-xseg/sys/user/xq/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/user/xq
-xseg/sys/user/xseg_user.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys/user
-xseg/sys/util.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/sys
-xseg/tools/create_initializer usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools
-xseg/tools/ext_scripts/attach usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools/ext_scripts
-xseg/tools/ext_scripts/create usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools/ext_scripts
-xseg/tools/ext_scripts/detach usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools/ext_scripts
-xseg/tools/ext_scripts/grow usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools/ext_scripts
-xseg/tools/ext_scripts/parameters.list usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools/ext_scripts
-xseg/tools/ext_scripts/remove usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools/ext_scripts
-xseg/tools/ext_scripts/verify usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools/ext_scripts
-xseg/tools/ext_scripts/vlmc_wrapper.py usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools/ext_scripts
-xseg/tools/qa/stress_test.sh usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools/qa
-xseg/tools/vlmc usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools
-xseg/tools/vlmc-blockd.py usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools
-xseg/tools/vlmc-filed.py usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools
-xseg/tools/vlmc_shared.py usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools
-xseg/tools/xseg-domain-targets usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools
-xseg/tools/xseg_devshell.sh usr/src/archipelago-kernel-dkms-0.1.1/xseg/tools
-xseg/util_libs/kernel/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/util_libs/kernel
-xseg/util_libs/user/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/util_libs/user
-xseg/util_libs/user/sos/Makefile usr/src/archipelago-kernel-dkms-0.1.1/xseg/util_libs/user/sos
-xseg/util_libs/user/sos/sos.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/util_libs/user/sos
-xseg/util_libs/user/sos/sos.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/util_libs/user/sos
-xseg/xseg/domain.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xseg
-xseg/xseg/protocol.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xseg
-xseg/xseg/xseg.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/xseg
-xseg/xseg/xseg.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xseg
-xseg/xseg/xseg_exports.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xseg
-
-xseg/xtypes/domain.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xatomic.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xhash.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xhash.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xhash_exports.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xhash_test.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xheap.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xheap.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xheap_test.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xlist.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xlist.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xlock.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xobj.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xobj.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xobj_exports.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xobj_test.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xpool.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xpool.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xpool_exports.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xpool_test.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xq.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xq.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xq_exports.h usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xq_lock_test.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes
-xseg/xtypes/xq_test.c usr/src/archipelago-kernel-dkms-0.1.1/xseg/xtypes

diff --git a/debian/archipelago-kernel-dkms.install.in b/debian/archipelago-kernel-dkms.install.in
new file mode 100644 (file)
index 0000000..ca6cab9
--- /dev/null
+++ b/debian/archipelago-kernel-dkms.install.in
@@ -0,0 +1,3 @@
+debian/archipelago-kernel-dkms-files/Makefile usr/src/archipelago-kernel-dkms-VERSION
+
+usr/src/archipelago-kernel-dkms-*

diff --git a/debian/archipelago.install b/debian/archipelago.install
index 0cc4e69..1f80ac7 100644 (file)
--- a/debian/archipelago.install
+++ b/debian/archipelago.install
@@ -1,9 +1,3 @@
-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/mt-pfiled usr/bin
-xseg/peers/user/xseg usr/bin
-xseg/peers/user/vlmc-xseg usr/bin
+usr/bin/*
 xseg/tools/vlmc usr/bin
 xseg/tools/archipelago usr/bin

diff --git a/debian/rules b/debian/rules
index 1f4884e..3ea4cf4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,11 @@
 # -*- makefile -*-
 
 .PHONY: override_dh_dkms override_dh_strip
+VERSION := $(shell head -n 1 debian/changelog | sed -r 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/g')
+
 
 %:
-       dh $@ --with dkms
+       dh $@ --with dkms --with python2
 
 override_dh_dkms:
        dh_dkms -V
@@ -13,5 +15,11 @@ override_dh_strip:
        dh_strip -plibxseg0 --dbg-package=libxseg0-dbg
        dh_strip -parchipelago --dbg-package=archipelago-dbg
 
-
+override_dh_auto_install:
+       sed -e 's/VERSION/$(VERSION)/g' < debian/archipelago-kernel-dkms.install.in \
+               > debian/archipelago-kernel-dkms.install
+       cp xseg/base.mk /tmp/base.mk
+       sed -e 's/VERSION/$(VERSION)/g' < /tmp/base.mk > xseg/base.mk
+       rm /tmp/base.mk
+       dh_auto_install