Re: [ptxdist] [PATCH v5] python3-numpy: New package
Hi, just in case v6 will follow see small nit bellow... On Thu, Nov 14, 2019 at 11:09:14AM +0100, Guillermo Rodríguez wrote: > NumPy is the fundamental package for scientific computing with Python. > > Signed-off-by: Guillermo Rodriguez > --- > v2: Switch to PyPi URL; this removes the dependency on Cython. > v3: Update LICENSE, add LICENSE_FILES > v4: Update LICENSE and LICENSE_FILES with additional licenses > v5: Removed "unknown" from LICENSE > > rules/python3-numpy.in | 10 +++ > rules/python3-numpy.make | 57 > 2 files changed, 67 insertions(+) > create mode 100644 rules/python3-numpy.in > create mode 100644 rules/python3-numpy.make > > diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in > new file mode 100644 > index 0..1440e409a > --- /dev/null > +++ b/rules/python3-numpy.in > @@ -0,0 +1,10 @@ > +## SECTION=python3 > + > +config PYTHON3_NUMPY > + tristate > + select PYTHON3 > + select HOST_PYTHON3_SETUPTOOLS > + prompt "python3-numpy" > + help > + NumPy is the fundamental package for scientific computing with > + Python. > diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make > new file mode 100644 > index 0..a8a0d4dfe > --- /dev/null > +++ b/rules/python3-numpy.make > @@ -0,0 +1,57 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2019 by Guillermo Rodriguez > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy > + > +# > +# Paths and names > +# > +PYTHON3_NUMPY_VERSION:= 1.16.1 > +PYTHON3_NUMPY_MD5:= dafda51934f645d66f98424521ae > +PYTHON3_NUMPY:= numpy-$(PYTHON3_NUMPY_VERSION) > +PYTHON3_NUMPY_SUFFIX := zip > +PYTHON3_NUMPY_URL:= > https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX) > +PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX) > +PYTHON3_NUMPY_DIR:= $(BUILDDIR)/$(PYTHON3_NUMPY) > +PYTHON3_NUMPY_LICENSE:= BSD AND BSD-3-Clause AND MIT > +PYTHON3_NUMPY_LICENSE_FILES := \ > + file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231 \ > + > file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \ > + > file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=22;md5=19537439573c5696a922ed7957c5b37e ^^^ - those two lines above: TABs please. > + > + > +# > > +# Prepare > +# > > + > +PYTHON3_NUMPY_CONF_TOOL := python3 > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/python3-numpy.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, python3-numpy) > + @$(call install_fixup, python3-numpy, PRIORITY, optional) > + @$(call install_fixup, python3-numpy, SECTION, base) > + @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez > ") > + @$(call install_fixup, python3-numpy, DESCRIPTION, missing) > + > + @$(call install_glob, python3-numpy, 0, 0, -, \ > + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, > *.py) > + > + @$(call install_finish, python3-numpy) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 2.21.0 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] jsoncpp: version bump 1.9.1 -> 1.9.2
Signed-off-by: Björn Esser --- rules/jsoncpp.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/jsoncpp.make b/rules/jsoncpp.make index 3bc1ba9b9..86630d765 100644 --- a/rules/jsoncpp.make +++ b/rules/jsoncpp.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_JSONCPP) += jsoncpp # # Paths and names # -JSONCPP_VERSION:= 1.9.1 -JSONCPP_MD5:= da9e0427550e1377d88b471265a3bb3e +JSONCPP_VERSION:= 1.9.2 +JSONCPP_MD5:= e31da248a8765597d79e94cf304b70fe JSONCPP:= jsoncpp-$(JSONCPP_VERSION) JSONCPP_SUFFIX := tar.gz JSONCPP_URL:= https://github.com/open-source-parsers/jsoncpp/archive/$(JSONCPP_VERSION).tar.gz -- 2.24.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/3] platforms: toolchain: bump default toolchain version
Prefer the currently released version for new platforms. Signed-off-by: Roland Hieber --- platforms/toolchain.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platforms/toolchain.in b/platforms/toolchain.in index c219fe29de25..026e4395c3ad 100644 --- a/platforms/toolchain.in +++ b/platforms/toolchain.in @@ -5,7 +5,7 @@ menu "toolchain " config CROSSCHAIN_VENDOR string prompt "check for specific toolchain vendor" - default "OSELAS.Toolchain-2016.06" + default "OSELAS.Toolchain-2019.09" help Add here an unique vendor string to ensure this project will be build with the correct toolchain. @@ -19,7 +19,7 @@ config CROSSCHAIN_VENDOR config CROSSCHAIN_CHECK string prompt "check for specific gcc version" - default "5.4.0" + default "9.2.1" help PTXdist calls your cross compiler with -dumpversion and compares the output with this string. This should help @@ -47,7 +47,7 @@ if LIBC_GLIBC config GLIBC_VERSION string prompt "glibc version" - default "2.23" + default "2.30" help Specify the glibc version this BSP shall be built with. This information is used to guess the toolchain path if you use "ptxdist toolchain" -- 2.24.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 3/3] ptxdist: add 'init', 'init-platform' commands to create new configs
Add small helpers to start from scratch with a new ptxconfig and/or
platformconfig. We do that by creating a standard directory structure,
then creating a minimal config file, selecting it, and calling oldconfig
on the created file while setting PTXDIST_FORCE to ignore all errors
about it not being a valid configuration file.
When initialising a new BSP, create the platformconfig first so the
selection of the ptxconfig does not complain about a missing
platformconfig.
Signed-off-by: Roland Hieber
---
I was also thinking about using 'alldefconfig' instead of 'oldconfig' so
that PTXdist does not ask so many questions for every package that can
be enabled in the ptxconfig, but then several important settings get
lost, like project name, toolchain/compiler version, compiler triplet
etc. Maybe we can ask those up front instead and pre-prime the config
accordingly, like it is already done now for the platform name in
PLATFORM.
---
bin/ptxdist | 19
doc/ref_parameter.inc| 5
scripts/lib/ptxd_lib_init.sh | 57
3 files changed, 81 insertions(+)
create mode 100644 scripts/lib/ptxd_lib_init.sh
diff --git a/bin/ptxdist b/bin/ptxdist
index cd673a9f3dd6..e1e0f5f7503d 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -938,6 +938,9 @@ PTXdist $(printf "%-24s" ${PTXDIST_VERSION_FULL}) Build
System for Embedded Linu
Setup and Project Actions:
+ init []initialise a new BSP in the current
directory
+ init-platform [] initialise a new platform in the current BSP
+
menu enter main control menu
setupsetup per-user preferences
@@ -2035,6 +2038,22 @@ EOF
do_${cmd}
exit
;;
+ init)
+ ptxd_lib_init_platform "$@" &&
+ ptxd_lib_init &&
+ ptxd_dialog_msgbox \
+ "Adapt the new BSP to your needs by
running:\n\n" \
+ "ptxdist menuconfig\n" \
+ "ptxdist menuconfig platform"
+ exit
+ ;;
+ init-platform)
+ ptxd_lib_init_platform "$@" &&
+ ptxd_dialog_msgbox \
+ "Adapt the new platform to your needs by
running:\n\n" \
+ "ptxdist menuconfig platform"
+ exit
+ ;;
image)
if [ ${#} -eq 0 ]; then
echo "No image given."
diff --git a/doc/ref_parameter.inc b/doc/ref_parameter.inc
index 74689b9d3cff..29203713f879 100644
--- a/doc/ref_parameter.inc
+++ b/doc/ref_parameter.inc
@@ -1,6 +1,11 @@
Setup and Project Actions
~
+``init ``, ``init-platform ``
+ initialise a new BSP in the current directory, or add a new platform to the
+ current BSP. This action creates all required config files, and then calls
+ *menuconfig* on them, and can be used to start a new BSP from scratch.
+
``menu``
this starts a dialog based frontend for those who do not like typing
commands. It will gain us access to the most common parameters to
diff --git a/scripts/lib/ptxd_lib_init.sh b/scripts/lib/ptxd_lib_init.sh
new file mode 100644
index ..a5ff71f557f9
--- /dev/null
+++ b/scripts/lib/ptxd_lib_init.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+ptxd_lib_init() {
+ PTXDIST_PTXCONFIG="configs/ptxconfig"
+
+ if [ -z "${PTXDIST_FORCE}" ] && [ -e "${PTXDIST_PTXCONFIG}" ]; then
+ echo -e \
+ "error: the file '${PTXDIST_PTXCONFIG}' already
exists,\n" \
+ " use '--force' to overwrite it."
+ return 1
+ fi
+
+ if [ -z "${PTXDIST_FORCE}" ] && [ -e "${PTXDIST_PTXCONFIG_DEFAULT}" ];
then
+ ptxd_dialog_msgbox \
+ "error: the file '${PTXDIST_PTXCONFIG_DEFAULT}' already
exists,\n" \
+ " use '--force' to overwrite it."
+ return 1
+ fi
+
+ PTXDIST_FORCE=1
+ mkdir -p "$(dirname "${PTXDIST_PTXCONFIG}")" &&
+ echo > "${PTXDIST_PTXCONFIG}" &&
+ do_select ptxconfig "${PTXDIST_PTXCONFIG}" &&
+ do_config alldefconfig
+}
+
+ptxd_lib_init_platform() {
+ local platformname="$1"
+ if [ -z "$platformname" ]; then
+ read -p 'New platform name? ' platformname
+ fi
+ if [ -z "$platformname" ]; then
+ echo "Platform name cannot be empty."
+ return 1
+ fi
+ PTXDIST_PLATFORMCONFIG="configs/platform-${platformname}/platformconfig"
+
+ if [ -z "${PTXDIST_FORCE}" ] && [ -e "${PTXDIST_PLATFORMCONFIG}" ]; then
+ ptxd_dialog_msgbox \
+ "error:
[ptxdist] [PATCH 1/3] ptxdist: _get_config_ptx: fix --force logic
When --force is used to override that message, PTXDIST_FORCE is set to
true in parse_first(), resulting in the message to be shown.
Signed-off-by: Roland Hieber
---
bin/ptxdist | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/ptxdist b/bin/ptxdist
index 9394b1739190..cd673a9f3dd6 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -250,7 +250,7 @@ _get_config_ptx() {
configfile_version="$(ptxd_get_ptxconf PTXCONF_CONFIGFILE_VERSION)"
- if [ $? -ne 0 -a -n "${PTXDIST_FORCE}" ]; then
+ if [ $? -ne 0 -a -z "${PTXDIST_FORCE}" ]; then
ptxd_dialog_msgbox \
"error: the config file
'${PTXDIST_PTXCONFIG#${PTXDIST_WORKSPACE}/}'\n" \
" is missing the symbol
'PTXCONF_CONFIGFILE_VERSION',\n" \
--
2.24.0
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3] python3-numpy: New package
On Thu, Nov 14, 2019 at 12:40:43PM +0100, Guillermo Rodriguez Garcia wrote:
> El jue., 14 nov. 2019 a las 12:18, Roland Hieber ()
> escribió:
>
> > On Thu, Nov 14, 2019 at 11:07:16AM +0100, Guillermo Rodriguez Garcia wrote:
> > > El jue., 14 nov. 2019 a las 10:56, Roland Hieber ()
> > > escribió:
> > >
> > > > > > numpy/core/src/multiarray/dragon4.c seems to be a license found
> > nowhere
> > > > > > else, so I would also add "AND UNKNOWN" to PYTHON3_NUMPY_LICENSE
> > and
> > > > add
> > > > > > its verbatim license text with startline and endline parameters in
> > > > > > PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license
> > > > > > texts mentioned in that variable and adds them to the license
> > report,
> > > > > > so it doesn't get lost too :)
> > > >
> > >
> > > On re-reading this: The license in dragon4.c is just MIT. So while it is
> > OK
> > > to add it to LICENSE_FILES I think we should not add the "AND unknown"
> > bit.
> >
> > Oh. I just blindly believed LICENSE.txt. But now that you say it, my
> > license matcher identifies it as "Zlib", not as "MIT".
> >
>
> Uhm, doesn't look like Zlib to me; here's the license text extracted from
> dragon4.c:
>
> /*
> * Copyright (c) 2014 Ryan Juckett
> *
> * Permission is hereby granted, free of charge, to any person obtaining a
> copy
> * of this software and associated documentation files (the "Software"), to
> * deal in the Software without restriction, including without limitation
> the
> * rights to use, copy, modify, merge, publish, distribute, sublicense,
> and/or
> * sell copies of the Software, and to permit persons to whom the Software
> is
> * furnished to do so, subject to the following conditions:
> *
> * The above copyright notice and this permission notice shall be included
> in
> * all copies or substantial portions of the Software.
> *
> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> OR
> * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> THE
> * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> * IN THE SOFTWARE.
> */
>
> And here are the MIT and Zlib licenses:
>
> https://spdx.org/licenses/MIT.html
> https://spdx.org/licenses/Zlib.html
>
> I would say that the license is indeed MIT, which is what LICENSE.txt says:
>
> Name: dragon4
> Files: numpy/core/src/multiarray/dragon4.c
> License: MIT
> For license text, see numpy/core/src/multiarray/dragon4.c
We're looking at different versions of the code. Your make file
specifies 1.16.1, and indeed that license was changed in commit
2babaaa12 ("LICENSE: update dragon4 license to MIT.") [1], which landed
in numpy 1.17.4. The _LICENSE vars should describe the version in the
make file.
Do you want to send a version-bump to the new version
instead? ;-)
[1]:
https://github.com/numpy/numpy/commit/2babaaa123c64c9f8d47d5b8b05942ab2c79a4e3
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany| Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3] python3-numpy: New package
El jue., 14 nov. 2019 a las 12:18, Roland Hieber () escribió: > On Thu, Nov 14, 2019 at 11:07:16AM +0100, Guillermo Rodriguez Garcia wrote: > > El jue., 14 nov. 2019 a las 10:56, Roland Hieber () > > escribió: > > > > > > > numpy/core/src/multiarray/dragon4.c seems to be a license found > nowhere > > > > > else, so I would also add "AND UNKNOWN" to PYTHON3_NUMPY_LICENSE > and > > > add > > > > > its verbatim license text with startline and endline parameters in > > > > > PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license > > > > > texts mentioned in that variable and adds them to the license > report, > > > > > so it doesn't get lost too :) > > > > > > > On re-reading this: The license in dragon4.c is just MIT. So while it is > OK > > to add it to LICENSE_FILES I think we should not add the "AND unknown" > bit. > > Oh. I just blindly believed LICENSE.txt. But now that you say it, my > license matcher identifies it as "Zlib", not as "MIT". > Uhm, doesn't look like Zlib to me; here's the license text extracted from dragon4.c: /* * Copyright (c) 2014 Ryan Juckett * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to * deal in the Software without restriction, including without limitation the * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or * sell copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ And here are the MIT and Zlib licenses: https://spdx.org/licenses/MIT.html https://spdx.org/licenses/Zlib.html I would say that the license is indeed MIT, which is what LICENSE.txt says: Name: dragon4 Files: numpy/core/src/multiarray/dragon4.c License: MIT For license text, see numpy/core/src/multiarray/dragon4.c BR, Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3] python3-numpy: New package
On Thu, Nov 14, 2019 at 11:07:16AM +0100, Guillermo Rodriguez Garcia wrote: > El jue., 14 nov. 2019 a las 10:56, Roland Hieber () > escribió: > > > > > numpy/core/src/multiarray/dragon4.c seems to be a license found nowhere > > > > else, so I would also add "AND UNKNOWN" to PYTHON3_NUMPY_LICENSE and > > add > > > > its verbatim license text with startline and endline parameters in > > > > PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license > > > > texts mentioned in that variable and adds them to the license report, > > > > so it doesn't get lost too :) > > > > On re-reading this: The license in dragon4.c is just MIT. So while it is OK > to add it to LICENSE_FILES I think we should not add the "AND unknown" bit. Oh. I just blindly believed LICENSE.txt. But now that you say it, my license matcher identifies it as "Zlib", not as "MIT". > I am sending v5, sorry for the noise. No problem, that's what review is for, and thanks for your patience :) - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] mesalib: version bump 19.2.2 -> 19.2.4
- skip broken 19.2.3 release Signed-off-by: Philipp Zabel --- Replaces the previously sent "mesalib: version bump 19.2.2 -> 19.2.3" patch. --- rules/mesalib.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/mesalib.make b/rules/mesalib.make index d6f5a04ac50a..1fcee06cf65b 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION:= 19.2.2 -MESALIB_MD5:= 712ce36099e948e7bf8526ef51d618ee +MESALIB_VERSION:= 19.2.4 +MESALIB_MD5:= 5c047732b81651ddb341597528b4b096 MESALIB:= mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL:= \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v5] python3-numpy: New package
NumPy is the fundamental package for scientific computing with Python. Signed-off-by: Guillermo Rodriguez --- v2: Switch to PyPi URL; this removes the dependency on Cython. v3: Update LICENSE, add LICENSE_FILES v4: Update LICENSE and LICENSE_FILES with additional licenses v5: Removed "unknown" from LICENSE rules/python3-numpy.in | 10 +++ rules/python3-numpy.make | 57 2 files changed, 67 insertions(+) create mode 100644 rules/python3-numpy.in create mode 100644 rules/python3-numpy.make diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in new file mode 100644 index 0..1440e409a --- /dev/null +++ b/rules/python3-numpy.in @@ -0,0 +1,10 @@ +## SECTION=python3 + +config PYTHON3_NUMPY + tristate + select PYTHON3 + select HOST_PYTHON3_SETUPTOOLS + prompt "python3-numpy" + help + NumPy is the fundamental package for scientific computing with + Python. diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make new file mode 100644 index 0..a8a0d4dfe --- /dev/null +++ b/rules/python3-numpy.make @@ -0,0 +1,57 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Guillermo Rodriguez +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy + +# +# Paths and names +# +PYTHON3_NUMPY_VERSION := 1.16.1 +PYTHON3_NUMPY_MD5 := dafda51934f645d66f98424521ae +PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION) +PYTHON3_NUMPY_SUFFIX := zip +PYTHON3_NUMPY_URL := https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX) +PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX) +PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY) +PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT +PYTHON3_NUMPY_LICENSE_FILES := \ + file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231 \ + file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \ + file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=22;md5=19537439573c5696a922ed7957c5b37e + + +# +# Prepare +# + +PYTHON3_NUMPY_CONF_TOOL:= python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-numpy.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-numpy) + @$(call install_fixup, python3-numpy, PRIORITY, optional) + @$(call install_fixup, python3-numpy, SECTION, base) + @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez ") + @$(call install_fixup, python3-numpy, DESCRIPTION, missing) + + @$(call install_glob, python3-numpy, 0, 0, -, \ + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py) + + @$(call install_finish, python3-numpy) + + @$(call touch) + +# vim: syntax=make -- 2.21.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v4] python3-numpy: New package
NumPy is the fundamental package for scientific computing with Python. Signed-off-by: Guillermo Rodriguez --- v2: Switch to PyPi URL; this removes the dependency on Cython. v3: Update LICENSE, add LICENSE_FILES v4: Update LICENSE and LICENSE_FILES with additional licenses rules/python3-numpy.in | 10 +++ rules/python3-numpy.make | 57 2 files changed, 67 insertions(+) create mode 100644 rules/python3-numpy.in create mode 100644 rules/python3-numpy.make diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in new file mode 100644 index 0..1440e409a --- /dev/null +++ b/rules/python3-numpy.in @@ -0,0 +1,10 @@ +## SECTION=python3 + +config PYTHON3_NUMPY + tristate + select PYTHON3 + select HOST_PYTHON3_SETUPTOOLS + prompt "python3-numpy" + help + NumPy is the fundamental package for scientific computing with + Python. diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make new file mode 100644 index 0..4adc0dda8 --- /dev/null +++ b/rules/python3-numpy.make @@ -0,0 +1,57 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Guillermo Rodriguez +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy + +# +# Paths and names +# +PYTHON3_NUMPY_VERSION := 1.16.1 +PYTHON3_NUMPY_MD5 := dafda51934f645d66f98424521ae +PYTHON3_NUMPY := numpy-$(PYTHON3_NUMPY_VERSION) +PYTHON3_NUMPY_SUFFIX := zip +PYTHON3_NUMPY_URL := https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX) +PYTHON3_NUMPY_SOURCE := $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX) +PYTHON3_NUMPY_DIR := $(BUILDDIR)/$(PYTHON3_NUMPY) +PYTHON3_NUMPY_LICENSE := BSD AND BSD-3-Clause AND MIT AND unknown +PYTHON3_NUMPY_LICENSE_FILES := \ + file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231 \ + file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \ + file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=22;md5=19537439573c5696a922ed7957c5b37e + + +# +# Prepare +# + +PYTHON3_NUMPY_CONF_TOOL:= python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-numpy.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-numpy) + @$(call install_fixup, python3-numpy, PRIORITY, optional) + @$(call install_fixup, python3-numpy, SECTION, base) + @$(call install_fixup, python3-numpy, AUTHOR, "Guillermo Rodriguez ") + @$(call install_fixup, python3-numpy, DESCRIPTION, missing) + + @$(call install_glob, python3-numpy, 0, 0, -, \ + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/numpy,, *.py) + + @$(call install_finish, python3-numpy) + + @$(call touch) + +# vim: syntax=make -- 2.21.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3] python3-numpy: New package
El jue., 14 nov. 2019 a las 10:56, Roland Hieber () escribió: > On Thu, Nov 14, 2019 at 10:36:56AM +0100, Guillermo Rodriguez Garcia wrote: > > Hi Roland, > > > > El mié., 13 nov. 2019 a las 10:36, Roland Hieber () > > escribió: > > > > > On Tue, Nov 12, 2019 at 12:51:03PM +0100, Guillermo Rodríguez wrote: > > > > NumPy is the fundamental package for scientific computing with > Python. > > > > > > > > Signed-off-by: Guillermo Rodriguez > > > > --- > > > > v2: Switch to PyPi URL; this removes the dependency on Cython. > > > > v3: Update LICENSE, add LICENSE_FILES > > > > > > > > rules/python3-numpy.in | 10 > > > > rules/python3-numpy.make | 54 > > > > > 2 files changed, 64 insertions(+) > > > > create mode 100644 rules/python3-numpy.in > > > > create mode 100644 rules/python3-numpy.make > > > > > > > > diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in > > > > new file mode 100644 > > > > index 0..1440e409a > > > > --- /dev/null > > > > +++ b/rules/python3-numpy.in > > > > @@ -0,0 +1,10 @@ > > > > +## SECTION=python3 > > > > + > > > > +config PYTHON3_NUMPY > > > > + tristate > > > > + select PYTHON3 > > > > + select HOST_PYTHON3_SETUPTOOLS > > > > + prompt "python3-numpy" > > > > + help > > > > + NumPy is the fundamental package for scientific computing > with > > > > + Python. > > > > diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make > > > > new file mode 100644 > > > > index 0..40cc351d3 > > > > --- /dev/null > > > > +++ b/rules/python3-numpy.make > > > > @@ -0,0 +1,54 @@ > > > > +# -*-makefile-*- > > > > +# > > > > +# Copyright (C) 2019 by Guillermo Rodriguez < > guille.rodrig...@gmail.com > > > > > > > > +# > > > > +# For further information about the PTXdist project and license > > > conditions > > > > +# see the README file. > > > > +# > > > > + > > > > +# > > > > +# We provide this package > > > > +# > > > > +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy > > > > + > > > > +# > > > > +# Paths and names > > > > +# > > > > +PYTHON3_NUMPY_VERSION:= 1.16.1 > > > > +PYTHON3_NUMPY_MD5:= dafda51934f645d66f98424521ae > > > > +PYTHON3_NUMPY:= numpy-$(PYTHON3_NUMPY_VERSION) > > > > +PYTHON3_NUMPY_SUFFIX := zip > > > > +PYTHON3_NUMPY_URL:= > > > > https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX) > > > > +PYTHON3_NUMPY_SOURCE := > > > $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX) > > > > +PYTHON3_NUMPY_DIR:= $(BUILDDIR)/$(PYTHON3_NUMPY) > > > > +PYTHON3_NUMPY_LICENSE:= BSD AND BSD-3-Clause AND MIT > > > > > > AND Apache-2.0, according to LICENSE.txt. > > > > > > I assume you mean LICENSES_bundled.txt and not LICENSE.txt > > I don't have a LICENSES_bundled.txt in the extracted zip file with that > MD5sum from that URL... > Right, sorry. The tarball combines the LICENSE.txt and LICENSES_bundled.txt files from the Github repo into one single LICENSE.txt file. I mixed them up. Guillermo > > > If I am reading that correctly, the Apache license only applies to the > > Sphinx theme. Since we are not bundling any documentation, I assume we > can > > ignore this one. > > OK. That was not clear to me. > > - Roland > > > > > > > > I would also add all the other > > > license files mentioned therein so we notice when they change or > vanish. > > > > > > The Python-2.0 license in doc/scipy-sphinx-theme/LICENSE.txt is > > > currently not available as an SPDX identifier, so I would leave this as > > > "AND UNKNOWN", and wait until the respective SPDX issue is resolved... > > > https://github.com/spdx/license-list-XML/issues/919 > > > > > > Same as above, this only applies to the Sphinx theme, so I assume we can > > ignore this. > > > > > > > > > > > > > numpy/core/src/multiarray/dragon4.c seems to be a license found nowhere > > > else, so I would also add "AND UNKNOWN" to PYTHON3_NUMPY_LICENSE and > add > > > its verbatim license text with startline and endline parameters in > > > PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license > > > texts mentioned in that variable and adds them to the license report, > > > so it doesn't get lost too :) > > > > > > > OK. > > > > > > > > > > > +PYTHON3_NUMPY_LICENSE_FILES := \ > > > > + file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231 > > > > > > > > > file://doc/sphinxext/LICENSE.txt;md5=dc37e8b18377b83250218fc557984e1a \ > > > > > > > file://doc/scipy-sphinx-theme/LICENSE.txt;md5=ea17c9a65c9ae0ccdf3b0a7fd1ee4616 > > > \ > > > > > > > file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \ > > > > > > > file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=22;md5=19537439573c5696a922ed7957c5b37e > > > \ > > > > > > (numpy/linalg/lapack_lite/LICENSE.txt is currently missing in the > > > tarball, see https://github.com/numpy/numpy/issues/13295) > > > > > > For reference, that last one can be generated with a
Re: [ptxdist] [PATCH v3] python3-numpy: New package
On Thu, Nov 14, 2019 at 10:36:56AM +0100, Guillermo Rodriguez Garcia wrote: > Hi Roland, > > El mié., 13 nov. 2019 a las 10:36, Roland Hieber () > escribió: > > > On Tue, Nov 12, 2019 at 12:51:03PM +0100, Guillermo Rodríguez wrote: > > > NumPy is the fundamental package for scientific computing with Python. > > > > > > Signed-off-by: Guillermo Rodriguez > > > --- > > > v2: Switch to PyPi URL; this removes the dependency on Cython. > > > v3: Update LICENSE, add LICENSE_FILES > > > > > > rules/python3-numpy.in | 10 > > > rules/python3-numpy.make | 54 > > > 2 files changed, 64 insertions(+) > > > create mode 100644 rules/python3-numpy.in > > > create mode 100644 rules/python3-numpy.make > > > > > > diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in > > > new file mode 100644 > > > index 0..1440e409a > > > --- /dev/null > > > +++ b/rules/python3-numpy.in > > > @@ -0,0 +1,10 @@ > > > +## SECTION=python3 > > > + > > > +config PYTHON3_NUMPY > > > + tristate > > > + select PYTHON3 > > > + select HOST_PYTHON3_SETUPTOOLS > > > + prompt "python3-numpy" > > > + help > > > + NumPy is the fundamental package for scientific computing with > > > + Python. > > > diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make > > > new file mode 100644 > > > index 0..40cc351d3 > > > --- /dev/null > > > +++ b/rules/python3-numpy.make > > > @@ -0,0 +1,54 @@ > > > +# -*-makefile-*- > > > +# > > > +# Copyright (C) 2019 by Guillermo Rodriguez > > > > > +# > > > +# For further information about the PTXdist project and license > > conditions > > > +# see the README file. > > > +# > > > + > > > +# > > > +# We provide this package > > > +# > > > +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy > > > + > > > +# > > > +# Paths and names > > > +# > > > +PYTHON3_NUMPY_VERSION:= 1.16.1 > > > +PYTHON3_NUMPY_MD5:= dafda51934f645d66f98424521ae > > > +PYTHON3_NUMPY:= numpy-$(PYTHON3_NUMPY_VERSION) > > > +PYTHON3_NUMPY_SUFFIX := zip > > > +PYTHON3_NUMPY_URL:= > > https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX) > > > +PYTHON3_NUMPY_SOURCE := > > $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX) > > > +PYTHON3_NUMPY_DIR:= $(BUILDDIR)/$(PYTHON3_NUMPY) > > > +PYTHON3_NUMPY_LICENSE:= BSD AND BSD-3-Clause AND MIT > > > > AND Apache-2.0, according to LICENSE.txt. > > > I assume you mean LICENSES_bundled.txt and not LICENSE.txt I don't have a LICENSES_bundled.txt in the extracted zip file with that MD5sum from that URL... > If I am reading that correctly, the Apache license only applies to the > Sphinx theme. Since we are not bundling any documentation, I assume we can > ignore this one. OK. That was not clear to me. - Roland > > > > I would also add all the other > > license files mentioned therein so we notice when they change or vanish. > > > > The Python-2.0 license in doc/scipy-sphinx-theme/LICENSE.txt is > > currently not available as an SPDX identifier, so I would leave this as > > "AND UNKNOWN", and wait until the respective SPDX issue is resolved... > > https://github.com/spdx/license-list-XML/issues/919 > > > Same as above, this only applies to the Sphinx theme, so I assume we can > ignore this. > > > > > > > > numpy/core/src/multiarray/dragon4.c seems to be a license found nowhere > > else, so I would also add "AND UNKNOWN" to PYTHON3_NUMPY_LICENSE and add > > its verbatim license text with startline and endline parameters in > > PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license > > texts mentioned in that variable and adds them to the license report, > > so it doesn't get lost too :) > > > > OK. > > > > > > > +PYTHON3_NUMPY_LICENSE_FILES := \ > > > + file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231 > > > > > > file://doc/sphinxext/LICENSE.txt;md5=dc37e8b18377b83250218fc557984e1a \ > > > > file://doc/scipy-sphinx-theme/LICENSE.txt;md5=ea17c9a65c9ae0ccdf3b0a7fd1ee4616 > > \ > > > > file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \ > > > > file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=22;md5=19537439573c5696a922ed7957c5b37e > > \ > > > > (numpy/linalg/lapack_lite/LICENSE.txt is currently missing in the > > tarball, see https://github.com/numpy/numpy/issues/13295) > > > > For reference, that last one can be generated with a > > > > sed -n 2,22p < inputfilename | md5sum > > > > Please check if all of this (especially the MD5s) make sense to you :) > > > > Yes. Will double check and submit a new version of the patch. > > Thank you! > > Guillermo Rodriguez Garcia > guille.rodrig...@gmail.com > ___ > ptxdist mailing list > ptxdist@pengutronix.de -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137
Re: [ptxdist] [PATCH v3] python3-numpy: New package
Hi Roland, El mié., 13 nov. 2019 a las 10:36, Roland Hieber () escribió: > On Tue, Nov 12, 2019 at 12:51:03PM +0100, Guillermo Rodríguez wrote: > > NumPy is the fundamental package for scientific computing with Python. > > > > Signed-off-by: Guillermo Rodriguez > > --- > > v2: Switch to PyPi URL; this removes the dependency on Cython. > > v3: Update LICENSE, add LICENSE_FILES > > > > rules/python3-numpy.in | 10 > > rules/python3-numpy.make | 54 > > 2 files changed, 64 insertions(+) > > create mode 100644 rules/python3-numpy.in > > create mode 100644 rules/python3-numpy.make > > > > diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in > > new file mode 100644 > > index 0..1440e409a > > --- /dev/null > > +++ b/rules/python3-numpy.in > > @@ -0,0 +1,10 @@ > > +## SECTION=python3 > > + > > +config PYTHON3_NUMPY > > + tristate > > + select PYTHON3 > > + select HOST_PYTHON3_SETUPTOOLS > > + prompt "python3-numpy" > > + help > > + NumPy is the fundamental package for scientific computing with > > + Python. > > diff --git a/rules/python3-numpy.make b/rules/python3-numpy.make > > new file mode 100644 > > index 0..40cc351d3 > > --- /dev/null > > +++ b/rules/python3-numpy.make > > @@ -0,0 +1,54 @@ > > +# -*-makefile-*- > > +# > > +# Copyright (C) 2019 by Guillermo Rodriguez > > > +# > > +# For further information about the PTXdist project and license > conditions > > +# see the README file. > > +# > > + > > +# > > +# We provide this package > > +# > > +PACKAGES-$(PTXCONF_PYTHON3_NUMPY) += python3-numpy > > + > > +# > > +# Paths and names > > +# > > +PYTHON3_NUMPY_VERSION:= 1.16.1 > > +PYTHON3_NUMPY_MD5:= dafda51934f645d66f98424521ae > > +PYTHON3_NUMPY:= numpy-$(PYTHON3_NUMPY_VERSION) > > +PYTHON3_NUMPY_SUFFIX := zip > > +PYTHON3_NUMPY_URL:= > https://pypi.python.org/packages/source/n/numpy/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX) > > +PYTHON3_NUMPY_SOURCE := > $(SRCDIR)/$(PYTHON3_NUMPY).$(PYTHON3_NUMPY_SUFFIX) > > +PYTHON3_NUMPY_DIR:= $(BUILDDIR)/$(PYTHON3_NUMPY) > > +PYTHON3_NUMPY_LICENSE:= BSD AND BSD-3-Clause AND MIT > > AND Apache-2.0, according to LICENSE.txt. I assume you mean LICENSES_bundled.txt and not LICENSE.txt If I am reading that correctly, the Apache license only applies to the Sphinx theme. Since we are not bundling any documentation, I assume we can ignore this one. > I would also add all the other > license files mentioned therein so we notice when they change or vanish. > > The Python-2.0 license in doc/scipy-sphinx-theme/LICENSE.txt is > currently not available as an SPDX identifier, so I would leave this as > "AND UNKNOWN", and wait until the respective SPDX issue is resolved... > https://github.com/spdx/license-list-XML/issues/919 Same as above, this only applies to the Sphinx theme, so I assume we can ignore this. > > > numpy/core/src/multiarray/dragon4.c seems to be a license found nowhere > else, so I would also add "AND UNKNOWN" to PYTHON3_NUMPY_LICENSE and add > its verbatim license text with startline and endline parameters in > PYTHON3_NUMPY_LICENSE_FILES. PTXdist extracts all those license > texts mentioned in that variable and adds them to the license report, > so it doesn't get lost too :) > OK. > > > +PYTHON3_NUMPY_LICENSE_FILES := \ > > + file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231 > > > file://doc/sphinxext/LICENSE.txt;md5=dc37e8b18377b83250218fc557984e1a \ > > file://doc/scipy-sphinx-theme/LICENSE.txt;md5=ea17c9a65c9ae0ccdf3b0a7fd1ee4616 > \ > > file://tools/npy_tempita/license.txt;md5=c66b85ddcd09296abff87601467724fd \ > > file://numpy/core/src/multiarray/dragon4.c;startline=2;endline=22;md5=19537439573c5696a922ed7957c5b37e > \ > > (numpy/linalg/lapack_lite/LICENSE.txt is currently missing in the > tarball, see https://github.com/numpy/numpy/issues/13295) > > For reference, that last one can be generated with a > > sed -n 2,22p < inputfilename | md5sum > > Please check if all of this (especially the MD5s) make sense to you :) > Yes. Will double check and submit a new version of the patch. Thank you! Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
