diff --git a/README.md b/README.md index 90a9a9c..2d33488 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ meta-REDHAWK-SDR ================= -> **Note:** This is a distant fork of [Axios' layer](http://github.com/Axios-Engineering/openembedded-hawk) that was fairly far removed. Their copyright has been added to this copyright list along with a large portion of the original README, and some recipes. After a series of updates and changes it was different enough that it was pushed as a separate layer. +> **Note:** This is a distant fork of [Axios' layer](http://github.com/Axios-Engineering/openembedded-hawk) that was fairly far removed. Their copyright has been added to this copyright list along various recipes and pieces of their README. After a series of updates and changes it was different enough that it was pushed as a separate layer. What is Yocto/Open-Embedded? --------------------------- @@ -12,9 +12,9 @@ From the [Yocto][1] page itself: In short, [Yocto][1] allows you to build a custom, light weight embedded linux distribution built specifically for your hardware. -What is Openembedded-Hawk +What is Meta-REDHAWK-SDR -------------------------- -Openembedded-hawk is a set of [Yocto][1]/[Open-Embedded][2] recipes for the [REDHAWK][3] framework, its dependencies, and a handful of example components, devices, and shared libraries. +Meta-REDHAWK-SDR is a set of [Yocto][1]/[Open-Embedded][2] recipes for the [REDHAWK][3] framework, its dependencies, and a handful of example components, devices, and shared libraries. This repository, along with the base Yocto framework will enable you to build the REDHAWK framework for any hardware platform in which a Board Support Package is available. @@ -27,46 +27,21 @@ There are plenty of BSPs floating around for other hardware platforms so do some Getting Started ---------------- -1. Install the required software listed in the [Yocto Quick Start Packages Section][6] +The most straight-forward installation is to use Google's repo and our [manifest](http://github.com/GeonTech/meta-redhawk-sdr-manifests). It amounts to a handful of terminal commands to `repo init` a manifest, which downloads the layers for a given configuration. Then running a terminal command to use our bblayers and local configuration files as templates. And finally, running bitbake. Instructions are provided at the link above. -2. Checkout the Yocto Poky repositories dizzy branch: +Alternatively, you can clone this layer into your own Yocto source tree: - git clone -b dizzy git://git.yoctoproject.org/poky.git + cd + git clone git://github.com/geontech/meta-redhawk-sdr.git +Then edit your `build/conf/bblayers.conf` to include a reference to `meta-redhawk-sdr` at the end of the list. See our `meta-redhawk-sdr/conf/bblayers.conf.sample` as an example. -3. Clone the openembedded-hawk repository inside the poky folder as meta-redhawk. - - ``` - cd poky - git clone https:///openembedded/meta-redhawk-sdr.git meta-redhawk - ``` - -4. Source the build-env script - - ``` - source oe-init-build-env - ``` - -5. Pick a machine type within the conf/local.conf file. The default will build for an emulated x86 machine type. - -6. Add REDHAWK recipes to the build image. The easiest way to do this is by using the conf/local.conf file and adding the IMAGE_INSTALL_append variable at the end. Here is an example that adds the core framework, frontend, and a GPP. Note that all the dependencies will automatically be built including redhawk-core - - ``` - IMAGE_INSTALL_append = " redhawk-frontend redhawk-gpp" - ``` - -6. Add the meta-redhawk directory to the BBLAYERS variable in conf/bblayers.conf so yocto knows where to search for our custom recipes. - -7. Build an image: - - ``` - bitbake core-image-minimal - ``` - -Alternative Methods +Finishing the Build ------------------- -In the `contrib/scripts` folder is the `build-image.sh` script, a derivative of a script from Philip Balister of Ettus Research who included it with their `meta-sdr`. It uses `wic` to build a single image file that can be directly copied to an SD card (`dd`) resulting in the appropriate partitions, etc., buased on the associated `wks` file. Specify the `BUILD_IMAGE` and `MACHINE` environment variables and this script will go through the whole process for you, automated. +In the `contrib/scripts` folder is the `build-image.sh` script, a derivative of a script from Philip Balister (@balister) of Ettus Research who included it with their `meta-sdr`. The script uses `wic` to build a single image file that can be directly copied to an SD card (`dd`) resulting in the appropriate partitions, etc., based on the associated `wks` file. + +To use it, link this script into your `build` directory, set it to executable, and specify the `BUILD_IMAGE` and `MACHINE` environment variables (e.g., `qemuarm` and `redhawk-gpp-image`). Then running this script will go through the whole bitbake process for you, automated. Additional Resources -------------------- @@ -75,6 +50,8 @@ Additional Resources [Bitbake cheatsheet][8] +[OpenEmbedded-Hawk][9] + [1]: https://www.yoctoproject.org/ "Yocto Project Homepage" [2]: http://www.openembedded.org/wiki/Main_Page "Open-Embedded Project Homepage" [3]: http://redhawksdr.org "REDHAWK Homepage" @@ -83,3 +60,5 @@ Additional Resources [6]: http://www.yoctoproject.org/docs/current/yocto-project-qs/yocto-project-qs.html#packages "Required Packages" [7]: http://www.yoctoproject.org/docs/latest/mega-manual/mega-manual.html "Yocto Mega Manual" [8]: http://www.openembedded.org/wiki/Bitbake_cheat_sheet "Bitbake Cheat Sheet" +[9]: http://github.com/axios-engineering/openembedded-hawk "Axios' OpenEmbedded-Hawk" + diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample index 3896e87..47a25b2 100644 --- a/conf/bblayers.conf.sample +++ b/conf/bblayers.conf.sample @@ -28,11 +28,11 @@ BBFILES ?= "" BBLAYERS ?= " \ ##COREBASE##/meta \ - ##COREBASE##/../meta-xilinx \ - ##COREBASE##/../meta-oe/meta-oe \ - ##COREBASE##/../meta-oe/meta-networking \ - ##COREBASE##/../meta-oe/meta-python \ - ##COREBASE##/../meta-oe/meta-filesystems \ - ##COREBASE##/../meta-redhawk-sdr \ + ##COREBASE##/meta-yocto \ + ##COREBASE##/meta-openembedded/meta-oe \ + ##COREBASE##/meta-openembedded/meta-networking \ + ##COREBASE##/meta-openembedded/meta-python \ + ##COREBASE##/meta-openembedded/meta-filesystems \ + ##COREBASE##/meta-redhawk-sdr \ " diff --git a/conf/layer.conf b/conf/layer.conf index b6bda73..eaba85c 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -24,9 +24,6 @@ BBFILES += "\ ${LAYERDIR}/recipes-*/*/*.bbappend \ " -# Toolchains above 4.8 cause some trouble. -GCCVERSION = "4.8%" - BBFILE_COLLECTIONS += "redhawk" BBFILE_PATTERN_redhawk = "^${LAYERDIR}/" BBFILE_PRIORITY_redhawk = "10" diff --git a/recipes-components/redhawk-siggen/redhawk-siggen_1.0.0.bb b/recipes-components/redhawk-siggen/redhawk-siggen_2.0.1.bb similarity index 89% rename from recipes-components/redhawk-siggen/redhawk-siggen_1.0.0.bb rename to recipes-components/redhawk-siggen/redhawk-siggen_2.0.1.bb index 26fc459..5dde3df 100644 --- a/recipes-components/redhawk-siggen/redhawk-siggen_1.0.0.bb +++ b/recipes-components/redhawk-siggen/redhawk-siggen_2.0.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d9836802 DEPENDS = "redhawk-bulkio" RDEPENDS_${PN} = "redhawk-bulkio" -SRC_URI = "git://github.com/RedhawkSDR/SigGen.git;branch=master;protocol=git \ +SRC_URI = "git://github.com/RedhawkSDR/SigGen.git;tag=2.0.1;protocol=git \ file://01_Remove_x86_and_Impls.patch;patchdir=.. \ file://03_Add_Missing_Files.patch; \ file://02_Ossie_Check_fix.patch; \ diff --git a/recipes-deps/omnievents/omnievents.inc b/recipes-deps/omnievents/omnievents.inc new file mode 100644 index 0000000..75e280f --- /dev/null +++ b/recipes-deps/omnievents/omnievents.inc @@ -0,0 +1,73 @@ +# +# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed +# with this source distribution. +# +# This file is part of Geon Technology's meta-redhawk-sdr. +# +# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# + +DESCRIPTION = "OmniEvents" +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=68ad62c64cc6c620126241fd429e68fe" +DEPENDS += "omniorb boost" + +# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits +SRCTAG ?= "" +SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" + +SRC_URI = "git://github.com/redhawksdr/omniEvents.git;${SRCTAGARG};protocol=git \ + file://omniEvents.patch \ + file://config.mk.patch \ + file://omniEvents \ +" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig update-rc.d + +EXTRA_OECONF="\ + --with-omniorb=${STAGING_DIR}/${MACHINE}/usr \ + --with-boost=${STAGING_DIR}/${MACHINE}/usr \ + " + +# Over-write default multi-threaded build temporarily. +PARALLEL_MAKE = "" + +# omniNames is 10, omniEvents will be 11. +INITSCRIPT_NAME = "omniEvents" +INITSCRIPT_PARAMS = "defaults 11" + +do_configure_append () { + # omniEvents isn't quite as auto-tooled as omniNames so its build + # in OE is a bit more involved; we have to manually copy sources, make files, etc. + # At this point, we're in the build folder. + cp -r ../git/Makefile ../git/idl ../git/src ../git/contrib ../git/tools ../git/examples . +} + +do_compile () { + export IDL=${STAGING_DIR}/${BUILD_SYS}/usr/bin/omniidl + export IDL_COS_DIR=${STAGING_DIR}/${BUILD_SYS}/usr/share/idl/omniORB + oe_runmake +} + +do_install () { + # Set a variable that the Makefiles obey for install. + autotools_do_install + install -d ${D}/etc ${D}/etc/init.d + install -m 0755 ${WORKDIR}/omniEvents ${D}/etc/init.d/omniEvents +} + diff --git a/recipes-deps/omnievents/omnievents_2.7.0.bb b/recipes-deps/omnievents/omnievents_2.7.0.bb index b698a63..b4b5a65 100644 --- a/recipes-deps/omnievents/omnievents_2.7.0.bb +++ b/recipes-deps/omnievents/omnievents_2.7.0.bb @@ -1,69 +1,4 @@ -# -# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed -# with this source distribution. -# -# This file is part of Geon Technology's meta-redhawk-sdr. -# -# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# - -DESCRIPTION = "OmniEvents" -SECTION = "devel" -PRIORITY = "optional" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=68ad62c64cc6c620126241fd429e68fe" -DEPENDS += "omniorb boost" - -SRC_URI = "git://github.com/redhawksdr/omniEvents.git;branch=develop;tag=2.7.0;protocol=git \ - file://omniEvents.patch \ - file://config.mk.patch \ - file://omniEvents \ -" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig update-rc.d - -EXTRA_OECONF="\ - --with-omniorb=${STAGING_DIR}/${MACHINE}/usr \ - --with-boost=${STAGING_DIR}/${MACHINE}/usr \ - " - -# Over-write default multi-threaded build temporarily. -PARALLEL_MAKE = "" - -# omniNames is 10, omniEvents will be 11. -INITSCRIPT_NAME = "omniEvents" -INITSCRIPT_PARAMS = "defaults 11" - -do_configure_append () { - # omniEvents isn't quite as auto-tooled as omniNames so its build - # in OE is a bit more involved; we have to manually copy sources, make files, etc. - # At this point, we're in the build folder. - cp -r ../git/Makefile ../git/idl ../git/src ../git/contrib ../git/tools ../git/examples . -} - -do_compile () { - export IDL=${STAGING_DIR}/${BUILD_SYS}/usr/bin/omniidl - export IDL_COS_DIR=${STAGING_DIR}/${BUILD_SYS}/usr/share/idl/omniORB - oe_runmake -} - -do_install () { - # Set a variable that the Makefiles obey for install. - autotools_do_install - install -d ${D}/etc ${D}/etc/init.d - install -m 0755 ${WORKDIR}/omniEvents ${D}/etc/init.d/omniEvents -} +SRCTAG = "2.7.0" +PREFERRED_VERSION_omniorb = "4.1.6" +include omnievents.inc diff --git a/recipes-deps/omnievents/omnievents_2.7.1.bb b/recipes-deps/omnievents/omnievents_2.7.1.bb new file mode 100644 index 0000000..8ba5b4f --- /dev/null +++ b/recipes-deps/omnievents/omnievents_2.7.1.bb @@ -0,0 +1,4 @@ +SRCTAG = "2.7.1" +PREFERRED_VERSION_omniorb = "4.2.0" +include omnievents.inc + diff --git a/recipes-deps/omniorb/files/pyPrefixIsPrefix.patch b/recipes-deps/omniorb/files/pyPrefixIsPrefix-4.1.6.patch similarity index 100% rename from recipes-deps/omniorb/files/pyPrefixIsPrefix.patch rename to recipes-deps/omniorb/files/pyPrefixIsPrefix-4.1.6.patch diff --git a/recipes-deps/omniorb/files/pyPrefixIsPrefix-4.2.0.patch b/recipes-deps/omniorb/files/pyPrefixIsPrefix-4.2.0.patch new file mode 100644 index 0000000..a63d5c1 --- /dev/null +++ b/recipes-deps/omniorb/files/pyPrefixIsPrefix-4.2.0.patch @@ -0,0 +1,20 @@ +--- a/src/tool/omniidl/cxx/dir.mk 2014-03-25 11:22:12.000000000 -0400 ++++ b/src/tool/omniidl/cxx/dir.mk 2017-01-06 13:49:56.793626502 -0500 +@@ -73,14 +73,14 @@ + + ifdef UnixPlatform + #CXXDEBUGFLAGS = -g +-PYPREFIX := $(shell $(PYTHON) -c 'import sys; sys.stdout.write(sys.exec_prefix)') ++PYPREFIX := $(PREFIX) + PYVERSION := $(shell $(PYTHON) -c 'import sys; sys.stdout.write(sys.version[:3])') + PYINCDIR := $(PYPREFIX)/include + PYINCFILE := "" + DIR_CPPFLAGS += -I$(PYINCDIR)/python$(PYVERSION) \ + -I$(PYINCDIR)/python$(PYVERSION)mu \ + -I$(PYINCDIR) \ +- -DPYTHON_INCLUDE="" ++ -DPYTHON_INCLUDE=$(PYINCFILE) + endif + + + diff --git a/recipes-deps/omniorb/files/rm_LongDouble.patch b/recipes-deps/omniorb/files/rm_LongDouble-4.1.6.patch similarity index 100% rename from recipes-deps/omniorb/files/rm_LongDouble.patch rename to recipes-deps/omniorb/files/rm_LongDouble-4.1.6.patch diff --git a/recipes-deps/omniorb/files/rm_LongDouble-4.2.0.patch b/recipes-deps/omniorb/files/rm_LongDouble-4.2.0.patch new file mode 100644 index 0000000..1c71d23 --- /dev/null +++ b/recipes-deps/omniorb/files/rm_LongDouble-4.2.0.patch @@ -0,0 +1,75 @@ +diff -Nuar omniORB-4.2.0/include/omniORB4/CORBA_sysdep_auto.h omniORB-4.2.0-patched/include/omniORB4/CORBA_sysdep_auto.h +--- omniORB-4.2.0/include/omniORB4/CORBA_sysdep_auto.h 2013-07-18 07:28:03.000000000 -0400 ++++ omniORB-4.2.0-patched/include/omniORB4/CORBA_sysdep_auto.h 2017-01-09 08:34:47.292907892 -0500 +@@ -70,12 +70,12 @@ + + #if !defined(OMNIORB_DISABLE_LONGDOUBLE) + # if defined(SIZEOF_LONG_DOUBLE) && (SIZEOF_LONG_DOUBLE == 16) +-# define HAS_LongDouble ++// # define HAS_LongDouble + # define _CORBA_LONGDOUBLE_DECL long double + # endif + + # if defined(SIZEOF_LONG_DOUBLE) && (SIZEOF_LONG_DOUBLE == 12) && defined(__i386__) +-# define HAS_LongDouble ++// # define HAS_LongDouble + # define _CORBA_LONGDOUBLE_DECL long double + # endif + #endif +diff -Nuar omniORB-4.2.0/include/omniORB4/CORBA_sysdep_trad.h omniORB-4.2.0-patched/include/omniORB4/CORBA_sysdep_trad.h +--- omniORB-4.2.0/include/omniORB4/CORBA_sysdep_trad.h 2014-01-17 10:27:56.000000000 -0500 ++++ omniORB-4.2.0-patched/include/omniORB4/CORBA_sysdep_trad.h 2017-01-09 08:37:30.544545283 -0500 +@@ -136,7 +136,7 @@ + + // GCC claims to support long long on all platforms + # define HAS_LongLong +-# define HAS_LongDouble ++// # define HAS_LongDouble + # define _CORBA_LONGLONG_DECL long long + # define _CORBA_ULONGLONG_DECL unsigned long long + # define _CORBA_LONGDOUBLE_DECL long double +@@ -190,7 +190,7 @@ + # define _CORBA_LONGDOUBLE_DECL long double + # define _CORBA_LONGLONG_CONST(x) (x##LL) + +-# define HAS_LongDouble ++// # define HAS_LongDouble + + + #elif defined(_MSC_VER) +@@ -223,7 +223,7 @@ + + # define HAVE_STRTOULL + +-# define HAS_LongDouble ++// # define HAS_LongDouble + # define HAS_LongLong + # define _CORBA_LONGDOUBLE_DECL long double + # define _CORBA_LONGLONG_DECL long long +@@ -258,7 +258,7 @@ + # define HAS_Cplusplus_const_cast + # define OMNI_REQUIRES_FQ_BASE_CTOR + # define HAS_LongLong +-# define HAS_LongDouble ++// # define HAS_LongDouble + # define _CORBA_LONGLONG_DECL long long + # define _CORBA_ULONGLONG_DECL unsigned long long + # define _CORBA_LONGDOUBLE_DECL long double +@@ -283,7 +283,7 @@ + # define HAS_Cplusplus_Namespace + # define HAS_Std_Namespace + # define HAS_LongLong +-# define HAS_LongDouble ++// # define HAS_LongDouble + # define _CORBA_LONGLONG_DECL long long + # define _CORBA_ULONGLONG_DECL unsigned long long + # define _CORBA_LONGDOUBLE_DECL long double +@@ -303,7 +303,7 @@ + # define _CORBA_ULONGLONG_DECL unsigned long long + # define _CORBA_LONGLONG_CONST(x) (x##LL) + # if defined(_FPWIDETYPES) +-# define HAS_LongDouble ++// # define HAS_LongDouble + # define _CORBA_LONGDOUBLE_DECL long double + # endif + # ifndef HAVE_STD diff --git a/recipes-deps/omniorb/omniorb.inc b/recipes-deps/omniorb/omniorb.inc new file mode 100644 index 0000000..dc85015 --- /dev/null +++ b/recipes-deps/omniorb/omniorb.inc @@ -0,0 +1,87 @@ +# +# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed +# with this source distribution. +# +# This file is part of Geon Technology's meta-redhawk-sdr. +# +# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# + +DESCRIPTION = "OmniORB High Performance ORB" +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=75b02c2872421380bbd47781d2bd75d3" + +DEPENDS += "omniorb-native python" +DEPENDS_virtclass-native += "python-native" + +RDEPENDS_${PN}-python += "python" +PACKAGES += "${PN}-python" +PROIVDES += "${PN}-python" + +SRC_URI_append = "\ + file://omniORB.cfg \ + file://omniORB-cross.patch \ + file://omniORB_embedded_appl.patch \ + file://pyPrefixIsPrefix-${PV}.patch \ + file://fixPythonShebang.patch \ + file://omniNames \ + file://rm_LongDouble-${PV}.patch \ +" + +S = "${WORKDIR}/omniORB-${PV}" + +# Here we need python libraries and the softlink for the omniidlmodule, we have to disable the check for soft links. +# Alternativly, we could packge this into the dev package and then pull that in but that would also get all the headers +# and idl files +INSANE_SKIP_${PN}-python += "dev-so" +FILES_${PN}-dev += "${datadir}/idl/omniORB/* ${datadir}/idl/omniORB/cos/*" + +FILES_${PN}-python += "${libdir}/python2.7/site-packages/_omniidlmodule.so*" +FILES_${PN}-python += "${libdir}/python2.7/site-packages/omniidl/*" +FILES_${PN}-python += "${libdir}/python2.7/site-packages/omniidl_be/*" +FILES_${PN}-dbg += "${libdir}/python2.7/site-packages/.debug/_omniidlmodule.so.4.1" + + +TARGET_CC_ARCH += "${LDFLAGS}" + +inherit autotools pkgconfig pythonnative update-rc.d + +INITSCRIPT_NAME = "omniNames" +INITSCRIPT_PARAMS = "defaults 10" + +CONFFILES_${PN} += "/etc/omniORB.cfg" + +do_compile () { + export TOOLBINDIR=${STAGING_BINDIR_NATIVE} + oe_runmake +} + +do_compile_virtclass-native () { + oe_runmake +} + +do_install () { + # Set a variable that the Makefiles obey for install. + autotools_do_install + install -d ${D}/etc/init.d + install -m 0644 ${WORKDIR}/omniORB.cfg ${D}/etc/omniORB.cfg + install -m 0755 ${WORKDIR}/omniNames ${D}/etc/init.d/omniNames +} + +BBCLASSEXTEND = "native" + +NATIVE_INSTALL_WORKS = "1" + diff --git a/recipes-deps/omniorb/omniorb_4.1.6.bb b/recipes-deps/omniorb/omniorb_4.1.6.bb index 3909233..54ad966 100644 --- a/recipes-deps/omniorb/omniorb_4.1.6.bb +++ b/recipes-deps/omniorb/omniorb_4.1.6.bb @@ -1,84 +1,8 @@ -# -# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed -# with this source distribution. -# -# This file is part of Geon Technology's meta-redhawk-sdr. -# -# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# - -DESCRIPTION = "OmniORB High Performance ORB" -SECTION = "devel" -PRIORITY = "optional" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=75b02c2872421380bbd47781d2bd75d3" -DEPENDS += "omniorb-native python" -DEPENDS_virtclass-native += "python-native" -PR = "r2" - -SRC_URI = "http://downloads.sourceforge.net/omniorb/omniORB-4.1.6.tar.bz2;name=omniORB416tarbz2 \ - file://omniORB.cfg \ - file://omniORB-cross.patch \ - file://omniORB_embedded_appl.patch \ - file://pyPrefixIsPrefix.patch \ - file://fixPythonShebang.patch \ - file://omniNames \ - file://rm_LongDouble.patch \ -" -SRC_URI_virtclass-native = "http://downloads.sourceforge.net/omniorb/omniORB-4.1.6.tar.bz2;name=omniORB416tarbz2 \ - file://omniORB.cfg \ - file://omniNames \ - file://rm_LongDouble.patch \ -" +SRC_URI = "http://downloads.sourceforge.net/omniorb/omniORB-4.1.6.tar.bz2;name=omniORB416tarbz2" +SRC_URI_virtclass-native = "http://downloads.sourceforge.net/omniorb/omniORB-4.1.6.tar.bz2;name=omniORB416tarbz2" SRC_URI[omniORB416tarbz2.md5sum] = "44990f8139c349b53ab43110de6c629b" SRC_URI[omniORB416tarbz2.sha256sum] = "749c5e615130c804e40f4028104c1f98469613ff32a7f81562d06e669ba0b2c1" -S = "${WORKDIR}/omniORB-${PV}" - -# Here we need python libraries and the softlink for the omniidlmodule, we have to disable the check for soft links. -# Alternativly, we could packge this into the dev package and then pull that in but that would also get all the headers -# and idl files -INSANE_SKIP_${PN} += "dev-so" -FILES_${PN} += "${libdir}/python*/*" -FILES_${PN}-dev += "${datadir}/idl/omniORB/* ${datadir}/idl/omniORB/cos/*" -FILES_${PN}-dbg += "${libdir}/python*/site-packages/.debug/*" - - -TARGET_CC_ARCH += "${LDFLAGS}" - -inherit autotools pkgconfig pythonnative update-rc.d - -INITSCRIPT_NAME = "omniNames" -INITSCRIPT_PARAMS = "defaults 10" - -CONFFILES_${PN} += "/etc/omniORB.cfg" - -do_compile () { - export TOOLBINDIR=${STAGING_BINDIR_NATIVE} - oe_runmake -} - -do_install () { - # Set a variable that the Makefiles obey for install. - autotools_do_install - install -d ${D}/etc/init.d - install -m 0644 ${WORKDIR}/omniORB.cfg ${D}/etc/omniORB.cfg - install -m 0755 ${WORKDIR}/omniNames ${D}/etc/init.d/omniNames -} - -BBCLASSEXTEND = "native" - -NATIVE_INSTALL_WORKS = "1" +include omniorb.inc diff --git a/recipes-deps/omniorb/omniorb_4.2.0.bb b/recipes-deps/omniorb/omniorb_4.2.0.bb new file mode 100644 index 0000000..0d4db2e --- /dev/null +++ b/recipes-deps/omniorb/omniorb_4.2.0.bb @@ -0,0 +1,8 @@ +SRC_URI = "http://downloads.sourceforge.net/omniorb/omniORB-4.2.0.tar.bz2;name=omniORB420tarbz2" +SRC_URI_virtclass-native = "http://downloads.sourceforge.net/omniorb/omniORB-4.2.0.tar.bz2;name=omniORB420tarbz2" + +SRC_URI[omniORB420tarbz2.md5sum] = "f1e104d0a2df92829c1b37a853f4805d" +SRC_URI[omniORB420tarbz2.sha256sum] = "74c273fc997c2881b128feb52182dbe067acfecc4cf37475f43c104338eba8bc" + +include omniorb.inc + diff --git a/recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk.patch b/recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk-3.6.patch similarity index 100% rename from recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk.patch rename to recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk-3.6.patch diff --git a/recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk-4.2.0.patch b/recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk-4.2.0.patch new file mode 100644 index 0000000..14858f4 --- /dev/null +++ b/recipes-deps/omniorbpy/files/omniORBpy_modules_dir.mk-4.2.0.patch @@ -0,0 +1,15 @@ +--- omniORBpy-4.2.0/modules/dir.mk 2013-06-19 09:55:16.000000000 -0400 ++++ omniORBpy-4.2.0-patched/modules/dir.mk 2017-01-09 10:17:18.310669203 -0500 +@@ -75,9 +75,9 @@ + PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix') + PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]') + PYINCDIR := $(PYPREFIX)/include +-PYINCFILE := "" +-PYINCTHRD := "" +-DIR_CPPFLAGS += -I$(PYINCDIR)/python$(PYVERSION) -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD) ++PYINCFILE := "" ++PYINCTHRD := "" ++DIR_CPPFLAGS += -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD) + DIR_CPPFLAGS += $(CORBA_CPPFLAGS) + + endif diff --git a/recipes-deps/omniorbpy/files/omniORBpy_modules_ziop_dir.mk-4.2.0.patch b/recipes-deps/omniorbpy/files/omniORBpy_modules_ziop_dir.mk-4.2.0.patch new file mode 100644 index 0000000..5a38e23 --- /dev/null +++ b/recipes-deps/omniorbpy/files/omniORBpy_modules_ziop_dir.mk-4.2.0.patch @@ -0,0 +1,11 @@ +--- omniORBpy-4.2.0/modules/ziop/dir.mk 2013-06-19 09:55:16.000000000 -0400 ++++ omniORBpy-4.2.0-patched/modules/ziop/dir.mk 2017-01-09 10:28:41.431824214 -0500 +@@ -22,7 +22,7 @@ + PYINCDIR := $(PYPREFIX)/include + PYINCFILE := "" + PYINCTHRD := "" +-DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD) ++DIR_CPPFLAGS += -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD) + DIR_CPPFLAGS += $(CORBA_CPPFLAGS) + + endif diff --git a/recipes-deps/omniorbpy/omniorbpy.inc b/recipes-deps/omniorbpy/omniorbpy.inc new file mode 100644 index 0000000..5f32be4 --- /dev/null +++ b/recipes-deps/omniorbpy/omniorbpy.inc @@ -0,0 +1,84 @@ +# +# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed +# with this source distribution. +# +# This file is part of Geon Technology's meta-redhawk-sdr. +# +# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# + +DESCRIPTION = "Python bindings for omniORB" +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589" +DEPENDS += "omniorb omniorbpy-native python" +DEPENDS_virtclass-native += "omniorb-native python-native" + +# This will allow this file to create symlinks to so files without throwing an error +INSANE_SKIP_${PN} = "dev-so" + +SRC_URI_append = "\ + file://omniORBpy-cross.patch \ + file://omniORBpy_modules_codesets_dir.mk.patch \ + file://omniORBpy_modules_connections_dir.mk.patch \ + file://omniORBpy_modules_sslTP_dir.mk.patch \ + file://omniORBpy_modules_dir.mk-${PV}.patch \ +" + +S = "${WORKDIR}/omniORBpy-${PV}" + +EXTRA_OECONF = "--with-omniorb=${STAGING_DIR_TARGET}/usr" +EXTRA_OECONF_virtclass-native = "--with-omniorb=${STAGING_DIR_NATIVE}/usr" + + +FILES_${PN} += " \ + ${libdir}/python2.7/site-packages/*.pth \ + ${libdir}/python2.7/site-packages/*.pyo \ + ${libdir}/python2.7/site-packages/*.py \ + ${libdir}/python2.7/site-packages/*.pyc \ + ${libdir}/python2.7/site-packages/*.so.* \ + ${libdir}/python2.7/site-packages/*.so \ + ${libdir}/python2.7/site-packages/omniidl_be/* \ + ${libdir}/python2.7/site-packages/omniORB/* \ + ${libdir}/python2.7/site-packages/omniORB/COS/* \ + ${libdir}/python2.7/site-packages/omniORB/COS/*/* \ + ${libdir}/python2.7/site-packages/CosNaming__POA/* \ + ${libdir}/python2.7/site-packages/CosNaming/* \ +" + +inherit autotools pkgconfig distutils-base + +#ERROR: QA Issue with omniorbpy-dev: No GNU_HASH in the elf binary... +#See for more info: http://old.nabble.com/No-GNU_HASH-found-in-elf-binary-td23072960.html +TARGET_CC_ARCH += "${LDFLAGS}" + +do_compile () { + export OMNIORB_BINDIR=${STAGING_BINDIR_NATIVE} + oe_runmake +} + +do_compile_virtclass-native () { + oe_runmake +} + +# omniOrb already provides the init file +do_install_append() { + rm -f ${D}${libdir}/python*/site-packages/omniidl_be/__init__.* +} + +BBCLASSEXTEND = "native" + +NATIVE_INSTALL_WORKS = "1" + diff --git a/recipes-deps/omniorbpy/omniorbpy_3.6.bb b/recipes-deps/omniorbpy/omniorbpy_3.6.bb index 13fe721..6174ea4 100644 --- a/recipes-deps/omniorbpy/omniorbpy_3.6.bb +++ b/recipes-deps/omniorbpy/omniorbpy_3.6.bb @@ -1,89 +1,10 @@ -# -# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed -# with this source distribution. -# -# This file is part of Geon Technology's meta-redhawk-sdr. -# -# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# +SRC_URI = "http://downloads.sourceforge.net/omniorb/omniORBpy-3.6.tar.bz2;name=omniORBpytarbz2" +SRC_URI_virtclass-native = "http://downloads.sourceforge.net/omniorb/omniORBpy-3.6.tar.bz2;name=omniORBpytarbz2" -DESCRIPTION = "Python bindings for omniORB" -SECTION = "devel" -PRIORITY = "optional" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589" -DEPENDS += "omniorb omniorbpy-native python" -DEPENDS_virtclass-native += "omniorb-native python-native" +SRC_URI[omniORBpytarbz2.md5sum] = "a7ab4789b913313f18a1171ff7a140b7" +SRC_URI[omniORBpytarbz2.sha256sum] = "b845eef13b56dfb47c98d65636ede5155ed4b84b2a64e35831b94668878af7c7" -# Apparently this will allow this file to create symlinks to so files without throwing an error -INSANE_SKIP_${PN} = "dev-so" +PREFERRED_VERSION_omniorb = "4.1.6" -PR = "r4" +include omniorbpy.inc -SRC_URI = "http://downloads.sourceforge.net/omniorb/omniORBpy-3.6.tar.bz2;name=omniORBpy36targz \ -file://omniORBpy-cross.patch \ -file://omniORBpy_modules_codesets_dir.mk.patch \ -file://omniORBpy_modules_connections_dir.mk.patch \ -file://omniORBpy_modules_dir.mk.patch \ -file://omniORBpy_modules_sslTP_dir.mk.patch \ -" -SRC_URI_virtclass-native = "http://downloads.sourceforge.net/omniorb/omniORBpy-3.6.tar.bz2;name=omniORBpy36targz" - -SRC_URI[omniORBpy36targz.md5sum] = "a7ab4789b913313f18a1171ff7a140b7" -SRC_URI[omniORBpy36targz.sha256sum] = "b845eef13b56dfb47c98d65636ede5155ed4b84b2a64e35831b94668878af7c7" - -S = "${WORKDIR}/omniORBpy-${PV}" - -EXTRA_OECONF = "--with-omniorb=${STAGING_DIR_TARGET}/usr" -EXTRA_OECONF_virtclass-native = "--with-omniorb=${STAGING_DIR_NATIVE}/usr" - - -FILES_${PN} += " \ - ${libdir}/python2.7/site-packages/*.pth \ - ${libdir}/python2.7/site-packages/*.pyo \ - ${libdir}/python2.7/site-packages/*.py \ - ${libdir}/python2.7/site-packages/*.pyc \ - ${libdir}/python2.7/site-packages/*.so.* \ - ${libdir}/python2.7/site-packages/*.so \ - ${libdir}/python2.7/site-packages/omniidl_be/* \ - ${libdir}/python2.7/site-packages/omniORB/* \ - ${libdir}/python2.7/site-packages/omniORB/COS/* \ - ${libdir}/python2.7/site-packages/omniORB/COS/*/* \ - ${libdir}/python2.7/site-packages/CosNaming__POA/* \ - ${libdir}/python2.7/site-packages/CosNaming/* \ -" - -inherit autotools pkgconfig distutils-base - -#ERROR: QA Issue with omniorbpy-dev: No GNU_HASH in the elf binary... -#See for more info: http://old.nabble.com/No-GNU_HASH-found-in-elf-binary-td23072960.html -TARGET_CC_ARCH += "${LDFLAGS}" - -do_compile () { - export OMNIORB_BINDIR=${STAGING_BINDIR_NATIVE} - oe_runmake -} - -do_compile_virtclass-native () { - oe_runmake -} - -# omniOrb already provides the init file -do_install_append() { - rm -f ${D}${libdir}/python*/site-packages/omniidl_be/__init__.* -} - -BBCLASSEXTEND = "native" - -NATIVE_INSTALL_WORKS = "1" diff --git a/recipes-deps/omniorbpy/omniorbpy_4.2.0.bb b/recipes-deps/omniorbpy/omniorbpy_4.2.0.bb new file mode 100644 index 0000000..b5b8a74 --- /dev/null +++ b/recipes-deps/omniorbpy/omniorbpy_4.2.0.bb @@ -0,0 +1,11 @@ +SRC_URI = "http://downloads.sourceforge.net/omniorb/omniORBpy-4.2.0.tar.bz2;name=omniORBpytarbz2" +SRC_URI_virtclass-native = "http://downloads.sourceforge.net/omniorb/omniORBpy-4.2.0.tar.bz2;name=omniORBpytarbz2" + +SRC_URI[omniORBpytarbz2.md5sum] = "50ecde547c865aad2074d30224779412" +SRC_URI[omniORBpytarbz2.sha256sum] = "c82b3bafacbb93cfaace41765219155f2b24eb3781369bba0581feb1dc50fe5e" + +PREFERRED_VERSION_omniorb = "4.2.0" + +SRC_URI_append = " file://omniORBpy_modules_ziop_dir.mk-4.2.0.patch" + +include omniorbpy.inc diff --git a/recipes-deps/python/pyrtm_0.2.bb b/recipes-deps/python/pyrtm_0.2.bb deleted file mode 100644 index 0cc5e8e..0000000 --- a/recipes-deps/python/pyrtm_0.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Python interface for Remember The Milk API." -AUTHOR = "Sridhar Ratnakumar / srid" -HOMEPAGE = "http://pypi.python.org/pypi/pyrtm" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=a53cbc7cb75660694e138ba973c148df" -DEPENDS = "python-native" - -inherit distutils - -SRC_URI = "http://pypi.python.org/packages/source/p/${PN}/${P}.tar.gz" -SRC_URI[md5sum] = "34423f39caf7df8a9db8e243be9cf1a0" -SRC_URI[sha256sum] = "d9d46d096a38cb692b55f4ee9f364d54348298e9497b11c1ef057539b5de1567" diff --git a/recipes-deps/python/python-cheetah_2.4.4.bb b/recipes-deps/python/python-cheetah_2.4.4.bb deleted file mode 100644 index 9dc4aaa..0000000 --- a/recipes-deps/python/python-cheetah_2.4.4.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Python template engine and code generation tool" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=aff1107514aa6aae948f9fe71fdc393b" - -SRCNAME = "Cheetah" - -PR = "r3" - -SRC_URI = "http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit setuptools - -RDEPENDS_${PN} = "python-pickle python-pprint" -RDEPENDS_${PN}_class-native = "" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "853917116e731afbc8c8a43c37e6ddba" -SRC_URI[sha256sum] = "be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550" diff --git a/recipes-deps/python/python-cython-0.15.1/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch b/recipes-deps/python/python-cython-0.15.1/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch deleted file mode 100644 index 9b9dd46..0000000 --- a/recipes-deps/python/python-cython-0.15.1/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch +++ /dev/null @@ -1,27 +0,0 @@ -From bfed128dfe9551a3a40b1ac4269f18ecfeac80a9 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 1 Oct 2011 11:46:30 +0200 -Subject: [PATCH] Don't append docs to _Extension.extension.__doc__ - -* here it fails with TypeError: unsupported operand type(s) for +: 'NoneType' and 'str' in setup.py - -Signed-off-by: Martin Jansa ---- - Cython/Distutils/extension.py | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/Cython/Distutils/extension.py b/Cython/Distutils/extension.py -index a5a6638..e76c1e7 100644 ---- a/Cython/Distutils/extension.py -+++ b/Cython/Distutils/extension.py -@@ -16,7 +16,6 @@ except ImportError: - warnings = None - - class Extension(_Extension.Extension): -- _Extension.Extension.__doc__ + \ - """pyrex_include_dirs : [string] - list of directories to search for Pyrex header files (.pxd) (in - Unix form for portability) --- -1.7.6.1 - diff --git a/recipes-deps/python/python-cython_0.15.1.bb b/recipes-deps/python/python-cython_0.15.1.bb deleted file mode 100644 index 0bf057a..0000000 --- a/recipes-deps/python/python-cython_0.15.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Cython is a language specially designed for writing Python extension modules. \ -It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \ -and the messy, low-level world of C." -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" -SRCNAME = "Cython" -BBCLASSEXTEND = "native" -PR = "r3" - -SRC_URI = "http://www.cython.org/release/${SRCNAME}-${PV}.tar.gz \ - file://0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch \ -" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -SRC_URI[md5sum] = "171021b3845c9ca8bd6d8185b3cde664" -SRC_URI[sha256sum] = "248123f2f02f2701a28d9452132ac835533b396a273cda9d361cb65c26067edc" - -inherit distutils diff --git a/recipes-deps/python/python-dateutil_1.5.bb b/recipes-deps/python/python-dateutil_1.5.bb deleted file mode 100644 index 6e10524..0000000 --- a/recipes-deps/python/python-dateutil_1.5.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Extensions to the standard Python date/time support" -HOMEPAGE = "http://labix.org/python-dateutil" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d82268718c68bda0b091006ec6e583c6" -SRCNAME = "${PN}" -PR = "r0" - -SRC_URI = "http://labix.org/download/python-dateutil/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit setuptools - -PACKAGES =+ "${PN}-zoneinfo" -FILES_${PN}-zoneinfo = "${libdir}/${PYTHON_DIR}/site-packages/dateutil/zoneinfo" - -RDEPENDS_${PN} = "\ - python-core \ - python-datetime \ -" - -SRC_URI[md5sum] = "35f3732db3f2cc4afdc68a8533b60a52" -SRC_URI[sha256sum] = "c08aca7d85f8f8eed61e83b3423b829262c596a9a78f7ca3de0bcee2217d0e3b" diff --git a/recipes-deps/python/python-docutils_0.5.bb b/recipes-deps/python/python-docutils_0.5.bb deleted file mode 100644 index e4c8a7d..0000000 --- a/recipes-deps/python/python-docutils_0.5.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Text processing system" -HOMEPAGE = "http://docutils.sourceforge.net" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=ac6ee29ac0310c091afab5ac4bea2fa3" -PR = "r2" - -DEPENDS = "python" - -SRC_URI = "${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz" -SRC_URI[md5sum] = "dd72dac92fc8e3eb0f48c3effeef80f6" -SRC_URI[sha256sum] = "747cf984edfca0575addbb42453274a1bdd98ec7780bd37a883dc8b2a66a610e" - -S = "${WORKDIR}/docutils-${PV}" - -inherit distutils - -BBCLASSEXTEND = "native" - diff --git a/recipes-deps/python/python-epydoc_3.0.1.bb b/recipes-deps/python/python-epydoc_3.0.1.bb deleted file mode 100644 index 4ec0668..0000000 --- a/recipes-deps/python/python-epydoc_3.0.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Epydoc is a tool for generating API documentation for Python modules, based on their docstrings" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=011c0d78eb6054d731c879132d7313f0" -HOMEPAGE = "http://epydoc.sourceforge.net/" -SRCNAME = "epydoc" -DEPENDS += "python" -DEPENDS_virtclass-native += "python-native" - -SRC_URI = "http://downloads.sourceforge.net/project/${SRCNAME}/${SRCNAME}/${PV}/${SRCNAME}-${PV}.tar.gz" -SRC_URI[md5sum] = "cdd6f6c76dd8bab5e653a343a0544294" -SRC_URI[sha256sum] = "d4e5c8d90937d01b05170f592c1fa9b29e9ed0498dfe7f0eb2a3af61725b6ad1" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - -BBCLASSEXTEND = "native" diff --git a/recipes-deps/python/python-feedparser_5.1.3.bb b/recipes-deps/python/python-feedparser_5.1.3.bb deleted file mode 100644 index 92d5568..0000000 --- a/recipes-deps/python/python-feedparser_5.1.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Python Atom and RSS feed parser" -HOMEPAGE = "http://code.google.com/p/feedparser" -SECTION = "devel/python" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f5fbe7f8b71b4019eca5ac5f900fd8ad" - -SRC_URI = "http://feedparser.googlecode.com/files/feedparser-${PV}.tar.bz2" -SRC_URI[md5sum] = "6fb6372a1dc2f56d4d79d740b8f49f25" -SRC_URI[sha256sum] = "7f6507d400d07edfd1ea8205da36808009b0c539f5b8a6e0ab54337b955e6dc3" - -S = "${WORKDIR}/feedparser-${PV}" - -inherit setuptools - diff --git a/recipes-deps/python/python-gdata_1.2.4.bb b/recipes-deps/python/python-gdata_1.2.4.bb deleted file mode 100644 index 7351759..0000000 --- a/recipes-deps/python/python-gdata_1.2.4.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Google Data APIs Python Client Library" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README.txt;md5=473bd4dff0ddca1f958244b2dc7a162c" -HOMEPAGE = "http://code.google.com/p/gdata-python-client/" - -inherit distutils - -SRC_URI = "http://gdata-python-client.googlecode.com/files/gdata.py-${PV}.tar.gz" -SRC_URI[md5sum] = "521f33a377d64f8a6505ba119415b787" -SRC_URI[sha256sum] = "fc5ddb8f76b17abd728721a0e0177ea35f55a70106f44dc9010b22eceb06abde" - -S = "${WORKDIR}/gdata.py-${PV}" - -FILES_${PN} += "${datadir}" - -RDEPENDS_${PN} = "python-elementtree" - diff --git a/recipes-deps/python/python-gevent_0.13.8.bb b/recipes-deps/python/python-gevent_0.13.8.bb deleted file mode 100644 index 3fd3e7c..0000000 --- a/recipes-deps/python/python-gevent_0.13.8.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A coroutine-based Python networking library" -DESCRIPTION = "gevent is a coroutine-based Python networking library that uses greenlet to provide \ -a high-level synchronous API on top of the libevent event loop." -HOMEPAGE = "http://www.gevent.org" -SECTION = "devel/python" -LICENSE = "MIT & BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2dbb33d00e1fd31c7041460a81ac0bd2 \ - file://LICENSE.pyevent;md5=718070c63de243053e2c616268b00fdd" -DEPENDS += "python-greenlet libevent" -RDEPENDS_${PN} += "python-greenlet python-mime python-pprint python-re" - -SRC_URI = "http://pypi.python.org/packages/source/g/gevent/gevent-${PV}.tar.gz" -SRC_URI[md5sum] = "ca9dcaa7880762d8ebbc266b11252960" -SRC_URI[sha256sum] = "54b8d26300ce408c0916a3e63ef6cd3e6aca76230833558deb7de15196ed955e" - -S = "${WORKDIR}/gevent-${PV}" - -inherit setuptools - diff --git a/recipes-deps/python/python-greenlet_0.3.4.bb b/recipes-deps/python/python-greenlet_0.3.4.bb deleted file mode 100644 index 4a240fa..0000000 --- a/recipes-deps/python/python-greenlet_0.3.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Python lightweight in-process concurrent programming" -HOMEPAGE = "http://pypi.python.org/pypi/greenlet" -SECTION = "devel/python" -LICENSE = "MIT & PSF" -LIC_FILES_CHKSUM = "file://LICENSE;md5=03143d7a1a9f5d8a0fee825f24ca9c36 \ - file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" -SRC_URI = "http://pypi.python.org/packages/source/g/greenlet/greenlet-${PV}.zip" -SRC_URI[md5sum] = "530a69acebbb0d66eb5abd83523d8272" -SRC_URI[sha256sum] = "259ed0f34de9b0c948f42bdaffe378ea53d210d38377c6dcb0c6b728fccad1b0" - -S = "${WORKDIR}/greenlet-${PV}" - -inherit distutils - diff --git a/recipes-deps/python/python-ldap/setup.cfg.patch b/recipes-deps/python/python-ldap/setup.cfg.patch deleted file mode 100644 index a703d34..0000000 --- a/recipes-deps/python/python-ldap/setup.cfg.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- python-ldap-2.3.9/setup.cfg.orig 2009-08-13 11:07:23.000000000 +0200 -+++ python-ldap-2.3.9/setup.cfg 2009-08-13 11:07:37.000000000 +0200 -@@ -1,9 +1,9 @@ - [_ldap] - extra_objects = - extra_compile_args = --libs = ldap_r lber sasl2 ssl crypto -+libs = ldap_r lber ssl crypto - library_dirs = /opt/openldap-RE24/lib --include_dirs = /opt/openldap-RE24/include /usr/include/sasl -+include_dirs = /opt/openldap-RE24/include - - [egg_info] - tag_build = diff --git a/recipes-deps/python/python-ldap_2.3.9.bb b/recipes-deps/python/python-ldap_2.3.9.bb deleted file mode 100644 index dfe1522..0000000 --- a/recipes-deps/python/python-ldap_2.3.9.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "LDAP client API for Python, C wrapper module around OpenLDAP 2.x with an object-oriented API" -SECTION = "devel/python" -LICENSE = "Python-style" -LIC_FILES_CHKSUM = "file://LICENCE;md5=a41c82edffa04912007cae1d20cac555" -HOMEPAGE = "http://www.python-ldap.org/" -DEPENDS = "python openldap" - -SRC_URI = "http://pypi.python.org/packages/source/p/${PN}/${PN}-${PV}.tar.gz \ - file://setup.cfg.patch" -SRC_URI[md5sum] = "a9f9f16338288d118a1ae6266c993247" -SRC_URI[sha256sum] = "62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4" - -inherit setuptools diff --git a/recipes-deps/python/python-lxml_3.0.2.bb b/recipes-deps/python/python-lxml_3.0.2.bb deleted file mode 100644 index 5ab7b4a..0000000 --- a/recipes-deps/python/python-lxml_3.0.2.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Python XML bindings for libxml2 and libxslt" -DESCRIPTION = "Powerful and Pythonic XML processing library combining \ -libxml2/libxslt with the ElementTree API." -HOMEPAGE = "http://codespeak.net/lxml" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=f9f1dc24f720c143c2240df41fe5073b" -SRCNAME = "lxml" - -DEPENDS = "libxml2 libxslt" - -SRC_URI = "http://pypi.python.org/packages/source/l/${SRCNAME}/${SRCNAME}-${PV}.tar.gz;name=lxml" -SRC_URI[lxml.md5sum] = "38b15b0dd5e9292cf98be800e84a3ce4" -SRC_URI[lxml.sha256sum] = "cadba4cf0e235127795f76a6f7092cb035da23a6e9ec4c93f8af43a6784cd101" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit setuptools - -DISTUTILS_BUILD_ARGS += " \ - --with-xslt-config='${STAGING_BINDIR_NATIVE}/pkg-config libxslt' \ - --with-xml2-config='${STAGING_BINDIR_CROSS}/xml2-config' \ -" - -DISTUTILS_INSTALL_ARGS += " \ - --with-xslt-config='${STAGING_BINDIR_NATIVE}/pkg-config libxslt' \ - --with-xml2-config='${STAGING_BINDIR_CROSS}/xml2-config' \ -" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS_${PN} += "libxml2 libxslt python-compression" -RDEPENDS_${PN}_virtclass-native = "libxml2-native libxslt-native" - diff --git a/recipes-deps/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/recipes-deps/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch deleted file mode 100644 index bcbdf24..0000000 --- a/recipes-deps/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Fri, 29 Mar 2013 15:17:17 +0100 -Subject: [PATCH] setup.py: link in sysroot, not in host directories - -Signed-off-by: Koen Kooi - -Upstream-status: Unknown ---- - setup.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index e7c49eb..8deaa34 100644 ---- a/setup.py -+++ b/setup.py -@@ -40,7 +40,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): - self.openssl = 'c:\\pkg' - else: - self.libraries = ['ssl', 'crypto'] -- self.openssl = '/usr' -+ self.openssl = os.environ.get( "STAGING_DIR" ) - - - def finalize_options(self): -@@ -49,8 +49,8 @@ class _M2CryptoBuildExt(build_ext.build_ext): - - build_ext.build_ext.finalize_options(self) - -- opensslIncludeDir = os.path.join(self.openssl, 'include') -- opensslLibraryDir = os.path.join(self.openssl, 'lib') -+ opensslIncludeDir = os.environ.get( "STAGING_INCDIR" ) -+ opensslLibraryDir = os.environ.get( "STAGING_LIBDIR" ) - - self.swig_opts = ['-I%s' % i for i in self.include_dirs + \ - [opensslIncludeDir]] --- -1.8.1.4 - diff --git a/recipes-deps/python/python-m2crypto_0.21.1.bb b/recipes-deps/python/python-m2crypto_0.21.1.bb deleted file mode 100644 index 9babc04..0000000 --- a/recipes-deps/python/python-m2crypto_0.21.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "A Python crypto and SSL toolkit" -HOMEPAGE = "http://chandlerproject.org/bin/view/Projects/MeTooCrypto" - -DEPENDS = "openssl swig-native" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" - -SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ - file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch" - -SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" -SRC_URI[sha256sum] = "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" - -S = "${WORKDIR}/M2Crypto-${PV}" - -inherit setuptools - -BBCLASSEXTEND = "native" diff --git a/recipes-deps/python/python-mako-native_0.7.2.bb b/recipes-deps/python/python-mako-native_0.7.2.bb deleted file mode 100644 index 0d4c1e4..0000000 --- a/recipes-deps/python/python-mako-native_0.7.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require python-mako_${PV}.bb -inherit native pythonnative - -DEPENDS = "python-native" -RDEPENDS_${PN} = "" -PR = "r0" diff --git a/recipes-deps/python/python-mako_0.7.2.bb b/recipes-deps/python/python-mako_0.7.2.bb deleted file mode 100644 index 9e381f3..0000000 --- a/recipes-deps/python/python-mako_0.7.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Templating library for Python" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=da8dd26ed9751ee0cfdf9df1a16bbb54" - -PR = "r2" - -SRC_URI = "http://www.makotemplates.org/downloads/Mako-${PV}.tar.gz" -SRC_URI[md5sum] = "e3c0a677aa4216da9e89ef8fa76cbafb" -SRC_URI[sha256sum] = "fe8698e845035586bd711a6748e4e40a208a58de276b9138026164700494b68f" - -S = "${WORKDIR}/Mako-${PV}" - -inherit setuptools - -RDEPENDS_${PN} = "python-threading \ - python-netclient \ - python-html \ -" diff --git a/recipes-deps/python/python-matplotlib/fix_setup.patch b/recipes-deps/python/python-matplotlib/fix_setup.patch deleted file mode 100644 index 9381583..0000000 --- a/recipes-deps/python/python-matplotlib/fix_setup.patch +++ /dev/null @@ -1,29 +0,0 @@ -This fixes the dependency checks inside of setup.py since things like -'import numpy' won't work with bitbake. - -diff --git a/setup.py b/setup.py -index 2f13821..e6d6ed0 100644 ---- a/setup.py -+++ b/setup.py -@@ -113,12 +113,6 @@ if 1: - baseline_images = [chop_package(f) for f in baseline_images] - package_data['matplotlib'].extend(baseline_images) - --if not check_for_numpy(): -- sys.exit(1) -- --if not check_for_freetype(): -- sys.exit(1) -- - build_ft2font(ext_modules, packages) - build_ttconv(ext_modules, packages) - build_contour(ext_modules, packages) -@@ -129,7 +123,7 @@ build_tri(ext_modules, packages) - - print_raw("") - print_raw("OPTIONAL BACKEND DEPENDENCIES") --has_libpng = check_for_libpng() -+has_libpng = True - - if has_libpng and options['build_agg']: - build_agg(ext_modules, packages) diff --git a/recipes-deps/python/python-matplotlib/fix_setupext.patch b/recipes-deps/python/python-matplotlib/fix_setupext.patch deleted file mode 100644 index e071595..0000000 --- a/recipes-deps/python/python-matplotlib/fix_setupext.patch +++ /dev/null @@ -1,29 +0,0 @@ -This fixes the numpy import problem in setupext.py using a hard-coded path. - -diff --git a/setupext.py b/setupext.py -index 962cedc..82297c4 100644 ---- a/setupext.py -+++ b/setupext.py -@@ -176,10 +176,7 @@ if os.path.exists(setup_cfg): - except: pass - - # For get_base_flags: --if options['basedirlist']: -- basedirlist = options['basedirlist'].split() --else: -- basedirlist = basedir[sys.platform] -+basedirlist = [os.environ['STAGING_LIBDIR']] - print("basedirlist is: %s" % basedirlist) - - if options['display_status']: -@@ -555,8 +552,8 @@ def check_for_numpy(): - - def add_numpy_flags(module): - "Add the modules flags to build extensions which use numpy" -- import numpy -- module.include_dirs.append(numpy.get_include()) -+ # Hard-coded path for OE since I know this is where numpy's include dir will be -+ module.include_dirs.append(os.path.join(os.environ['STAGING_LIBDIR'], 'python2.7/site-packages/numpy/core/include/')) - - def add_png_flags(module): - try_pkgconfig(module, 'libpng', 'png') diff --git a/recipes-deps/python/python-matplotlib_1.1.0.bb b/recipes-deps/python/python-matplotlib_1.1.0.bb deleted file mode 100644 index 7bb61fd..0000000 --- a/recipes-deps/python/python-matplotlib_1.1.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "matplotlib is a python 2D plotting library which produces publication quality figures in a variety of hardcopy formats" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://README.txt;md5=83c5bf8b16a5f99507f2f47a21ae3b81" -PR = "r1" - -DEPENDS += "python-numpy freetype libpng" -RDEPENDS_${PN} = "python-core python-distutils python-numpy freetype libpng" - -SRC_URI = "${SOURCEFORGE_MIRROR}/matplotlib/matplotlib-${PV}.tar.gz \ - file://fix_setup.patch \ - file://fix_setupext.patch \ -" - -S = "${WORKDIR}/matplotlib-${PV}" - -EXTRA_OECONF = "--disable-docs --with-python-includes=${STAGING_INCDIR}/../" - -inherit distutils - -do_compile_prepend() { - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ - true -} - -# need to export these variables for python-config to work -export PYTHONPATH -export BUILD_SYS -export HOST_SYS -export STAGING_INCDIR -export STAGING_LIBDIR - - -SRC_URI[md5sum] = "57a627f30b3b27821f808659889514c2" -SRC_URI[sha256sum] = "be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7" diff --git a/recipes-deps/python/python-nose_1.2.1.bb b/recipes-deps/python/python-nose_1.2.1.bb deleted file mode 100644 index 083d052..0000000 --- a/recipes-deps/python/python-nose_1.2.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "nose extends the test loading and running features of unittest, \ -making it easier to write, find and run tests." -SECTION = "devel/python" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://lgpl.txt;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI = "http://pypi.python.org/packages/source/n/nose/nose-${PV}.tar.gz" - -SRC_URI[md5sum] = "735e3f1ce8b07e70ee1b742a8a53585a" -SRC_URI[sha256sum] = "2171e9202d118d302d5db1decb52dd862b79e2a626ca19653a6914574a6ca7d9" - -S = "${WORKDIR}/nose-${PV}" - -inherit distutils diff --git a/recipes-deps/python/python-numeric/no-lapack.patch b/recipes-deps/python/python-numeric/no-lapack.patch deleted file mode 100644 index c1916b8..0000000 --- a/recipes-deps/python/python-numeric/no-lapack.patch +++ /dev/null @@ -1,33 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- Numeric-23.7/setup.py~nolapack -+++ Numeric-23.7/setup.py -@@ -32,7 +32,7 @@ - mathlibs = [] - - # delete all but the first one in this list if using your own LAPACK/BLAS --sourcelist = [os.path.join('Src', 'lapack_litemodule.c'), -+sourcelist = [ - #os.path.join('Src', 'blas_lite.c'), - #os.path.join('Src', 'f2c_lite.c'), - #os.path.join('Src', 'zlapack_lite.c'), -@@ -40,12 +40,12 @@ - ] - # set these to use your own BLAS; - --library_dirs_list = ['/usr/lib/atlas'] --libraries_list = ['lapack', 'cblas', 'f77blas', 'atlas', 'g2c'] -+library_dirs_list = [] -+libraries_list = [] - - # set to true (1), if you also want BLAS optimized matrixmultiply/dot/innerproduct --use_dotblas = 1 --include_dirs = ['/usr/include/atlas'] -+use_dotblas = 0 -+include_dirs = [] - # You may need to set this to find cblas.h - # e.g. on UNIX using ATLAS this should be ['/usr/include/atlas'] - extra_link_args = [] diff --git a/recipes-deps/python/python-numeric_24.2.bb b/recipes-deps/python/python-numeric_24.2.bb deleted file mode 100644 index 35ace89..0000000 --- a/recipes-deps/python/python-numeric_24.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "A sophisticated Numeric Processing Package for Python" -SECTION = "devel/python" -LICENSE = "PSF & LLNL" -LIC_FILES_CHKSUM = "file://Legal.htm;md5=e3ce75dedd4043918d15979ae43e312e" - -PR = "ml3" - -SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz" -S = "${WORKDIR}/Numeric-${PV}" - -inherit distutils - -SRC_URI[md5sum] = "2ae672656e06716a149acb048cca3093" -SRC_URI[sha256sum] = "5f72e729eb6ff57442f2a38bfc9931738b59e5077928e2e70d22b4610ff15258" diff --git a/recipes-deps/python/python-numpy/aarch64/_numpyconfig.h b/recipes-deps/python/python-numpy/aarch64/_numpyconfig.h deleted file mode 100644 index be57ac2..0000000 --- a/recipes-deps/python/python-numpy/aarch64/_numpyconfig.h +++ /dev/null @@ -1,30 +0,0 @@ -#define NPY_HAVE_ENDIAN_H 1 -#define NPY_SIZEOF_SHORT SIZEOF_SHORT -#define NPY_SIZEOF_INT SIZEOF_INT -#define NPY_SIZEOF_LONG SIZEOF_LONG -#define NPY_SIZEOF_FLOAT 4 -#define NPY_SIZEOF_COMPLEX_FLOAT 8 -#define NPY_SIZEOF_DOUBLE 8 -#define NPY_SIZEOF_COMPLEX_DOUBLE 16 -#define NPY_SIZEOF_LONGDOUBLE 16 -#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 -#define NPY_SIZEOF_PY_INTPTR_T 8 -#define NPY_SIZEOF_PY_LONG_LONG 8 -#define NPY_SIZEOF_LONGLONG 8 -#define NPY_NO_SMP 0 -#define NPY_HAVE_DECL_ISNAN -#define NPY_HAVE_DECL_ISINF -#define NPY_HAVE_DECL_ISFINITE -#define NPY_HAVE_DECL_SIGNBIT -#define NPY_USE_C99_COMPLEX 1 -#define NPY_HAVE_COMPLEX_DOUBLE 1 -#define NPY_HAVE_COMPLEX_FLOAT 1 -#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 -#define NPY_USE_C99_FORMATS 1 -#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) -#define NPY_ABI_VERSION 0x01000009 -#define NPY_API_VERSION 0x00000007 - -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS 1 -#endif diff --git a/recipes-deps/python/python-numpy/aarch64/config.h b/recipes-deps/python/python-numpy/aarch64/config.h deleted file mode 100644 index c30b868..0000000 --- a/recipes-deps/python/python-numpy/aarch64/config.h +++ /dev/null @@ -1,139 +0,0 @@ -#define HAVE_ENDIAN_H 1 -#define SIZEOF_PY_INTPTR_T 8 -#define SIZEOF_PY_LONG_LONG 8 -#define MATHLIB m -#define HAVE_SIN 1 -#define HAVE_COS 1 -#define HAVE_TAN 1 -#define HAVE_SINH 1 -#define HAVE_COSH 1 -#define HAVE_TANH 1 -#define HAVE_FABS 1 -#define HAVE_FLOOR 1 -#define HAVE_CEIL 1 -#define HAVE_SQRT 1 -#define HAVE_LOG10 1 -#define HAVE_LOG 1 -#define HAVE_EXP 1 -#define HAVE_ASIN 1 -#define HAVE_ACOS 1 -#define HAVE_ATAN 1 -#define HAVE_FMOD 1 -#define HAVE_MODF 1 -#define HAVE_FREXP 1 -#define HAVE_LDEXP 1 -#define HAVE_RINT 1 -#define HAVE_TRUNC 1 -#define HAVE_EXP2 1 -#define HAVE_LOG2 1 -#define HAVE_ATAN2 1 -#define HAVE_POW 1 -#define HAVE_NEXTAFTER 1 -#define HAVE_SINF 1 -#define HAVE_COSF 1 -#define HAVE_TANF 1 -#define HAVE_SINHF 1 -#define HAVE_COSHF 1 -#define HAVE_TANHF 1 -#define HAVE_FABSF 1 -#define HAVE_FLOORF 1 -#define HAVE_CEILF 1 -#define HAVE_RINTF 1 -#define HAVE_TRUNCF 1 -#define HAVE_SQRTF 1 -#define HAVE_LOG10F 1 -#define HAVE_LOGF 1 -#define HAVE_LOG1PF 1 -#define HAVE_EXPF 1 -#define HAVE_EXPM1F 1 -#define HAVE_ASINF 1 -#define HAVE_ACOSF 1 -#define HAVE_ATANF 1 -#define HAVE_ASINHF 1 -#define HAVE_ACOSHF 1 -#define HAVE_ATANHF 1 -#define HAVE_HYPOTF 1 -#define HAVE_ATAN2F 1 -#define HAVE_POWF 1 -#define HAVE_FMODF 1 -#define HAVE_MODFF 1 -#define HAVE_FREXPF 1 -#define HAVE_LDEXPF 1 -#define HAVE_EXP2F 1 -#define HAVE_LOG2F 1 -#define HAVE_COPYSIGNF 1 -#define HAVE_NEXTAFTERF 1 -#define HAVE_SINL 1 -#define HAVE_COSL 1 -#define HAVE_TANL 1 -#define HAVE_SINHL 1 -#define HAVE_COSHL 1 -#define HAVE_TANHL 1 -#define HAVE_FABSL 1 -#define HAVE_FLOORL 1 -#define HAVE_CEILL 1 -#define HAVE_RINTL 1 -#define HAVE_TRUNCL 1 -#define HAVE_SQRTL 1 -#define HAVE_LOG10L 1 -#define HAVE_LOGL 1 -#define HAVE_LOG1PL 1 -#define HAVE_EXPL 1 -#define HAVE_EXPM1L 1 -#define HAVE_ASINL 1 -#define HAVE_ACOSL 1 -#define HAVE_ATANL 1 -#define HAVE_ASINHL 1 -#define HAVE_ACOSHL 1 -#define HAVE_ATANHL 1 -#define HAVE_HYPOTL 1 -#define HAVE_ATAN2L 1 -#define HAVE_POWL 1 -#define HAVE_FMODL 1 -#define HAVE_MODFL 1 -#define HAVE_FREXPL 1 -#define HAVE_LDEXPL 1 -#define HAVE_EXP2L 1 -#define HAVE_LOG2L 1 -#define HAVE_COPYSIGNL 1 -#define HAVE_NEXTAFTERL 1 -#define HAVE_DECL_SIGNBIT -#define HAVE_COMPLEX_H 1 -#define HAVE_CREAL 1 -#define HAVE_CIMAG 1 -#define HAVE_CABS 1 -#define HAVE_CARG 1 -#define HAVE_CEXP 1 -#define HAVE_CSQRT 1 -#define HAVE_CLOG 1 -#define HAVE_CCOS 1 -#define HAVE_CSIN 1 -#define HAVE_CPOW 1 -#define HAVE_CREALF 1 -#define HAVE_CIMAGF 1 -#define HAVE_CABSF 1 -#define HAVE_CARGF 1 -#define HAVE_CEXPF 1 -#define HAVE_CSQRTF 1 -#define HAVE_CLOGF 1 -#define HAVE_CCOSF 1 -#define HAVE_CSINF 1 -#define HAVE_CPOWF 1 -#define HAVE_CREALL 1 -#define HAVE_CIMAGL 1 -#define HAVE_CABSL 1 -#define HAVE_CARGL 1 -#define HAVE_CEXPL 1 -#define HAVE_CSQRTL 1 -#define HAVE_CLOGL 1 -#define HAVE_CCOSL 1 -#define HAVE_CSINL 1 -#define HAVE_CPOWL 1 -#define HAVE_LDOUBLE_IEEE_QUAD_LE 1 -#ifndef __cplusplus -/* #undef inline */ -#endif - -#ifndef _NPY_NPY_CONFIG_H_ -#error config.h should never be included directly, include npy_config.h instead -#endif diff --git a/recipes-deps/python/python-numpy/arm/config.h b/recipes-deps/python/python-numpy/arm/config.h deleted file mode 100644 index 17ef186..0000000 --- a/recipes-deps/python/python-numpy/arm/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */ -/* #define SIZEOF_SHORT 2 */ -/* #define SIZEOF_INT 4 */ -/* #define SIZEOF_LONG 4 */ -/* #define SIZEOF_FLOAT 4 */ -/* #define SIZEOF_DOUBLE 8 */ -#define SIZEOF_LONG_DOUBLE 12 -#define SIZEOF_PY_INTPTR_T 4 -/* #define SIZEOF_LONG_LONG 8 */ -#define SIZEOF_PY_LONG_LONG 8 -/* #define CHAR_BIT 8 */ -#define MATHLIB m -#define HAVE_FLOAT_FUNCS -#define HAVE_LOG1P -#define HAVE_EXPM1 -#define HAVE_INVERSE_HYPERBOLIC -#define HAVE_INVERSE_HYPERBOLIC_FLOAT -#define HAVE_ISNAN -#define HAVE_ISINF -#define HAVE_RINT - diff --git a/recipes-deps/python/python-numpy/arm/numpyconfig.h b/recipes-deps/python/python-numpy/arm/numpyconfig.h deleted file mode 100644 index c4bf654..0000000 --- a/recipes-deps/python/python-numpy/arm/numpyconfig.h +++ /dev/null @@ -1,17 +0,0 @@ -/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */ -/* - * * This file is generated by numpy/core/setup.pyc. DO NOT EDIT - * */ -#define NPY_SIZEOF_SHORT 2 -#define NPY_SIZEOF_INT 4 -#define NPY_SIZEOF_LONG 4 -#define NPY_SIZEOF_FLOAT 4 -#define NPY_SIZEOF_DOUBLE 8 -#define NPY_SIZEOF_LONGDOUBLE 12 -#define NPY_SIZEOF_PY_INTPTR_T 4 -#define NPY_NO_SMP 0 - -#define NPY_SIZEOF_LONGLONG 8 -#define NPY_SIZEOF_PY_LONG_LONG 8 -/* #define CHAR_BIT 8 */ - diff --git a/recipes-deps/python/python-numpy/i586/config.h b/recipes-deps/python/python-numpy/i586/config.h deleted file mode 100644 index 08e41e3..0000000 --- a/recipes-deps/python/python-numpy/i586/config.h +++ /dev/null @@ -1,108 +0,0 @@ -#define SIZEOF_PY_INTPTR_T 4 -#define SIZEOF_PY_LONG_LONG 8 -#define MATHLIB m -#define HAVE_SIN -#define HAVE_COS -#define HAVE_TAN -#define HAVE_SINH -#define HAVE_COSH -#define HAVE_TANH -#define HAVE_FABS -#define HAVE_FLOOR -#define HAVE_CEIL -#define HAVE_SQRT -#define HAVE_LOG10 -#define HAVE_LOG -#define HAVE_EXP -#define HAVE_ASIN -#define HAVE_ACOS -#define HAVE_ATAN -#define HAVE_FMOD -#define HAVE_MODF -#define HAVE_FREXP -#define HAVE_LDEXP -#define HAVE_RINT -#define HAVE_TRUNC -#define HAVE_EXP2 -#define HAVE_LOG2 -#define HAVE_ATAN2 -#define HAVE_POW -#define HAVE_NEXTAFTER -#define HAVE_SINF -#define HAVE_COSF -#define HAVE_TANF -#define HAVE_SINHF -#define HAVE_COSHF -#define HAVE_TANHF -#define HAVE_FABSF -#define HAVE_FLOORF -#define HAVE_CEILF -#define HAVE_RINTF -#define HAVE_TRUNCF -#define HAVE_SQRTF -#define HAVE_LOG10F -#define HAVE_LOGF -#define HAVE_LOG1PF -#define HAVE_EXPF -#define HAVE_EXPM1F -#define HAVE_ASINF -#define HAVE_ACOSF -#define HAVE_ATANF -#define HAVE_ASINHF -#define HAVE_ACOSHF -#define HAVE_ATANHF -#define HAVE_HYPOTF -#define HAVE_ATAN2F -#define HAVE_POWF -#define HAVE_FMODF -#define HAVE_MODFF -#define HAVE_FREXPF -#define HAVE_LDEXPF -#define HAVE_EXP2F -#define HAVE_LOG2F -#define HAVE_COPYSIGNF -#define HAVE_NEXTAFTERF -#define HAVE_SINL -#define HAVE_COSL -#define HAVE_TANL -#define HAVE_SINHL -#define HAVE_COSHL -#define HAVE_TANHL -#define HAVE_FABSL -#define HAVE_FLOORL -#define HAVE_CEILL -#define HAVE_RINTL -#define HAVE_TRUNCL -#define HAVE_SQRTL -#define HAVE_LOG10L -#define HAVE_LOGL -#define HAVE_LOG1PL -#define HAVE_EXPL -#define HAVE_EXPM1L -#define HAVE_ASINL -#define HAVE_ACOSL -#define HAVE_ATANL -#define HAVE_ASINHL -#define HAVE_ACOSHL -#define HAVE_ATANHL -#define HAVE_HYPOTL -#define HAVE_ATAN2L -#define HAVE_POWL -#define HAVE_FMODL -#define HAVE_MODFL -#define HAVE_FREXPL -#define HAVE_LDEXPL -#define HAVE_EXP2L -#define HAVE_LOG2L -#define HAVE_COPYSIGNL -#define HAVE_NEXTAFTERL -#define HAVE_DECL_SIGNBIT -#define HAVE_COMPLEX_H -#define HAVE_LDOUBLE_INTEL_EXTENDED_12_BYTES_LE 1 -#ifndef __cplusplus -/* #undef inline */ -#endif - -#ifndef _NPY_NPY_CONFIG_H_ -#error config.h should never be included directly, include npy_config.h instead -#endif diff --git a/recipes-deps/python/python-numpy/i586/numpyconfig.h b/recipes-deps/python/python-numpy/i586/numpyconfig.h deleted file mode 100644 index ff7938c..0000000 --- a/recipes-deps/python/python-numpy/i586/numpyconfig.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _NPY_NUMPYCONFIG_H_ -#define _NPY_NUMPYCONFIG_H_ - -#include "_numpyconfig.h" - -/* - * On Mac OS X, because there is only one configuration stage for all the archs - * in universal builds, any macro which depends on the arch needs to be - * harcoded - */ -#ifdef __APPLE__ - #undef NPY_SIZEOF_LONG - #undef NPY_SIZEOF_PY_INTPTR_T - - #ifdef __LP64__ - #define NPY_SIZEOF_LONG 8 - #define NPY_SIZEOF_PY_INTPTR_T 8 - #else - #define NPY_SIZEOF_LONG 4 - #define NPY_SIZEOF_PY_INTPTR_T 4 - #endif -#endif - -#endif diff --git a/recipes-deps/python/python-numpy/mipsel/config.h b/recipes-deps/python/python-numpy/mipsel/config.h deleted file mode 100644 index 17ef186..0000000 --- a/recipes-deps/python/python-numpy/mipsel/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */ -/* #define SIZEOF_SHORT 2 */ -/* #define SIZEOF_INT 4 */ -/* #define SIZEOF_LONG 4 */ -/* #define SIZEOF_FLOAT 4 */ -/* #define SIZEOF_DOUBLE 8 */ -#define SIZEOF_LONG_DOUBLE 12 -#define SIZEOF_PY_INTPTR_T 4 -/* #define SIZEOF_LONG_LONG 8 */ -#define SIZEOF_PY_LONG_LONG 8 -/* #define CHAR_BIT 8 */ -#define MATHLIB m -#define HAVE_FLOAT_FUNCS -#define HAVE_LOG1P -#define HAVE_EXPM1 -#define HAVE_INVERSE_HYPERBOLIC -#define HAVE_INVERSE_HYPERBOLIC_FLOAT -#define HAVE_ISNAN -#define HAVE_ISINF -#define HAVE_RINT - diff --git a/recipes-deps/python/python-numpy/mipsel/numpyconfig.h b/recipes-deps/python/python-numpy/mipsel/numpyconfig.h deleted file mode 100644 index c4bf654..0000000 --- a/recipes-deps/python/python-numpy/mipsel/numpyconfig.h +++ /dev/null @@ -1,17 +0,0 @@ -/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */ -/* - * * This file is generated by numpy/core/setup.pyc. DO NOT EDIT - * */ -#define NPY_SIZEOF_SHORT 2 -#define NPY_SIZEOF_INT 4 -#define NPY_SIZEOF_LONG 4 -#define NPY_SIZEOF_FLOAT 4 -#define NPY_SIZEOF_DOUBLE 8 -#define NPY_SIZEOF_LONGDOUBLE 12 -#define NPY_SIZEOF_PY_INTPTR_T 4 -#define NPY_NO_SMP 0 - -#define NPY_SIZEOF_LONGLONG 8 -#define NPY_SIZEOF_PY_LONG_LONG 8 -/* #define CHAR_BIT 8 */ - diff --git a/recipes-deps/python/python-numpy/trycompile.diff b/recipes-deps/python/python-numpy/trycompile.diff deleted file mode 100644 index 3ab3d72..0000000 --- a/recipes-deps/python/python-numpy/trycompile.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- /tmp/setup.py 2008-09-01 10:37:44.000000000 +0200 -+++ numpy-1.1.1/numpy/core/setup.py 2008-09-01 10:38:20.373198000 +0200 -@@ -80,8 +80,7 @@ - raise SystemError,\ - "Non-existing %s. Perhaps you need to install"\ - " python-dev|python-devel." % (python_h) -- result = config_cmd.try_run(tc,include_dirs=[python_include], -- library_dirs = default_lib_dirs) -+ result = config_cmd.try_compile(tc) - if not result: - raise SystemError,"Failed to test configuration. "\ - "See previous error messages for more information." -@@ -95,7 +94,7 @@ - if mathlib: - mathlibs_choices.insert(0,mathlib.split(',')) - for libs in mathlibs_choices: -- if config_cmd.try_run(tc,libraries=libs): -+ if config_cmd.try_compile(tc): - mathlibs = libs - break - else: -@@ -180,10 +179,7 @@ - " python-dev|python-devel." % (python_h) - - config.numpy_include_dirs -- result = config_cmd.try_run(testcode, -- include_dirs = [python_include] + \ -- config.numpy_include_dirs, -- library_dirs = default_lib_dirs) -+ result = config_cmd.try_compile(testcode) - - if not result: - raise SystemError,"Failed to generate numpy configuration. "\ diff --git a/recipes-deps/python/python-numpy/unbreak-assumptions.diff b/recipes-deps/python/python-numpy/unbreak-assumptions.diff deleted file mode 100644 index c5b4481..0000000 --- a/recipes-deps/python/python-numpy/unbreak-assumptions.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- /tmp/system_info.py 2008-08-22 00:38:16.000000000 +0200 -+++ numpy-1.1.1/numpy/distutils/system_info.py 2008-08-22 00:40:33.013198000 +0200 -@@ -137,11 +137,8 @@ - default_x11_lib_dirs = [] - default_x11_include_dirs = [] - else: -- default_lib_dirs = ['/usr/local/lib', '/opt/lib', '/usr/lib', -- '/opt/local/lib', '/sw/lib'] -- default_include_dirs = ['/usr/local/include', -- '/opt/include', '/usr/include', -- '/opt/local/include', '/sw/include'] -+ default_lib_dirs = ['/non-existant-dir'] -+ default_include_dirs = ['non-existant-dir'] - default_src_dirs = ['.','/usr/local/src', '/opt/src','/sw/src'] - - try: diff --git a/recipes-deps/python/python-numpy/x86-64/_numpyconfig.h b/recipes-deps/python/python-numpy/x86-64/_numpyconfig.h deleted file mode 100644 index be57ac2..0000000 --- a/recipes-deps/python/python-numpy/x86-64/_numpyconfig.h +++ /dev/null @@ -1,30 +0,0 @@ -#define NPY_HAVE_ENDIAN_H 1 -#define NPY_SIZEOF_SHORT SIZEOF_SHORT -#define NPY_SIZEOF_INT SIZEOF_INT -#define NPY_SIZEOF_LONG SIZEOF_LONG -#define NPY_SIZEOF_FLOAT 4 -#define NPY_SIZEOF_COMPLEX_FLOAT 8 -#define NPY_SIZEOF_DOUBLE 8 -#define NPY_SIZEOF_COMPLEX_DOUBLE 16 -#define NPY_SIZEOF_LONGDOUBLE 16 -#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 -#define NPY_SIZEOF_PY_INTPTR_T 8 -#define NPY_SIZEOF_PY_LONG_LONG 8 -#define NPY_SIZEOF_LONGLONG 8 -#define NPY_NO_SMP 0 -#define NPY_HAVE_DECL_ISNAN -#define NPY_HAVE_DECL_ISINF -#define NPY_HAVE_DECL_ISFINITE -#define NPY_HAVE_DECL_SIGNBIT -#define NPY_USE_C99_COMPLEX 1 -#define NPY_HAVE_COMPLEX_DOUBLE 1 -#define NPY_HAVE_COMPLEX_FLOAT 1 -#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 -#define NPY_USE_C99_FORMATS 1 -#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) -#define NPY_ABI_VERSION 0x01000009 -#define NPY_API_VERSION 0x00000007 - -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS 1 -#endif diff --git a/recipes-deps/python/python-numpy/x86-64/config.h b/recipes-deps/python/python-numpy/x86-64/config.h deleted file mode 100644 index 0ce63b7..0000000 --- a/recipes-deps/python/python-numpy/x86-64/config.h +++ /dev/null @@ -1,139 +0,0 @@ -#define HAVE_ENDIAN_H 1 -#define SIZEOF_PY_INTPTR_T 8 -#define SIZEOF_PY_LONG_LONG 8 -#define MATHLIB m -#define HAVE_SIN 1 -#define HAVE_COS 1 -#define HAVE_TAN 1 -#define HAVE_SINH 1 -#define HAVE_COSH 1 -#define HAVE_TANH 1 -#define HAVE_FABS 1 -#define HAVE_FLOOR 1 -#define HAVE_CEIL 1 -#define HAVE_SQRT 1 -#define HAVE_LOG10 1 -#define HAVE_LOG 1 -#define HAVE_EXP 1 -#define HAVE_ASIN 1 -#define HAVE_ACOS 1 -#define HAVE_ATAN 1 -#define HAVE_FMOD 1 -#define HAVE_MODF 1 -#define HAVE_FREXP 1 -#define HAVE_LDEXP 1 -#define HAVE_RINT 1 -#define HAVE_TRUNC 1 -#define HAVE_EXP2 1 -#define HAVE_LOG2 1 -#define HAVE_ATAN2 1 -#define HAVE_POW 1 -#define HAVE_NEXTAFTER 1 -#define HAVE_SINF 1 -#define HAVE_COSF 1 -#define HAVE_TANF 1 -#define HAVE_SINHF 1 -#define HAVE_COSHF 1 -#define HAVE_TANHF 1 -#define HAVE_FABSF 1 -#define HAVE_FLOORF 1 -#define HAVE_CEILF 1 -#define HAVE_RINTF 1 -#define HAVE_TRUNCF 1 -#define HAVE_SQRTF 1 -#define HAVE_LOG10F 1 -#define HAVE_LOGF 1 -#define HAVE_LOG1PF 1 -#define HAVE_EXPF 1 -#define HAVE_EXPM1F 1 -#define HAVE_ASINF 1 -#define HAVE_ACOSF 1 -#define HAVE_ATANF 1 -#define HAVE_ASINHF 1 -#define HAVE_ACOSHF 1 -#define HAVE_ATANHF 1 -#define HAVE_HYPOTF 1 -#define HAVE_ATAN2F 1 -#define HAVE_POWF 1 -#define HAVE_FMODF 1 -#define HAVE_MODFF 1 -#define HAVE_FREXPF 1 -#define HAVE_LDEXPF 1 -#define HAVE_EXP2F 1 -#define HAVE_LOG2F 1 -#define HAVE_COPYSIGNF 1 -#define HAVE_NEXTAFTERF 1 -#define HAVE_SINL 1 -#define HAVE_COSL 1 -#define HAVE_TANL 1 -#define HAVE_SINHL 1 -#define HAVE_COSHL 1 -#define HAVE_TANHL 1 -#define HAVE_FABSL 1 -#define HAVE_FLOORL 1 -#define HAVE_CEILL 1 -#define HAVE_RINTL 1 -#define HAVE_TRUNCL 1 -#define HAVE_SQRTL 1 -#define HAVE_LOG10L 1 -#define HAVE_LOGL 1 -#define HAVE_LOG1PL 1 -#define HAVE_EXPL 1 -#define HAVE_EXPM1L 1 -#define HAVE_ASINL 1 -#define HAVE_ACOSL 1 -#define HAVE_ATANL 1 -#define HAVE_ASINHL 1 -#define HAVE_ACOSHL 1 -#define HAVE_ATANHL 1 -#define HAVE_HYPOTL 1 -#define HAVE_ATAN2L 1 -#define HAVE_POWL 1 -#define HAVE_FMODL 1 -#define HAVE_MODFL 1 -#define HAVE_FREXPL 1 -#define HAVE_LDEXPL 1 -#define HAVE_EXP2L 1 -#define HAVE_LOG2L 1 -#define HAVE_COPYSIGNL 1 -#define HAVE_NEXTAFTERL 1 -#define HAVE_DECL_SIGNBIT -#define HAVE_COMPLEX_H 1 -#define HAVE_CREAL 1 -#define HAVE_CIMAG 1 -#define HAVE_CABS 1 -#define HAVE_CARG 1 -#define HAVE_CEXP 1 -#define HAVE_CSQRT 1 -#define HAVE_CLOG 1 -#define HAVE_CCOS 1 -#define HAVE_CSIN 1 -#define HAVE_CPOW 1 -#define HAVE_CREALF 1 -#define HAVE_CIMAGF 1 -#define HAVE_CABSF 1 -#define HAVE_CARGF 1 -#define HAVE_CEXPF 1 -#define HAVE_CSQRTF 1 -#define HAVE_CLOGF 1 -#define HAVE_CCOSF 1 -#define HAVE_CSINF 1 -#define HAVE_CPOWF 1 -#define HAVE_CREALL 1 -#define HAVE_CIMAGL 1 -#define HAVE_CABSL 1 -#define HAVE_CARGL 1 -#define HAVE_CEXPL 1 -#define HAVE_CSQRTL 1 -#define HAVE_CLOGL 1 -#define HAVE_CCOSL 1 -#define HAVE_CSINL 1 -#define HAVE_CPOWL 1 -#define HAVE_LDOUBLE_INTEL_EXTENDED_16_BYTES_LE 1 -#ifndef __cplusplus -/* #undef inline */ -#endif - -#ifndef _NPY_NPY_CONFIG_H_ -#error config.h should never be included directly, include npy_config.h instead -#endif diff --git a/recipes-deps/python/python-numpy_1.7.0.bb b/recipes-deps/python/python-numpy_1.7.0.bb deleted file mode 100644 index 7d2f2e2..0000000 --- a/recipes-deps/python/python-numpy_1.7.0.bb +++ /dev/null @@ -1,69 +0,0 @@ -DESCRIPTION = "A sophisticated Numeric Processing Package for Python" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f87832d854acbade6e9f5c601c8b30b1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ - ${CONFIGFILESURI} " - -CONFIGFILESURI ?= "" - -CONFIGFILESURI_aarch64 = " \ - file://config.h \ - file://_numpyconfig.h \ -" -CONFIGFILESURI_arm = " \ - file://config.h \ - file://numpyconfig.h \ -" -CONFIGFILESURI_mipsel = " \ - file://config.h \ - file://numpyconfig.h \ -" -CONFIGFILESURI_i586 = " \ - file://config.h \ - file://numpyconfig.h \ -" -CONFIGFILESURI_x86-64 = " \ - file://config.h \ - file://_numpyconfig.h \ -" - -S = "${WORKDIR}/numpy-${PV}" - -inherit distutils - -# Make the build fail and replace *config.h with proper one -# This is a ugly, ugly hack - Koen -do_compile_prepend() { - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python-native/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ - true - cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/ -} - -FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" - -SRC_URI[md5sum] = "4fa54e40b6a243416f0248123b6ec332" -SRC_URI[sha256sum] = "f4fa70b7edbab65ee6432eb63743f5489f1919c614632b20b2fb45aa7e682ac6" - -# install what is needed for numpy.test() -RDEPENDS_${PN} = "python-unittest \ - python-difflib \ - python-pprint \ - python-pickle \ - python-shell \ - python-nose \ - python-doctest \ - python-datetime \ - python-distutils \ - python-misc \ - python-mmap \ - python-netclient \ - python-numbers \ - python-pydoc \ - python-pkgutil \ - python-email \ - python-subprocess \ - python-compression \ -" diff --git a/recipes-deps/python/python-pexpect_2.3.bb b/recipes-deps/python/python-pexpect_2.3.bb deleted file mode 100644 index 1c64365..0000000 --- a/recipes-deps/python/python-pexpect_2.3.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "A Pure Python Expect like Module for Python" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE;md5=04a2bf11b85ce49d4a8c0c413fd34404" -SRCNAME = "pexpect" -PR = "ml3" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - -RDEPENDS_${PN} = "\ - python-core \ - python-io \ - python-terminal \ - python-resource \ - python-fcntl \ -" - - -SRC_URI[md5sum] = "bf107cf54e67bc6dec5bea1f3e6a65c3" -SRC_URI[sha256sum] = "d315e7f3a8544fd85034d7e17fd7c5854e8f0828f5791f83cf313f8fa5740b75" diff --git a/recipes-deps/python/python-psutil_0.6.1.bb b/recipes-deps/python/python-psutil_0.6.1.bb deleted file mode 100644 index 6e462c0..0000000 --- a/recipes-deps/python/python-psutil_0.6.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "A cross-platform process and system utilities module for Python" -SECTION = "devel/python" -HOMEPAGE = "http://code.google.com/p/psutil" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0f02e99f7f3c9a7fe8ecfc5d44c2be62" - -SRC_URI = "http://psutil.googlecode.com/files/psutil-${PV}.tar.gz" -SRC_URI[md5sum] = "3cfcbfb8525f6e4c70110e44a85e907e" -SRC_URI[sha256sum] = "d665a4cc58c9a5d207fb0dc9869fc0ee10f4f66ad885e84886ef6339ccce0a6f" - -S = "${WORKDIR}/psutil-${PV}" - -inherit setuptools - diff --git a/recipes-deps/python/python-pyalsaaudio_0.4.bb b/recipes-deps/python/python-pyalsaaudio_0.4.bb deleted file mode 100644 index 49fbc8f..0000000 --- a/recipes-deps/python/python-pyalsaaudio_0.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Support for the Linux 2.6.x ALSA Sound System" -SECTION = "devel/python" -DEPENDS = "alsa-lib" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1a3b161aa0fcec32a0c8907a2219ad9d" -SRCNAME = "pyalsaaudio" -PR = "ml2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pyalsaaudio/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - -SRC_URI[md5sum] = "b312c28efba7db0494836a79f0a49898" -SRC_URI[sha256sum] = "07148ce16024724b17cc24c51d0f4fb78af214b09b7dc8dcb7b06e5647f4c582" diff --git a/recipes-deps/python/python-pyopenssl_0.13.bb b/recipes-deps/python/python-pyopenssl_0.13.bb deleted file mode 100644 index 01f43da..0000000 --- a/recipes-deps/python/python-pyopenssl_0.13.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Simple Python wrapper around the OpenSSL library" -SECTION = "devel/python" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRCNAME = "pyOpenSSL" - -DEPENDS = "openssl" -PR = "r1" - -SRC_URI = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${PV}.tar.gz" -SRC_URI[md5sum] = "767bca18a71178ca353dff9e10941929" -SRC_URI[sha256sum] = "21e12b03abaa0e04ecc8cd9c251598f71bae11c9f385304234e4ea5618c6163b" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - -PACKAGES =+ "${PN}-tests" -FILES_${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/test" - -RDEPENDS_${PN} = "python-threading" -RDEPENDS_${PN}-tests = "${PN}" diff --git a/recipes-deps/python/python-pyserial_2.4.bb b/recipes-deps/python/python-pyserial_2.4.bb deleted file mode 100644 index 0cce5cb..0000000 --- a/recipes-deps/python/python-pyserial_2.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Serial Port Support for Python" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7424386ffe323e815ee62ee9ad591dd8" -SRCNAME = "pyserial" -PR = "ml4" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit setuptools - -# FIXME might stop packaging serialwin32 and serialjava files - -RDEPENDS_${PN} = "\ - python-fcntl \ - python-io \ - python-stringold \ -" - -SRC_URI[md5sum] = "eec19df59fd75ba5a136992897f8e468" -SRC_URI[sha256sum] = "6b6a9e3d2fd5978c92c843e0109918a4bcac481eecae316254481c0e0f7e73c8" diff --git a/recipes-deps/python/python-pyudev_0.16.1.bb b/recipes-deps/python/python-pyudev_0.16.1.bb deleted file mode 100644 index 741d037..0000000 --- a/recipes-deps/python/python-pyudev_0.16.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "A libudev binding" -HOMEPAGE = "http://pypi.python.org/pypi/pyudev" -SECTION = "devel/python" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRCNAME = "pyudev" -SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" -SRC_URI[md5sum] = "4034de584b6d9efcbfc590a047c63285" -SRC_URI[sha256sum] = "765d1c14bd9bd031f64e2612225621984cb2bbb8cbc0c03538bcc4c735ff1c95" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit setuptools - -do_configure_prepend() { - sed -i "/import pyudev/d" ${S}/setup.py - sed -i "s/str(pyudev.__version__)/'${PV}'/g" ${S}/setup.py -} - -RDEPENDS_${PN} = "\ - python-ctypes \ - python-subprocess \ - python-misc \ -" diff --git a/recipes-deps/python/python-pyusb_1.0.0a2.bb b/recipes-deps/python/python-pyusb_1.0.0a2.bb deleted file mode 100644 index e5956db..0000000 --- a/recipes-deps/python/python-pyusb_1.0.0a2.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "PyUSB provides USB access on the Python language" -HOMEPAGE = "http://pyusb.sourceforge.net/" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a53a9c39efcfb812e2464af14afab013" -DEPENDS = "libusb1" -PR = "r1" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/pyusb/${SRCNAME}-${PV}.tar.gz \ -" -SRC_URI[md5sum] = "9136b3dc019272c62a5b6d4eb624f89f" -SRC_URI[sha256sum] = "dacbf7d568c0bb09a974d56da66d165351f1ba3c4d5169ab5b734266623e1736" - -SRCNAME = "pyusb" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils diff --git a/recipes-deps/python/python-pyyaml/setup.py b/recipes-deps/python/python-pyyaml/setup.py deleted file mode 100644 index fb64983..0000000 --- a/recipes-deps/python/python-pyyaml/setup.py +++ /dev/null @@ -1,64 +0,0 @@ -NAME = 'PyYAML' -VERSION = '3.06' -DESCRIPTION = "YAML parser and emitter for Python" -LONG_DESCRIPTION = """\ -YAML is a data serialization format designed for human readability and -interaction with scripting languages. PyYAML is a YAML parser and -emitter for Python. - -PyYAML features a complete YAML 1.1 parser, Unicode support, pickle -support, capable extension API, and sensible error messages. PyYAML -supports standard YAML tags and provides Python-specific tags that allow -to represent an arbitrary Python object. - -PyYAML is applicable for a broad range of tasks from complex -configuration files to object serialization and persistance.""" -AUTHOR = "Kirill Simonov" -AUTHOR_EMAIL = 'xi@resolvent.net' -LICENSE = "MIT" -PLATFORMS = "Any" -URL = "http://pyyaml.org/wiki/PyYAML" -DOWNLOAD_URL = "http://pyyaml.org/download/pyyaml/%s-%s.tar.gz" % (NAME, VERSION) -CLASSIFIERS = [ - "Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", - "Programming Language :: Python", - "Topic :: Software Development :: Libraries :: Python Modules", - "Topic :: Text Processing :: Markup", -] - -from distutils.core import setup -from distutils.extension import Extension -from Cython.Distutils import build_ext - -import sys, os.path - - -if __name__ == '__main__': - - setup( - name=NAME, - version=VERSION, - description=DESCRIPTION, - long_description=LONG_DESCRIPTION, - author=AUTHOR, - author_email=AUTHOR_EMAIL, - license=LICENSE, - platforms=PLATFORMS, - url=URL, - download_url=DOWNLOAD_URL, - classifiers=CLASSIFIERS, - - package_dir={'': 'lib'}, - packages=['yaml'], - - ext_modules = [ - Extension( "_yaml", ["ext/_yaml.pyx"], libraries = ["yaml"] ) - ], - - cmdclass={ - 'build_ext': build_ext, - }, - ) diff --git a/recipes-deps/python/python-pyyaml_3.10.bb b/recipes-deps/python/python-pyyaml_3.10.bb deleted file mode 100644 index 100e1c8..0000000 --- a/recipes-deps/python/python-pyyaml_3.10.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Python support for YAML" -HOMEPAGE = "http://www.pyyaml.org" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6015f088759b10e0bc2bf64898d4ae17" -DEPENDS = "libyaml python-cython-native" - -SRC_URI = "http://pyyaml.org/download/pyyaml/PyYAML-${PV}.tar.gz \ - file://setup.py \ -" - -SRC_URI[md5sum] = "74c94a383886519e9e7b3dd1ee540247" -SRC_URI[sha256sum] = "e713da45c96ca53a3a8b48140d4120374db622df16ab71759c9ceb5b8d46fe7c" - -S = "${WORKDIR}/PyYAML-${PV}" - -inherit distutils - -do_configure_prepend() { - # upstream setup.py overcomplicated, use ours - install -m 0644 ${WORKDIR}/setup.py ${S} -} diff --git a/recipes-deps/python/python-simplejson_2.2.1.bb b/recipes-deps/python/python-simplejson_2.2.1.bb deleted file mode 100644 index 85d69c1..0000000 --- a/recipes-deps/python/python-simplejson_2.2.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python" -HOMEPAGE = "http://cheeseshop.python.org/pypi/simplejson" -SECTION = "devel/python" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8a9f8dcfcd28c34daa443e5b1d29813b" -PR = "r1" - -SRCNAME = "simplejson" - -SRC_URI = "http://cheeseshop.python.org/packages/source/s/simplejson/${SRCNAME}-${PV}.tar.gz" -SRC_URI[md5sum] = "070c6467462bd63306f1756b01df6d70" -SRC_URI[sha256sum] = "e85c5ae24dd9827113893c1dd2c799528195057388096f0fc45ad4b32b378c26" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - -RDEPENDS_${PN} = "\ - python-core \ - python-re \ - python-io \ - python-netserver \ - python-numbers \ -" - - diff --git a/recipes-deps/python/python-sip_4.14.2.bb b/recipes-deps/python/python-sip_4.14.2.bb deleted file mode 100644 index 747d896..0000000 --- a/recipes-deps/python/python-sip_4.14.2.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries" -SECTION = "devel/python" -HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" -AUTHOR = "Phil Thompson" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://siplib.sbf.in;endline=15;md5=3d462bd8cb43db3e4be998fe155ae9cf" -DEPENDS = "python" -RDEPENDS_${PN} = "python-core" - -# riverbankcomputing is upstream, but keeps only latest version, sf usually have few older -#SRC_URI = "http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${PV}.tar.gz" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz" -SRC_URI[md5sum] = "b93442e745b3be2fad89de0686a76ce9" -SRC_URI[sha256sum] = "1a9d3bf26c821f369c175f8e68946b79bc994da4f96e8f5ecff06e6ee7ac0528" - -S = "${WORKDIR}/sip-${PV}/siplib" - -inherit qt4x11 distutils-base - -EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \ - CONFIG=console \ - DESTDIR= \ - VERSION=1.0.0 \ - TARGET=sip \ - DEFINES=SIP_QT_SUPPORT \ - INCLUDEPATH+=. \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - INCLUDEPATH+=${STAGING_INCDIR}" - - -do_configure_prepend() { - cat siplib.sbf.in | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, | sed s,@CFG_MODULE_BASENAME@,sip, > siplib.pro - cat siplib.c.in | sed s,@CFG_MODULE_BASENAME@,sip, > siplib.c - cat sip.h.in | sed -e s,@CFG_MODULE_NAME@,sip,g > sip.h -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ - install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so - # sipconfig.py sipdistutils.py - install -d ${D}${includedir} - install -m 0644 ../siplib/sip.h ${D}${includedir}/sip.h -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so" - diff --git a/recipes-deps/python/python-smbus_3.0.3.bb b/recipes-deps/python/python-smbus_3.0.3.bb deleted file mode 100644 index 3085d2f..0000000 --- a/recipes-deps/python/python-smbus_3.0.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Set of i2c tools for linux - Python module" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://smbusmodule.c;startline=1;endline=17;md5=fa24df321a520ff8e10f203425ab9fa8" - -SRC_URI = "http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-${PV}.tar.bz2 \ -" -SRC_URI[md5sum] = "511376eed04455cdb277ef19c5f73bb4" -SRC_URI[sha256sum] = "23b28e474741834e3f1b35b0686528769a13adc92d2ff5603cbda1d6bd5e5629" - -DEPENDS = "i2c-tools" - -inherit distutils - -S = "${WORKDIR}/i2c-tools-${PV}/py-smbus/" - -do_configure_prepend() { - # Adjust for OE header rename - sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: Module.mk - sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: smbusmodule.c -} diff --git a/recipes-deps/python/python-sqlalchemy_0.7.9.bb b/recipes-deps/python/python-sqlalchemy_0.7.9.bb deleted file mode 100644 index 09c9312..0000000 --- a/recipes-deps/python/python-sqlalchemy_0.7.9.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ -application developers the full power and flexibility of SQL" -HOMEPAGE = "http://www.sqlalchemy.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=baffc5e5f4804c92fc9be155fed70d41" -RDEPENDS_${PN} += "python-numbers" -PR = "r0" - -SRCNAME = "SQLAlchemy" -SRC_URI = "${SOURCEFORGE_MIRROR}/sqlalchemy/${SRCNAME}-${PV}.tar.gz" -SRC_URI[md5sum] = "c4852d586d95a59fbc9358f4467875d5" -SRC_URI[sha256sum] = "f7a305ad122144f364ce09a2d9ed5159d5f46ec43650653593e7dfa05d3294a1" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit setuptools diff --git a/recipes-deps/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch b/recipes-deps/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch deleted file mode 100644 index 0b0d471..0000000 --- a/recipes-deps/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d7fb0a6ef3f3cbdfc1f21f5a67d54fa9d2c1e183 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Wed, 2 Nov 2011 11:07:24 +0100 -Subject: [PATCH] disable AI_ADDRCONFIG flag - -Signed-off-by: Koen Kooi - -Upstream-Status: unknown ---- - tornado/netutil.py | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -diff --git a/tornado/netutil.py b/tornado/netutil.py -index cfff0ba..c181f24 100644 ---- a/tornado/netutil.py -+++ b/tornado/netutil.py -@@ -238,12 +238,6 @@ def bind_sockets(port, address=None, family=socket.AF_UNSPEC, backlog=128): - if address == "": - address = None - flags = socket.AI_PASSIVE -- if hasattr(socket, "AI_ADDRCONFIG"): -- # AI_ADDRCONFIG ensures that we only try to bind on ipv6 -- # if the system is configured for it, but the flag doesn't -- # exist on some platforms (specifically WinXP, although -- # newer versions of windows have it) -- flags |= socket.AI_ADDRCONFIG - for res in set(socket.getaddrinfo(address, port, family, socket.SOCK_STREAM, - 0, flags): - af, socktype, proto, canonname, sockaddr = res --- -1.7.2.5 - diff --git a/recipes-deps/python/python-tornado_git.bb b/recipes-deps/python/python-tornado_git.bb deleted file mode 100644 index 28026b3..0000000 --- a/recipes-deps/python/python-tornado_git.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Tornado is an open source version of the scalable, non-blocking web server and tools that power FriendFeed." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README;md5=e7fb9954003d7cd93322ccf282210d1c" - -PV = "2.2.1+git${SRCPV}" - -SRCREV = "c501917eba46dec30b1f2ef12497dffc4beec505" -SRC_URI = "git://github.com/facebook/tornado.git;branch=branch2.2 \ - file://0001-disable-AI_ADDRCONFIG-flag.patch \ -" - -S = "${WORKDIR}/git" - -inherit setuptools - - diff --git a/recipes-deps/python/python-twisted_10.2.0.bb b/recipes-deps/python/python-twisted_10.2.0.bb deleted file mode 100644 index d585bfa..0000000 --- a/recipes-deps/python/python-twisted_10.2.0.bb +++ /dev/null @@ -1,229 +0,0 @@ -DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \ -Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols \ -(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more." -HOMEPAGE = "http://www.twistedmatrix.com" -SECTION = "console/network" - -#twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL. -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c3159ad36d96a939fcd8f2c2c9b9d08a" -PR = "r3" - -SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/10.2/Twisted-${PV}.tar.bz2 " -SRC_URI[md5sum] = "73da62c793269eade8121da336b01ba5" -SRC_URI[sha256sum] = "562ed61c18aa72da99c23fb19c2c101d178995eb3a78ab3c09560a613e180c84" - -S = "${WORKDIR}/Twisted-${PV}" - -inherit setuptools - -do_install_append() { - # remove some useless files before packaging - find ${D} \( -name "*.bat" -o -name "*.c" -o -name "*.h" \) -exec rm -f {} \; -} - -PACKAGES += "\ - ${PN}-zsh \ - ${PN}-test \ - ${PN}-protocols \ - ${PN}-bin \ - ${PN}-conch \ - ${PN}-lore \ - ${PN}-mail \ - ${PN}-names \ - ${PN}-news \ - ${PN}-runner \ - ${PN}-web \ - ${PN}-words \ - ${PN}-flow \ - ${PN}-pair \ - ${PN}-core \ -" - -RDEPENDS_${PN} = "python-core python-zopeinterface" -RDEPENDS_${PN} += "\ - ${PN}-bin \ - ${PN}-conch \ - ${PN}-lore \ - ${PN}-mail \ - ${PN}-names \ - ${PN}-news \ - ${PN}-runner \ - ${PN}-web \ - ${PN}-words \ -" - -ALLOW_EMPTY_${PN} = "1" -FILES_${PN} = "" - -FILES_${PN}-test = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \ -" - -FILES_${PN}-protocols = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/*.py* \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/gps/ \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/mice/ \ -" - -FILES_${PN}-zsh = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \ -" - -FILES_${PN}-bin = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/_c_urlarg.so \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/cBanana.so \ -" - -FILES_${PN}-conch = " \ - ${bindir}/ckeygen \ - ${bindir}/tkconch \ - ${bindir}/conch \ - ${bindir}/conchftp \ - ${bindir}/cftp \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch \ -" - -FILES_${PN}-core = " \ -${bindir}/manhole \ -${bindir}/mktap \ -${bindir}/twistd \ -${bindir}/tap2deb \ -${bindir}/tap2rpm \ -${bindir}/tapconvert \ -${bindir}/tkmktap \ -${bindir}/trial \ -${bindir}/easy_install* \ -${bindir}/pyhtmlizer \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.so \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/dropin.cache \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/application \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/cred \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/enterprise \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/internet \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols\ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python\ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/tap/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/*.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/topfiles \ -${libdir}/${PYTHON_DIR}/site-packages/Twisted*egg-info \ -" - -FILES_${PN}-lore = " \ -${bindir}/bookify \ -${bindir}/lore \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_lore.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/lore \ -" - -FILES_${PN}-mail = " \ -${bindir}/mailmail \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/mail \ -" - -FILES_${PN}-names = " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/names \ -" - -FILES_${PN}-news = " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/news \ -" - -FILES_${PN}-runner = " \ -${libdir}/site-packages/twisted/runner/portmap.so \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/runner\ -" - -FILES_${PN}-web = " \ -${bindir}/websetroot \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/web\ -" - -FILES_${PN}-words = " \ -${bindir}/im \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/words\ -" - -FILES_${PN}-flow = " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_flow.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/flow \" - -FILES_${PN}-pair = " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_pair.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/pair \ -" - -FILES_${PN}-dbg += " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*/.debug \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/.debug \ -" - diff --git a/recipes-deps/python/python-vobject_0.8.1c.bb b/recipes-deps/python/python-vobject_0.8.1c.bb deleted file mode 100644 index 5c6d82b..0000000 --- a/recipes-deps/python/python-vobject_0.8.1c.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Python package for parsing and generating vCard and vCalendar files" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -HOMEPAGE = "http://vobject.skyhouseconsulting.com/" -SRCNAME = "vobject" -RDEPENDS_${PN} = "python python-dateutil" -PR = "r4" - -SRC_URI = "http://vobject.skyhouseconsulting.com/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit setuptools - -SRC_URI[md5sum] = "c9686dd74d39fdae140890d9c694c076" -SRC_URI[sha256sum] = "594113117f2017ed837c8f3ce727616f9053baa5a5463a7420c8249b8fc556f5" diff --git a/recipes-deps/python/python-webdav_0.1.2.bb b/recipes-deps/python/python-webdav_0.1.2.bb deleted file mode 100644 index 7a6437d..0000000 --- a/recipes-deps/python/python-webdav_0.1.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "This project aims to provide an object-oriented Python WebDAV client-side library\ - based on Python`s standard httplib and Greg Stein`s davlib.\ - The client shall fully support RFCs 4918 (basic specification),\ - 3744 (access control), and 3253 (versioning)." -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://src/webdav/WebdavClient.py;endline=15;md5=a1520fad859feb7b0d7f05277bc6ce48" -HOMEPAGE = "http://sourceforge.net/projects/pythonwebdavlib/" -SRCNAME = "Python_WebDAV_Library" -DEPENDS = "python" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pythonwebdavlib/Python%20WebDAV%20Library%20-%20${PV}/${SRCNAME}-${PV}.zip" -SRC_URI[md5sum] = "8e49e0ecc5b4327c4f752a544ee10e1a" -SRC_URI[sha256sum] = "72c029ad1e25de950f59c2f1812d009d2c1691b70e4b5b09f1af9006e8fd5f23" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - diff --git a/recipes-deps/python/python-zopeinterface_3.5.1.bb b/recipes-deps/python/python-zopeinterface_3.5.1.bb deleted file mode 100644 index f2dbee2..0000000 --- a/recipes-deps/python/python-zopeinterface_3.5.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Interface definitions for Zope products" -SECTION = "console/network" - -LICENSE = "ZPL-2.1" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e54fd776274c1b7423ec128974bd9d46" -PR = "r1" - -SRC_URI = "http://pypi.python.org/packages/source/z/zope.interface/zope.interface-${PV}.tar.gz" -SRC_URI[md5sum] = "685fc532550abb07cca6190c9cd2b901" -SRC_URI[sha256sum] = "b81d898532c47f73475c2d0c23580e289eed25923d007eca8e62750c0998bba0" - -S = "${WORKDIR}/zope.interface-${PV}" - -inherit setuptools - -RPROVIDES_${PN} += "zope-interfaces" -FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*.egg/*/*/.debug" -FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/zope/interface/*.c" -FILES_${PN}-doc += "${PYTHON_SITEPACKAGES_DIR}/zope/interface/*.txt" -FILES_${PN}-tests = " \ - ${PYTHON_SITEPACKAGES_DIR}/zope/interface/tests \ - ${PYTHON_SITEPACKAGES_DIR}/zope/interface/common/tests \ -" diff --git a/recipes-deps/rtlsdr/files/01_fix_pkgconfig.patch b/recipes-deps/rtlsdr/files/01_fix_pkgconfig.patch new file mode 100644 index 0000000..b786c71 --- /dev/null +++ b/recipes-deps/rtlsdr/files/01_fix_pkgconfig.patch @@ -0,0 +1,16 @@ +# YLB @ Axios provided this patch in openembedded-hawk +# There's not a cleaner way to get at this variable post-patch +# in bitbake so far as BTG can tell, either. +diff --git a/librtlsdr.pc.in b/librtlsdr.pc.in +index 5e55049..6c42f8c 100644 +--- a/librtlsdr.pc.in ++++ b/librtlsdr.pc.in +@@ -6,6 +6,7 @@ includedir=@includedir@ + Name: RTL-SDR Library + Description: C Utility Library + Version: @VERSION@ +-Cflags: -I${includedir}/ @RTLSDR_PC_CFLAGS@ ++# YLB - ugly hack should fix later. ++Cflags: -I${includedir}/ -I${includedir}/libusb-1.0 + Libs: -L${libdir} -lrtlsdr -lusb-1.0 + Libs.private: @RTLSDR_PC_LIBS@ diff --git a/recipes-deps/rtlsdr/rtlsdr_0.5.3.bb b/recipes-deps/rtlsdr/rtlsdr_0.5.3.bb index 945f4ab..7d9104c 100644 --- a/recipes-deps/rtlsdr/rtlsdr_0.5.3.bb +++ b/recipes-deps/rtlsdr/rtlsdr_0.5.3.bb @@ -6,14 +6,13 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING;md5=751419260aa954499f7abaabaa DEPENDS = "libusb1" RDEPENDS_${PN} = "libusb1" -SRC_URI = "git://git.osmocom.org/rtl-sdr.git;branch=master;protocol=git \ -" - -SRCREV = "df9596b2d1ebd36cdb14549cfdd76c25092e14d0" +SRC_URI = "\ + git://git.osmocom.org/rtl-sdr.git;tag=v0.5.3;protocol=git \ + file://01_fix_pkgconfig.patch \ + " PR = "r0" S = "${WORKDIR}/git" inherit autotools pkgconfig - diff --git a/recipes-deps/xsd/xsd_3.3.0-2.bb b/recipes-deps/xsd/xsd_3.3.0-2.bb index 7dc3227..b09e94c 100644 --- a/recipes-deps/xsd/xsd_3.3.0-2.bb +++ b/recipes-deps/xsd/xsd_3.3.0-2.bb @@ -28,7 +28,7 @@ DEPENDS = "" DEPENDS_virtclass-native = "xsd-dev" BBCLASSEXTEND = "native" -PROVIDES += "${PN}-dev" +PROVIDES += "${PN}-dev ${PN}-dev-native" SRC_URI = " \ http://codesynthesis.com/download/xsd/3.3/linux-gnu/x86_64/xsd-3.3.0-x86_64-linux-gnu.tar.bz2;name=xsd330bintarbz2 \ diff --git a/recipes-devices/gpp/files/01_Clear_AMFLAGS_GPP_NO_TEST.patch b/recipes-devices/gpp/files/01_Clear_AMFLAGS_GPP_NO_TEST.patch new file mode 100644 index 0000000..815ddd0 --- /dev/null +++ b/recipes-devices/gpp/files/01_Clear_AMFLAGS_GPP_NO_TEST.patch @@ -0,0 +1,18 @@ +--- cpp/Makefile.am 2017-01-09 15:40:57.047135798 -0500 ++++ cpp-patched/Makefile.am 2017-01-09 15:48:45.716371407 -0500 +@@ -24,15 +24,6 @@ + + xmldir = $(prefix)/dev/devices/GPP/ + dist_xml_DATA = ../GPP.scd.xml ../GPP.prf.xml ../GPP.spd.xml +-ACLOCAL_AMFLAGS = -I m4 -I${OSSIEHOME}/share/aclocal/ossie +- +-all-local: GPP +- mkdir -p ../tests/sdr/dev/devices/GPP/cpp +- cp GPP ../tests/sdr/dev/devices/GPP/cpp/ +- cp ../GPP.scd.xml ../tests/sdr/dev/devices/GPP/ +- cp ../GPP.spd.xml ../tests/sdr/dev/devices/GPP/ +- cp ../GPP.prf.xml ../tests/sdr/dev/devices/GPP/ +- ./gpp_setup --gppcfg --silent --location=../tests/sdr/dev/devices/GPP + + distclean-local: + rm -f config.* diff --git a/recipes-devices/gpp/files/02_armv7l_default_2.0.4.patch b/recipes-devices/gpp/files/02_armv7l_default_2.0.4.patch new file mode 100644 index 0000000..4ef5d3a --- /dev/null +++ b/recipes-devices/gpp/files/02_armv7l_default_2.0.4.patch @@ -0,0 +1,11 @@ +--- cpp/gpp_setup 2017-01-09 15:15:39.216102148 -0500 ++++ cpp-patched/gpp_setup 2017-01-09 15:16:25.909848851 -0500 +@@ -90,7 +90,7 @@ + 'i686':'x86', + 'x86_64':'x86_64', + 'armv7l':'armv7l'} +- self.props['processor_name'] = tmp_proc_map.get(tmp_uname_p, 'x86') ++ self.props['processor_name'] = tmp_proc_map.get(tmp_uname_p, 'armv7l') + + + diff --git a/recipes-devices/gpp/files/02_armv7l_default.patch b/recipes-devices/gpp/files/02_armv7l_default_pre-2.0.4.patch similarity index 100% rename from recipes-devices/gpp/files/02_armv7l_default.patch rename to recipes-devices/gpp/files/02_armv7l_default_pre-2.0.4.patch diff --git a/recipes-devices/gpp/files/configure-gpp_2.0.4 b/recipes-devices/gpp/files/configure-gpp_2.0.4 new file mode 100755 index 0000000..efd9f86 --- /dev/null +++ b/recipes-devices/gpp/files/configure-gpp_2.0.4 @@ -0,0 +1,14 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: configure-gpp +# Required-Start: +# Required-Stop: +# Default-Start: S +# Default-Stop: +### END INIT INFO + +echo "Configuring GPP" +source /etc/profile +cd $SDRROOT/dev/devices/GPP +cpp/gpp_setup --location=./ --mcastnic=MCASTNIC + diff --git a/recipes-devices/gpp/files/configure-gpp b/recipes-devices/gpp/files/configure-gpp_pre-2.0.4 similarity index 100% rename from recipes-devices/gpp/files/configure-gpp rename to recipes-devices/gpp/files/configure-gpp_pre-2.0.4 diff --git a/recipes-devices/gpp/gpp.inc b/recipes-devices/gpp/gpp.inc new file mode 100644 index 0000000..111932f --- /dev/null +++ b/recipes-devices/gpp/gpp.inc @@ -0,0 +1,70 @@ +# +# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed +# with this source distribution. +# +# This file is part of Geon Technology's meta-redhawk-sdr. +# +# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# + +DESCRIPTION = "REDHAWK Core Framework GPP" +HOMEPAGE = "http://www.redhawksdr.org" +LICENSE = "LGPL-3.0" +LIC_FILES_CHKSUM ?= "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +# ################################################ +# End user-controlled variables to adjust the node +# ################################################ +RH_GPP_MCASTNIC ?= "" +RH_GPP_NODE_NAME ?= "DevMgr-GPP" +# ################################################ + +DEPENDS = "redhawk-bulkio" +RDEPENDS_${PN} = "redhawk-bulkio" + +# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits +SRCTAG ?= "" +SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" + +SRC_URI ?= "git://github.com/RedhawkSDR/framework-GPP.git;${SRCTAGARG};protocol=git" + +SRC_URI_append = "\ + file://03_Add_Missing_Files.patch \ + file://05_GPP_ps_e.patch \ +" + +S ?= "${WORKDIR}/git/cpp" + + +# We have to inherit from pythonnative if we do stuff with the system python. +# autotools-brokensep is the sasme as autotools but our build and src locations are the same since we cannot build away from our src. +inherit autotools-brokensep pkgconfig pythonnative redhawk-device + +FILES_${PN} += "${SDRROOT}/*" +INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir installed-vs-shipped" + +EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" +EXTRA_OECONF += "--prefix=${SDRROOT}" + +# Setting pymod_ossie=yes is to avoid the configure call checking for the python ossie module. This isn't ideal but it checks by running python and trying to import said module which is all cross compiled. +# We could have it run in a native build but what does that really prove then? +CACHED_CONFIGUREVARS += "ac_cv_pymod_ossie=yes" + +# The GPP needs to be setup once it's running on the embedded system. +# This ensures the script is added to init.d and the XML files are linked +# to the volatile filesystem. +inherit update-rc.d +INITSCRIPT_NAME = "configure-gpp" +INITSCRIPT_PARAMS = "defaults 98" + diff --git a/recipes-devices/gpp/gpp_2.0.1.bb b/recipes-devices/gpp/gpp_2.0.1.bb index 7f38dbd..321f8ff 100644 --- a/recipes-devices/gpp/gpp_2.0.1.bb +++ b/recipes-devices/gpp/gpp_2.0.1.bb @@ -1,87 +1,13 @@ -# -# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed -# with this source distribution. -# -# This file is part of Geon Technology's meta-redhawk-sdr. -# -# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# +SRCTAG = "2.0.1" +PREFERRED_VERSION_redhawk-bulkio = "2.0.1" -DESCRIPTION = "REDHAWK Core Framework GPP" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -# ################################################ -# End user-controlled variables to adjust the node -# ################################################ -RH_GPP_MCASTNIC ?= "" -RH_GPP_NODE_NAME ?= "DevMgr-GPP" -# ################################################ - -DEPENDS = "redhawk-bulkio" -RDEPENDS_${PN} = "redhawk-bulkio" - -PREFERRED_VERSION_redhawk-bulkio = "2.%" - -SRC_URI = "git://github.com/RedhawkSDR/framework-GPP.git;tag=2.0.1;protocol=git \ +SRC_URI_append = "\ file://01_Clear_AMFLAGS_GPP.patch \ - file://02_armv7l_default.patch \ - file://03_Add_Missing_Files.patch \ + file://02_armv7l_default_pre-2.0.4.patch \ + file://configure-gpp_pre-2.0.4 \ file://04_GPP_spd_armv7l.patch;patchdir=${WORKDIR}/git \ - file://05_GPP_ps_e.patch \ - file://configure-gpp \ " -S = "${WORKDIR}/git/cpp" - - -# We have to inherit from pythonnative if we do stuff with the system python. -# autotools-brokensep is the sasme as autotools but our build and src locations are the same since we cannot build away from our src. -inherit autotools-brokensep pkgconfig pythonnative redhawk-device - -FILES_${PN} += "${SDRROOT}/*" -INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir installed-vs-shipped" - -EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" -EXTRA_OECONF += "--prefix=${SDRROOT}" - -# Setting pymod_ossie=yes is to avoid the configure call checking for the python ossie module. This isn't ideal but it checks by running python and trying to import said module which is all cross compiled. -# We could have it run in a native build but what does that really prove then? -CACHED_CONFIGUREVARS += "ac_cv_pymod_ossie=yes" - -# Dumb-down the build a bit. -CXXFLAGS += "-fpermissive" -CFLAGS += "-fpermissive" - - -# The GPP needs to be setup once it's running on the embedded system. -# This ensures the script is added to init.d and the XML files are linked -# to the volatile filesystem. -inherit update-rc.d -INITSCRIPT_NAME = "configure-gpp" -INITSCRIPT_PARAMS = "defaults 98" +include gpp.inc +include gpp_install_append_pre_2.0.4.inc -# Install the script -do_install_append() { - install -d ${D}/etc/init.d - sed -i "s|MCASTNIC|${RH_GPP_MCASTNIC}|g" ${WORKDIR}/configure-gpp - install -m 0755 ${WORKDIR}/configure-gpp ${D}/etc/init.d - - # Run create_node - ${D}${SDRROOT}/dev/devices/GPP/cpp/create_node.py \ - --sdrroot="${D}${SDRROOT}" \ - --nodename="${RH_GPP_NODE_NAME}" - -} diff --git a/recipes-devices/gpp/gpp_2.0.3.bb b/recipes-devices/gpp/gpp_2.0.3.bb new file mode 100644 index 0000000..8358fd4 --- /dev/null +++ b/recipes-devices/gpp/gpp_2.0.3.bb @@ -0,0 +1,13 @@ +SRCTAG = "2.0.3" +PREFERRED_VERSION_redhawk-bulkio = "2.0.3" + +SRC_URI_append = "\ + file://01_Clear_AMFLAGS_GPP.patch \ + file://02_armv7l_default_pre-2.0.4.patch \ + file://configure-gpp_pre-2.0.4 \ + file://04_GPP_spd_armv7l.patch;patchdir=${WORKDIR}/git \ +" + +include gpp.inc +include gpp_install_append_pre_2.0.4.inc + diff --git a/recipes-devices/gpp/gpp_2.0.4.bb b/recipes-devices/gpp/gpp_2.0.4.bb new file mode 100644 index 0000000..76b1a5b --- /dev/null +++ b/recipes-devices/gpp/gpp_2.0.4.bb @@ -0,0 +1,26 @@ +SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.4;protocol=git" + +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +S = "${WORKDIR}/git/GPP/cpp" + +PREFERRED_VERSION_redhawk-bulkio = "2.0.4" + +SRC_URI_append = "\ + file://01_Clear_AMFLAGS_GPP_NO_TEST.patch \ + file://02_armv7l_default_2.0.4.patch \ + file://configure-gpp_2.0.4 \ + file://04_GPP_spd_armv7l.patch;patchdir=${WORKDIR}/git/GPP \ +" + +# ################################################ +# End user-controlled variables to adjust the node +# ################################################ +RH_GPP_MCASTNIC ?= "" +RH_GPP_NODE_NAME ?= "DevMgr-GPP-${MACHINE}" +RH_GPP_NAME ?= "GPP-${TARGET_ARCH}" +# ################################################ + +include gpp.inc +include gpp_install_append_2.0.4.inc + diff --git a/recipes-devices/gpp/gpp_install_append_2.0.4.inc b/recipes-devices/gpp/gpp_install_append_2.0.4.inc new file mode 100644 index 0000000..12ad234 --- /dev/null +++ b/recipes-devices/gpp/gpp_install_append_2.0.4.inc @@ -0,0 +1,13 @@ + +# Install the script +do_install_append() { + install -d ${D}/etc/init.d + sed -i "s|MCASTNIC|${RH_GPP_MCASTNIC}|g" ${WORKDIR}/configure-gpp_2.0.4 + install -m 0755 ${WORKDIR}/configure-gpp_2.0.4 ${D}/etc/init.d/configure-gpp + + # Run node creator (containing just this device) + ${D}${SDRROOT}/dev/devices/GPP/cpp/gpp_setup \ + --sdrroot="${D}${SDRROOT}" \ + --nodename="${RH_GPP_NODE_NAME}" \ + --gppname="${RH_GPP_NAME}" +} diff --git a/recipes-devices/gpp/gpp_install_append_pre_2.0.4.inc b/recipes-devices/gpp/gpp_install_append_pre_2.0.4.inc new file mode 100644 index 0000000..6a60dd6 --- /dev/null +++ b/recipes-devices/gpp/gpp_install_append_pre_2.0.4.inc @@ -0,0 +1,12 @@ + +# Install the script +do_install_append() { + install -d ${D}/etc/init.d + sed -i "s|MCASTNIC|${RH_GPP_MCASTNIC}|g" ${WORKDIR}/configure-gpp_pre-2.0.4 + install -m 0755 ${WORKDIR}/configure-gpp_pre-2.0.4 ${D}/etc/init.d/configure-gpp + + # Run create_node + ${D}${SDRROOT}/dev/devices/GPP/cpp/create_node.py \ + --sdrroot="${D}${SDRROOT}" \ + --nodename="${RH_GPP_NODE_NAME}" +} diff --git a/recipes-devices/rtl2832u/files/nodeconfig.patch b/recipes-devices/rtl2832u/files/nodeconfig_2.0.0.patch similarity index 100% rename from recipes-devices/rtl2832u/files/nodeconfig.patch rename to recipes-devices/rtl2832u/files/nodeconfig_2.0.0.patch diff --git a/recipes-devices/rtl2832u/files/nodeconfig_2.0.1.patch b/recipes-devices/rtl2832u/files/nodeconfig_2.0.1.patch new file mode 100644 index 0000000..1ed9702 --- /dev/null +++ b/recipes-devices/rtl2832u/files/nodeconfig_2.0.1.patch @@ -0,0 +1,20 @@ +--- git/nodeconfig.py 2016-03-09 14:41:47.482999800 -0500 ++++ git-patched/nodeconfig.py 2016-03-09 14:43:45.513263853 -0500 +@@ -122,7 +122,7 @@ + compfiles = [{'id':RTL2832U_componentfile, 'localfile':os.path.join('/devices', 'rh', 'RTL2832U', 'RTL2832U.spd.xml')}] + else: + compfiles = [{'id':RTL2832U_componentfile, 'localfile':os.path.join('/nodes', self.options.nodename.replace('.','/'), 'RTL2832U', 'RTL2832U.spd.xml')}] +- compplacements = [{'refid':RTL2832U_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.RTL2832U_' + self.hostname.replace('.', '_')}]}] ++ compplacements = [{'refid':RTL2832U_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.RTL2832U'}]}] + + ##################### + # DeviceManager files +@@ -230,7 +230,7 @@ + from optparse import OptionParser + parser = OptionParser() + #parser.usage = "%s [options] [simple_prop1 simple_value1]..." +- parser.add_option("--domainname", dest="domainname", default=None, ++ parser.add_option("--domainname", dest="domainname", default="REDHAWK_DEV", + help="Must give a domain name") + parser.add_option("--rtlname", dest="name", default="", + help="Name of the targeted RTL") diff --git a/recipes-devices/rtl2832u/rtl2832u.inc b/recipes-devices/rtl2832u/rtl2832u.inc new file mode 100644 index 0000000..c22a01b --- /dev/null +++ b/recipes-devices/rtl2832u/rtl2832u.inc @@ -0,0 +1,83 @@ +# +# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed +# with this source distribution. +# +# This file is part of Geon Technology's meta-redhawk-sdr. +# +# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# + +DESCRIPTION = "REDHAWK Device for the RTL2832U" +HOMEPAGE = "http://www.redhawksdr.org" +LICENSE = "GPL-3.0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=92aadbd9e4b26926809a4e97460613d5" + +# ################################################ +# End user-controlled variables to adjust the node +# ################################################ +RH_RTL2832U_NAME ?= "" +RH_RTL2832U_VENDOR ?= "" +RH_RTL2832U_PRODUCT ?= "" +RH_RTL2832U_SERIAL ?= "" +RH_RTL2832U_INDEX ?= "" +RH_RTL2832U_NODE_NAME ?= "DevMgr-RTL2832U" +# ################################################ + + +DEPENDS = "redhawk-frontend redhawk-bulkio rtlsdr" +RDEPENDS_${PN} = "redhawk-frontend rtlsdr" + +# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits +SRCTAG ?= "" +SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" + +SRC_URI = "git://github.com/RedhawkSDR/RTL2832U.git;${SRCTAGARG};protocol=git \ + file://Add_Missing_Files.patch \ + file://Fix_rtl_version_constraint.patch \ + file://Clear_AMFLAGS.patch \ + file://nodeconfig_${PV}.patch \ +" + +S = "${WORKDIR}/git/cpp" + +# We have to inherit from pythonnative if we do stuff with the system python. +# autotools-brokensep is the same as autotools but our build and src locations are the same since we cannot build away from our src. +inherit autotools-brokensep pkgconfig pythonnative redhawk-device + +FILES_${PN} += "${SDRROOT}/*" +INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir installed-vs-shipped" + +EXTRA_OECONF += "--prefix=${SDRROOT}" +EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" + +# Link nodeconfig.py into the source directory so we can patch it. +addtask link_nodeconfig before do_patch after do_unpack +do_link_nodeconfig () { + mv ${S}/../nodeconfig.py ${S} + ln -sf ${S}/nodeconfig.py ${S}/../nodeconfig.py +} + +# Install the template node +do_install_append () { + ${D}${SDRROOT}/dev/devices/rh/RTL2832U/nodeconfig.py \ + --sdrroot="${D}${SDRROOT}" \ + --nodename="DevMgr-${MACHINE}-RTL2832U" \ + --rtlname="${RH_RTL2832U_NAME}" \ + --rtlvendor="${RH_RTL2832U_VENDOR}" \ + --rtlproduct="${RH_RTL2832U_PRODUCT}" \ + --rtlserial="${RH_RTL2832U_SERIAL}" \ + --rtlindex="${RH_RTL2832U_INDEX}" \ + --inplace +} + diff --git a/recipes-devices/rtl2832u/rtl2832u_2.0.0.bb b/recipes-devices/rtl2832u/rtl2832u_2.0.0.bb index e365354..8c91f83 100644 --- a/recipes-devices/rtl2832u/rtl2832u_2.0.0.bb +++ b/recipes-devices/rtl2832u/rtl2832u_2.0.0.bb @@ -1,79 +1,4 @@ -# -# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed -# with this source distribution. -# -# This file is part of Geon Technology's meta-redhawk-sdr. -# -# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# - -DESCRIPTION = "REDHAWK Device for the RTL2832U" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "GPL-3.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=92aadbd9e4b26926809a4e97460613d5" - -# ################################################ -# End user-controlled variables to adjust the node -# ################################################ -RH_RTL2832U_NAME ?= "" -RH_RTL2832U_VENDOR ?= "" -RH_RTL2832U_PRODUCT ?= "" -RH_RTL2832U_SERIAL ?= "" -RH_RTL2832U_INDEX ?= "" -RH_RTL2832U_NODE_NAME ?= "DevMgr-RTL2832U" -# ################################################ - - -DEPENDS = "redhawk-frontend redhawk-bulkio rtlsdr" -RDEPENDS_${PN} = "redhawk-frontend rtlsdr" - -SRC_URI = "git://github.com/RedhawkSDR/RTL2832U.git;tag=2.0.0;protocol=git \ - file://Add_Missing_Files.patch \ - file://Fix_rtl_version_constraint.patch \ - file://Clear_AMFLAGS.patch \ - file://nodeconfig.patch \ -" - -S = "${WORKDIR}/git/cpp" - -# We have to inherit from pythonnative if we do stuff with the system python. -# autotools-brokensep is the same as autotools but our build and src locations are the same since we cannot build away from our src. -inherit autotools-brokensep pkgconfig pythonnative redhawk-device - -FILES_${PN} += "${SDRROOT}/*" -INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir installed-vs-shipped" - -EXTRA_OECONF += "--prefix=${SDRROOT}" -EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" - -# Link nodeconfig.py into the source directory so we can patch it. -addtask link_nodeconfig before do_patch after do_unpack -do_link_nodeconfig () { - mv ${S}/../nodeconfig.py ${S} - ln -sf ${S}/nodeconfig.py ${S}/../nodeconfig.py -} - -# Install the template node -do_install_append () { - ${D}${SDRROOT}/dev/devices/rh/RTL2832U/nodeconfig.py \ - --sdrroot="${D}${SDRROOT}" \ - --nodename="DevMgr-${MACHINE}-RTL2832U" \ - --rtlname="${RH_RTL2832U_NAME}" \ - --rtlvendor="${RH_RTL2832U_VENDOR}" \ - --rtlproduct="${RH_RTL2832U_PRODUCT}" \ - --rtlserial="${RH_RTL2832U_SERIAL}" \ - --rtlindex="${RH_RTL2832U_INDEX}" \ - --inplace -} +SRCTAG = "2.0.0" +PREFERRED_VERSION_redhawk-bulkio = "2.0.0" +include rtl2832u.inc diff --git a/recipes-devices/rtl2832u/rtl2832u_2.0.1.bb b/recipes-devices/rtl2832u/rtl2832u_2.0.1.bb new file mode 100644 index 0000000..f52d80f --- /dev/null +++ b/recipes-devices/rtl2832u/rtl2832u_2.0.1.bb @@ -0,0 +1,4 @@ +SRCTAG = "2.0.1" +PREFERRED_VERSION_redhawk-bulkio = "2.0.3" + +include rtl2832u.inc diff --git a/recipes-devices/usrp-uhd/files/nodeconfig.patch b/recipes-devices/usrp-uhd/files/nodeconfig_4.0.0.patch similarity index 100% rename from recipes-devices/usrp-uhd/files/nodeconfig.patch rename to recipes-devices/usrp-uhd/files/nodeconfig_4.0.0.patch diff --git a/recipes-devices/usrp-uhd/files/nodeconfig_4.0.1.patch b/recipes-devices/usrp-uhd/files/nodeconfig_4.0.1.patch new file mode 100644 index 0000000..d90d512 --- /dev/null +++ b/recipes-devices/usrp-uhd/files/nodeconfig_4.0.1.patch @@ -0,0 +1,20 @@ +--- git/nodeconfig.py 2016-03-10 07:01:00.251851153 -0500 ++++ git-patched/nodeconfig.py 2016-03-10 07:04:01.358334653 -0500 +@@ -121,7 +121,7 @@ + compfiles = [{'id':USRP_UHD_componentfile, 'localfile':os.path.join('/devices', 'rh', 'USRP_UHD', 'USRP_UHD.spd.xml')}] + else: + compfiles = [{'id':USRP_UHD_componentfile, 'localfile':os.path.join('/nodes', self.options.nodename.replace('.','/'), 'USRP_UHD', 'USRP_UHD.spd.xml')}] +- compplacements = [{'refid':USRP_UHD_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.USRP_UHD_' + self.hostname.replace('.', '_')}]}] ++ compplacements = [{'refid':USRP_UHD_componentfile, 'instantiations':[{'id':self.uuids["componentinstantiation"], 'usagename':'rh.USRP_UHD'}]}] + + ##################### + # DeviceManager files +@@ -229,7 +229,7 @@ + from optparse import OptionParser + parser = OptionParser() + parser.usage = "%s [options] [simple_prop1 simple_value1]..." +- parser.add_option("--domainname", dest="domainname", default=None, ++ parser.add_option("--domainname", dest="domainname", default="REDHAWK_DEV", + help="Must give a domainname") + parser.add_option("--usrptype", dest="type", default="", + help="The hardware series identifier (usrp1, usrp2, b200, x300, ...)") diff --git a/recipes-devices/usrp-uhd/usrp-uhd.inc b/recipes-devices/usrp-uhd/usrp-uhd.inc new file mode 100644 index 0000000..0837fe9 --- /dev/null +++ b/recipes-devices/usrp-uhd/usrp-uhd.inc @@ -0,0 +1,87 @@ +# +# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed +# with this source distribution. +# +# This file is part of Geon Technology's meta-redhawk-sdr. +# +# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# + +DESCRIPTION = "REDHAWK Device for the USRP UHD" +HOMEPAGE = "http://www.redhawksdr.org" +LICENSE = "GPL-3.0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +# NOTE: This recipe requires the USRP UHD driver and hardware installed +# which is provided by the meta-sdr layer which relies on meta-ettus. + +# ################################################ +# End user-controlled variables to adjust the node +# ################################################ +RH_USRP_UHD_TYPE ?= "e3x0" +RH_USRP_UHD_NAME ?= "" +RH_USRP_UHD_IP ?= "" +RH_USRP_UHD_SERIAL ?= "" +RH_USRP_UHD_NODE_NAME ?= "DevMgr-USRP_UHD" +# ################################################ + +DEPENDS = "redhawk-bulkio redhawk-frontend uhd" +RDEPENDS_${PN} = "redhawk-bulkio redhawk-frontend uhd" + +# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits +SRCTAG ?= "" +SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" + +SRC_URI = "git://github.com/RedhawkSDR/USRP_UHD.git;${SRCTAGARG};protocol=git \ + file://Add_Missing_Files.patch \ + file://nodeconfig_${PV}.patch \ + file://Clear_AMFLAGS.patch \ + file://remove_x86.patch \ +" + +S = "${WORKDIR}/git/cpp" + +# We have to inherit from pythonnative if we do stuff with the system python. +# autotools-brokensep is the same as autotools but our build and src locations are the same since we cannot build away from our src. +inherit autotools-brokensep pkgconfig pythonnative redhawk-device + +EXTRA_OECONF += "--prefix=${SDRROOT}" +EXTRA_AUTORECONF += "-I ${STAGING_DIR}/${MACHINE}${OSSIEHOME}/share/aclocal/ossie" + +FILES_${PN} += "${SDRROOT}/*" +INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir installed-vs-shipped" + + +# Link nodeconfig.py and SPD into the source directory so we can patch it. +addtask link_nodeconfig before do_patch after do_unpack +do_link_nodeconfig () { + mv ${S}/../nodeconfig.py \ + ${S}/../USRP_UHD.spd.xml \ + ${S} + ln -sf ${S}/nodeconfig.py ${S}/../nodeconfig.py + ln -sf ${S}/USRP_UHD.spd.xml ${S}/../USRP_UHD.spd.xml +} + +# Install the template node +do_install_append () { + ${D}${SDRROOT}/dev/devices/rh/USRP_UHD/nodeconfig.py \ + --sdrroot="${D}${SDRROOT}" \ + --nodename="${RH_USRP_UHD_NODE_NAME}" \ + --usrptype="${RH_USRP_UHD_TYPE}" \ + --usrpip="${RH_USRP_UHD_IP}" \ + --usrpname="${RH_USRP_UHD_IP}" \ + --usrpserial="${RH_USRP_UHD_SERIAL}" \ + --inplace \ +} + diff --git a/recipes-devices/usrp-uhd/usrp-uhd_4.0.0.bb b/recipes-devices/usrp-uhd/usrp-uhd_4.0.0.bb index b29b95a..e5484af 100644 --- a/recipes-devices/usrp-uhd/usrp-uhd_4.0.0.bb +++ b/recipes-devices/usrp-uhd/usrp-uhd_4.0.0.bb @@ -1,85 +1,5 @@ -# -# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed -# with this source distribution. -# -# This file is part of Geon Technology's meta-redhawk-sdr. -# -# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# - -DESCRIPTION = "REDHAWK Device for the USRP UHD" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "GPL-3.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -# NOTE: This recipe requires the USRP UHD driver and hardware installed -# which is provided by the meta-sdr layer which relies on meta-ettus. - -# ################################################ -# End user-controlled variables to adjust the node -# ################################################ -RH_USRP_UHD_TYPE ?= "e3x0" -RH_USRP_UHD_NAME ?= "" -RH_USRP_UHD_IP ?= "" -RH_USRP_UHD_SERIAL ?= "" -RH_USRP_UHD_NODE_NAME ?= "DevMgr-USRP_UHD" -# ################################################ - -DEPENDS = "redhawk-frontend uhd" -RDEPENDS_${PN} = "redhawk-frontend uhd" - -SRC_URI = "git://github.com/RedhawkSDR/USRP_UHD.git;tag=4.0.0;protocol=git \ - file://Add_Missing_Files.patch \ - file://nodeconfig.patch \ - file://Clear_AMFLAGS.patch \ - file://remove_x86.patch \ -" - -PR = "r0" - -S = "${WORKDIR}/git/cpp" - -# We have to inherit from pythonnative if we do stuff with the system python. -# autotools-brokensep is the same as autotools but our build and src locations are the same since we cannot build away from our src. -inherit autotools-brokensep pkgconfig pythonnative redhawk-device - -EXTRA_OECONF += "--prefix=${SDRROOT}" -EXTRA_AUTORECONF += "-I ${STAGING_DIR}/${MACHINE}${OSSIEHOME}/share/aclocal/ossie" - -FILES_${PN} += "${SDRROOT}/*" -INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir installed-vs-shipped" - - -# Link nodeconfig.py and SPD into the source directory so we can patch it. -addtask link_nodeconfig before do_patch after do_unpack -do_link_nodeconfig () { - mv ${S}/../nodeconfig.py \ - ${S}/../USRP_UHD.spd.xml \ - ${S} - ln -sf ${S}/nodeconfig.py ${S}/../nodeconfig.py - ln -sf ${S}/USRP_UHD.spd.xml ${S}/../USRP_UHD.spd.xml -} - -# Install the template node -do_install_append () { - ${D}${SDRROOT}/dev/devices/rh/USRP_UHD/nodeconfig.py \ - --sdrroot="${D}${SDRROOT}" \ - --nodename="${RH_USRP_UHD_NODE_NAME}" \ - --usrptype="${RH_USRP_UHD_TYPE}" \ - --usrpip="${RH_USRP_UHD_IP}" \ - --usrpname="${RH_USRP_UHD_IP}" \ - --usrpserial="${RH_USRP_UHD_SERIAL}" \ - --inplace \ -} +SRCTAG = "4.0.0-3" +PREFERRED_VERSION_redhawk-bulkio = "2.0.3" +PREFERRED_VERSION_redhawk-frontend = "2.3.2" +include usrp-uhd.inc diff --git a/recipes-devices/usrp-uhd/usrp-uhd_4.0.1.bb b/recipes-devices/usrp-uhd/usrp-uhd_4.0.1.bb new file mode 100644 index 0000000..4b63dbe --- /dev/null +++ b/recipes-devices/usrp-uhd/usrp-uhd_4.0.1.bb @@ -0,0 +1,5 @@ +SRCTAG = "4.0.1" +PREFERRED_VERSION_redhawk-bulkio = "2.0.3" +PREFERRED_VERSION_redhawk-frontend = "2.3.3" +include usrp-uhd.inc + diff --git a/recipes-images/images/native-sdk.inc b/recipes-images/images/native-sdk.inc index 0e190e6..41204c5 100644 --- a/recipes-images/images/native-sdk.inc +++ b/recipes-images/images/native-sdk.inc @@ -7,6 +7,7 @@ TOOLCHAIN_HOST_TASK_append = " nativesdk-python-cheetah \ nativesdk-cmake nativesdk-python-mako \ " +# Removed glib-2.0 CORE_IMAGE_EXTRA_INSTALL = "\ alsa-utils \ i2c-tools \ @@ -26,13 +27,10 @@ CORE_IMAGE_EXTRA_INSTALL = "\ python-distutils \ python-numpy \ htop \ - sshfs-fuse \ - glib-2.0 \ orc \ libudev \ iperf \ openssh-sftp \ openssh-sftp-server \ fftwf \ - ntpdate \ " diff --git a/recipes-images/images/redhawk-base-image.bb b/recipes-images/images/redhawk-base-image.bb index 509bb8b..7afa06c 100644 --- a/recipes-images/images/redhawk-base-image.bb +++ b/recipes-images/images/redhawk-base-image.bb @@ -26,8 +26,9 @@ LICENSE = "LGPL-3.0" require version-image.inc require native-sdk.inc +# Removed tools-sdk debug-tweaks dev-pkgs tools-debug IMAGE_FEATURES += " \ - splash ssh-server-openssh tools-sdk tools-debug debug-tweaks dev-pkgs \ + splash ssh-server-openssh \ " EXTRA_IMAGE_FEATURES += "package-management" diff --git a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio.inc b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio.inc new file mode 100644 index 0000000..d3b8c5e --- /dev/null +++ b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio.inc @@ -0,0 +1,103 @@ +# +# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed +# with this source distribution. +# +# This file is part of Geon Technology's meta-redhawk-sdr. +# +# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# + +DESCRIPTION = "REDHAWK Framework BulkIO Interfaces" +HOMEPAGE = "http://www.redhawksdr.org" +LICENSE = "LGPL-3.0" +LIC_FILES_CHKSUM ?= "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +DEPENDS = "redhawk-core" +RDEPENDS_${PN} = "redhawk-core" +RDEPENDS_${PN}-python = "redhawk-core-python" + +PACKAGES += "${PN}-python" +PROVIDES += "${PN}-python" + +# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits +SRCTAG ?= "" +SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" + +SRC_URI ?= "git://github.com/RedhawkSDR/framework-bulkioInterfaces.git;${SRCTAGARG};protocol=git" + +SRC_URI_append = "\ + file://subdir_objects.patch \ + file://Add_Missing_Files.patch \ +" + +S ?= "${WORKDIR}/git" + +# We have to inherit from pythonnative if we do stuff with the system python. +# autotools-brokensep is the sasme as autotools but our build and src locations are the same since we cannot build away from our src. +inherit autotools-brokensep pkgconfig pythonnative redhawk-sysroot redhawk-oeconf + +FILES_${PN}-python += " \ + ${OSSIEHOME}/lib/python \ +" + +FILES_${PN} += " \ + ${OSSIEHOME}/lib/lib*.so.* \ +" + +FILES_${PN}-dbg += " \ + ${OSSIEHOME}/lib/.debug \ +" + +FILES_${PN}-dev += " \ + ${OSSIEHOME}/lib/lib*.so \ + ${OSSIEHOME}/include \ + ${OSSIEHOME}/share/* \ + ${OSSIEHOME}/lib/pkgconfig \ +" + +FILES_${PN}-staticdev += " \ + ${OSSIEHOME}/lib/*.a \ + ${OSSIEHOME}/lib/lib*.la \ +" + +INSANE_SKIP_${PN} += "libdir" +INSANE_SKIP_${PN}-dbg += "libdir" + +EXTRA_OECONF += "\ + --disable-java \ + --disable-log4cxx \ + --with-boost-system=boost_system \ + " + +EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" + +CXXFLAGS += "-fpermissive" + +# Needed so that when the python distutils is run it can get the system prefix which, since it's the build system python will be /.../x86_64-linux/usr and replace it with our host systems name. +do_configure_prepend() { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} + export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" +} + +# Needed so that when the python distutils is run it can get the system prefix. +do_install_prepend() { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} +} + diff --git a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.1.bb b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.1.bb index 4826f24..bfb3171 100644 --- a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.1.bb +++ b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.1.bb @@ -1,75 +1,5 @@ -# -# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed -# with this source distribution. -# -# This file is part of Geon Technology's meta-redhawk-sdr. -# -# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# +SRCTAG = "2.0.1" +PREFERRED_VERSION_redhawk-core = "2.0.1" -DESCRIPTION = "REDHAWK Framework BulkIO Interfaces" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -DEPENDS = "redhawk-core" -RDEPENDS_${PN} = "redhawk-core" - -PREFERRED_VERSION_redhawk-core = "2.%" - -SRC_URI = "git://github.com/RedhawkSDR/framework-bulkioInterfaces.git;tag=2.0.1;protocol=git \ - file://subdir_objects.patch \ - file://Add_Missing_Files.patch \ -" - -S = "${WORKDIR}/git" - -# We have to inherit from pythonnative if we do stuff with the system python. -# autotools-brokensep is the sasme as autotools but our build and src locations are the same since we cannot build away from our src. -inherit autotools-brokensep pkgconfig pythonnative redhawk-sysroot redhawk-oeconf - -FILES_${PN} += " \ - ${OSSIEHOME}/* \ -" -INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir installed-vs-shipped" - -EXTRA_OECONF += "\ - --disable-java \ - --disable-log4cxx \ - --with-boost-system=boost_system \ - " -EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" - -# Required -CXXFLAGS += "-fpermissive" -CFLAGS += "-fpermissive" - - -# Needed so that when the python distutils is run it can get the system prefix which, since it's the build system python will be /.../x86_64-linux/usr and replace it with our host systems name. -do_configure_prepend() { - export BUILD_SYS=${BUILD_SYS} - export HOST_SYS=${HOST_SYS} - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} - export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" -} - -# Needed so that when the python distutils is run it can get the system prefix. -do_install_prepend() { - export BUILD_SYS=${BUILD_SYS} - export HOST_SYS=${HOST_SYS} - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} -} +include redhawk-bulkio.inc diff --git a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.2.bb b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.2.bb new file mode 100644 index 0000000..8fa0a94 --- /dev/null +++ b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.2.bb @@ -0,0 +1,6 @@ +SRCTAG = "2.0.2" +PREFERRED_VERSION_redhawk-core = "2.0.2" +INSANE_SKIP_${PN}-dbg += "libdir" + +include redhawk-bulkio.inc + diff --git a/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.4.bb b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.4.bb new file mode 100644 index 0000000..8a07c20 --- /dev/null +++ b/recipes-redhawk/redhawk-bulkio/redhawk-bulkio_2.0.4.bb @@ -0,0 +1,12 @@ +SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.4;protocol=git" + +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +S = "${WORKDIR}/git/bulkioInterfaces" + +PREFERRED_VERSION_redhawk-core = "2.0.4" + +INSANE_SKIP_${PN}-dbg += "libdir" + +include redhawk-bulkio.inc + diff --git a/recipes-redhawk/redhawk-burstio/redhawk-burstio.inc b/recipes-redhawk/redhawk-burstio/redhawk-burstio.inc new file mode 100644 index 0000000..f4aff44 --- /dev/null +++ b/recipes-redhawk/redhawk-burstio/redhawk-burstio.inc @@ -0,0 +1,106 @@ +# +# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed +# with this source distribution. +# +# This file is part of Geon Technology's meta-redhawk-sdr. +# +# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# + +DESCRIPTION = "REDHAWK Framework BulkIO Interfaces" +HOMEPAGE = "http://www.redhawksdr.org" +LICENSE = "LGPL-3.0" +LIC_FILES_CHKSUM ?= "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +DEPENDS = "redhawk-bulkio" +RDEPENDS_${PN} = "redhawk-bulkio" +RDEPENDS_${PN}-python = "redhawk-bulkio-python" + +PACKAGES += "${PN}-python" +PROVIDES += "${PN}-python" + +# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits +SRCTAG ?= "" +SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" + +SRC_URI ?= "git://github.com/RedhawkSDR/burstIOInterfaces.git;${SRCTAGARG};protocol=git" + +SRC_URI_append = "\ + file://subdir_objects.patch \ + file://makefile.am.patch \ + file://IDLDIR.patch \ +" + +S ?= "${WORKDIR}/git" + +# We have to inherit from pythonnative if we do stuff with the system python. +# autotools-brokensep is the sasme as autotools but our build and src locations are the same since we cannot build away from our src. +inherit autotools-brokensep pkgconfig pythonnative redhawk-sysroot redhawk-oeconf + + +FILES_${PN}-python += " \ + ${OSSIEHOME}/lib/python \ +" + +FILES_${PN} += " \ + ${OSSIEHOME}/lib/lib*.so.* \ +" + +FILES_${PN}-dbg += " \ + ${OSSIEHOME}/lib/.debug \ +" + +FILES_${PN}-dev += " \ + ${OSSIEHOME}/lib/lib*.so \ + ${OSSIEHOME}/include \ + ${OSSIEHOME}/share/* \ + ${OSSIEHOME}/lib/pkgconfig \ +" + +FILES_${PN}-staticdev += " \ + ${OSSIEHOME}/lib/*.a \ + ${OSSIEHOME}/lib/lib*.la \ +" + +INSANE_SKIP_${PN} += "libdir" +INSANE_SKIP_${PN}-dbg += "libdir" + + +EXTRA_OECONF += "\ + -disable-java \ + --with-boost-system=boost_system \ + " +EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" + +CXXFLAGS += "-fpermissive" + +PARALLEL_MAKE = "" + +# Needed so that when the python distutils is run it can get the system prefix which, since it's the build system python will be /.../x86_64-linux/usr and replace it with our host systems name. +do_configure_prepend() { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} + export STAGING_BASE=${STAGING_DIR}/${MACHINE} + export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" +} + +# Needed so that when the python distutils is run it can get the system prefix. +do_install_prepend() { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} +} diff --git a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.1.bb b/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.1.bb index dc503b7..9c34ca6 100644 --- a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.1.bb +++ b/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.1.bb @@ -1,78 +1,5 @@ -# -# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed -# with this source distribution. -# -# This file is part of Geon Technology's meta-redhawk-sdr. -# -# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# +SRCTAG = "2.0.1" +PREFERRED_VERSION_redhawk-core = "2.0.1" -DESCRIPTION = "REDHAWK Framework BulkIO Interfaces" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" +include redhawk-burstio.inc -DEPENDS = "redhawk-bulkio" -RDEPENDS_${PN} = "redhawk-bulkio" - -PREFERRED_VERSION_redhawk-bulkio = "2.%" - -SRC_URI = "git://github.com/RedhawkSDR/burstIOInterfaces.git;tag=2.0.1;protocol=git \ - file://subdir_objects.patch \ - file://makefile.am.patch \ - file://IDLDIR.patch \ -" - -S = "${WORKDIR}/git" - -# We have to inherit from pythonnative if we do stuff with the system python. -# autotools-brokensep is the sasme as autotools but our build and src locations are the same since we cannot build away from our src. -inherit autotools-brokensep pkgconfig pythonnative redhawk-sysroot redhawk-oeconf - - -FILES_${PN} += " \ - ${OSSIEHOME}/* \ -" -INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir" - - -EXTRA_OECONF += "\ - -disable-java \ - --with-boost-system=boost_system \ - " -EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" - -# Required -CXXFLAGS += "-fpermissive" -CFLAGS += "-fpermissive" - -PARALLEL_MAKE = "" - -# Needed so that when the python distutils is run it can get the system prefix which, since it's the build system python will be /.../x86_64-linux/usr and replace it with our host systems name. -do_configure_prepend() { - export BUILD_SYS=${BUILD_SYS} - export HOST_SYS=${HOST_SYS} - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} - export STAGING_BASE=${STAGING_DIR}/${MACHINE} - export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" -} - -# Needed so that when the python distutils is run it can get the system prefix. -do_install_prepend() { - export BUILD_SYS=${BUILD_SYS} - export HOST_SYS=${HOST_SYS} - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} -} diff --git a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.2.bb b/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.2.bb new file mode 100644 index 0000000..53efc95 --- /dev/null +++ b/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.2.bb @@ -0,0 +1,6 @@ +SRCTAG = "2.0.2" +PREFERRED_VERSION_redhawk-core = "2.0.2" +INSANE_SKIP_${PN}-dbg += "libdir" + +include redhawk-burstio.inc + diff --git a/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.4.bb b/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.4.bb new file mode 100644 index 0000000..0212d77 --- /dev/null +++ b/recipes-redhawk/redhawk-burstio/redhawk-burstio_2.0.4.bb @@ -0,0 +1,12 @@ +SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.4;protocol=git" + +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +S = "${WORKDIR}/git/burstioInterfaces" + +PREFERRED_VERSION_redhawk-core = "2.0.4" + +INSANE_SKIP_${PN}-dbg += "libdir" + +include redhawk-burstio.inc + diff --git a/recipes-redhawk/redhawk-codegen/redhawk-codegen.inc b/recipes-redhawk/redhawk-codegen/redhawk-codegen.inc new file mode 100644 index 0000000..4cbedb5 --- /dev/null +++ b/recipes-redhawk/redhawk-codegen/redhawk-codegen.inc @@ -0,0 +1,53 @@ +# +# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed +# with this source distribution. +# +# This file is part of Geon Technology's meta-redhawk-sdr. +# +# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# + +DESCRIPTION = "REDHAWK Codegen" +HOMEPAGE = "http://www.redhawksdr.org" +LICENSE = "LGPL-3.0" +LIC_FILES_CHKSUM ?= "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +DEPENDS = "redhawk-core" +RDEPENDS_${PN} = "redhawk-core python" + +# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits +SRCTAG ?= "" +SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" + +SRC_URI ?= "git://github.com/RedhawkSDR/framework-codegen.git;${SRCTAGARG};protocol=git" + +S ?= "${WORKDIR}/git" + +# Recipe concept based on: http://stackoverflow.com/questions/16090550/building-python-packages + +# This is a python package +inherit setuptools redhawk-env + +do_configure_prepend() { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} +} + +BBCLASSEXTEND = "native" + +do_install_append() { + rm -f ${D}${libdir}/python*/site-packages/site.py* +} diff --git a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.1.bb b/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.1.bb index 1b7cb04..1509596 100644 --- a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.1.bb +++ b/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.1.bb @@ -1,51 +1,5 @@ -# -# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed -# with this source distribution. -# -# This file is part of Geon Technology's meta-redhawk-sdr. -# -# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# +SRCTAG = "2.0.1" +PREFERRED_VERSION_redhawk-core = "2.0.1" -DESCRIPTION = "REDHAWK Codegen" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" +include redhawk-codegen.inc -DEPENDS = "redhawk-core" -RDEPENDS_${PN} = "redhawk-core python" - -PREFERRED_VERSION_redhawk-core = "2.%" - -SRC_URI = "git://github.com/RedhawkSDR/framework-codegen.git;tag=2.0.1;protocol=git" - -S = "${WORKDIR}/git" - -# Recipe concept based on: http://stackoverflow.com/questions/16090550/building-python-packages - -# This is a python package -inherit setuptools redhawk-env - -do_configure_prepend() { - export BUILD_SYS=${BUILD_SYS} - export HOST_SYS=${HOST_SYS} - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} -} - -BBCLASSEXTEND = "native" - -do_install_append() { - rm -f ${D}${libdir}/python*/site-packages/site.py* -} diff --git a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.2.bb b/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.2.bb new file mode 100644 index 0000000..fc76428 --- /dev/null +++ b/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.2.bb @@ -0,0 +1,5 @@ +SRCTAG = "2.0.2" +PREFERRED_VERSION_redhawk-core = "2.0.2" + +include redhawk-codegen.inc + diff --git a/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.4.bb b/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.4.bb new file mode 100644 index 0000000..9a93aef --- /dev/null +++ b/recipes-redhawk/redhawk-codegen/redhawk-codegen_2.0.4.bb @@ -0,0 +1,10 @@ +SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.4;protocol=git" + +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +S = "${WORKDIR}/git/redhawk-codegen" + +PREFERRED_VERSION_redhawk-core = "2.0.4" + +include redhawk-codegen.inc + diff --git a/recipes-redhawk/redhawk-core/files/gcc_fix_ApplicationFactory_impl.patch b/recipes-redhawk/redhawk-core/files/gcc_fix_ApplicationFactory_impl.patch new file mode 100644 index 0000000..a3bae58 --- /dev/null +++ b/recipes-redhawk/redhawk-core/files/gcc_fix_ApplicationFactory_impl.patch @@ -0,0 +1,15 @@ +# Patch provided from http://stackoverflow.com/questions/38571741 +# user bhilburn +diff --git src-a/control/sdr/dommgr/ApplicationFactory_impl.cpp src-b/control/sdr/dommgr/ApplicationFactory_impl.cpp +index d370519..92699e0 100644 +--- src-a/control/sdr/dommgr/ApplicationFactory_impl.cpp ++++ src-b/control/sdr/dommgr/ApplicationFactory_impl.cpp +@@ -194,7 +194,7 @@ void ApplicationFactory_impl::ValidateSPD(CF::FileManager_ptr fileMgr, + const bool require_prf, + const bool require_scd) { + SoftPkg pkg; +- ValidateSPD(fileMgr, pkg, false, false ); ++ ValidateSPD(fileMgr, pkg, sfw_profile, require_prf, require_scd); + } + + void ApplicationFactory_impl::ValidateSPD(CF::FileManager_ptr fileMgr, diff --git a/recipes-redhawk/redhawk-core/files/gcc_fix_applicationSupport.patch b/recipes-redhawk/redhawk-core/files/gcc_fix_applicationSupport.patch new file mode 100644 index 0000000..fdc8e4a --- /dev/null +++ b/recipes-redhawk/redhawk-core/files/gcc_fix_applicationSupport.patch @@ -0,0 +1,15 @@ +# Patch provided from http://stackoverflow.com/questions/38571741 +# user bhilburn +diff --git src-a/control/sdr/dommgr/applicationSupport.cpp src-b/control/sdr/dommgr/applicationSupport.cpp +index 1daa7ce..fbb5ac8 100644 +--- src-a/control/sdr/dommgr/applicationSupport.cpp ++++ src-b/control/sdr/dommgr/applicationSupport.cpp +@@ -853,7 +853,7 @@ const bool ComponentInfo::isScaCompliant() + + bool ComponentInfo::isAssignedToDevice() const + { +- return assignedDevice; ++ return static_cast(assignedDevice); + } + + bool ComponentInfo::checkStruct(CF::Properties &props) diff --git a/recipes-redhawk/redhawk-core/files/gcc_fix_nodebooter.patch b/recipes-redhawk/redhawk-core/files/gcc_fix_nodebooter.patch new file mode 100644 index 0000000..5fb73b9 --- /dev/null +++ b/recipes-redhawk/redhawk-core/files/gcc_fix_nodebooter.patch @@ -0,0 +1,15 @@ +# Patch provided from http://stackoverflow.com/questions/38571741 +# user bhilburn +diff --git src-a/control/framework/nodebooter.cpp src-b/control/framework/nodebooter.cpp +index d79c291..dbd97ad 100644 +--- src-a/control/framework/nodebooter.cpp ++++ src-b/control/framework/nodebooter.cpp +@@ -141,7 +141,7 @@ void loadPRFExecParams (const std::string& prfFile, ExecParams& execParams) + prf.load(prfStream); + } catch (const ossie::parser_error& ex) { + std::string parser_error_line = ossie::retrieveParserErrorLineNumber(ex.what()); +- LOG_ERROR(nodebooter, "Failed to parse PRF file " << prfStream<< ". " << parser_error_line << "The XML parser returned the following error: " << ex.what()); ++ LOG_ERROR(nodebooter, "Failed to parse PRF file " << prfFile<< ". " << parser_error_line << "The XML parser returned the following error: " << ex.what()); + exit(EXIT_FAILURE); + } + prfStream.close(); diff --git a/recipes-redhawk/redhawk-core/redhawk-core.inc b/recipes-redhawk/redhawk-core/redhawk-core.inc new file mode 100644 index 0000000..6aa6a3d --- /dev/null +++ b/recipes-redhawk/redhawk-core/redhawk-core.inc @@ -0,0 +1,138 @@ +# +# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed +# with this source distribution. +# +# This file is part of Geon Technology's meta-redhawk-sdr. +# +# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# + +DESCRIPTION = "REDHAWK Core Framework" +HOMEPAGE = "http://www.redhawksdr.org" +LICENSE = "LGPL-3.0" +LIC_FILES_CHKSUM ?= "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +# We have to inherit from pythonnative if we do stuff with the system python. +# autotools-brokensep is the sasme as autotools but our build and src locations are the same since we cannot build away from our src. +inherit autotools-brokensep pkgconfig pythonnative redhawk-sysroot redhawk-oeconf + +DEPENDS = "omniorbpy omniorbpy-native log4cxx xsd-native omniorb omnievents e2fsprogs apr-util apr zip expat boost boost-native python-numpy python-threading python-numbers python-resource ossp-uuid" +RDEPENDS_${PN} = "python omniorbpy omniorb omnievents e2fsprogs apr-util apr zip expat boost python-numpy python-threading python-subprocess python-numbers python-xml python-resource ossp-uuid" +RDEPENDS_${PN}-python = "${PN} omniorb-python omniorbpy python-numpy python-threading python-numbers python-resource python-xml python-lxml" + +# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits +SRCTAG ?= "" +SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" + +SRC_URI ?= "git://github.com/redhawksdr/framework-core.git;${SRCTAGARG};protocol=git" + +SRC_URI_append = "\ + file://OSSIEHOME_global_prefix.patch \ + file://Remove_Tests.patch \ + file://Add_Missing_Files.patch \ + file://Remove_x86_DomMgr.patch \ + file://Fix_Idl_prefix.patch \ + file://arm_based_device_manager.patch \ + file://remove_csh_scripts.patch \ + file://allow_idl_dir_set.patch \ + file://gcc_fix_nodebooter.patch \ + file://gcc_fix_applicationSupport.patch \ +" + +S ?= "${WORKDIR}/git/src" + +EXTRA_OECONF += "\ + --with-sdr=${SDRROOT} \ + --disable-java \ + --with-expat=${STAGING_DIR_TARGET}/usr \ + idldir=${STAGING_DIR_TARGET}/usr/share/idl/omniORB \ + OMNICOS_IDLDIR=${STAGING_DIR_TARGET}/usr/share/idl/omniORB/COS \ + --with-boost-regex=boost_regex \ + --disable-log4cxx \ + " + +CXXFLAGS += "-fpermissive" + +PACKAGES += "${PN}-python" +PROVIDES += "${PN}-python" + + +FILES_${PN}-dbg += " \ + ${SDRROOT}/dev/mgr/.debug \ + ${SDRROOT}/dom/mgr/.debug \ + ${OSSIEHOME}/lib/.debug \ + ${OSSIEHOME}/bin/.debug \ +" + +FILES_${PN}-python += " \ + ${OSSIEHOME}/lib/python \ + ${OSSIEHOME}/bin/sdrlint \ + ${OSSIEHOME}/bin/prf2py.py \ + ${OSSIEHOME}/bin/cleanns \ + ${OSSIEHOME}/bin/redhawk-softpkg \ + ${OSSIEHOME}/bin/rh_net_diag \ + ${OSSIEHOME}/bin/rhlauncher \ + ${OSSIEHOME}/bin/nodeCleanup.py \ + ${OSSIEHOME}/bin/cleanomni \ + ${OSSIEHOME}/bin/scaclt \ + ${OSSIEHOME}/bin/qtbrowse \ + ${OSSIEHOME}/bin/py2prf \ + ${OSSIEHOME}/bin/eventviewer \ + ${OSSIEHOME}/bin/cleanes \ +" + +FILES_${PN} += " \ + ${OSSIEHOME}/lib/lib*.so.* \ + ${OSSIEHOME}/bin/nodeBooter \ + /etc/* \ + ${SDRROOT}/* \ +" + +FILES_${PN}-staticdev += " \ + ${OSSIEHOME}/lib/lib*.a \ + ${OSSIEHOME}/lib/lib*.la \ +" + +FILES_${PN}-dev += " \ + ${OSSIEHOME}/lib/lib*.so \ + ${OSSIEHOME}/share \ + ${OSSIEHOME}/include \ + ${OSSIEHOME}/lib/pkgconfig \ +" + +INSANE_SKIP_${PN} += "libdir" +INSANE_SKIP_${PN}-dbg += "libdir" + +# Needed so that when the python distutils is run it can get the system prefix. +do_install_prepend() { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} +} + +# Because we're using non-standard locations, we have to describe our locations +# to autotools +# Get the things from /etc (sysconfdir) +redhawk_core_etc_sysroot () { + sysroot_stage_dir ${D}${sysconfdir}/bash_completion.d \ + ${SYSROOT_DESTDIR}${sysconfdir}/bash_completion.d + sysroot_stage_dir ${D}${sysconfdir}/ld.so.conf.d \ + ${SYSROOT_DESTDIR}${sysconfdir}/ld.so.conf.d + sysroot_stage_dir ${D}${sysconfdir}/profile.d \ + ${SYSROOT_DESTDIR}${sysconfdir}/profile.d +} + +SYSROOT_PREPROCESS_FUNCS += "redhawk_core_etc_sysroot" + diff --git a/recipes-redhawk/redhawk-core/redhawk-core_2.0.1.bb b/recipes-redhawk/redhawk-core/redhawk-core_2.0.1.bb index f7574b0..6fe329a 100644 --- a/recipes-redhawk/redhawk-core/redhawk-core_2.0.1.bb +++ b/recipes-redhawk/redhawk-core/redhawk-core_2.0.1.bb @@ -1,96 +1,9 @@ -# -# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed -# with this source distribution. -# -# This file is part of Geon Technology's meta-redhawk-sdr. -# -# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# +SRCTAG = "2.0.1" +PREFERRED_VERSION_omniorb = "4.1.6" -DESCRIPTION = "REDHAWK Core Framework" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - -# We have to inherit from pythonnative if we do stuff with the system python. -# autotools-brokensep is the sasme as autotools but our build and src locations are the same since we cannot build away from our src. -inherit autotools-brokensep pkgconfig pythonnative redhawk-sysroot redhawk-oeconf - -DEPENDS = "omniorbpy omniorbpy-native log4cxx xsd-native omniorb omnievents e2fsprogs apr-util apr zip expat boost boost-native python-numpy python-threading python-numbers python-resource ossp-uuid" -RDEPENDS_${PN} = "python omniorbpy omniorb omnievents e2fsprogs apr-util apr zip expat boost python-numpy python-threading python-subprocess python-numbers python-xml python-resource ossp-uuid" - -PROVIDES += "${PN}-dev ${PN}-staticdev" - -SRC_URI = "\ - git://github.com/redhawksdr/framework-core.git;tag=2.0.1;protocol=git \ - file://OSSIEHOME_global_prefix.patch \ - file://Remove_Tests.patch \ - file://Add_Missing_Files.patch \ - file://Remove_x86_DomMgr.patch \ - file://Fix_Idl_prefix.patch \ - file://arm_based_device_manager.patch \ - file://remove_csh_scripts.patch \ - file://allow_idl_dir_set.patch \ -" - -S = "${WORKDIR}/git/src" - -EXTRA_OECONF += "\ - --with-sdr=${SDRROOT} \ - --disable-java \ - --with-expat=${STAGING_DIR_TARGET}/usr \ - idldir=${STAGING_DIR_TARGET}/usr/share/idl/omniORB \ - OMNICOS_IDLDIR=${STAGING_DIR_TARGET}/usr/share/idl/omniORB/COS \ - --with-boost-regex=boost_regex \ - --disable-log4cxx \ - " - -FILES_${PN} += " \ - /etc/* \ - ${OSSIEHOME}/* \ - ${SDRROOT}/* \ +SRC_URI_append = "\ + file://gcc_fix_ApplicationFactory_impl.patch \ " -# The skip is because we're bundling up all of OSSIEHOME which contains libraries, etc. -# into a single package and none of those files are in /usr/lib, /usr/bin, etc. resulting -# in QA getting upset. We *need* this because otherwise QA will throw an error and kill -# the packaging, and yet the downstream dependencies and post-install behaviors are hard- -# coded to look in $OSSIEHOME for these things. -INSANE_SKIP_${PN} += "dev-so la libdir debug-files staticdev installed-vs-shipped" - -# Required -CXXFLAGS += "-fpermissive" - -# Needed so that when the python distutils is run it can get the system prefix. -do_install_prepend() { - export BUILD_SYS=${BUILD_SYS} - export HOST_SYS=${HOST_SYS} - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} -} - -# Because we're using non-standard locations, we have to describe our locations -# to autotools -# Get the things from /etc (sysconfdir) -redhawk_core_etc_sysroot () { - sysroot_stage_dir ${D}${sysconfdir}/bash_completion.d \ - ${SYSROOT_DESTDIR}${sysconfdir}/bash_completion.d - sysroot_stage_dir ${D}${sysconfdir}/ld.so.conf.d \ - ${SYSROOT_DESTDIR}${sysconfdir}/ld.so.conf.d - sysroot_stage_dir ${D}${sysconfdir}/profile.d \ - ${SYSROOT_DESTDIR}${sysconfdir}/profile.d -} +include redhawk-core.inc -SYSROOT_PREPROCESS_FUNCS += "redhawk_core_etc_sysroot" - diff --git a/recipes-redhawk/redhawk-core/redhawk-core_2.0.3.bb b/recipes-redhawk/redhawk-core/redhawk-core_2.0.3.bb new file mode 100644 index 0000000..8057b83 --- /dev/null +++ b/recipes-redhawk/redhawk-core/redhawk-core_2.0.3.bb @@ -0,0 +1,9 @@ +SRCTAG = "2.0.3" +PREFERRED_VERSION_omniorb = "4.1.6" + +SRC_URI_append = "\ + file://gcc_fix_ApplicationFactory_impl.patch \ +" + +include redhawk-core.inc + diff --git a/recipes-redhawk/redhawk-core/redhawk-core_2.0.4.bb b/recipes-redhawk/redhawk-core/redhawk-core_2.0.4.bb new file mode 100644 index 0000000..66100d7 --- /dev/null +++ b/recipes-redhawk/redhawk-core/redhawk-core_2.0.4.bb @@ -0,0 +1,11 @@ +SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.4;protocol=git" + +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +S = "${WORKDIR}/git/redhawk/src" + +PREFERRED_VERSION_omniorb = "4.2.0" + +include redhawk-core.inc + + diff --git a/recipes-redhawk/redhawk-frontend/redhawk-frontend.inc b/recipes-redhawk/redhawk-frontend/redhawk-frontend.inc new file mode 100644 index 0000000..a992223 --- /dev/null +++ b/recipes-redhawk/redhawk-frontend/redhawk-frontend.inc @@ -0,0 +1,108 @@ +# +# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed +# with this source distribution. +# +# This file is part of Geon Technology's meta-redhawk-sdr. +# +# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# + +DESCRIPTION = "REDHAWK Framework FrontEnd Interfaces" +HOMEPAGE = "http://www.redhawksdr.org" +LICENSE = "LGPL-3.0" +LIC_FILES_CHKSUM ?= "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +DEPENDS = "redhawk-bulkio" +RDEPENDS_${PN} = "redhawk-bulkio" +RDEPENDS_${PN}-python = "redhawk-bulkio-python" + +PACKAGES += "${PN}-python" +PROVIDES += "${PN}-python" + +# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits +SRCTAG ?= "" +SRCTAGARG = "${@['nobranch=1', 'tag=${SRCTAG}'][d.getVar('SRCTAG', True) != '']}" + +SRC_URI ?= "git://github.com/RedhawkSDR/frontendInterfaces.git;${SRCTAGARG};protocol=git" + +SRC_URI_append = "\ + file://IDLDIR.patch \ + file://Add_Missing_Files.patch \ +" + +S ?= "${WORKDIR}/git" + +# We have to inherit from pythonnative if we do stuff with the system python. +# autotools-brokensep is the sasme as autotools but our build and src locations are the same since we cannot build away from our src. +inherit autotools-brokensep pkgconfig pythonnative redhawk-sysroot redhawk-oeconf + + +FILES_${PN}-python += " \ + ${OSSIEHOME}/lib/python \ +" + +FILES_${PN} += " \ + ${OSSIEHOME}/share \ + ${OSSIEHOME}/lib/lib*.so.* \ +" + +FILES_${PN}-dbg += " \ + ${OSSIEHOME}/lib/.debug \ +" + +FILES_${PN}-dev += " \ + ${OSSIEHOME}/lib/*.so \ + ${OSSIEHOME}/include \ + ${OSSIEHOME}/lib/pkgconfig \ +" + +FILES_${PN}-staticdev += " \ + ${OSSIEHOME}/lib/*.a \ + ${OSSIEHOME}/lib/*.la \ +" + +INSANE_SKIP_${PN} += "libdir" +INSANE_SKIP_${PN}-dbg += "libdir" + + +EXTRA_OECONF += "\ + --disable-java \ + --disable-log4cxx \ + " +EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" + +# Required +CXXFLAGS += "-fpermissive" +CFLAGS += "-fpermissive" + +# Since prefix is set this has to override that +CACHED_CONFIGUREVARS += "ac_cv_pymod_ossie=yes ac_cv_pymod_bulkio_bulkioInterfaces=yes" + +# Needed so that when the python distutils is run it can get the system prefix which, since it's the build system python will be /.../x86_64-linux/usr and replace it with our host systems name. +do_configure_prepend() { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} + export STAGING_BASE=${STAGING_DIR}/${MACHINE} + export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" +} + +# Needed so that when the python distutils is run it can get the system prefix. +do_install_prepend() { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} +} diff --git a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.1.bb b/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.1.bb index c31a3bc..0718339 100644 --- a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.1.bb +++ b/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.1.bb @@ -1,79 +1,6 @@ -# -# This file is protected by Copyright. Please refer to the COPYRIGHT file distributed -# with this source distribution. -# -# This file is part of Geon Technology's meta-redhawk-sdr. -# -# Geon Technology's meta-redhawk-sdr is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Geon Technology's meta-redhawk-sdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# +SRCTAG = "2.3.1" -DESCRIPTION = "REDHAWK Framework FrontEnd Interfaces" -HOMEPAGE = "http://www.redhawksdr.org" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" +PREFERRED_VERSION_redhawk-bulkio = "2.0.1" -DEPENDS = "redhawk-bulkio" -RDEPENDS_${PN} = "redhawk-bulkio" +include redhawk-frontend.inc -PREFERRED_VERSION_redhawk-bulkio = "2.%" - -SRC_URI = "\ - git://github.com/RedhawkSDR/frontendInterfaces.git;tag=2.3.1;protocol=git \ - file://IDLDIR.patch \ - file://Add_Missing_Files.patch \ -" - -S = "${WORKDIR}/git" - -# We have to inherit from pythonnative if we do stuff with the system python. -# autotools-brokensep is the sasme as autotools but our build and src locations are the same since we cannot build away from our src. -inherit autotools-brokensep pkgconfig pythonnative redhawk-sysroot redhawk-oeconf - - -FILES_${PN} += " \ - ${OSSIEHOME}/* \ -" -INSANE_SKIP_${PN} += "debug-files dev-so staticdev libdir" - - -EXTRA_OECONF += "\ - --disable-java \ - --disable-log4cxx \ - " -EXTRA_AUTORECONF += "-I ${OSSIEHOME_STAGED}/share/aclocal/ossie" - -# Required -CXXFLAGS += "-fpermissive" -CFLAGS += "-fpermissive" - -# Since prefix is set this has to override that -CACHED_CONFIGUREVARS += "ac_cv_pymod_ossie=yes ac_cv_pymod_bulkio_bulkioInterfaces=yes" - -# Needed so that when the python distutils is run it can get the system prefix which, since it's the build system python will be /.../x86_64-linux/usr and replace it with our host systems name. -do_configure_prepend() { - export BUILD_SYS=${BUILD_SYS} - export HOST_SYS=${HOST_SYS} - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} - export STAGING_BASE=${STAGING_DIR}/${MACHINE} - export PKG_CONFIG_PATH="${OSSIEHOME_STAGED}/lib/pkgconfig:${PKG_CONFIG_PATH}" -} - -# Needed so that when the python distutils is run it can get the system prefix. -do_install_prepend() { - export BUILD_SYS=${BUILD_SYS} - export HOST_SYS=${HOST_SYS} - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} -} diff --git a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.3.bb b/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.3.bb new file mode 100644 index 0000000..7e52bcf --- /dev/null +++ b/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.3.bb @@ -0,0 +1,6 @@ +SRCTAG = "2.3.3" + +PREFERRED_VERSION_redhawk-bulkio = "2.0.2" + +include redhawk-frontend.inc + diff --git a/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.4.bb b/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.4.bb new file mode 100644 index 0000000..100678f --- /dev/null +++ b/recipes-redhawk/redhawk-frontend/redhawk-frontend_2.3.4.bb @@ -0,0 +1,10 @@ +SRC_URI = "git://github.com/RedhawkSDR/core-framework.git;tag=2.0.4;protocol=git" + +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +S = "${WORKDIR}/git/frontendInterfaces" + +PREFERRED_VERSION_redhawk-bulkio = "2.0.4" + +include redhawk-frontend.inc + diff --git a/recipes-softpkg/redhawk-dsp/redhawk-dsp_1.0.0.bb b/recipes-softpkg/redhawk-dsp/redhawk-dsp_2.0.0.bb similarity index 92% rename from recipes-softpkg/redhawk-dsp/redhawk-dsp_1.0.0.bb rename to recipes-softpkg/redhawk-dsp/redhawk-dsp_2.0.0.bb index e9c309c..96e1b86 100644 --- a/recipes-softpkg/redhawk-dsp/redhawk-dsp_1.0.0.bb +++ b/recipes-softpkg/redhawk-dsp/redhawk-dsp_2.0.0.bb @@ -7,14 +7,12 @@ DEPENDS = "redhawk-bulkio" RDEPENDS_${PN} = "redhawk-bulkio" SRC_URI = " \ - git://github.com/RedhawkSDR/dsp.git;branch=master;protocol=git \ + git://github.com/RedhawkSDR/dsp.git;tag=2.0.0;protocol=git \ file://03_Add_Missing_Files.patch \ " SRCREV = "2b3dfb93b5f836e66768f582312e4266cae52cd6" -PR = "r0" - S = "${WORKDIR}/git/cpp"