From 5059f3c09b8d62d119a63106ef8dbc2703fc9fc9 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 25 Jan 2011 14:57:19 +0100 Subject: [PATCH] removed devel.pkgs, use -DEVEL-RPMS instead --- devel.pkgs | 127 -------------------------------------------------- wextoolbox.mk | 7 +++ 2 files changed, 7 insertions(+), 127 deletions(-) delete mode 100644 devel.pkgs diff --git a/devel.pkgs b/devel.pkgs deleted file mode 100644 index 454d26c..0000000 --- a/devel.pkgs +++ /dev/null @@ -1,127 +0,0 @@ -# -groupname: PlanetLabDevel -groupdesc: Building PlanetLab -# general utilities -package: sendmail sendmail-cf mailx -package: make install git -package: glibc glibc-common -package: bzip2 gzip -package: cpio tar -package: coreutils -package: rpm rpm-build rpm-devel -package: redhat-rpm-config -package: curl curl-devel -package: subversion cvs -package: less -package: openssh -package: emacs -# undetermined -package: expect -package: gd -package: httpd mod_python mod_ssl -package: openssl -package: openssl-devel -package: zlib -package: zlib-devel -package: bison flex -package: libtool -package: metadata -package: mysql mysql-devel mysql-server -package: python python-devel -package: doxygen -package: vixie-cron -package: xmlsec1 xmlsec1-openssl -package: udev -package: expat-devel -package: db4-devel -package: ncurses-devel -package: readline-devel -package: dnsmasq -# for spec2make / rpmlib -package=f8: popt-devel -# kernel -package: gnupg -package: diffutils -package: vconfig -package: iptables -package: wget -package: beecrypt-devel -package: tetex-latex -package: gcc-c++ -# iptables -package: linuxdoc-tools -package: sudo -package: yum createrepo -# mysql -package: gperf -package: time -# bootmanager -package: sharutils -# bootcd -package: nasm -package: mkisofs -package: dosfstools -package: mtools -package: syslinux -# myplc -package: rsync -package: ghostscript -# PLCAPI -package: docbook-utils-pdf -package: postgresql postgresql-devel postgresql-python postgresql-server -# if we don't specify @arch@ for php-devel, we end up with the 2 variants (i386 and x86_64) -# in an undetermined order, and php-config --extension-dir might return the wrong place -package: php php-devel.@arch@ php-gd php-pgsql -package>=f12: php-devel -package: PyXML -# used to reference SOAPpy as well -# for pypcilib -package: pciutils-devel -########## -# for vsys - same as for php-devel above -package: ocaml.@arch@ ocaml-ocamldoc -# use local inotify-tools on centos -package>=f8:inotify-tools-devel -########## -# for util-vserver -package: ctags -package>=f12: e2fsprogs-devel -## for util-vserver-pl -# use local libnl on centos -package>=f8: libnl-devel -# zabbix/monitor -package: net-snmp net-snmp-devel -package=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@ -package: TurboGears -package: python-cherrypy -########## -# for sfa : rebuilding wsdl index at build-time -package: python-uuid pyOpenSSL m2crypto -package: libxml2-python libxslt-python -package: python-ZSI -package: python-psycopg2 - -########## for boost -package: bzip2-devel libicu-devel chrpath -########## for gnuradio -# we use our local boost, see gnuradio-DEPEND-DEVEL-RPMS in the makefile -# again, with f11 we could use the stock boost rpm -# package: boost-devel -package: python-numeric numpy wxPython PyQt4 swig fftw sdcc gsl guile cppunit -package: fftw-devel gsl-devel libusb-devel cppunit-devel - -########## for crunchxml -package: glib2-devel libxml-devel libxml2-devel scons - -########## for spectools -package: gtk2-devel - -########## for SGE -#package: kdevelop-devel kdevelop kdevelop-libs java-1.6.0-openjdk -#package: lesstif lesstif-devel - - -# for ejabberd -package: erlang -package: pam-devel -package: hevea diff --git a/wextoolbox.mk b/wextoolbox.mk index 8981d52..356d7bf 100644 --- a/wextoolbox.mk +++ b/wextoolbox.mk @@ -30,6 +30,7 @@ #f14# boost-MODULES := boost #f14# boost-SPEC := boost.spec #f14# boost-BUILD-FROM-SRPM := yes +#f14# boost-DEVEL-RPMS := bzip2-devel libicu-devel chrpath #f14# ALL += boost #f14# IN_BOOTSTRAPFS += boost #f14# @@ -39,6 +40,7 @@ #f14# gnuradio-MODULES := gnuradio #f14# gnuradio-SPEC := gnuradio.spec #f14# gnuradio-BUILD-FROM-SRPM := yes +#f14# gnuradio-DEVEL-RPMS := python-numeric numpy wxPython PyQt4 swig fftw sdcc gsl guile cppunit fftw-devel gsl-devel libusb-devel cppunit-devel #f14# # boost-devel needs boost ! #f14# gnuradio-DEPEND-DEVEL-RPMS := boost boost-devel #f14# ALL += gnuradio @@ -62,6 +64,7 @@ IN_BOOTSTRAPFS += bbn crunchxml-MODULES := crunchxml crunchxml-SPEC := crunchxml.spec crunchxml-BUILD-FROM-SRPM := yes +crunchxml-DEVEL-RPMS := glib2-devel libxml-devel libxml2-devel scons ALL += crunchxml IN_BOOTSTRAPFS += crunchxml @@ -71,6 +74,7 @@ IN_BOOTSTRAPFS += crunchxml spectools-MODULES := spectools spectools-SPEC := spectools.spec spectools-BUILD-FROM-SRPM := yes +spectools-DEVEL-RPMS := gtk2-devel ALL += spectools IN_BOOTSTRAPFS += spectools @@ -80,6 +84,9 @@ IN_BOOTSTRAPFS += spectools sge-MODULES := sge sge-SPEC := sge.spec sge-BUILD-FROM-SRPM := yes +sge-DEVEL-RPMS += kdevelop-devel kdevelop kdevelop-libs java-1.6.0-openjdk +sge-DEVEL-RPMS += lesstif lesstif-devel + # turning this off - current focus is on deploying the sge box separately from myplc # packaging is still broken, and we're exploring a ready-t-o-use distro on centos # ALL += sge -- 2.43.0