git://git.onelab.eu
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bc2ea65
)
nodemanager split packaging
author
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Tue, 26 Jun 2012 07:39:13 +0000
(09:39 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Tue, 26 Jun 2012 07:39:13 +0000
(09:39 +0200)
config.lxc/nodeimage.pkgs
patch
|
blob
|
history
config.planetlab/nodeimage.pkgs
patch
|
blob
|
history
lxc.mk
patch
|
blob
|
history
onelab.mk
patch
|
blob
|
history
planetlab.mk
patch
|
blob
|
history
diff --git
a/config.lxc/nodeimage.pkgs
b/config.lxc/nodeimage.pkgs
index
74aa863
..
585c8b4
100644
(file)
--- a/
config.lxc/nodeimage.pkgs
+++ b/
config.lxc/nodeimage.pkgs
@@
-119,7
+119,7
@@
package: wireless-tools
#package: util-vserver-legacy
#package: util-vserver-pl
#package: util-python
#package: util-vserver-legacy
#package: util-vserver-pl
#package: util-python
-package:
NodeManager
+package:
nodemanager-lxc
package: NodeUpdate
package: codemux
package: pl_sshd
package: NodeUpdate
package: codemux
package: pl_sshd
diff --git
a/config.planetlab/nodeimage.pkgs
b/config.planetlab/nodeimage.pkgs
index
91582a2
..
bc33eab
100644
(file)
--- a/
config.planetlab/nodeimage.pkgs
+++ b/
config.planetlab/nodeimage.pkgs
@@
-110,9
+110,6
@@
package: util-vserver-sysv
package: util-vserver-legacy
package: util-vserver-pl
#package: util-python
package: util-vserver-legacy
package: util-vserver-pl
#package: util-python
-# temporary, so we can build planetlab and onelab
-package: NodeManager
-# temporary
package: nodemanager-vs
package: NodeUpdate
package: codemux
package: nodemanager-vs
package: NodeUpdate
package: codemux
diff --git
a/lxc.mk
b/lxc.mk
index
4540a2e
..
f54ae75
100644
(file)
--- a/
lxc.mk
+++ b/
lxc.mk
@@
-56,12
+56,17
@@
ALL += ipod
IN_NODEIMAGE += ipod
#
IN_NODEIMAGE += ipod
#
-#
NodeM
anager
+#
nodem
anager
#
#
-nodemanager-MODULES := nodemanager
-nodemanager-SPEC := NodeManager.spec
-ALL += nodemanager
-IN_NODEIMAGE += nodemanager
+nodemanager-lib-MODULES := nodemanager
+nodemanager-lib-SPEC := nodemanager-lib.spec
+ALL += nodemanager-lib
+IN_NODEIMAGE += nodemanager-lib
+
+nodemanager-lxc-MODULES := nodemanager
+nodemanager-lxc-SPEC := nodemanager-lxc.spec
+ALL += nodemanager-lxc
+IN_NODEIMAGE += nodemanager-lxc
#
# pl_sshd
#
# pl_sshd
diff --git
a/onelab.mk
b/onelab.mk
index
9a79651
..
627be2c
100644
(file)
--- a/
onelab.mk
+++ b/
onelab.mk
@@
-180,7
+180,7
@@
ALL += ipod
IN_NODEIMAGE += ipod
#
IN_NODEIMAGE += ipod
#
-#
NodeM
anager
+#
nodem
anager
#
nodemanager-lib-MODULES := nodemanager
nodemanager-lib-SPEC := nodemanager-lib.spec
#
nodemanager-lib-MODULES := nodemanager
nodemanager-lib-SPEC := nodemanager-lib.spec
diff --git
a/planetlab.mk
b/planetlab.mk
index
3034593
..
4cdd41d
100644
(file)
--- a/
planetlab.mk
+++ b/
planetlab.mk
@@
-150,7
+150,7
@@
ALL += ipod
IN_NODEIMAGE += ipod
#
IN_NODEIMAGE += ipod
#
-#
NodeM
anager
+#
nodem
anager
#
nodemanager-lib-MODULES := nodemanager
nodemanager-lib-SPEC := nodemanager-lib.spec
#
nodemanager-lib-MODULES := nodemanager
nodemanager-lib-SPEC := nodemanager-lib.spec