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 branch 'master' of ssh://git.onelab.eu/git/build
[build.git]
/
trellis.mk
diff --git
a/trellis.mk
b/trellis.mk
index
e98432f
..
90f3601
100644
(file)
--- a/
trellis.mk
+++ b/
trellis.mk
@@
-1,3
+1,5
@@
+# $Id$
+# $URL$
#
# declare the packages to be built and their dependencies
# initial version from Mark Huang
#
# declare the packages to be built and their dependencies
# initial version from Mark Huang
@@
-5,8
+7,6
@@
# Copyright (C) 2003-2006 The Trustees of Princeton University
# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
#
# Copyright (C) 2003-2006 The Trustees of Princeton University
# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
#
-# $Id: planetlab.mk 14860 2009-08-27 16:18:44Z acb $
-#
# see doc in Makefile
#
# see doc in Makefile
#
@@
-56,9
+56,7
@@
IN_BOOTSTRAPFS += madwifi
#
util-vserver-MODULES := util-vserver
util-vserver-SPEC := util-vserver.spec
#
util-vserver-MODULES := util-vserver
util-vserver-SPEC := util-vserver.spec
-# Dependencies for util-vserver-0.30.216
-util-vserver-DEPEND-DEVEL-RPMS := ctags
-util-vserver-RPMFLAGS:= --without dietlibc
+#util-vserver-RPMFLAGS:= --without dietlibc
ALL += util-vserver
IN_BOOTSTRAPFS += util-vserver
ALL += util-vserver
IN_BOOTSTRAPFS += util-vserver
@@
-246,6
+244,13
@@
www-register-wizard-SPEC := www-register-wizard.spec
ALL += www-register-wizard
IN_MYPLC += www-register-wizard
ALL += www-register-wizard
IN_MYPLC += www-register-wizard
+#
+# pcucontrol
+#
+pcucontrol-MODULES := pcucontrol
+pcucontrol-SPEC := pcucontrol.spec
+ALL += pcucontrol
+
#
# monitor
#
#
# monitor
#