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
Merge commit 'local_master/master'
[build.git]
/
onelab.mk
diff --git
a/onelab.mk
b/onelab.mk
index
bc93785
..
6db4b04
100644
(file)
--- a/
onelab.mk
+++ b/
onelab.mk
@@
-175,7
+175,7
@@
IN_BOOTSTRAPFS += util-vserver-pl
#
# NodeUpdate
#
#
# NodeUpdate
#
-nodeupdate-MODULES :=
NodeU
pdate
+nodeupdate-MODULES :=
nodeu
pdate
nodeupdate-SPEC := NodeUpdate.spec
ALL += nodeupdate
IN_BOOTSTRAPFS += nodeupdate
nodeupdate-SPEC := NodeUpdate.spec
ALL += nodeupdate
IN_BOOTSTRAPFS += nodeupdate
@@
-191,7
+191,7
@@
IN_BOOTSTRAPFS += ipod
#
# NodeManager
#
#
# NodeManager
#
-nodemanager-MODULES :=
NodeM
anager
+nodemanager-MODULES :=
nodem
anager
nodemanager-SPEC := NodeManager.spec
ALL += nodemanager
IN_BOOTSTRAPFS += nodemanager
nodemanager-SPEC := NodeManager.spec
ALL += nodemanager
IN_BOOTSTRAPFS += nodemanager
@@
-383,6
+383,10
@@
sfa-SPEC := sfa.spec
ALL += sfa
endif
ALL += sfa
endif
+sface-MODULES := sface
+sface-SPEC := sface.spec
+ALL += sface
+
#
# nodeconfig
#
#
# nodeconfig
#
@@
-447,7
+451,7
@@
IN_MYPLC += bootcd
#
# vserver : reference image for slices
#
#
# vserver : reference image for slices
#
-vserver-MODULES := vserverreference build
+vserver-MODULES := vserver
-
reference build
vserver-SPEC := vserver-reference.spec
vserver-DEPEND-PACKAGES := $(IN_VSERVER)
vserver-DEPEND-FILES := RPMS/yumgroups.xml
vserver-SPEC := vserver-reference.spec
vserver-DEPEND-PACKAGES := $(IN_VSERVER)
vserver-DEPEND-FILES := RPMS/yumgroups.xml