Re: [ptxdist] [PATCH] rules: optee-client: Allow enabling/disabling the rpmb emulator
On 2020-11-24 14:41, Robin van der Gracht wrote: Its enabled by default for backwards compatibility. Signed-off-by: Robin van der Gracht --- rules/optee-client.in | 5 + rules/optee-client.make | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rules/optee-client.in b/rules/optee-client.in index be97b36..e5758ef 100644 --- a/rules/optee-client.in +++ b/rules/optee-client.in @@ -20,4 +20,9 @@ config OPTEE_CLIENT_SYSTEMD_UNIT depends on SYSTEMD prompt "install systemd service file for tee-supplicant" +config OPTEE_CLIENT_RPMB_EMU + bool + default y + prompt "Emulate RPMB device for testing" + endif diff --git a/rules/optee-client.make b/rules/optee-client.make index 7fbebf1..797037e 100644 --- a/rules/optee-client.make +++ b/rules/optee-client.make @@ -32,7 +32,8 @@ OPTEE_CLIENT_MAKE_ENV := \ $(CROSS_ENV) \ LIBDIR=/usr/lib \ INCLUDEDIR=/usr/include \ - CFG_TEE_CLIENT_LOAD_PATH=/usr/lib/ + CFG_TEE_CLIENT_LOAD_PATH=/usr/lib/ \ + RPMB_EMU=$(call ptx/ifdef, PTXCONF_OPTEE_CLIENT_RPMB_EMU, 1, 0) # # Target-Install NOTE: Follow commit needs to be included in optee-client for this to work. https://github.com/OP-TEE/optee_client/commit/a0d685745ae00bfc275c27a07565f490de48b5e2 This is not true for the version included in PTXdist (3.5.0). The latest tagged release also doesn't have the commit yet, its only in 'master'. We might have to add it separately in the patches directory. I'll re-submit a patch soon. Regards, Robin ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 1/2] optee-client: version bump 3.5.0 -> 3.11.0
Hi Michael, On 2021-01-08 09:57, Michael Olbrich wrote: On Thu, Dec 17, 2020 at 09:14:53AM +0100, Robin van der Gracht wrote: Signed-off-by: Robin van der Gracht Hmm, shouldn't optee be updated as well? You are right. If thats OK with Rouven I'll add a patch that bumbs the optee package's version to 3.11.0 as well. Robin ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] rules: optee-client: Allow enabling/disabling the rpmb emulator
Its enabled by default for backwards compatibility. Signed-off-by: Robin van der Gracht --- rules/optee-client.in | 5 + rules/optee-client.make | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rules/optee-client.in b/rules/optee-client.in index be97b36..e5758ef 100644 --- a/rules/optee-client.in +++ b/rules/optee-client.in @@ -20,4 +20,9 @@ config OPTEE_CLIENT_SYSTEMD_UNIT depends on SYSTEMD prompt "install systemd service file for tee-supplicant" +config OPTEE_CLIENT_RPMB_EMU + bool + default y + prompt "Emulate RPMB device for testing" + endif diff --git a/rules/optee-client.make b/rules/optee-client.make index 7fbebf1..797037e 100644 --- a/rules/optee-client.make +++ b/rules/optee-client.make @@ -32,7 +32,8 @@ OPTEE_CLIENT_MAKE_ENV := \ $(CROSS_ENV) \ LIBDIR=/usr/lib \ INCLUDEDIR=/usr/include \ - CFG_TEE_CLIENT_LOAD_PATH=/usr/lib/ + CFG_TEE_CLIENT_LOAD_PATH=/usr/lib/ \ + RPMB_EMU=$(call ptx/ifdef, PTXCONF_OPTEE_CLIENT_RPMB_EMU, 1, 0) # # Target-Install -- 2.25.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 2/2] optee-client: Make RPMB emulation configurable
Enabled by default for backwards compatibility. The added patch was pulled from the optee-client git repository. It will be included in the next optee-client release. Signed-off-by: Robin van der Gracht --- ...ake-RPMB_EMU-a-conditional-assignmen.patch | 36 +++ rules/optee-client.make | 1 + 2 files changed, 37 insertions(+) create mode 100644 patches/optee-client-3.11.0/0001-tee-supplicant-make-RPMB_EMU-a-conditional-assignmen.patch diff --git a/patches/optee-client-3.11.0/0001-tee-supplicant-make-RPMB_EMU-a-conditional-assignmen.patch b/patches/optee-client-3.11.0/0001-tee-supplicant-make-RPMB_EMU-a-conditional-assignmen.patch new file mode 100644 index 0..cf1a12703 --- /dev/null +++ b/patches/optee-client-3.11.0/0001-tee-supplicant-make-RPMB_EMU-a-conditional-assignmen.patch @@ -0,0 +1,36 @@ +From a0d685745ae00bfc275c27a07565f490de48b5e2 Mon Sep 17 00:00:00 2001 +From: Ilias Apalodimas +Date: Mon, 19 Oct 2020 14:29:24 +0300 +Subject: [PATCH] tee-supplicant: make RPMB_EMU a conditional assignment + +At the moment the RPMB_EMU variable in the Makefile uses a simple +assignment and unconditionally sets the variable. +Move it to a conditional assignment and allow users to override it +from the command line with: +CROSS_COMPILE=aarch64-linux-gnu- RPMB_EMU=0 make + +Signed-off-by: Ilias Apalodimas +Reviewed-by: Jerome Forissier +Reviewed-by: Jens Wiklander +--- + tee-supplicant/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tee-supplicant/Makefile b/tee-supplicant/Makefile +index b7cf39a..fa26154 100644 +--- a/tee-supplicant/Makefile b/tee-supplicant/Makefile +@@ -3,8 +3,8 @@ include ../config.mk + + OUT_DIR := $(OO)/tee-supplicant + +-# Emulate RPMB ioctl's +-RPMB_EMU := 1 ++# Emulate RPMB ioctl's by default ++RPMB_EMU ?= 1 + + .PHONY: all tee-supplicant clean + +-- +2.25.1 + diff --git a/rules/optee-client.make b/rules/optee-client.make index dc76773c7..85ea30cc9 100644 --- a/rules/optee-client.make +++ b/rules/optee-client.make @@ -32,6 +32,7 @@ OPTEE_CLIENT_MAKE_ENV := \ $(CROSS_ENV) \ LIBDIR=/usr/lib \ INCLUDEDIR=/usr/include \ + RPMB_EMU=$(call ptx/ifdef, PTXCONF_OPTEE_CLIENT_RPMB_EMU, 1, 0) \ CFG_TEE_CLIENT_LOAD_PATH=/usr/lib/ # -- 2.25.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 1/2] optee-client: version bump 3.5.0 -> 3.11.0
Signed-off-by: Robin van der Gracht --- rules/optee-client.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/optee-client.make b/rules/optee-client.make index 7fbebf1f1..dc76773c7 100644 --- a/rules/optee-client.make +++ b/rules/optee-client.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPTEE_CLIENT) += optee-client # # Paths and names # -OPTEE_CLIENT_VERSION := 3.5.0 -OPTEE_CLIENT_MD5 := 2738729cb2457f2b4993ef6b91a6519d +OPTEE_CLIENT_VERSION := 3.11.0 +OPTEE_CLIENT_MD5 := 876f3afb72cdd64dd9b5a3606923d0d1 OPTEE_CLIENT := optee-client-$(OPTEE_CLIENT_VERSION) OPTEE_CLIENT_SUFFIX:= tar.gz OPTEE_CLIENT_URL := https://github.com/OP-TEE/optee_client/archive/$(OPTEE_CLIENT_VERSION).$(OPTEE_CLIENT_SUFFIX) @@ -48,6 +48,7 @@ $(STATEDIR)/optee-client.targetinstall: @$(call install_fixup, optee-client,DESCRIPTION,missing) @$(call install_lib, optee-client, 0, 0, 0644, libteec) + @$(call install_lib, optee-client, 0, 0, 0644, libckteec) @$(call install_copy, optee-client, 0, 0, 0755, -, /usr/sbin/tee-supplicant) ifdef PTXCONF_OPTEE_CLIENT_SYSTEMD_UNIT @$(call install_alternative, optee-client, 0, 0, 0644, \ -- 2.25.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v2 2/2] optee-client: Make RPMB emulation configurable
Enabled by default for backwards compatibility. The added patch was pulled from the optee-client git repository. It will be included in the next optee-client release. Signed-off-by: Robin van der Gracht --- v2: Added the missing optee-client.in changes. ...ake-RPMB_EMU-a-conditional-assignmen.patch | 36 +++ rules/optee-client.in | 5 +++ rules/optee-client.make | 1 + 3 files changed, 42 insertions(+) create mode 100644 patches/optee-client-3.11.0/0001-tee-supplicant-make-RPMB_EMU-a-conditional-assignmen.patch diff --git a/patches/optee-client-3.11.0/0001-tee-supplicant-make-RPMB_EMU-a-conditional-assignmen.patch b/patches/optee-client-3.11.0/0001-tee-supplicant-make-RPMB_EMU-a-conditional-assignmen.patch new file mode 100644 index 0..cf1a12703 --- /dev/null +++ b/patches/optee-client-3.11.0/0001-tee-supplicant-make-RPMB_EMU-a-conditional-assignmen.patch @@ -0,0 +1,36 @@ +From a0d685745ae00bfc275c27a07565f490de48b5e2 Mon Sep 17 00:00:00 2001 +From: Ilias Apalodimas +Date: Mon, 19 Oct 2020 14:29:24 +0300 +Subject: [PATCH] tee-supplicant: make RPMB_EMU a conditional assignment + +At the moment the RPMB_EMU variable in the Makefile uses a simple +assignment and unconditionally sets the variable. +Move it to a conditional assignment and allow users to override it +from the command line with: +CROSS_COMPILE=aarch64-linux-gnu- RPMB_EMU=0 make + +Signed-off-by: Ilias Apalodimas +Reviewed-by: Jerome Forissier +Reviewed-by: Jens Wiklander +--- + tee-supplicant/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tee-supplicant/Makefile b/tee-supplicant/Makefile +index b7cf39a..fa26154 100644 +--- a/tee-supplicant/Makefile b/tee-supplicant/Makefile +@@ -3,8 +3,8 @@ include ../config.mk + + OUT_DIR := $(OO)/tee-supplicant + +-# Emulate RPMB ioctl's +-RPMB_EMU := 1 ++# Emulate RPMB ioctl's by default ++RPMB_EMU ?= 1 + + .PHONY: all tee-supplicant clean + +-- +2.25.1 + diff --git a/rules/optee-client.in b/rules/optee-client.in index be97b3689..dbde5656d 100644 --- a/rules/optee-client.in +++ b/rules/optee-client.in @@ -20,4 +20,9 @@ config OPTEE_CLIENT_SYSTEMD_UNIT depends on SYSTEMD prompt "install systemd service file for tee-supplicant" +config OPTEE_CLIENT_RPMB_EMU +bool +default y +prompt "Emulate RPMB device for testing" + endif diff --git a/rules/optee-client.make b/rules/optee-client.make index dc76773c7..85ea30cc9 100644 --- a/rules/optee-client.make +++ b/rules/optee-client.make @@ -32,6 +32,7 @@ OPTEE_CLIENT_MAKE_ENV := \ $(CROSS_ENV) \ LIBDIR=/usr/lib \ INCLUDEDIR=/usr/include \ + RPMB_EMU=$(call ptx/ifdef, PTXCONF_OPTEE_CLIENT_RPMB_EMU, 1, 0) \ CFG_TEE_CLIENT_LOAD_PATH=/usr/lib/ # -- 2.25.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] PTXCONF_RAUC_COMPATIBLE location
Hi Bastian, On 2021-08-18 15:52, Bastian Krause wrote: Hi Robin, On 8/18/21 3:17 PM, Robin van der Gracht wrote: We're building an OS for multiple platforms. The platforms aren't compatible. Is the system.conf supposed to be identical on both platforms - apart from the compatible? If you mean the ptxconfig file (generated by `ptxdist menuconfig`) then yes. We've refreshed the hardware of an existing product but want the OS to stay the same. Best regards, Robin van der Gracht -- Protonic Holland Factorij 36 1689AL Zwaag +31 (0)229 212928 https://www.protonic.nl ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] PTXCONF_RAUC_COMPATIBLE location
Hi Dennis,
On 2021-08-23 06:27, Denis Osterland-Heim wrote:
Hi Robin,
You may simply add the platform name to the compatibility string.
PTXCONF_RAUC_COMPATIBLE="${PTXCONF_PROJECT_VENDOR} ${PTXCONF_PROJECT}
${PTXCONF_PLATFORM}"
Thank you for your reply.
I've been doing so for some time now. But recently I had to rename my
platforms but I'd like to keep the compatible string the same. That is when
I starded questioning the location.
Kind regards,
Robin van der Gracht
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
Re: [ptxdist] PTXCONF_RAUC_COMPATIBLE location
Hi Dennis,
On 2021-08-24 08:44, Denis Osterland-Heim wrote:
Hi Roland,
Am Montag, den 23.08.2021, 11:13 +0200 schrieb Roland Hieber:
On Mon, Aug 23, 2021 at 07:41:24AM +, Denis Osterland-Heim wrote:
> Hi Robin,
>
> I see. It is not perfect, that image-rauc uses the variables from rauc
silently.
… and IMAGE_RAUC cannot depend on RAUC because one is in the
platformconfig menu and one is in the ptxconfig menu. But it will work
this way nevertheless because at the time that IMAGE_RAUC_ENV is
assigned in rules/image-rauc.make, the kconfig variables from both menus
are already available in make.
> I would suggest:
>
> diff --git a/platforms/image-rauc.in b/platforms/image-rauc.in
> index 1f9427b40..bfbe4a18a 100644
> --- a/platforms/image-rauc.in
> +++ b/platforms/image-rauc.in
> @@ -26,4 +26,26 @@ config IMAGE_RAUC_DESCRIPTION
> help
>Optional description that will be placed in the Bundles metadata.
>
> +config IMAGE_RAUC_COMPATIBLE
> +string
> +prompt "RAUC Bundle Compatible"
> +default "${PTXCONF_RAUC_COMPATIBLE}"
> +help
> + An explicit identification string that RAUC uses to assure an update
> + bundle matches with the correct root filesystem on the target.
> + .
> + Only if the compatible in the targets RAUC system.conf file and those
> + in the Bundle's manifest match exactly, an update will be performed.
> + .
> + This must match the client configuration.
> +
> +config IMAGE_RAUC_BUNDLE_VERSION
> +string
> +prompt "RAUC Bundle Version"
> +default "${PTXDIST_RAUC_BUNDLE_VERSION}"
> +help
> + Overwrite the bundle version if needed.
> + .
> + This must match the client configuration.
> +
This has the disadvantage that the menu item is duplicated, and we
cannot make sure the values entered in the ptxconfig menu are the same
as in the platformconfig menu. So I'd rather leave it like it is now.
The image build will fail anyways with "Failed to create bundle:
Missing value for key 'compatible'" if RAUC is disabled. So maybe add a
short snippet in the image-rauc help text that rauc must be
enabled?
Would be welcome.
So if the flexibility to define the compatibility string in menu- or
platformconfig is not welcome,
we are back at the discussion, if compatibility string should resident in
menu- or platformconfig.
I believe that there are more applications that use multiple different
images
on one platform.
This would give a tendency to menuconfig, but with variables it does not
matter where it is technically.
Robins core problem seems to be, that there is no place where he can store
the compatibility platform name (the old one).
Robin, it looks like it would be the best solution that you add
`platforms/compatibility-name.in` to you BSP
and use its variable in RAUC_COMPATIBLE.
Agreed. This is probably best for my situation in which I want something
different than PTXCONF_PLATFORM. I see that it's not something we need to
'fix' upstream.
Than we'll leave it at this. Thanks you all for sharing your thoughts.
Robin
Regards, Denis
- Roland
> endif
> diff --git a/rules/image-rauc.make b/rules/image-rauc.make
> index fe1b0e89b..1fd810f71 100644
> --- a/rules/image-rauc.make
> +++ b/rules/image-rauc.make
> @@ -28,8 +28,8 @@ ifdef PTXCONF_IMAGE_RAUC
>
> IMAGE_RAUC_ENV= \
> $(CODE_SIGNING_ENV) \
> -RAUC_BUNDLE_COMPATIBLE="$(call remove_quotes,$(PTXCONF_RAUC_COMPATIBLE))" \
> -RAUC_BUNDLE_VERSION="$(call remove_quotes, $(PTXCONF_RAUC_BUNDLE_VERSION))" \
> +RAUC_BUNDLE_COMPATIBLE="$(call
remove_quotes,$(PTXCONF_IMAGE_RAUC_COMPATIBLE))" \
> +RAUC_BUNDLE_VERSION="$(call remove_quotes,
$(PTXCONF_IMAGE_RAUC_BUNDLE_VERSION))" \
> RAUC_BUNDLE_BUILD=$(call ptx/sh, date +%FT%T%z) \
> RAUC_BUNDLE_DESCRIPTION=$(PTXCONF_IMAGE_RAUC_DESCRIPTION) \
> RAUC_KEY="$(shell cs_get_uri update)" \
>
> Upstream and in your configuration:
>
> PTXCONF_RAUC_COMPATIBLE="${PTXCONF_IMAGE_RAUC_COMPATIBLE}"
>
> and in your platformconfigs:
>
> PTXCONF_IMAGE_RAUC_COMPATIBLE="what ever you want"
>
> This change would be transparent for all existing use-cases and give
additional flexibility.
>
> Regards, Denis
>
>
> Am Montag, den 23.08.2021, 08:54 +0200 schrieb Robin van der Gracht:
> > Hi Dennis,
> >
> > On 2021-08-23 06:27, Denis Osterland-Heim wrote:
> > > Hi Robin,
> > >
> > > You may simply add the platform name to the compatibility string.
> > >
> > > PTXCONF_RAUC_COMPATIBLE="${PTXCONF_PROJECT_VENDOR} ${PTXCONF_PROJECT}
> > > ${PTXCONF_PLATFORM}"
> >
> > Thank you for your reply.
> >
> > I've been doing so for some time now. But recently I had to rename my
> > platforms bu
[ptxdist] [PATCH] kernel-fit: Fix dtb file inclusion
KERNEL_DTB is not set. This results in a FIT image without device tree inclusion. Signed-off-by: Robin van der Gracht --- rules/kernel-fit.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/kernel-fit.make b/rules/kernel-fit.make index ffead846b..fd1ffe707 100644 --- a/rules/kernel-fit.make +++ b/rules/kernel-fit.make @@ -28,7 +28,7 @@ KERNEL_FIT_KERNEL = $(KERNEL_IMAGE_PATH_y) ifdef PTXCONF_KERNEL_FIT_INITRAMFS KERNEL_FIT_INITRAMFS := $(IMAGEDIR)/root.cpio endif -KERNEL_FIT_DTB = $(KERNEL_DTB) +KERNEL_FIT_DTB = $(foreach dtb, $(KERNEL_DTB_FILES), $(IMAGEDIR)/$(dtb)) # # Target-Install -- 2.30.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] PTXCONF_RAUC_COMPATIBLE location
Hi! We're building an OS for multiple platforms. The platforms aren't compatible. So we have a single ptxconfig and multiple platformconfig files. The rauc compatible string (PTXCONF_RAUC_COMPATIBLE) is set in the ptxconfig file. Is there a special reason for the PTXCONF_RAUC_COMPATIBLE being in the ptxconfig (menuconfig) or would it be fine to move it to the platformconfig (next to the platform specific description PTXCONF_IMAGE_RAUC_DESCRIPTION)? Best regards, Robin van der Gracht -- Protonic Holland Factorij 36 1689AL Zwaag +31 (0)229 212928 https://www.protonic.nl ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v2] kernel-fit: Fix dtb file inclusion
KERNEL_DTB is not set. This results in a FIT image without dtb files. Signed-off-by: Robin van der Gracht --- changes for v2: - use 'addprefix' instead of 'foreach'. rules/kernel-fit.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/kernel-fit.make b/rules/kernel-fit.make index ffead846b..64e82042f 100644 --- a/rules/kernel-fit.make +++ b/rules/kernel-fit.make @@ -28,7 +28,7 @@ KERNEL_FIT_KERNEL = $(KERNEL_IMAGE_PATH_y) ifdef PTXCONF_KERNEL_FIT_INITRAMFS KERNEL_FIT_INITRAMFS := $(IMAGEDIR)/root.cpio endif -KERNEL_FIT_DTB = $(KERNEL_DTB) +KERNEL_FIT_DTB = $(addprefix $(IMAGEDIR)/,$(KERNEL_DTB_FILES)) # # Target-Install -- 2.30.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 0/5] Update to Python3.11
This patchset contains an update for the Python package and several Python modules for compatibility weith the new Python version. Was able to update and test several Python modules but not all of them. Signed-off-by: Robin van der Gracht Robin van der Gracht (5): python3: Version bumb to 3.11.2 python3-aiofiles: Version bumb to 0.8.0 python3-frozenlist: Version bumb 1.3.3 python3-aiohttp: Version bumb to 3.8.4 python3-yarl: Version bumb to 1.8.2 rules/python3-aiofiles.make | 4 ++-- rules/python3-aiohttp.make| 4 ++-- rules/python3-frozenlist.make | 4 ++-- rules/python3-yarl.make | 4 ++-- rules/python3.make| 7 --- 5 files changed, 12 insertions(+), 11 deletions(-) -- 2.37.2
[ptxdist] [PATCH 4/5] python3-aiohttp: Version bumb to 3.8.4
Current version has no Python3.11 support. aiohttp/_websocket.c:198:12: fatal error: longintrepr.h: No such file or directory 198 | #include "longintrepr.h" |^~~ compilation terminated. Signed-off-by: Robin van der Gracht --- rules/python3-aiohttp.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-aiohttp.make b/rules/python3-aiohttp.make index 64bd6b0e8..a49f8f3cc 100644 --- a/rules/python3-aiohttp.make +++ b/rules/python3-aiohttp.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_AIOHTTP) += python3-aiohttp # # Paths and names # -PYTHON3_AIOHTTP_VERSION:= 3.8.1 -PYTHON3_AIOHTTP_MD5:= faf7726dc65a940272874c0f441e8ec6 +PYTHON3_AIOHTTP_VERSION:= 3.8.4 +PYTHON3_AIOHTTP_MD5:= 8208bc4b519ac4520720577f93561855 PYTHON3_AIOHTTP:= aiohttp-$(PYTHON3_AIOHTTP_VERSION) PYTHON3_AIOHTTP_SUFFIX := tar.gz PYTHON3_AIOHTTP_URL:= $(call ptx/mirror-pypi, aiohttp, $(PYTHON3_AIOHTTP).$(PYTHON3_AIOHTTP_SUFFIX)) -- 2.37.2
[ptxdist] [PATCH 1/5] python3: Version bumb to 3.11.2
Signed-off-by: Robin van der Gracht --- rules/python3.make | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/python3.make b/rules/python3.make index b8cffc190..d3f872206 100644 --- a/rules/python3.make +++ b/rules/python3.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PYTHON3) += python3 # # Paths and names # -PYTHON3_VERSION:= 3.10.4 -PYTHON3_MD5:= 21f2e113e087083a1e8cf10553d93599 +PYTHON3_VERSION:= 3.11.2 +PYTHON3_MD5:= a957cffb58a89303b62124896881950b PYTHON3_MAJORMINOR := $(basename $(PYTHON3_VERSION)) PYTHON3_SITEPACKAGES := /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages PYTHON3:= Python-$(PYTHON3_VERSION) @@ -76,7 +76,8 @@ PYTHON3_CONF_OPT := \ --without-dtrace \ --with-computed-gotos \ --without-ensurepip \ - --with-openssl=$(SYSROOT)/usr + --with-openssl=$(SYSROOT)/usr \ + --with-build-python=python$(PYTHON3_MAJORMINOR) # Keep dictionary order in .pyc files stable PYTHON3_MAKE_ENV := \ -- 2.37.2
[ptxdist] [PATCH 2/5] python3-aiofiles: Version bumb to 0.8.0
Current version has no Python3.11 support. import aiofiles File "/usr/lib/python3.11/site-packages/aiofiles/__init__.py", line 2, in File "/usr/lib/python3.11/site-packages/aiofiles/threadpool/__init__.py", line 8, in File "/usr/lib/python3.11/site-packages/aiofiles/threadpool/binary.py", line 1, in File "/usr/lib/python3.11/site-packages/aiofiles/base.py", line 7, in File "/usr/lib/python3.11/site-packages/aiofiles/base.py", line 14, in AsyncBase AttributeError: module 'asyncio' has no attribute 'coroutine'. Did you mean: 'coroutines'? Signed-off-by: Robin van der Gracht --- rules/python3-aiofiles.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-aiofiles.make b/rules/python3-aiofiles.make index edb5d23e1..7fe76c4de 100644 --- a/rules/python3-aiofiles.make +++ b/rules/python3-aiofiles.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_AIOFILES) += python3-aiofiles # # Paths and names # -PYTHON3_AIOFILES_VERSION := 0.3.2 -PYTHON3_AIOFILES_MD5 := 726de778d9e4b1c6d5e4d04994a03505 +PYTHON3_AIOFILES_VERSION := 0.8.0 +PYTHON3_AIOFILES_MD5 := 697deeb4fdcb620c45f114f173ed7c0d PYTHON3_AIOFILES := aiofiles-$(PYTHON3_AIOFILES_VERSION) PYTHON3_AIOFILES_SUFFIX:= tar.gz PYTHON3_AIOFILES_URL := $(call ptx/mirror-pypi, aiofiles, $(PYTHON3_AIOFILES).$(PYTHON3_AIOFILES_SUFFIX)) -- 2.37.2
[ptxdist] [PATCH 3/5] python3-frozenlist: Version bumb 1.3.3
Current version has no Python3.11 support. Signed-off-by: Robin van der Gracht --- rules/python3-frozenlist.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-frozenlist.make b/rules/python3-frozenlist.make index 68367a499..6a7114274 100644 --- a/rules/python3-frozenlist.make +++ b/rules/python3-frozenlist.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_FROZENLIST) += python3-frozenlist # # Paths and names # -PYTHON3_FROZENLIST_VERSION := 1.3.0 -PYTHON3_FROZENLIST_MD5 := e65d870bd189ba3c21ab7eb10eab22b7 +PYTHON3_FROZENLIST_VERSION := 1.3.3 +PYTHON3_FROZENLIST_MD5 := 14e9ffd849c6a1dfa3c6b1fb1ff77b14 PYTHON3_FROZENLIST := frozenlist-$(PYTHON3_FROZENLIST_VERSION) PYTHON3_FROZENLIST_SUFFIX := tar.gz PYTHON3_FROZENLIST_URL := $(call ptx/mirror-pypi, frozenlist, $(PYTHON3_FROZENLIST).$(PYTHON3_FROZENLIST_SUFFIX)) -- 2.37.2
[ptxdist] [PATCH 5/5] python3-yarl: Version bumb to 1.8.2
Current version has no Python3.11 support. yarl/_quoting_c.c:196:12: fatal error: longintrepr.h: No such file or directory 196 | #include "longintrepr.h" |^~~ compilation terminated. Signed-off-by: Robin van der Gracht --- rules/python3-yarl.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-yarl.make b/rules/python3-yarl.make index d6831493f..0f6f2d8e3 100644 --- a/rules/python3-yarl.make +++ b/rules/python3-yarl.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_YARL) += python3-yarl # # Paths and names # -PYTHON3_YARL_VERSION := 1.5.1 -PYTHON3_YARL_MD5 := a9b20bf0b8a6962e1101b28908a67bf8 +PYTHON3_YARL_VERSION := 1.8.2 +PYTHON3_YARL_MD5 := 57c82725b9f4895eecee45faf5e61a54 PYTHON3_YARL := yarl-$(PYTHON3_YARL_VERSION) PYTHON3_YARL_SUFFIX:= tar.gz PYTHON3_YARL_URL := $(call ptx/mirror-pypi, yarl, $(PYTHON3_YARL).$(PYTHON3_YARL_SUFFIX)) -- 2.37.2
Re: [ptxdist] [PATCH 1/3] rules: opensc: Version bumb to 0.23.0
On 13-04-2023 15:57, Michael Olbrich wrote:
On Thu, Apr 13, 2023 at 09:25:54AM +0200, Robin van der Gracht wrote:
...
+From 9294183e07ff4944e3f5e590f343f5727636767e Mon Sep 17 00:00:00 2001
+From: Jakub Jelen
+Date: Thu, 1 Dec 2022 20:08:53 +0100
+Subject: [PATCH] pkcs11-tool: Fix private key import
+
+---
+ src/tools/pkcs11-tool.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c
+index aae205fe..cfee8526 100644
+--- a/src/tools/pkcs11-tool.c
b/src/tools/pkcs11-tool.c
+@@ -3669,13 +3669,13 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct
rsakey_info *rsa)
+ RSA_get0_factors(r, _p, _q);
+ RSA_get0_crt_params(r, _dmp1, _dmq1, _iqmp);
+ #else
+- if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1,
_d) != 1 ||
++ if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_D, _d) !=
1 ||
+ EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1,
_p) != 1 ||
+ EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2,
_q) != 1 ||
+ EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT1,
_dmp1) != 1 ||
+ EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT2,
_dmq1) != 1 ||
+- EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT3,
_iqmp) != 1) {
+ util_fatal("OpenSSL error during RSA private key
parsing");
++ EVP_PKEY_get_bn_param(pkey,
OSSL_PKEY_PARAM_RSA_COEFFICIENT1, _iqmp) != 1) {
This is broken. Probably a bad conflict resolution. The next upstream
commit fixes this. So far it looks promising. I'll do some more testing and
clean it up.
I only compile tested the patch.
Ok, thanks!
Kind regards,
Robin
Re: [ptxdist] [PATCH 1/3] rules: opensc: Version bumb to 0.23.0
Hi Michael,
On 12-04-2023 08:28, Michael Olbrich wrote:
On Thu, Apr 06, 2023 at 04:50:14PM +0200, Robin van der Gracht wrote:
Signed-off-by: Robin van der Gracht
With this update pkcs11-tool (from host-opensc) does not work correctly any
more. I'm getting "error: OpenSSL error during RSA private key parsing" and
then a segfault. For example with the host-ptx-code-signing-dev package.
I'm not sure what's wrong here.
I'm not seeing this error with our setup but we're on 2023.02.0 with
openssl 1.1.1t.
I did notice a fix for RSA key imports in the opensc repository shortly
after version 0.23.0 was released. I've created a ptxdist patch that
includes that patch. It's attached to this email.
Can you verify if this fixes the error?
Kind regards,
RobinFrom 7c85dd2c365031bc793cac7ba29ac67e5105e144 Mon Sep 17 00:00:00 2001
From: Robin van der Gracht
Date: Thu, 13 Apr 2023 09:18:00 +0200
Subject: [PATCH] opensc: Add patch that fixes RSA private key imports
Signed-off-by: Robin van der Gracht
---
...1-pkcs11-tool-Fix-private-key-import.patch | 32 +++
patches/OpenSC-0.23.0/series | 1 +
2 files changed, 33 insertions(+)
create mode 100644 patches/OpenSC-0.23.0/0001-pkcs11-tool-Fix-private-key-import.patch
create mode 100644 patches/OpenSC-0.23.0/series
diff --git a/patches/OpenSC-0.23.0/0001-pkcs11-tool-Fix-private-key-import.patch b/patches/OpenSC-0.23.0/0001-pkcs11-tool-Fix-private-key-import.patch
new file mode 100644
index 0..a58fc69a4
--- /dev/null
+++ b/patches/OpenSC-0.23.0/0001-pkcs11-tool-Fix-private-key-import.patch
@@ -0,0 +1,32 @@
+From 9294183e07ff4944e3f5e590f343f5727636767e Mon Sep 17 00:00:00 2001
+From: Jakub Jelen
+Date: Thu, 1 Dec 2022 20:08:53 +0100
+Subject: [PATCH] pkcs11-tool: Fix private key import
+
+---
+ src/tools/pkcs11-tool.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c
+index aae205fe..cfee8526 100644
+--- a/src/tools/pkcs11-tool.c
b/src/tools/pkcs11-tool.c
+@@ -3669,13 +3669,13 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa)
+ RSA_get0_factors(r, _p, _q);
+ RSA_get0_crt_params(r, _dmp1, _dmq1, _iqmp);
+ #else
+- if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, _d) != 1 ||
++ if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_D, _d) != 1 ||
+ EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, _p) != 1 ||
+ EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, _q) != 1 ||
+ EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT1, _dmp1) != 1 ||
+ EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT2, _dmq1) != 1 ||
+- EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT3, _iqmp) != 1) {
+ util_fatal("OpenSSL error during RSA private key parsing");
++ EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_COEFFICIENT1, _iqmp) != 1) {
+ }
+ #endif
+ RSA_GET_BN(rsa, private_exponent, r_d);
+--
+2.37.2
+
diff --git a/patches/OpenSC-0.23.0/series b/patches/OpenSC-0.23.0/series
new file mode 100644
index 0..ebefe3cd1
--- /dev/null
+++ b/patches/OpenSC-0.23.0/series
@@ -0,0 +1 @@
+0001-pkcs11-tool-Fix-private-key-import.patch
--
2.37.2
Re: [ptxdist] [PATCH 3/3] rules: pcsc-lite: Add option for building with USB support
On 12-04-2023 08:32, Michael Olbrich wrote: On Thu, Apr 06, 2023 at 04:50:16PM +0200, Robin van der Gracht wrote: Signed-off-by: Robin van der Gracht --- rules/pcsc-lite.in | 5 + rules/pcsc-lite.make | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rules/pcsc-lite.in b/rules/pcsc-lite.in index 016a70037..de1c288c3 100644 --- a/rules/pcsc-lite.in +++ b/rules/pcsc-lite.in @@ -18,6 +18,11 @@ menuconfig PCSC_LITE if PCSC_LITE +config PCSC_LITE_USB +bool "USB Support" +help + Add USB support. Wrong indention. This should be tabs instead of spaces. I've fixed this while applying the patch. In the future, please run 'ptxdist lint' before sending patches. It will complain about all the small stuff like this. Ack. Thanks for pointing out the lint feature. Will do. Robin
[ptxdist] [PATCH 1/3] rules: opensc: Version bumb to 0.23.0
Signed-off-by: Robin van der Gracht --- rules/host-opensc.make | 2 +- rules/opensc.make | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/host-opensc.make b/rules/host-opensc.make index 0319064fd..24488de38 100644 --- a/rules/host-opensc.make +++ b/rules/host-opensc.make @@ -40,7 +40,7 @@ HOST_OPENSC_CONF_OPT := \ --disable-doc \ --disable-dnie-ui \ --disable-notify \ - --enable-tests=no \ + --disable-cmocka \ --disable-static HOST_OPENSC_CPPFLAGS := -Wno-implicit-fallthrough diff --git a/rules/opensc.make b/rules/opensc.make index 0278c53f1..dac5c3ecb 100644 --- a/rules/opensc.make +++ b/rules/opensc.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_OPENSC) += opensc # # Paths and names # -OPENSC_VERSION := 0.19.0 -OPENSC_MD5 := 40734b2343cf83c62c4c403f8a37475e +OPENSC_VERSION := 0.23.0 +OPENSC_MD5 := 35c599e673ae9205550974e2dcbe0825 OPENSC := OpenSC-$(OPENSC_VERSION) OPENSC_SUFFIX := tar.gz OPENSC_URL := https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION)/$(OPENSC).$(OPENSC_SUFFIX) @@ -56,7 +56,7 @@ OPENSC_CONF_OPT := \ --disable-doc \ --disable-dnie-ui \ --disable-notify \ - --$(call ptx/endis,PTXCONF_OPENSC_TESTSUITE)-tests \ + --$(call ptx/endis,PTXCONF_OPENSC_TESTSUITE)-cmocka \ --disable-static # -- 2.37.2
[ptxdist] [PATCH 3/3] rules: pcsc-lite: Add option for building with USB support
Signed-off-by: Robin van der Gracht --- rules/pcsc-lite.in | 5 + rules/pcsc-lite.make | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rules/pcsc-lite.in b/rules/pcsc-lite.in index 016a70037..de1c288c3 100644 --- a/rules/pcsc-lite.in +++ b/rules/pcsc-lite.in @@ -18,6 +18,11 @@ menuconfig PCSC_LITE if PCSC_LITE +config PCSC_LITE_USB +bool "USB Support" +help + Add USB support. + config PCSC_LITE_LIBUDEV bool "libudev support" diff --git a/rules/pcsc-lite.make b/rules/pcsc-lite.make index d773a8bb6..0c6edcbfe 100644 --- a/rules/pcsc-lite.make +++ b/rules/pcsc-lite.make @@ -38,7 +38,7 @@ PCSC_LITE_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --$(call ptx/endis, PTXCONF_PCSC_LITE_SYSTEMD_UNIT)-libsystemd \ --disable-serial \ - --disable-usb \ + --$(call ptx/endis, PTXCONF_PCSC_LITE_USB)-usb \ --$(call ptx/endis, PTXCONF_PCSC_LITE_LIBUDEV)-libudev \ --disable-libusb \ --disable-polkit \ -- 2.37.2
[ptxdist] [PATCH 2/3] rules: pcsc-lite: Version bumb to 1.9.8
Signed-off-by: Robin van der Gracht --- rules/pcsc-lite.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/pcsc-lite.make b/rules/pcsc-lite.make index 128489aa6..d773a8bb6 100644 --- a/rules/pcsc-lite.make +++ b/rules/pcsc-lite.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PCSC_LITE) += pcsc-lite # # Paths and names # -PCSC_LITE_VERSION := 1.8.23 -PCSC_LITE_MD5 := 3ba4b45456a500b5f1f22bf56a2dee38 +PCSC_LITE_VERSION := 1.9.8 +PCSC_LITE_MD5 := d063c6ca17c17fab39a85132811e155d PCSC_LITE_SUFFIX := tar.bz2 PCSC_LITE := pcsc-lite-$(PCSC_LITE_VERSION) PCSC_LITE_URL := https://pcsclite.apdu.fr/files/$(PCSC_LITE).$(PCSC_LITE_SUFFIX) -- 2.37.2
[ptxdist] [PATCH v2 0/5] Update to Python3.11
This patchset contains an update for the Python package and several Python modules for compatibility weith the new Python version. Was able to update and test several Python modules but not all of them. v2: - Remove the patches in patches/Python-3.10.4/* Signed-off-by: Robin van der Gracht Robin van der Gracht (5): python3: Version bumb to 3.11.2 python3-aiofiles: Version bumb to 0.8.0 python3-frozenlist: Version bumb 1.3.3 python3-aiohttp: Version bumb to 3.8.4 python3-yarl: Version bumb to 1.8.2 ...-leak-host-path-into-target-binaries.patch | 23 -- ...02-python3-prevent-host-path-leakage.patch | 43 --- patches/Python-3.10.4/series | 5 --- rules/python3-aiofiles.make | 4 +- rules/python3-aiohttp.make| 4 +- rules/python3-frozenlist.make | 4 +- rules/python3-yarl.make | 4 +- rules/python3.make| 7 +-- 8 files changed, 12 insertions(+), 82 deletions(-) delete mode 100644 patches/Python-3.10.4/0001-python3-don-t-leak-host-path-into-target-binaries.patch delete mode 100644 patches/Python-3.10.4/0002-python3-prevent-host-path-leakage.patch delete mode 100644 patches/Python-3.10.4/series -- 2.37.2
[ptxdist] [PATCH v2 3/5] python3-frozenlist: Version bumb 1.3.3
Current version has no Python3.11 support. Signed-off-by: Robin van der Gracht --- rules/python3-frozenlist.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-frozenlist.make b/rules/python3-frozenlist.make index 68367a499..6a7114274 100644 --- a/rules/python3-frozenlist.make +++ b/rules/python3-frozenlist.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_FROZENLIST) += python3-frozenlist # # Paths and names # -PYTHON3_FROZENLIST_VERSION := 1.3.0 -PYTHON3_FROZENLIST_MD5 := e65d870bd189ba3c21ab7eb10eab22b7 +PYTHON3_FROZENLIST_VERSION := 1.3.3 +PYTHON3_FROZENLIST_MD5 := 14e9ffd849c6a1dfa3c6b1fb1ff77b14 PYTHON3_FROZENLIST := frozenlist-$(PYTHON3_FROZENLIST_VERSION) PYTHON3_FROZENLIST_SUFFIX := tar.gz PYTHON3_FROZENLIST_URL := $(call ptx/mirror-pypi, frozenlist, $(PYTHON3_FROZENLIST).$(PYTHON3_FROZENLIST_SUFFIX)) -- 2.37.2
[ptxdist] [PATCH v2 1/5] python3: Version bumb to 3.11.2
Signed-off-by: Robin van der Gracht
---
...-leak-host-path-into-target-binaries.patch | 23 --
...02-python3-prevent-host-path-leakage.patch | 43 ---
patches/Python-3.10.4/series | 5 ---
rules/python3.make| 7 +--
4 files changed, 4 insertions(+), 74 deletions(-)
delete mode 100644
patches/Python-3.10.4/0001-python3-don-t-leak-host-path-into-target-binaries.patch
delete mode 100644
patches/Python-3.10.4/0002-python3-prevent-host-path-leakage.patch
delete mode 100644 patches/Python-3.10.4/series
diff --git
a/patches/Python-3.10.4/0001-python3-don-t-leak-host-path-into-target-binaries.patch
b/patches/Python-3.10.4/0001-python3-don-t-leak-host-path-into-target-binaries.patch
deleted file mode 100644
index e59f7c649..0
---
a/patches/Python-3.10.4/0001-python3-don-t-leak-host-path-into-target-binaries.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Michael Olbrich
-Date: Sun, 14 Oct 2018 18:51:17 +0200
-Subject: [PATCH] python3: don't leak host path into target binaries
-
-Without this the rpath of the _dbm module contains /usr/lib.
-
-Signed-off-by: Michael Olbrich
- setup.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index bf90600eaad3..9250f5a1b691 100644
a/setup.py
-+++ b/setup.py
-@@ -1516,7 +1516,6 @@ class PyBuildExt(build_ext):
- if dbm_setup_debug: print("building dbm using bdb")
- dbmext = Extension('_dbm', ['_dbmmodule.c'],
-library_dirs=dblib_dir,
-- runtime_library_dirs=dblib_dir,
-include_dirs=db_incs,
-define_macros=[
-('HAVE_BERKDB_H', None),
diff --git a/patches/Python-3.10.4/0002-python3-prevent-host-path-leakage.patch
b/patches/Python-3.10.4/0002-python3-prevent-host-path-leakage.patch
deleted file mode 100644
index e4d5eed17..0
--- a/patches/Python-3.10.4/0002-python3-prevent-host-path-leakage.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Bastian Stender
-Date: Mon, 8 Jan 2018 16:11:23 +0100
-Subject: [PATCH] python3: prevent host path leakage
-
-If cross-compiling and host/target architecture match host paths are
-added to include_dirs and library_dirs in add_multiarch_paths() (e.g.
-/usr/lib/i386-linux-gnu, /usr/include/i386-linux-gnu). This leads to
-build failures for some extensions (at least _ssl and _socket).
-
-ptxdist does not support multiarch, so remove this addition when
-cross-compiling.
-
-Based on a patch by Alexandru Ardelean .
-
-See these patches for reference:
-- https://github.com/openwrt/packages/pull/784
--
https://github.com/openwrt/packages/blob/master/lang/python/python/patches/006-remove-multi-arch-and-local-paths.patch
--
http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-devtools/python/python/host_include_contamination.patch
-
-Signed-off-by: Bastian Stender
- setup.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 9250f5a1b691..3278aaf6e677 100644
a/setup.py
-+++ b/setup.py
-@@ -829,10 +829,12 @@ class PyBuildExt(build_ext):
- if not CROSS_COMPILING:
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+
-+self.add_multiarch_paths()
-+
- # only change this for cross builds for 3.3, issues on Mageia
- if CROSS_COMPILING:
- self.add_cross_compiling_paths()
--self.add_multiarch_paths()
- self.add_ldflags_cppflags()
-
- def init_inc_lib_dirs(self):
-
diff --git a/patches/Python-3.10.4/series b/patches/Python-3.10.4/series
deleted file mode 100644
index 305ae1d73..0
--- a/patches/Python-3.10.4/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-python3-don-t-leak-host-path-into-target-binaries.patch
-0002-python3-prevent-host-path-leakage.patch
-# 9a6f885c0db25c8cff5dd088d9eff6af - git-ptx-patches magic
diff --git a/rules/python3.make b/rules/python3.make
index b8cffc190..d3f872206 100644
--- a/rules/python3.make
+++ b/rules/python3.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PYTHON3) += python3
#
# Paths and names
#
-PYTHON3_VERSION:= 3.10.4
-PYTHON3_MD5:= 21f2e113e087083a1e8cf10553d93599
+PYTHON3_VERSION:= 3.11.2
+PYTHON3_MD5:= a957cffb58a89303b62124896881950b
PYTHON3_MAJORMINOR := $(basename $(PYTHON3_VERSION))
PYTHON3_SITEPACKAGES := /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages
PYTHON3:= Python-$(PYTHON3_VERSION)
@@ -76,7 +76,8 @@ PYTHON3_CONF_OPT := \
--without-dtrace \
--with-computed-gotos \
--without
[ptxdist] [PATCH v2 2/5] python3-aiofiles: Version bumb to 0.8.0
Current version has no Python3.11 support. import aiofiles File "/usr/lib/python3.11/site-packages/aiofiles/__init__.py", line 2, in File "/usr/lib/python3.11/site-packages/aiofiles/threadpool/__init__.py", line 8, in File "/usr/lib/python3.11/site-packages/aiofiles/threadpool/binary.py", line 1, in File "/usr/lib/python3.11/site-packages/aiofiles/base.py", line 7, in File "/usr/lib/python3.11/site-packages/aiofiles/base.py", line 14, in AsyncBase AttributeError: module 'asyncio' has no attribute 'coroutine'. Did you mean: 'coroutines'? Signed-off-by: Robin van der Gracht --- rules/python3-aiofiles.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-aiofiles.make b/rules/python3-aiofiles.make index edb5d23e1..7fe76c4de 100644 --- a/rules/python3-aiofiles.make +++ b/rules/python3-aiofiles.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_AIOFILES) += python3-aiofiles # # Paths and names # -PYTHON3_AIOFILES_VERSION := 0.3.2 -PYTHON3_AIOFILES_MD5 := 726de778d9e4b1c6d5e4d04994a03505 +PYTHON3_AIOFILES_VERSION := 0.8.0 +PYTHON3_AIOFILES_MD5 := 697deeb4fdcb620c45f114f173ed7c0d PYTHON3_AIOFILES := aiofiles-$(PYTHON3_AIOFILES_VERSION) PYTHON3_AIOFILES_SUFFIX:= tar.gz PYTHON3_AIOFILES_URL := $(call ptx/mirror-pypi, aiofiles, $(PYTHON3_AIOFILES).$(PYTHON3_AIOFILES_SUFFIX)) -- 2.37.2
[ptxdist] [PATCH v2 4/5] python3-aiohttp: Version bumb to 3.8.4
Current version has no Python3.11 support. aiohttp/_websocket.c:198:12: fatal error: longintrepr.h: No such file or directory 198 | #include "longintrepr.h" |^~~ compilation terminated. Signed-off-by: Robin van der Gracht --- rules/python3-aiohttp.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-aiohttp.make b/rules/python3-aiohttp.make index 64bd6b0e8..a49f8f3cc 100644 --- a/rules/python3-aiohttp.make +++ b/rules/python3-aiohttp.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_AIOHTTP) += python3-aiohttp # # Paths and names # -PYTHON3_AIOHTTP_VERSION:= 3.8.1 -PYTHON3_AIOHTTP_MD5:= faf7726dc65a940272874c0f441e8ec6 +PYTHON3_AIOHTTP_VERSION:= 3.8.4 +PYTHON3_AIOHTTP_MD5:= 8208bc4b519ac4520720577f93561855 PYTHON3_AIOHTTP:= aiohttp-$(PYTHON3_AIOHTTP_VERSION) PYTHON3_AIOHTTP_SUFFIX := tar.gz PYTHON3_AIOHTTP_URL:= $(call ptx/mirror-pypi, aiohttp, $(PYTHON3_AIOHTTP).$(PYTHON3_AIOHTTP_SUFFIX)) -- 2.37.2
[ptxdist] [PATCH v2 5/5] python3-yarl: Version bumb to 1.8.2
Current version has no Python3.11 support. yarl/_quoting_c.c:196:12: fatal error: longintrepr.h: No such file or directory 196 | #include "longintrepr.h" |^~~ compilation terminated. Signed-off-by: Robin van der Gracht --- rules/python3-yarl.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-yarl.make b/rules/python3-yarl.make index d6831493f..0f6f2d8e3 100644 --- a/rules/python3-yarl.make +++ b/rules/python3-yarl.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_YARL) += python3-yarl # # Paths and names # -PYTHON3_YARL_VERSION := 1.5.1 -PYTHON3_YARL_MD5 := a9b20bf0b8a6962e1101b28908a67bf8 +PYTHON3_YARL_VERSION := 1.8.2 +PYTHON3_YARL_MD5 := 57c82725b9f4895eecee45faf5e61a54 PYTHON3_YARL := yarl-$(PYTHON3_YARL_VERSION) PYTHON3_YARL_SUFFIX:= tar.gz PYTHON3_YARL_URL := $(call ptx/mirror-pypi, yarl, $(PYTHON3_YARL).$(PYTHON3_YARL_SUFFIX)) -- 2.37.2
Re: [ptxdist] [PATCH 1/5] python3: Version bumb to 3.11.2
Hi Michael, On 22-03-2023 20:14, Michael Olbrich wrote: On Wed, Mar 22, 2023 at 11:13:54AM +0100, Robin van der Gracht wrote: Signed-off-by: Robin van der Gracht There are two patches for the old Python version. The second one is obsolete with the latest toolchain wrapper changes. But please check the rpath referenced in the first patch and either remove or update the patch. Aah right. I forgot about those. I just build python3-db and inspected the resulting .so and found that R[UN]PATH is nolonger explicitly stated. So I'll remove both patches. I'll send a v2 soon. Thanks! - Robin
[ptxdist] [PATCH] optee: Add missing dependency on host-dtc
Signed-off-by: Robin van der Gracht --- platforms/optee.in | 1 + 1 file changed, 1 insertion(+) diff --git a/platforms/optee.in b/platforms/optee.in index 4e2b4eb25..371f5b237 100644 --- a/platforms/optee.in +++ b/platforms/optee.in @@ -6,6 +6,7 @@ menuconfig OPTEE select HOST_SYSTEM_PYTHON3 select HOST_SYSTEM_PYTHON3_PYELFTOOLS select HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY + select HOST_DTC depends on ARCH_ARM || ARCH_ARM64 depends on !ARCH_ARM64 || BROKEN help -- 2.39.2
