Re: [ptxdist] [PATCH] networkmanager: version bump 1.20.0 -> 1.20.8
On Tue, Nov 26, 2019 at 08:35:57AM +0100, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl The old version has a patch. It a backport from master. I'm not sure if it was added to any bugfix release. Michael > --- > rules/networkmanager.make | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/rules/networkmanager.make b/rules/networkmanager.make > index 682764f65..de0e755b3 100644 > --- a/rules/networkmanager.make > +++ b/rules/networkmanager.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager > # > # Paths and names > # > -NETWORKMANAGER_VERSION := 1.20.0 > -NETWORKMANAGER_MD5 := 109df9b0813755a98735206f5b2d68da > +NETWORKMANAGER_VERSION := 1.20.8 > +NETWORKMANAGER_MD5 := c0ceb5ab14bfdfeee07536d94cc5c548 > NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) > NETWORKMANAGER_SUFFIX:= tar.xz > NETWORKMANAGER_URL := > https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.20/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) > -- > 2.24.0 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://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 v5 2/2] u-boot: bugfix: missing imx dtb image clean
On Tue, Nov 26, 2019 at 08:49:55AM +0100, Alexander Dahl wrote:
> This one LGTM.
>
> Tested-by: Alexander Dahl
Both patches?
Michael
> Am Montag, 25. November 2019, 19:03:35 CET schrieb Bruno Thomsen:
> > Fixes: 58c48f349901 ("u-boot: Add u-boot-dtb.imx install option")
> >
> > Cc: Denis OSTERLAND
> > Cc: Alexander Dahl
> > Signed-off-by: Bruno Thomsen
> > ---
> > v5:
> > - moved bugfix to seperate patch
> > v4-v1:
> > - patch did not exist
> >
> > rules/u-boot.make | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/rules/u-boot.make b/rules/u-boot.make
> > index 9609dca97..04d801fc6 100644
> > --- a/rules/u-boot.make
> > +++ b/rules/u-boot.make
> > @@ -195,7 +195,7 @@ $(STATEDIR)/u-boot.clean:
> > @$(call clean_pkg, U_BOOT)
> > @rm -vf $(IMAGEDIR)/u-boot.bin $(IMAGEDIR)/u-boot.srec
> > $(IMAGEDIR)/u-boot.elf @rm -vf $(IMAGEDIR)/u-boot.img $(IMAGEDIR)/SPL
> > $(IMAGEDIR)/MLO
> > - @rm -vf $(IMAGEDIR)/u-boot.imx
> > + @rm -vf $(IMAGEDIR)/u-boot.imx $(IMAGEDIR)/u-boot-dtb.imx
> > @rm -vf $(IMAGEDIR)/u-boot-env.img
> > @rm -vf $(IMAGEDIR)/u-boot-dtb.bin $(IMAGEDIR)/u-boot-with-spl-pbl.bin
>
>
> --
>
>
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://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 v5 2/2] u-boot: bugfix: missing imx dtb image clean
This one LGTM.
Tested-by: Alexander Dahl
Am Montag, 25. November 2019, 19:03:35 CET schrieb Bruno Thomsen:
> Fixes: 58c48f349901 ("u-boot: Add u-boot-dtb.imx install option")
>
> Cc: Denis OSTERLAND
> Cc: Alexander Dahl
> Signed-off-by: Bruno Thomsen
> ---
> v5:
> - moved bugfix to seperate patch
> v4-v1:
> - patch did not exist
>
> rules/u-boot.make | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/rules/u-boot.make b/rules/u-boot.make
> index 9609dca97..04d801fc6 100644
> --- a/rules/u-boot.make
> +++ b/rules/u-boot.make
> @@ -195,7 +195,7 @@ $(STATEDIR)/u-boot.clean:
> @$(call clean_pkg, U_BOOT)
> @rm -vf $(IMAGEDIR)/u-boot.bin $(IMAGEDIR)/u-boot.srec
> $(IMAGEDIR)/u-boot.elf @rm -vf $(IMAGEDIR)/u-boot.img $(IMAGEDIR)/SPL
> $(IMAGEDIR)/MLO
> - @rm -vf $(IMAGEDIR)/u-boot.imx
> + @rm -vf $(IMAGEDIR)/u-boot.imx $(IMAGEDIR)/u-boot-dtb.imx
> @rm -vf $(IMAGEDIR)/u-boot-env.img
> @rm -vf $(IMAGEDIR)/u-boot-dtb.bin $(IMAGEDIR)/u-boot-with-spl-pbl.bin
--
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] networkmanager: version bump 1.20.0 -> 1.20.8
Signed-off-by: Ladislav Michl --- rules/networkmanager.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/networkmanager.make b/rules/networkmanager.make index 682764f65..de0e755b3 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.20.0 -NETWORKMANAGER_MD5 := 109df9b0813755a98735206f5b2d68da +NETWORKMANAGER_VERSION := 1.20.8 +NETWORKMANAGER_MD5 := c0ceb5ab14bfdfeee07536d94cc5c548 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.20/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) -- 2.24.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCHv2] config: boardsetup: add nfs client specifications
On Mon, Nov 25, 2019 at 09:19:55PM -0500, Alexander Aring wrote:
> This patch adds additional client specifications for the nfsroot mount.
> The default value is the same as it was hardcoded before. This offers to
> change this line without maintaining the whole file in a separate BSP.
>
> The client specifications is part of the official export format which is
> set right after the directory which is exported, for more information
> lookup:
>
> https://linux.die.net/man/8/unfsd
>
> Signed-off-by: Alexander Aring
> ---
> changes since v2:
> s/client_specficiations/client_specificiations/
I already pushed the first version to master when Roland noticed the typo.
I have a fix for it in my queue.
Michael
> config/boardsetup/Kconfig | 17 +
> scripts/lib/ptxd_make_nfsd.sh | 7 ++-
> 2 files changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/config/boardsetup/Kconfig b/config/boardsetup/Kconfig
> index 8ffa27224..2d3791807 100644
> --- a/config/boardsetup/Kconfig
> +++ b/config/boardsetup/Kconfig
> @@ -39,6 +39,23 @@ config BOARDSETUP_NFSROOT_PATH
> above given path is exported by nfs server. This field will be ignored
> if you don't use nfsroot.
>
> +config BOARDSETUP_NFSROOT_CLIENT_SPECIFICATIONS
> + string
> + prompt "nfsroot client specifications"
> + default "(rw,no_root_squash)"
> + help
> + Specify the list of client specifications for the nfsroot export.
> + Example: "1.2.3.4(rw) 192.168.2.0/24(ro,all_squash)"
> +
> + Clients can be specified using either a hostname, an IP address, or
> an IP
> + network. Networks can be given by specifying the number of leading 1
> bits
> + in the netmask or by giving the full netmask. If the hostname is
> empty, the
> + directory is exported to everyone.
> +
> + Options can follow a client specification and have to be enclosed in
> + parenthesis, with the opening paren directly following the client
> name or
> + address. If no options are given, ro and root_squash are enabled by
> default.
> +
> config BOARDSETUP_TFTP_PATH
> string
> prompt "tftp path"
> diff --git a/scripts/lib/ptxd_make_nfsd.sh b/scripts/lib/ptxd_make_nfsd.sh
> index 0bc9c906b..c3e75edf7 100644
> --- a/scripts/lib/ptxd_make_nfsd.sh
> +++ b/scripts/lib/ptxd_make_nfsd.sh
> @@ -8,6 +8,7 @@
>
> ptxd_make_nfsd_exec() {
> local port
> +local client_specificiations
> local root="/$(basename "${ptx_nfsroot}")"
> local base="$(dirname "${ptx_nfsroot}")"
>
> @@ -15,11 +16,15 @@ ptxd_make_nfsd_exec() {
> port=2049
> fi
>
> +if ! client_specificiations="$(ptxd_get_kconfig "${PTXDIST_BOARDSETUP}"
> "PTXCONF_BOARDSETUP_NFSROOT_CLIENT_SPECIFICATIONS")"; then
> + client_specificiations="(rw,no_root_squash)"
> +fi
> +
> echo
> echo "Mount rootfs with
> nfsroot=${root},v3,tcp,port=${port},mountport=${port}"
> echo
>
> -echo "/ (rw,no_root_squash)" > "${PTXDIST_TEMPDIR}/exports" &&
> +echo "/ ${client_specificiations}" > "${PTXDIST_TEMPDIR}/exports" &&
> UNFS_BASE="${base}" unfsd -e "${PTXDIST_TEMPDIR}/exports" -n ${port} -m
> ${port} -p -d
> }
> export -f ptxd_make_nfsd_exec
> --
> 2.20.1
>
>
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://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] Toolchain for STM32MP15x
On Mon, Nov 25, 2019 at 05:43:01PM +0100, Guillermo Rodriguez Garcia wrote: > Hi all, > > I have setup the toolchain with the settings from my previous email > (-mcpu=cortex-a7 -mfpu=neon-vfpv4) > > When I try to build the Linux kernel I get lots of warnings about > conflicting toolchain options: > > arch/arm/kernel/elf.c:1:0: warning: switch -mcpu=cortex-a7 conflicts > with -march=armv5t switch The problem is, that the kernel tries to add it's own -march=armv7-a and I guess that causes warnings in combination with -mcpu=cortex-a7 (at least with some gcc versions). This is tested with -Werror, so it fails. The fallback is -march=armv5t ... (see arch/arm/Makefile in the kernel). You cannot use -mcpu= in the extra cflags like this. > This is with OSELAS.Toolchain-2016.06.1, using arm-v7a-linux-gnueabihf. > > I am not sure where the -march=armv5t is coming from, since this is an > arm-v7a toolchain. > > Also if I use -mcpu=cortex-a9 instead of cortex-a7, there are no warnings :-? This will have the same problem with gcc 9.x. > Can anyone sehd some light ? See above. Combining -march= with -mcpu= is not really supported and the result is undefined. I'd say, just use -mfpu=neon-vfpv4. Have you tested if -mcpu=cortex-a7 actually makes a difference? I've done some tests with some other -mcpu= values and I've not seen any real difference. Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://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] python3-pycparser: New package
On Mon, Nov 25, 2019 at 10:57:00AM +0100, Guillermo Rodriguez Garcia wrote: > El lun., 25 nov. 2019 a las 8:04, Michael Olbrich > () escribió: > > > > On Thu, Nov 21, 2019 at 10:17:05AM +0100, Guillermo Rodríguez wrote: > > > pycparser is a complete parser of the C language, written in pure > > > Python using the PLY parsing library. It parses C code into an AST > > > and can serve as a front-end for C compilers or analysis tools. > > > > > > Guillermo Rodriguez > > > --- > > > rules/python3-pycparser.in | 10 +++ > > > rules/python3-pycparser.make | 54 > > > 2 files changed, 64 insertions(+) > > > create mode 100644 rules/python3-pycparser.in > > > create mode 100644 rules/python3-pycparser.make > > > > > > diff --git a/rules/python3-pycparser.in b/rules/python3-pycparser.in > > > new file mode 100644 > > > index 0..07cd9960e > > > --- /dev/null > > > +++ b/rules/python3-pycparser.in > > > @@ -0,0 +1,10 @@ > > > +## SECTION=python3 > > > + > > > +config PYTHON3_PYCPARSER > > > + tristate > > > + select PYTHON3 > > > + prompt "python3-pycparser" > > > + help > > > + pycparser is a complete parser of the C language, written in pure > > > + Python using the PLY parsing library. It parses C code into an AST > > > + and can serve as a front-end for C compilers or analysis tools. > > > diff --git a/rules/python3-pycparser.make b/rules/python3-pycparser.make > > > new file mode 100644 > > > index 0..8ef168299 > > > --- /dev/null > > > +++ b/rules/python3-pycparser.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_PYCPARSER) += python3-pycparser > > > + > > > +# > > > +# Paths and names > > > +# > > > +PYTHON3_PYCPARSER_VERSION:= 2.18 > > > +PYTHON3_PYCPARSER_MD5:= 72370da54358202a60130e223d488136 > > > +PYTHON3_PYCPARSER:= pycparser-$(PYTHON3_PYCPARSER_VERSION) > > > +PYTHON3_PYCPARSER_SUFFIX := tar.gz > > > +PYTHON3_PYCPARSER_URL:= > > > https://pypi.python.org/packages/source/p/pycparser/$(PYTHON3_PYCPARSER).$(PYTHON3_PYCPARSER_SUFFIX) > > > +PYTHON3_PYCPARSER_SOURCE := > > > $(SRCDIR)/$(PYTHON3_PYCPARSER).$(PYTHON3_PYCPARSER_SUFFIX) > > > +PYTHON3_PYCPARSER_DIR:= $(BUILDDIR)/$(PYTHON3_PYCPARSER) > > > +PYTHON3_PYCPARSER_LICENSE:= BSD > > > > This is not an SPDX license identifier. Which BSD license is this supposed > > to be? > > This seems to be BSD-3-Clause. > Shall I resend or will you fix that up? I'll do the fixup. Michael > Guillermo > > > > > Michael > > > > > +PYTHON3_PYCPARSER_LICENSE_FILES := \ > > > + file://LICENSE;md5=86f1cedb4e6410a88ce8e30b91079169 > > > + > > > +# > > > > > > +# Prepare > > > +# > > > > > > + > > > +PYTHON3_PYCPARSER_CONF_TOOL := python3 > > > + > > > +# > > > > > > +# Target-Install > > > +# > > > > > > + > > > +$(STATEDIR)/python3-pycparser.targetinstall: > > > + @$(call targetinfo) > > > + > > > + @$(call install_init, python3-pycparser) > > > + @$(call install_fixup, python3-pycparser, PRIORITY, optional) > > > + @$(call install_fixup, python3-pycparser, SECTION, base) > > > + @$(call install_fixup, python3-pycparser, AUTHOR, "Guillermo > > > Rodriguez ") > > > + @$(call install_fixup, python3-pycparser, DESCRIPTION, missing) > > > + > > > + @$(call install_glob, python3-pycparser, 0, 0, -, \ > > > + > > > /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/pycparser,, *.py) > > > + > > > + @$(call install_finish, python3-pycparser) > > > + > > > + @$(call touch) > > > + > > > +# vim: syntax=make > > > -- > > > 2.21.0 > > > > > > > > > ___ > > > ptxdist mailing list > > > ptxdist@pengutronix.de > > > > > > > -- > > Pengutronix e.K. | | > > Steuerwalder Str. 21 | http://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 > > > > -- > Guillermo Rodriguez Garcia > guille.rodrig...@gmail.com > > ___ > ptxdist mailing list > ptxdist@pengutronix.de --
[ptxdist] [PATCH] rules: host-qemu: enable kvm by default
This patch enables kvm feature of qemu by default. So far I know there exists no additional library dependency to enable this feature. In some combinations of host architecture and emulated architecture it can increase the performance significantly. Signed-off-by: Alexander Aring --- rules/host-qemu.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/host-qemu.make b/rules/host-qemu.make index 7735f9218..66d30726f 100644 --- a/rules/host-qemu.make +++ b/rules/host-qemu.make @@ -105,7 +105,7 @@ HOST_QEMU_CONF_OPT = \ --disable-curl \ --enable-fdt \ --disable-bluez \ - --disable-kvm \ + --enable-kvm \ --disable-hax \ --disable-rdma \ --disable-pvrdma \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCHv2] config: boardsetup: add nfs client specifications
This patch adds additional client specifications for the nfsroot mount.
The default value is the same as it was hardcoded before. This offers to
change this line without maintaining the whole file in a separate BSP.
The client specifications is part of the official export format which is
set right after the directory which is exported, for more information
lookup:
https://linux.die.net/man/8/unfsd
Signed-off-by: Alexander Aring
---
changes since v2:
s/client_specficiations/client_specificiations/
config/boardsetup/Kconfig | 17 +
scripts/lib/ptxd_make_nfsd.sh | 7 ++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/config/boardsetup/Kconfig b/config/boardsetup/Kconfig
index 8ffa27224..2d3791807 100644
--- a/config/boardsetup/Kconfig
+++ b/config/boardsetup/Kconfig
@@ -39,6 +39,23 @@ config BOARDSETUP_NFSROOT_PATH
above given path is exported by nfs server. This field will be ignored
if you don't use nfsroot.
+config BOARDSETUP_NFSROOT_CLIENT_SPECIFICATIONS
+ string
+ prompt "nfsroot client specifications"
+ default "(rw,no_root_squash)"
+ help
+ Specify the list of client specifications for the nfsroot export.
+ Example: "1.2.3.4(rw) 192.168.2.0/24(ro,all_squash)"
+
+ Clients can be specified using either a hostname, an IP address, or
an IP
+ network. Networks can be given by specifying the number of leading 1
bits
+ in the netmask or by giving the full netmask. If the hostname is
empty, the
+ directory is exported to everyone.
+
+ Options can follow a client specification and have to be enclosed in
+ parenthesis, with the opening paren directly following the client
name or
+ address. If no options are given, ro and root_squash are enabled by
default.
+
config BOARDSETUP_TFTP_PATH
string
prompt "tftp path"
diff --git a/scripts/lib/ptxd_make_nfsd.sh b/scripts/lib/ptxd_make_nfsd.sh
index 0bc9c906b..c3e75edf7 100644
--- a/scripts/lib/ptxd_make_nfsd.sh
+++ b/scripts/lib/ptxd_make_nfsd.sh
@@ -8,6 +8,7 @@
ptxd_make_nfsd_exec() {
local port
+local client_specificiations
local root="/$(basename "${ptx_nfsroot}")"
local base="$(dirname "${ptx_nfsroot}")"
@@ -15,11 +16,15 @@ ptxd_make_nfsd_exec() {
port=2049
fi
+if ! client_specificiations="$(ptxd_get_kconfig "${PTXDIST_BOARDSETUP}"
"PTXCONF_BOARDSETUP_NFSROOT_CLIENT_SPECIFICATIONS")"; then
+ client_specificiations="(rw,no_root_squash)"
+fi
+
echo
echo "Mount rootfs with
nfsroot=${root},v3,tcp,port=${port},mountport=${port}"
echo
-echo "/ (rw,no_root_squash)" > "${PTXDIST_TEMPDIR}/exports" &&
+echo "/ ${client_specificiations}" > "${PTXDIST_TEMPDIR}/exports" &&
UNFS_BASE="${base}" unfsd -e "${PTXDIST_TEMPDIR}/exports" -n ${port} -m
${port} -p -d
}
export -f ptxd_make_nfsd_exec
--
2.20.1
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH v5 2/2] u-boot: bugfix: missing imx dtb image clean
Fixes: 58c48f349901 ("u-boot: Add u-boot-dtb.imx install option")
Cc: Denis OSTERLAND
Cc: Alexander Dahl
Signed-off-by: Bruno Thomsen
---
v5:
- moved bugfix to seperate patch
v4-v1:
- patch did not exist
rules/u-boot.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/u-boot.make b/rules/u-boot.make
index 9609dca97..04d801fc6 100644
--- a/rules/u-boot.make
+++ b/rules/u-boot.make
@@ -195,7 +195,7 @@ $(STATEDIR)/u-boot.clean:
@$(call clean_pkg, U_BOOT)
@rm -vf $(IMAGEDIR)/u-boot.bin $(IMAGEDIR)/u-boot.srec
$(IMAGEDIR)/u-boot.elf
@rm -vf $(IMAGEDIR)/u-boot.img $(IMAGEDIR)/SPL $(IMAGEDIR)/MLO
- @rm -vf $(IMAGEDIR)/u-boot.imx
+ @rm -vf $(IMAGEDIR)/u-boot.imx $(IMAGEDIR)/u-boot-dtb.imx
@rm -vf $(IMAGEDIR)/u-boot-env.img
@rm -vf $(IMAGEDIR)/u-boot-dtb.bin $(IMAGEDIR)/u-boot-with-spl-pbl.bin
--
2.23.0
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH v5 1/2] u-boot: generate environment image
Add possiblity to generate a default or a custom environment image. Image can be used during manufacturing to avoid bootloader console usage and speed up first boot. Other image use-cases include device development edition, device demonstration mode, etc. Custom environment image is generated from an user provided config file with one 'var=value' per line format. Input config file name is configurable. Cc: Denis OSTERLAND Cc: Alexander Dahl Signed-off-by: Bruno Thomsen --- v5: - split imx dtb image cleanup into bugfix patch - removed remove quotes in statedir - remove quetes in platformconfigdir - common prefix defines - common env image name - remove custom env image install and clean v4: - u-boot version limitation help. - env image size is now Kconfig hex input - custom env source file is now stored in platformconfigdir - changes in custom env source file trigger rebuild - use default mkenvimage pad - cleanup of env images - fix missing cleanup of imx dtb image v3: - remove multiple env images support - use static image names - rebase patches on top of: u-boot: Build out-of-tree v2: - remove HOST_U_BOOT_TOOLS dependency - configurable default env image name - add custom env image generation option - move all options to sub menu platforms/u-boot.in | 61 + rules/u-boot.make | 25 +++ 2 files changed, 86 insertions(+) diff --git a/platforms/u-boot.in b/platforms/u-boot.in index 9bac4a758..21baf7c72 100644 --- a/platforms/u-boot.in +++ b/platforms/u-boot.in @@ -71,6 +71,67 @@ config U_BOOT_CONFIG endif +choice + prompt "Generate environment image" + default U_BOOT_ENV_IMAGE_NONE + help + U-Boot from version 2018.03 support out-of-tree environment + image generation. + +config U_BOOT_ENV_IMAGE_NONE + prompt "none" + bool + help + Don't generate an U-Boot environment image. + +config U_BOOT_ENV_IMAGE_DEFAULT + prompt "default" + bool + help + Use U-Boot's mkenvimage to compile a default U-Boot environment + image for use in e.g. device manufacturing or development. + +config U_BOOT_ENV_IMAGE_CUSTOM + prompt "custom" + bool + help + Use U-Boot's mkenvimage to compile a custom U-Boot environment + image based on the text file in U_BOOT_ENV_IMAGE_CUSTOM_SOURCE + for use in e.g. device manufacturing or development. + +endchoice + +config U_BOOT_ENV_IMAGE_CUSTOM_SOURCE + prompt "Custom environment source" + string + default "custom_env.config" + depends on U_BOOT_ENV_IMAGE_CUSTOM + help + Text file in platform config directory describing the custom + environment. + The file should have lines in the form var=value, one per line. + Blank lines and lines starting with a # are ignored. + +if !U_BOOT_ENV_IMAGE_NONE + +config U_BOOT_ENV_IMAGE_SIZE + prompt "Environment image size" + hex + default 0x2000 + help + Enter the U-Boot environment size in hexadecimal for generation + of image. A wrong size will typically cause crc error when used. + Must match size defined in target config and "/etc/fw_env.config". + +config U_BOOT_ENV_IMAGE_REDUNDANT + prompt "Environment image with redundant copy" + bool + help + Use to generate a redundant environment in the image. + Must match target config and "/etc/fw_env.config". + +endif + config U_BOOT_BOOT_SCRIPT prompt "Compile U-Boot boot script" bool diff --git a/rules/u-boot.make b/rules/u-boot.make index e3c2c2389..9609dca97 100644 --- a/rules/u-boot.make +++ b/rules/u-boot.make @@ -43,6 +43,12 @@ U_BOOT_BOOT_SCRIPT_BIN := $(call remove_quotes, \ $(STATEDIR)/u-boot.compile: $(U_BOOT_BOOT_SCRIPT_TXT) endif +ifdef PTXCONF_U_BOOT_ENV_IMAGE_CUSTOM +U_BOOT_ENV_IMAGE_CUSTOM_SRC := $(call ptx/in-platformconfigdir, \ + $(call remove_quotes, $(PTXCONF_U_BOOT_ENV_IMAGE_CUSTOM_SOURCE))) +$(STATEDIR)/u-boot.compile: $(U_BOOT_ENV_IMAGE_CUSTOM_SRC) +endif + U_BOOT_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) @@ -100,6 +106,20 @@ ifdef PTXCONF_U_BOOT_BOOT_SCRIPT @$(U_BOOT_BUILD_DIR)/tools/mkimage -T script -C none \ -d $(U_BOOT_BOOT_SCRIPT_TXT) \ $(U_BOOT_BUILD_DIR)/boot.scr.uimg +endif +ifdef PTXCONF_U_BOOT_ENV_IMAGE_DEFAULT + $(U_BOOT_MAKE_ENV) $(U_BOOT_DIR)/scripts/get_default_envs.sh $(U_BOOT_BUILD_DIR) | \ + $(U_BOOT_BUILD_DIR)/tools/mkenvimage \ + $(call ptx/ifdef,PTXCONF_U_BOOT_ENV_IMAGE_REDUNDANT,-r,) \ + -s $(PTXCONF_U_BOOT_ENV_IMAGE_SIZE) \ + -o $(U_BOOT_BUILD_DIR)/u-boot-env.img - +endif +ifdef PTXCONF_U_BOOT_ENV_IMAGE_CUSTOM + $(U_BOOT_BUILD_DIR)/tools/mkenvimage \ + $(call ptx/ifdef,PTXCONF_U_BOOT_ENV_IMAGE_REDUNDANT,-r,) \ + -s
[ptxdist] [PATCH] host-libcap: always build a dynamically linked exectables
For unknown reasons the libcap executables are build static if a .git directory
is present in the topdir folder. Linking breaks if position independent
executables are activated in the ptxdist hardening flags.
This patch overrides the git detection to always build dynamically linked
executables.
Related: eda8ef326785 ("libcap: always build a dynamically linked exectables")
Signed-off-by: Bruno Thomsen
---
rules/host-libcap.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/host-libcap.make b/rules/host-libcap.make
index 5407efd01..61df84778 100644
--- a/rules/host-libcap.make
+++ b/rules/host-libcap.make
@@ -16,7 +16,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBCAP) += host-libcap
# Prepare
#
-HOST_LIBCAP_MAKE_OPT := prefix= BUILD_GPERF=no PAM_CAP=no LIBATTR=no lib=lib
+HOST_LIBCAP_MAKE_OPT := prefix= BUILD_GPERF=no PAM_CAP=no LIBATTR=no
DYNAMIC=yes lib=lib
HOST_LIBCAP_INSTALL_OPT := $(HOST_LIBCAP_MAKE_OPT) RAISE_SETFCAP=no install
# vim: syntax=make
--
2.23.0
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] Toolchain for STM32MP15x
Hi all, I have setup the toolchain with the settings from my previous email (-mcpu=cortex-a7 -mfpu=neon-vfpv4) When I try to build the Linux kernel I get lots of warnings about conflicting toolchain options: arch/arm/kernel/elf.c:1:0: warning: switch -mcpu=cortex-a7 conflicts with -march=armv5t switch This is with OSELAS.Toolchain-2016.06.1, using arm-v7a-linux-gnueabihf. I am not sure where the -march=armv5t is coming from, since this is an arm-v7a toolchain. Also if I use -mcpu=cortex-a9 instead of cortex-a7, there are no warnings :-? Can anyone sehd some light ? Thank you, Guillermo El lun., 25 nov. 2019 a las 13:33, Guillermo Rodriguez Garcia () escribió: > > Hi all, > > I am trying to setup a toolchain for the STM32MP15x. The main CPU is a > single or dual (depending on p/n) Cortex-A7, supporting NEON and > VFPv4. > > I'm using the OSELAS arm-v7a-linux-gnueabihf toolchain. As for the > extra flags I believe I should use -mcpu=cortex-a7 -mfpu=neon-vfpv4. > > Does this look correct? Any comments / hints? > > BR, > > Guillermo Rodriguez Garcia > guille.rodrig...@gmail.com -- Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Toolchain for STM32MP15x
Hi all, I am trying to setup a toolchain for the STM32MP15x. The main CPU is a single or dual (depending on p/n) Cortex-A7, supporting NEON and VFPv4. I'm using the OSELAS arm-v7a-linux-gnueabihf toolchain. As for the extra flags I believe I should use -mcpu=cortex-a7 -mfpu=neon-vfpv4. Does this look correct? Any comments / hints? BR, Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v4] u-boot: generate environment image
Hi Denis, Den man. 25. nov. 2019 kl. 09.44 skrev Denis OSTERLAND : > > +choice > > + prompt "Generate environment image" > > + default U_BOOT_NONE_ENV_IMAGE > > + help > > + U-Boot from version 2018.03 support out-of-tree environment > > + image generation. > > + > > +config U_BOOT_NONE_ENV_IMAGE > looks a little bit odd. > I would expect a common prefix, with the choice at the end. > U_BOOT_ENV_IMAGE_NONE > U_BOOT_ENV_IMAGE_DEFAULT > U_BOOT_ENV_IMAGE_CUSTOM > > But that´s not a show stopper, I think. Okay, I see what you mean, a little bit less Yoda :) > > +ifdef PTXCONF_U_BOOT_DEFAULT_ENV_IMAGE > > + $(U_BOOT_MAKE_ENV) $(U_BOOT_DIR)/scripts/get_default_envs.sh > > $(U_BOOT_BUILD_DIR) | \ > > + $(U_BOOT_BUILD_DIR)/tools/mkenvimage \ > > + $(call ptx/ifdef,PTXCONF_U_BOOT_ENV_IMAGE_REDUNDANT,-r,) \ > > + -s $(PTXCONF_U_BOOT_ENV_IMAGE_SIZE) \ > > + -o $(U_BOOT_BUILD_DIR)/u-boot-env.img - > > +endif > > +ifdef PTXCONF_U_BOOT_CUSTOM_ENV_IMAGE > > + $(U_BOOT_BUILD_DIR)/tools/mkenvimage \ > > + $(call ptx/ifdef,PTXCONF_U_BOOT_ENV_IMAGE_REDUNDANT,-r,) \ > > + -s $(PTXCONF_U_BOOT_ENV_IMAGE_SIZE) \ > > + -o $(U_BOOT_BUILD_DIR)/u-boot-custom-env.img \ > I see no need for a different env image name here. > Custom or default is the choice how to generate the image. > It is easier to pass the images to your factory if the have always the same > name. > This gives you the chance to change image type, without a need to change > production flow. Check, one image to rule them all. > > - @rm -vf $(IMAGEDIR)/u-boot.imx > > + @rm -vf $(IMAGEDIR)/u-boot.imx $(IMAGEDIR)/u-boot-dtb.imx > Why u-boot-dtb.imx sneaks in here? Have i missed something? My mistake, I will move it to a separate bugfix patch. /Bruno ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] config: boardsetup: add nfs client specifications
On Fri, Nov 22, 2019 at 09:15:34AM -0500, Alexander Aring wrote:
> This patch adds additional client specifications for the nfsroot mount.
> The default value is the same as it was hardcoded before. This offers to
> change this line without maintaining the whole file in a separate BSP.
>
> The client specifications is part of the official export format which is
> set right after the directory which is exported, for more information
> lookup:
>
> https://linux.die.net/man/8/unfsd
>
> Signed-off-by: Alexander Aring
> ---
> config/boardsetup/Kconfig | 17 +
> scripts/lib/ptxd_make_nfsd.sh | 7 ++-
> 2 files changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/config/boardsetup/Kconfig b/config/boardsetup/Kconfig
> index 8ffa27224..2d3791807 100644
> --- a/config/boardsetup/Kconfig
> +++ b/config/boardsetup/Kconfig
> @@ -39,6 +39,23 @@ config BOARDSETUP_NFSROOT_PATH
> above given path is exported by nfs server. This field will be ignored
> if you don't use nfsroot.
>
> +config BOARDSETUP_NFSROOT_CLIENT_SPECIFICATIONS
> + string
> + prompt "nfsroot client specifications"
> + default "(rw,no_root_squash)"
> + help
> + Specify the list of client specifications for the nfsroot export.
> + Example: "1.2.3.4(rw) 192.168.2.0/24(ro,all_squash)"
> +
> + Clients can be specified using either a hostname, an IP address, or
> an IP
> + network. Networks can be given by specifying the number of leading 1
> bits
> + in the netmask or by giving the full netmask. If the hostname is
> empty, the
> + directory is exported to everyone.
> +
> + Options can follow a client specification and have to be enclosed in
> + parenthesis, with the opening paren directly following the client
> name or
> + address. If no options are given, ro and root_squash are enabled by
> default.
> +
> config BOARDSETUP_TFTP_PATH
> string
> prompt "tftp path"
> diff --git a/scripts/lib/ptxd_make_nfsd.sh b/scripts/lib/ptxd_make_nfsd.sh
> index 0bc9c906b..f7d8136d0 100644
> --- a/scripts/lib/ptxd_make_nfsd.sh
> +++ b/scripts/lib/ptxd_make_nfsd.sh
> @@ -8,6 +8,7 @@
>
> ptxd_make_nfsd_exec() {
> local port
> +local client_specficiations
^-- typo alert, but seems to be consistent
nevertheless :)
- Roland
> local root="/$(basename "${ptx_nfsroot}")"
> local base="$(dirname "${ptx_nfsroot}")"
>
> @@ -15,11 +16,15 @@ ptxd_make_nfsd_exec() {
> port=2049
> fi
>
> +if ! client_specficiations="$(ptxd_get_kconfig "${PTXDIST_BOARDSETUP}"
> "PTXCONF_BOARDSETUP_NFSROOT_CLIENT_SPECIFICATIONS")"; then
> + client_specficiations="(rw,no_root_squash)"
> +fi
> +
> echo
> echo "Mount rootfs with
> nfsroot=${root},v3,tcp,port=${port},mountport=${port}"
> echo
>
> -echo "/ (rw,no_root_squash)" > "${PTXDIST_TEMPDIR}/exports" &&
> +echo "/ ${client_specficiations}" > "${PTXDIST_TEMPDIR}/exports" &&
> UNFS_BASE="${base}" unfsd -e "${PTXDIST_TEMPDIR}/exports" -n ${port} -m
> ${port} -p -d
> }
> export -f ptxd_make_nfsd_exec
> --
> 2.20.1
>
>
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
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] python3-pycparser: New package
Hi Michael, El lun., 25 nov. 2019 a las 8:04, Michael Olbrich () escribió: > > On Thu, Nov 21, 2019 at 10:17:05AM +0100, Guillermo Rodríguez wrote: > > pycparser is a complete parser of the C language, written in pure > > Python using the PLY parsing library. It parses C code into an AST > > and can serve as a front-end for C compilers or analysis tools. > > > > Guillermo Rodriguez > > --- > > rules/python3-pycparser.in | 10 +++ > > rules/python3-pycparser.make | 54 > > 2 files changed, 64 insertions(+) > > create mode 100644 rules/python3-pycparser.in > > create mode 100644 rules/python3-pycparser.make > > > > diff --git a/rules/python3-pycparser.in b/rules/python3-pycparser.in > > new file mode 100644 > > index 0..07cd9960e > > --- /dev/null > > +++ b/rules/python3-pycparser.in > > @@ -0,0 +1,10 @@ > > +## SECTION=python3 > > + > > +config PYTHON3_PYCPARSER > > + tristate > > + select PYTHON3 > > + prompt "python3-pycparser" > > + help > > + pycparser is a complete parser of the C language, written in pure > > + Python using the PLY parsing library. It parses C code into an AST > > + and can serve as a front-end for C compilers or analysis tools. > > diff --git a/rules/python3-pycparser.make b/rules/python3-pycparser.make > > new file mode 100644 > > index 0..8ef168299 > > --- /dev/null > > +++ b/rules/python3-pycparser.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_PYCPARSER) += python3-pycparser > > + > > +# > > +# Paths and names > > +# > > +PYTHON3_PYCPARSER_VERSION:= 2.18 > > +PYTHON3_PYCPARSER_MD5:= 72370da54358202a60130e223d488136 > > +PYTHON3_PYCPARSER:= pycparser-$(PYTHON3_PYCPARSER_VERSION) > > +PYTHON3_PYCPARSER_SUFFIX := tar.gz > > +PYTHON3_PYCPARSER_URL:= > > https://pypi.python.org/packages/source/p/pycparser/$(PYTHON3_PYCPARSER).$(PYTHON3_PYCPARSER_SUFFIX) > > +PYTHON3_PYCPARSER_SOURCE := > > $(SRCDIR)/$(PYTHON3_PYCPARSER).$(PYTHON3_PYCPARSER_SUFFIX) > > +PYTHON3_PYCPARSER_DIR:= $(BUILDDIR)/$(PYTHON3_PYCPARSER) > > +PYTHON3_PYCPARSER_LICENSE:= BSD > > This is not an SPDX license identifier. Which BSD license is this supposed > to be? This seems to be BSD-3-Clause. Shall I resend or will you fix that up? Guillermo > > Michael > > > +PYTHON3_PYCPARSER_LICENSE_FILES := \ > > + file://LICENSE;md5=86f1cedb4e6410a88ce8e30b91079169 > > + > > +# > > > > +# Prepare > > +# > > > > + > > +PYTHON3_PYCPARSER_CONF_TOOL := python3 > > + > > +# > > > > +# Target-Install > > +# > > > > + > > +$(STATEDIR)/python3-pycparser.targetinstall: > > + @$(call targetinfo) > > + > > + @$(call install_init, python3-pycparser) > > + @$(call install_fixup, python3-pycparser, PRIORITY, optional) > > + @$(call install_fixup, python3-pycparser, SECTION, base) > > + @$(call install_fixup, python3-pycparser, AUTHOR, "Guillermo > > Rodriguez ") > > + @$(call install_fixup, python3-pycparser, DESCRIPTION, missing) > > + > > + @$(call install_glob, python3-pycparser, 0, 0, -, \ > > + > > /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/pycparser,, *.py) > > + > > + @$(call install_finish, python3-pycparser) > > + > > + @$(call touch) > > + > > +# vim: syntax=make > > -- > > 2.21.0 > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://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 -- Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v7] python3-numpy: New package
Hi Michael,
El lun., 25 nov. 2019 a las 7:33, Michael Olbrich
() escribió:
>
> On Tue, Nov 19, 2019 at 01:39:05PM +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
> > v6: Updated to 1.17.4, added patch to fix cross compilation
> > v7: Removed SETUPTOOLS dependency, reformatted sse2 patch header
> >
> > .../numpy-1.17.4/0001-remove-sse2-flag.patch | 27 +
> > patches/numpy-1.17.4/series | 1 +
> > rules/python3-numpy.in| 9 +++
> > rules/python3-numpy.make | 57 +++
> > 4 files changed, 94 insertions(+)
> > create mode 100644 patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> > create mode 100644 patches/numpy-1.17.4/series
> > create mode 100644 rules/python3-numpy.in
> > create mode 100644 rules/python3-numpy.make
> >
> > diff --git a/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> > b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> > new file mode 100644
> > index 0..2c88b429b
> > --- /dev/null
> > +++ b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
> > @@ -0,0 +1,27 @@
> > +From 4708211dc86d396f30c54bf71bc7194338272637 Mon Sep 17 00:00:00 2001
> > +From: mattip
> > +Date: Mon, 11 Nov 2019 12:48:00 -0700
> > +Subject: [PATCH] BUILD: remove SSE2 flag from numpy.random builds
> > +
> > +This is a backport of https://github.com/numpy/numpy/pull/14878
> > +
> > +---
> > + numpy/random/setup.py | 5 -
> > + 1 file changed, 5 deletions(-)
> > +
> > +diff --git a/numpy/random/setup.py b/numpy/random/setup.py
> > +index ca01250f437..f9059d7d76a 100644
> > +--- a/numpy/random/setup.py
> > b/numpy/random/setup.py
> > +@@ -49,11 +49,6 @@
> > + elif not is_msvc:
> > + # Some bit generators require c99
> > + EXTRA_COMPILE_ARGS += ['-std=c99']
> > +-INTEL_LIKE = any(arch in platform.machine()
> > +- for arch in ('x86', 'i686', 'i386', 'amd64'))
> > +-if INTEL_LIKE:
> > +-# Assumes GCC or GCC-like compiler
> > +-EXTRA_COMPILE_ARGS += ['-msse2']
> > +
> > + # Use legacy integer variable sizes
> > + LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')]
> > diff --git a/patches/numpy-1.17.4/series b/patches/numpy-1.17.4/series
> > new file mode 100644
> > index 0..64785c945
> > --- /dev/null
> > +++ b/patches/numpy-1.17.4/series
> > @@ -0,0 +1 @@
> > +0001-remove-sse2-flag.patch
> > diff --git a/rules/python3-numpy.in b/rules/python3-numpy.in
> > new file mode 100644
> > index 0..174a2bae1
> > --- /dev/null
> > +++ b/rules/python3-numpy.in
> > @@ -0,0 +1,9 @@
> > +## SECTION=python3
> > +
> > +config PYTHON3_NUMPY
> > + tristate
> > + select PYTHON3
> > + 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..6b161856b
> > --- /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.17.4
> > +PYTHON3_NUMPY_MD5:= d7d3563cca0b99ba68a3f064a9e46ebe
> > +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
>
> BSD is not a valid SPDX identifier. Which license does this refer to?
> No need to resent it, I can do a fixup, but I need to know what to change.
Not sure anymore, perhaps that's a leftover from a previous version of
the patch (since I switched from 1.16.1 to 1.17.4, and some licenses
have changed).
I rechecked everything from scratch and I see the following:
- Main numpy license is BSD-3-Clause. License text is here:
https://github.com/numpy/numpy/blob/master/LICENSE.txt
- According to https://github.com/numpy/numpy/blob/master/LICENSES_bundled.txt,
the following additional licenses apply to certain bundled components:
Name: lapack-lite
Files: numpy/linalg/lapack_lite/*
License: 3-clause BSD
For details, see
[ptxdist] [PATCH v3] python3-cffi: New package
Foreign Function Interface for Python calling C code. Signed-off-by: Guillermo Rodriguez --- v2: Fix site-packages path v3: Fix whitespace rules/python3-cffi.in | 8 ++ rules/python3-cffi.make | 56 + 2 files changed, 64 insertions(+) create mode 100644 rules/python3-cffi.in create mode 100644 rules/python3-cffi.make diff --git a/rules/python3-cffi.in b/rules/python3-cffi.in new file mode 100644 index 0..e26714d51 --- /dev/null +++ b/rules/python3-cffi.in @@ -0,0 +1,8 @@ +## SECTION=python3 + +config PYTHON3_CFFI + tristate + select PYTHON3 + prompt "python3-cffi" + help + Foreign Function Interface for Python calling C code. diff --git a/rules/python3-cffi.make b/rules/python3-cffi.make new file mode 100644 index 0..978af8af6 --- /dev/null +++ b/rules/python3-cffi.make @@ -0,0 +1,56 @@ +# -*-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_CFFI) += python3-cffi + +# +# Paths and names +# +PYTHON3_CFFI_VERSION := 1.13.2 +PYTHON3_CFFI_MD5 := 652203cf99faa254efff7fab23c2f3a2 +PYTHON3_CFFI := cffi-$(PYTHON3_CFFI_VERSION) +PYTHON3_CFFI_SUFFIX:= tar.gz +PYTHON3_CFFI_URL := https://pypi.python.org/packages/source/c/cffi/$(PYTHON3_CFFI).$(PYTHON3_CFFI_SUFFIX) +PYTHON3_CFFI_SOURCE:= $(SRCDIR)/$(PYTHON3_CFFI).$(PYTHON3_CFFI_SUFFIX) +PYTHON3_CFFI_DIR := $(BUILDDIR)/$(PYTHON3_CFFI) +PYTHON3_CFFI_LICENSE := MIT +PYTHON3_CFFI_LICENSE_FILES := \ + file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf + +# +# Prepare +# + +PYTHON3_CFFI_CONF_TOOL := python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-cffi.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-cffi) + @$(call install_fixup, python3-cffi, PRIORITY, optional) + @$(call install_fixup, python3-cffi, SECTION, base) + @$(call install_fixup, python3-cffi, AUTHOR, "Guillermo Rodriguez ") + @$(call install_fixup, python3-cffi, DESCRIPTION, missing) + + @$(call install_glob, python3-cffi, 0, 0, -, \ + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/cffi,, *.py *.h) + + @$(call install_lib, python3-cffi, 0, 0, 0644, python$(PYTHON3_MAJORMINOR)/site-packages/_cffi_backend.cpython*) + + @$(call install_finish, python3-cffi) + + @$(call touch) + +# vim: syntax=make -- 2.21.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v4] u-boot: generate environment image
Hi Alexander, thanks for the hint. I missed that line. Regards Denis Am Freitag, den 22.11.2019, 18:36 +0100 schrieb Alexander Dahl: > Hei hei, > > I will test on Monday, but one short remark below. > > On Fri, Nov 22, 2019 at 04:42:32PM +0100, Bruno Thomsen wrote: > > Add possiblity to generate a default or a custom environment > > image. Image can be used during manufacturing to avoid bootloader > > console usage and speed up first boot. Other image use-cases > > include device development edition, device demonstration > > mode, etc. > > > > Custom environment image is generated from an user provided > > config file with one 'var=value' per line format. Input config > > file name is configurable. > > > > Cc: Denis OSTERLAND > > Cc: Alexander Dahl > > Signed-off-by: Bruno Thomsen > > --- > > v4: > > - u-boot version limitation help. > > - env image size is now Kconfig hex input > > - custom env source file is now stored in platformconfigdir > > - changes in custom env source file trigger rebuild > > - use default mkenvimage pad > > - cleanup of env images > > - fix missing cleanup of imx dtb image > > Could you please move the missing cleanup to a separate patch? > Installing that image was introduced in commit > 58c48f349901988fb9bc63b7f2f9bbb30c6ef60d and I think this should be > fixed apart from the env stuff. > > > v3: > > - remove multiple env images support > > - use static image names > > - rebase patches on top of: u-boot: Build out-of-tree > > v2: > > - remove HOST_U_BOOT_TOOLS dependency > > - configurable default env image name > > - add custom env image generation option > > - move all options to sub menu > > > > platforms/u-boot.in | 61 + > > rules/u-boot.make | 31 ++- > > 2 files changed, 91 insertions(+), 1 deletion(-) > > > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > > index 9bac4a758..e6585b508 100644 > > --- a/platforms/u-boot.in > > +++ b/platforms/u-boot.in > > @@ -71,6 +71,67 @@ config U_BOOT_CONFIG > > > > endif > > > > +choice > > + prompt "Generate environment image" > > + default U_BOOT_NONE_ENV_IMAGE > > + help > > + U-Boot from version 2018.03 support out-of-tree environment > > + image generation. > > + > > +config U_BOOT_NONE_ENV_IMAGE > > + prompt "none" > > + bool > > + help > > + Don't generate an U-Boot environment image. > > + > > +config U_BOOT_DEFAULT_ENV_IMAGE > > + prompt "default" > > + bool > > + help > > + Use U-Boot's mkenvimage to compile a default U-Boot environment > > + image for use in e.g. device manufacturing or development. > > + > > +config U_BOOT_CUSTOM_ENV_IMAGE > > + prompt "custom" > > + bool > > + help > > + Use U-Boot's mkenvimage to compile a custom U-Boot environment > > + image based on the text file in U_BOOT_CUSTOM_ENV_IMAGE_SOURCE > > + for use in e.g. device manufacturing or development. > > + > > +endchoice > > + > > +config U_BOOT_CUSTOM_ENV_IMAGE_SOURCE > > + prompt "Custom environment source" > > + string > > + default "custom_env.config" > > + depends on U_BOOT_CUSTOM_ENV_IMAGE > > + help > > + Text file in platform config directory describing the custom > > + environment. > > + The file should have lines in the form var=value, one per line. > > + Blank lines and lines starting with a # are ignored. > > + > > +if !U_BOOT_NONE_ENV_IMAGE > > + > > +config U_BOOT_ENV_IMAGE_SIZE > > + prompt "Environment image size" > > + hex > > + default 0x2000 > > + help > > + Enter the U-Boot environment size in hexadecimal for generation > > + of image. A wrong size will typically cause crc error when used. > > + Must match size defined in target config and "/etc/fw_env.config". > > + > > +config U_BOOT_ENV_IMAGE_REDUNDANT > > + prompt "Environment image with redundant copy" > > + bool > > + help > > + Use to generate a redundant environment in the image. > > + Must match target config and "/etc/fw_env.config". > > + > > +endif > > + > > config U_BOOT_BOOT_SCRIPT > > prompt "Compile U-Boot boot script" > > bool > > diff --git a/rules/u-boot.make b/rules/u-boot.make > > index e3c2c2389..3d983378e 100644 > > --- a/rules/u-boot.make > > +++ b/rules/u-boot.make > > @@ -43,6 +43,12 @@ U_BOOT_BOOT_SCRIPT_BIN := $(call remove_quotes, \ > > $(STATEDIR)/u-boot.compile: $(U_BOOT_BOOT_SCRIPT_TXT) > > endif > > > > +ifdef PTXCONF_U_BOOT_CUSTOM_ENV_IMAGE > > +U_BOOT_CUSTOM_ENV_SRC := $(call ptx/in-platformconfigdir, \ > > + $(PTXCONF_U_BOOT_CUSTOM_ENV_IMAGE_SOURCE)) > > +$(STATEDIR)/u-boot.compile: $(call remove_quotes, $(U_BOOT_CUSTOM_ENV_SRC)) > > +endif > > + > > U_BOOT_WRAPPER_BLACKLIST := \ > > $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) > > > > @@ -100,6 +106,20 @@ ifdef PTXCONF_U_BOOT_BOOT_SCRIPT > > @$(U_BOOT_BUILD_DIR)/tools/mkimage -T script -C none \ > > -d $(U_BOOT_BOOT_SCRIPT_TXT) \ > >
Re: [ptxdist] [PATCH] python3-cffi: New package
El vie., 22 nov. 2019 a las 15:22, Michael Olbrich () escribió: > > On Thu, Nov 21, 2019 at 10:15:57AM +0100, Guillermo Rodríguez wrote: > > Foreign Function Interface for Python calling C code. > > > > Signed-off-by: Guillermo Rodriguez > > --- > > rules/python3-cffi.in | 8 ++ > > rules/python3-cffi.make | 56 + > > 2 files changed, 64 insertions(+) > > create mode 100644 rules/python3-cffi.in > > create mode 100644 rules/python3-cffi.make > > > > diff --git a/rules/python3-cffi.in b/rules/python3-cffi.in > > new file mode 100644 > > index 0..5b30de6d3 > > --- /dev/null > > +++ b/rules/python3-cffi.in > > @@ -0,0 +1,8 @@ > > +## SECTION=python3 > > + > > +config PYTHON3_CFFI > > + tristate > > + select PYTHON3 > > + prompt "python3-ccfi" > > + help > > + Foreign Function Interface for Python calling C code. > > diff --git a/rules/python3-cffi.make b/rules/python3-cffi.make > > new file mode 100644 > > index 0..5c6524d2c > > --- /dev/null > > +++ b/rules/python3-cffi.make > > @@ -0,0 +1,56 @@ > > +# -*-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_CFFI) += python3-cffi > > + > > +# > > +# Paths and names > > +# > > +PYTHON3_CFFI_VERSION := 1.13.2 > > +PYTHON3_CFFI_MD5 := 652203cf99faa254efff7fab23c2f3a2 > > +PYTHON3_CFFI := cffi-$(PYTHON3_CFFI_VERSION) > > +PYTHON3_CFFI_SUFFIX := tar.gz > > +PYTHON3_CFFI_URL := > > https://pypi.python.org/packages/source/c/cffi/$(PYTHON3_CFFI).$(PYTHON3_CFFI_SUFFIX) > > +PYTHON3_CFFI_SOURCE := $(SRCDIR)/$(PYTHON3_CFFI).$(PYTHON3_CFFI_SUFFIX) > > +PYTHON3_CFFI_DIR := $(BUILDDIR)/$(PYTHON3_CFFI) > > +PYTHON3_CFFI_LICENSE := MIT > > +PYTHON3_CFFI_LICENSE_FILES := \ > > + file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf > > Trailing Whitespace. > > > + > > +# > > > > +# Prepare > > +# > > > > + > > +PYTHON3_CFFI_CONF_TOOL := python3 > > + > > +# > > > > +# Target-Install > > +# > > > > + > > +$(STATEDIR)/python3-cffi.targetinstall: > > + @$(call targetinfo) > > + > > + @$(call install_init, python3-cffi) > > + @$(call install_fixup, python3-cffi, PRIORITY, optional) > > + @$(call install_fixup, python3-cffi, SECTION, base) > > + @$(call install_fixup, python3-cffi, AUTHOR, "Guillermo Rodriguez > > ") > > + @$(call install_fixup, python3-cffi, DESCRIPTION, missing) > > + > > + @$(call install_glob, python3-cffi, 0, 0, -, \ > > + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,, *.py *.h) > > I think this should be: > > /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/cffi,, > *.py *.h) > > Otherwise the egg-info stuff is installed, and I'm pretty sure that's not > needed, right? Right. This is fixed in v2 already. Will take care of whitespace and resend. Guillermo > > > + > > Trailing Whitespace. > > Michael > > > + @$(call install_lib, python3-cffi, 0, 0, 0644, > > python$(PYTHON3_MAJORMINOR)/site-packages/_cffi_backend.cpython*) > > + > > + @$(call install_finish, python3-cffi) > > + > > + @$(call touch) > > + > > +# vim: syntax=make > > -- > > 2.21.0 > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v4] u-boot: generate environment image
Hi, Am Freitag, den 22.11.2019, 16:42 +0100 schrieb Bruno Thomsen: > Add possiblity to generate a default or a custom environment > image. Image can be used during manufacturing to avoid bootloader > console usage and speed up first boot. Other image use-cases > include device development edition, device demonstration > mode, etc. > > Custom environment image is generated from an user provided > config file with one 'var=value' per line format. Input config > file name is configurable. > > Cc: Denis OSTERLAND > Cc: Alexander Dahl > Signed-off-by: Bruno Thomsen > --- > v4: > - u-boot version limitation help. > - env image size is now Kconfig hex input > - custom env source file is now stored in platformconfigdir > - changes in custom env source file trigger rebuild > - use default mkenvimage pad > - cleanup of env images > - fix missing cleanup of imx dtb image > v3: > - remove multiple env images support > - use static image names > - rebase patches on top of: u-boot: Build out-of-tree > v2: > - remove HOST_U_BOOT_TOOLS dependency > - configurable default env image name > - add custom env image generation option > - move all options to sub menu > > platforms/u-boot.in | 61 + > rules/u-boot.make | 31 ++- > 2 files changed, 91 insertions(+), 1 deletion(-) > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > index 9bac4a758..e6585b508 100644 > --- a/platforms/u-boot.in > +++ b/platforms/u-boot.in > @@ -71,6 +71,67 @@ config U_BOOT_CONFIG > > endif > > +choice > + prompt "Generate environment image" > + default U_BOOT_NONE_ENV_IMAGE > + help > + U-Boot from version 2018.03 support out-of-tree environment > + image generation. > + > +config U_BOOT_NONE_ENV_IMAGE looks a little bit odd. I would expect a common prefix, with the choice at the end. U_BOOT_ENV_IMAGE_NONE U_BOOT_ENV_IMAGE_DEFAULT U_BOOT_ENV_IMAGE_CUSTOM But that´s not a show stopper, I think. > + prompt "none" > + bool > + help > + Don't generate an U-Boot environment image. > + > +config U_BOOT_DEFAULT_ENV_IMAGE > + prompt "default" > + bool > + help > + Use U-Boot's mkenvimage to compile a default U-Boot environment > + image for use in e.g. device manufacturing or development. > + > +config U_BOOT_CUSTOM_ENV_IMAGE > + prompt "custom" > + bool > + help > + Use U-Boot's mkenvimage to compile a custom U-Boot environment > + image based on the text file in U_BOOT_CUSTOM_ENV_IMAGE_SOURCE > + for use in e.g. device manufacturing or development. > + > +endchoice > + > +config U_BOOT_CUSTOM_ENV_IMAGE_SOURCE > + prompt "Custom environment source" > + string > + default "custom_env.config" > + depends on U_BOOT_CUSTOM_ENV_IMAGE > + help > + Text file in platform config directory describing the custom > + environment. > + The file should have lines in the form var=value, one per line. > + Blank lines and lines starting with a # are ignored. > + > +if !U_BOOT_NONE_ENV_IMAGE > + > +config U_BOOT_ENV_IMAGE_SIZE > + prompt "Environment image size" > + hex > + default 0x2000 > + help > + Enter the U-Boot environment size in hexadecimal for generation > + of image. A wrong size will typically cause crc error when used. > + Must match size defined in target config and "/etc/fw_env.config". > + > +config U_BOOT_ENV_IMAGE_REDUNDANT > + prompt "Environment image with redundant copy" > + bool > + help > + Use to generate a redundant environment in the image. > + Must match target config and "/etc/fw_env.config". > + > +endif > + > config U_BOOT_BOOT_SCRIPT > prompt "Compile U-Boot boot script" > bool > diff --git a/rules/u-boot.make b/rules/u-boot.make > index e3c2c2389..3d983378e 100644 > --- a/rules/u-boot.make > +++ b/rules/u-boot.make > @@ -43,6 +43,12 @@ U_BOOT_BOOT_SCRIPT_BIN := $(call remove_quotes, \ > $(STATEDIR)/u-boot.compile: $(U_BOOT_BOOT_SCRIPT_TXT) > endif > > +ifdef PTXCONF_U_BOOT_CUSTOM_ENV_IMAGE > +U_BOOT_CUSTOM_ENV_SRC := $(call ptx/in-platformconfigdir, \ > + $(PTXCONF_U_BOOT_CUSTOM_ENV_IMAGE_SOURCE)) > +$(STATEDIR)/u-boot.compile: $(call remove_quotes, $(U_BOOT_CUSTOM_ENV_SRC)) > +endif > + > U_BOOT_WRAPPER_BLACKLIST := \ > $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) > > @@ -100,6 +106,20 @@ ifdef PTXCONF_U_BOOT_BOOT_SCRIPT > @$(U_BOOT_BUILD_DIR)/tools/mkimage -T script -C none \ > -d $(U_BOOT_BOOT_SCRIPT_TXT) \ > $(U_BOOT_BUILD_DIR)/boot.scr.uimg > +endif > +ifdef PTXCONF_U_BOOT_DEFAULT_ENV_IMAGE > + $(U_BOOT_MAKE_ENV) $(U_BOOT_DIR)/scripts/get_default_envs.sh > $(U_BOOT_BUILD_DIR) | \ > + $(U_BOOT_BUILD_DIR)/tools/mkenvimage \ > + $(call ptx/ifdef,PTXCONF_U_BOOT_ENV_IMAGE_REDUNDANT,-r,) \ > + -s $(PTXCONF_U_BOOT_ENV_IMAGE_SIZE) \ > + -o
