X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=wexlxc.mk;h=c6e4be6b785901e56aca87b5acfa347955316261;hb=8a04721e49e449e291cb70d67a314ca2e64173ac;hp=f32a1075f87613387fac347b4b9781fa9fe51500;hpb=8dd3efd6b89901f04f0349e56f64ea39b5d9f45a;p=wextoolbox.git diff --git a/wexlxc.mk b/wexlxc.mk index f32a107..c6e4be6 100644 --- a/wexlxc.mk +++ b/wexlxc.mk @@ -1,4 +1,41 @@ # +### status as of may 23 2012 +# this essentially targets f16 of course +# however in f16 gnuradio comes as 3.4 while f14 had 3.2: +# [2012.05.23--wtx-f14-64] ~ # rpm -q gnuradio +# gnuradio-3.2.2-9.fc14.x86_64 +# [2012.05.23--wexlxc-f16-64] ~ # rpm -q gnuradio +# gnuradio-3.4.2-7.fc16.x86_64 +### +# This causes bbn build crash +# our bbn comes from http://mirror.onelab.eu/third-party/bbn_80211-3.2.2.tar.gz +# and when built against gnuradio in f16, we're getting +# g++ -DHAVE_CONFIG_H -I. -I../.. -pthread -I/usr/include/gnuradio -I/usr/include/python2.7 -g -O2 -Wall -Woverloaded-virtual -pthread -MT bbn.lo -M\ +# D -MP -MF .deps/bbn.Tpo -c bbn.cc -fPIC -DPIC -o .libs/bbn.o +# In file included from bbn.cc:4108:0: +# bbn_tap.h:38:24: fatal error: omnithread.h: No such file or directory +# +# I could not at first sight easily locate a new bbn that would be numbered 3.4 +# all they have seems to be a svn repo... +# +# we'll start with using plain lxc for orange and we'll see if that's a real issue +# might as well be just fine +# +### moving forward I face another issue with spectools +# +# gcc -I./ -g -O2 -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -c spectool_raw.c -o spectool_raw.o +# gcc spectool_container.o wispy_hw_gen1.o wispy_hw_24x.o wispy_hw_dbx.o spectool_net_client.o spectool_raw.o -o spectool_raw -lpthread -lm -lusb +# wispy_hw_dbx.o: In function `wispydbx_usb_open': +# /longbuildroot/BUILD/spectools-2009_06_R1/wispy_hw_dbx.c:635: undefined reference to `usb_debug' +# collect2: ld returned 1 exit status +# make[1]: *** [spectool_raw] Error 1 +# make[1]: Leaving directory `/build/BUILD/spectools-2009_06_R1' +# error: Bad exit status from /longbuildroot/tmp/rpm-tmp.zqqEgL (%build) +# +# putting this aside as well for now +# +### +# # declare the packages to be built and their dependencies # initial version from Mark Huang # Mark Huang @@ -17,8 +54,8 @@ bbn-BUILD-FROM-SRPM := yes # now from the stock repo bbn-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel swig #bbn-DEPEND-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel -ALL += bbn -IN_NODEIMAGE += bbn +#ALL += bbn +#IN_NODEIMAGE += bbn # # crunchxml @@ -26,7 +63,7 @@ IN_NODEIMAGE += bbn crunchxml-MODULES := crunchxml crunchxml-SPEC := crunchxml.spec crunchxml-BUILD-FROM-SRPM := yes -crunchxml-DEVEL-RPMS := glib2-devel libxml-devel libxml2-devel scons +crunchxml-DEVEL-RPMS := glib2-devel libxml-devel libxml2-devel scons gsl-devel ALL += crunchxml IN_NODEIMAGE += crunchxml @@ -36,9 +73,9 @@ IN_NODEIMAGE += crunchxml spectools-MODULES := spectools spectools-SPEC := spectools.spec spectools-BUILD-FROM-SRPM := yes -spectools-DEVEL-RPMS := gtk2-devel -ALL += spectools -IN_NODEIMAGE += spectools +spectools-DEVEL-RPMS := gtk2-devel libusb-devel +#ALL += spectools +#IN_NODEIMAGE += spectools # # sge @@ -54,36 +91,51 @@ sge-DEVEL-RPMS += lesstif lesstif-devel # ALL += sge # IN_NODEIMAGE += sge +######################################## # -# kernel +# lxctools: scripts for entering containers # -# use a package name with srpm in it: -# so the source rpm is created by running make srpm in the codebase +lxctools-MODULES := lxctools +lxctools-SPEC := lxctools.spec +ALL += lxctools +IN_NODEIMAGE += lxctools + +# +# lxcsu: root context module for entering namespaces # +lxcsu-MODULES := lxcsu +lxcsu-SPEC := lxcsu.spec +ALL += lxcsu +IN_NODEIMAGE += lxcsu -# rebuild kernel-3.1 on fedora14 due to instabilities of the stock kernel -ifeq "$(DISTRONAME)" "f14" -kernel-MODULES := linux-3 -kernel-SPEC := kernel-3.1.spec -kernel-DEVEL-RPMS += gettext elfutils-devel -kernel-BUILD-FROM-SRPM := yes -ifeq "$(HOSTARCH)" "i386" -kernel-RPMFLAGS:= --target i686 --with firmware -else -kernel-RPMFLAGS:= --target $(HOSTARCH) --with firmware -endif -kernel-SPECVARS += kernelconfig=planetlab -KERNELS += kernel +# +# +# transforward: root context module for transparent port forwarding +# +transforward-MODULES := transforward +transforward-SPEC := transforward.spec +ALL += transforward +IN_NODEIMAGE += transforward -kernels: $(KERNELS) -kernels-clean: $(foreach package,$(KERNELS),$(package)-clean) +# +# procprotect: root context module for protecting against weaknesses in /proc +# +procprotect-MODULES := procprotect +procprotect-SPEC := procprotect.spec +ALL += procprotect +IN_NODEIMAGE += procprotect -ALL += $(KERNELS) -# this is to mark on which image a given rpm is supposed to go -IN_BOOTCD += $(KERNELS) -IN_SLICEIMAGE += $(KERNELS) -IN_NODEIMAGE += $(KERNELS) -endif +# +# ipfw: root context module, and slice companion +# +ipfwroot-MODULES := ipfw +ipfwroot-SPEC := planetlab/ipfwroot.spec +ALL += ipfwroot +IN_NODEIMAGE += ipfwroot + +ipfwslice-MODULES := ipfw +ipfwslice-SPEC := planetlab/ipfwslice.spec +ALL += ipfwslice # # NodeUpdate @@ -102,12 +154,25 @@ ALL += ipod IN_NODEIMAGE += ipod # -# NodeManager +# plnode-utils +# +plnode-utils-MODULES := plnode-utils +plnode-utils-SPEC := plnode-utils-lxc.spec +ALL += plnode-utils +IN_NODEIMAGE += plnode-utils + +# +# nodemanager # -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 @@ -133,6 +198,13 @@ fprobe-ulog-SPEC := fprobe-ulog.spec ALL += fprobe-ulog IN_NODEIMAGE += fprobe-ulog +#################### libvirt on f16 is too old, sounds like f17 has something fine +local_libvirt=false +ifeq "$(DISTRONAME)" "f16" +local_libvirt=true +endif + +ifeq "$(local_libvirt)" "true" # # libvirt # @@ -142,7 +214,7 @@ libvirt-BUILD-FROM-SRPM := yes libvirt-DEVEL-RPMS += libxml2-devel gnutls-devel device-mapper-devel yajl-devel gettext libvirt-DEVEL-RPMS += python-devel libcap-ng-devel libpciaccess-devel radvd numactl-devel libvirt-DEVEL-RPMS += xhtml1-dtds libxslt libtasn1-devel systemtap-sdt-devel iptables-ipv6 augeas -libvirt-DEVEL-RPMS += libudev-devel +libvirt-DEVEL-RPMS += libudev-devel libpcap-devel libnl-devel ebtables scrub libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \ --without storage-fs --without storage-lvm \ --without polkit --without sasl --without audit --with capng --with udev \ @@ -153,6 +225,7 @@ libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without sto ALL += libvirt IN_NODEREPO += libvirt IN_NODEIMAGE += libvirt +endif # # DistributedRateLimiting @@ -235,10 +308,18 @@ ALL += vsyssh # 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 +# +# bind_public +# +bind_public-MODULES := bind_public +bind_public-SPEC := bind_public.spec +IN_SLICEIMAGE += bind_public +ALL += bind_public + # # plcapi # @@ -272,40 +353,6 @@ www-register-wizard-SPEC := www-register-wizard.spec ALL += www-register-wizard IN_MYPLC += www-register-wizard -# -# pcucontrol -# -pcucontrol-MODULES := pcucontrol -pcucontrol-SPEC := pcucontrol.spec -ALL += pcucontrol - -# -# monitor -# -#monitor-MODULES := monitor -#monitor-SPEC := Monitor.spec -#monitor-DEVEL-RPMS += net-snmp net-snmp-devel -#ALL += monitor -#IN_NODEIMAGE += monitor - -# -# PLC RT -# -plcrt-MODULES := PLCRT -plcrt-SPEC := plcrt.spec -ALL += plcrt - -# f12 has 0.9-1 already -ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)" -# -# pyopenssl -# -pyopenssl-MODULES := pyopenssl -pyopenssl-SPEC := pyOpenSSL.spec -pyopenssl-BUILD-FROM-SRPM := yes -ALL += pyopenssl -endif - # # pyaspects # @@ -314,26 +361,6 @@ pyaspects-SPEC := pyaspects.spec pyaspects-BUILD-FROM-SRPM := yes ALL += pyaspects -# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__ -# In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model -build_sfa=true -ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)" -build_sfa=false -endif - -ifeq "$(build_sfa)" "true" -# -# sfa - Slice Facility Architecture -# -sfa-MODULES := sfa -sfa-SPEC := sfa.spec -ALL += sfa - -sface-MODULES := sface -sface-SPEC := sface.spec -ALL += sface -endif - # # nodeconfig #