git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetic
[build.git]
/
onelab.mk
diff --git
a/onelab.mk
b/onelab.mk
index
47ccd76
..
7a925bc
100644
(file)
--- a/
onelab.mk
+++ b/
onelab.mk
@@
-32,7
+32,7
@@
kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
ALL += $(KERNELS)
# this is to mark on which image a given rpm is supposed to go
IN_BOOTCD += $(KERNELS)
ALL += $(KERNELS)
# this is to mark on which image a given rpm is supposed to go
IN_BOOTCD += $(KERNELS)
-IN_SLICEIMAGE += $(KERNELS)
+
#
IN_SLICEIMAGE += $(KERNELS)
IN_NODEIMAGE += $(KERNELS)
#
IN_NODEIMAGE += $(KERNELS)
#
@@
-176,6
+176,14
@@
ipod-SPEC := ipod.spec
ALL += ipod
IN_NODEIMAGE += ipod
ALL += ipod
IN_NODEIMAGE += ipod
+#
+# plnode-utils
+#
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-vs.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
+
#
# nodemanager
#
#
# nodemanager
#
@@
-234,7
+242,7
@@
ALL += pf2slice
#
# PlanetLab Mom: Cleans up your mess
#
#
# PlanetLab Mom: Cleans up your mess
#
-mom-MODULES :=
M
om
+mom-MODULES :=
m
om
mom-SPEC := pl_mom.spec
ALL += mom
IN_NODEIMAGE += mom
mom-SPEC := pl_mom.spec
ALL += mom
IN_NODEIMAGE += mom
@@
-297,10
+305,15
@@
ALL += vsyssh
# vsys-scripts
#
vsys-scripts-MODULES := vsys-scripts
# vsys-scripts
#
vsys-scripts-MODULES := vsys-scripts
-vsys-scripts-SPEC := vsys-scripts.spec
+vsys-scripts-SPEC :=
root-context/
vsys-scripts.spec
IN_NODEIMAGE += vsys-scripts
ALL += vsys-scripts
IN_NODEIMAGE += vsys-scripts
ALL += vsys-scripts
+vsys-wrapper-MODULES := vsys-scripts
+vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
+IN_SLICEIMAGE += vsys-wrapper
+ALL += vsys-wrapper
+
# openvswitch requires an autoconf more recent than what f12 has
ifeq "$(DISTRONAME)" "f12"
autoconf-MODULES := autoconf
# openvswitch requires an autoconf more recent than what f12 has
ifeq "$(DISTRONAME)" "f12"
autoconf-MODULES := autoconf