[ptxdist] [PATCH] python3-asyncua: version bump 1.0.6 -> 1.1.0
Signed-off-by: Artur Wiebe --- rules/python3-asyncua.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-asyncua.make b/rules/python3-asyncua.make index 4f26db722..0fbf3e4fe 100644 --- a/rules/python3-asyncua.make +++ b/rules/python3-asyncua.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_ASYNCUA) += python3-asyncua # # Paths and names # -PYTHON3_ASYNCUA_VERSION:= 1.0.6 -PYTHON3_ASYNCUA_MD5:= 6353843cb95ba72a4e71bf623c26bff0 +PYTHON3_ASYNCUA_VERSION:= 1.1.0 +PYTHON3_ASYNCUA_MD5:= 3131bf0f9554f91c4f63cbdc019fce8b PYTHON3_ASYNCUA:= asyncua-$(PYTHON3_ASYNCUA_VERSION) PYTHON3_ASYNCUA_SUFFIX := tar.gz PYTHON3_ASYNCUA_URL:= $(call ptx/mirror-pypi, asyncua, $(PYTHON3_ASYNCUA).$(PYTHON3_ASYNCUA_SUFFIX)) -- 2.43.2
[ptxdist] [PATCH] kexec-tools: version bump 2.0.27 -> 2.0.28
Signed-off-by: Artur Wiebe --- rules/kexec-tools.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/kexec-tools.make b/rules/kexec-tools.make index e76aa34e9..6e6f9b796 100644 --- a/rules/kexec-tools.make +++ b/rules/kexec-tools.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_KEXEC_TOOLS) += kexec-tools # # Paths and names # -KEXEC_TOOLS_VERSION:= 2.0.27 -KEXEC_TOOLS_MD5:= 70472060cdcbfdb0de6ae651193fbc7d +KEXEC_TOOLS_VERSION:= 2.0.28 +KEXEC_TOOLS_MD5:= c775dfc1c5f1397f390b5478845185be KEXEC_TOOLS:= kexec-tools-$(KEXEC_TOOLS_VERSION) KEXEC_TOOLS_SUFFIX := tar.xz KEXEC_TOOLS_URL:= $(call ptx/mirror, KERNEL, utils/kernel/kexec/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX)) -- 2.43.0
Re: [ptxdist] [PATCH] python3-pycparser: version bump 2.18 -> 2.21
Hi Michael, On Tuesday, 30 January, 2024 08:59 CET, Michael Olbrich wrote: > Hi, > > On Mon, Jan 29, 2024 at 11:05:53AM +0100, Artur Wiebe wrote: > > LICENSE file change: > > "Slightly tweak the LICENSE file to be more canonical" > > Please look at the differences of the file in the old and new version. > You'll note that the only difference is the copyright year. > > The commit message you mentioned is from a change that was made _after_ the > new release. Sorry, you are right. I'll be more careful next time! > > The whole point of the checksum is, that we notice if something changes. > That means, actually looking at the files, comparing the two versions. So > we can decided if the license needs to be changed. And finally document the > whole process in the commit message. Thank you for the explanation. Maybe it should be mentioned in the docs: https://www.ptxdist.org/doc/contributing.html#updating-a-package-to-a-new-version Best Regards, Artur > > If you are unsure what to do with a change then ask here on the list. > > Regards, > Michael > > > > Signed-off-by: Artur Wiebe > > --- > > rules/python3-pycparser.make | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/rules/python3-pycparser.make b/rules/python3-pycparser.make > > index 484410713..a4a644778 100644 > > --- a/rules/python3-pycparser.make > > +++ b/rules/python3-pycparser.make > > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_PYCPARSER) += python3-pycparser > > # > > # Paths and names > > # > > -PYTHON3_PYCPARSER_VERSION := 2.18 > > -PYTHON3_PYCPARSER_MD5 := 72370da54358202a60130e223d488136 > > +PYTHON3_PYCPARSER_VERSION := 2.21 > > +PYTHON3_PYCPARSER_MD5 := 48f7d743bf018f7bb2ffc5fb976d1492 > > PYTHON3_PYCPARSER := pycparser-$(PYTHON3_PYCPARSER_VERSION) > > PYTHON3_PYCPARSER_SUFFIX := tar.gz > > PYTHON3_PYCPARSER_URL := $(call ptx/mirror-pypi, pycparser, > > $(PYTHON3_PYCPARSER).$(PYTHON3_PYCPARSER_SUFFIX)) > > @@ -23,7 +23,7 @@ PYTHON3_PYCPARSER_SOURCE := > > $(SRCDIR)/$(PYTHON3_PYCPARSER).$(PYTHON3_PYCPARSER_S > > PYTHON3_PYCPARSER_DIR := $(BUILDDIR)/$(PYTHON3_PYCPARSER) > > PYTHON3_PYCPARSER_LICENSE := BSD-3-Clause > > PYTHON3_PYCPARSER_LICENSE_FILES := \ > > - file://LICENSE;md5=86f1cedb4e6410a88ce8e30b91079169 > > + file://LICENSE;md5=2c28cdeabcb88f5843d934381b4b4fea > > > > # > > > > # Prepare > > -- > > 2.43.0 > > > > > > > > -- > 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] [PATCH] python3-pycparser: version bump 2.18 -> 2.21
LICENSE file change: Update LICENSE copyright year Signed-off-by: Artur Wiebe --- rules/python3-pycparser.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/python3-pycparser.make b/rules/python3-pycparser.make index 484410713..a4a644778 100644 --- a/rules/python3-pycparser.make +++ b/rules/python3-pycparser.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_PYCPARSER) += python3-pycparser # # Paths and names # -PYTHON3_PYCPARSER_VERSION := 2.18 -PYTHON3_PYCPARSER_MD5 := 72370da54358202a60130e223d488136 +PYTHON3_PYCPARSER_VERSION := 2.21 +PYTHON3_PYCPARSER_MD5 := 48f7d743bf018f7bb2ffc5fb976d1492 PYTHON3_PYCPARSER := pycparser-$(PYTHON3_PYCPARSER_VERSION) PYTHON3_PYCPARSER_SUFFIX := tar.gz PYTHON3_PYCPARSER_URL := $(call ptx/mirror-pypi, pycparser, $(PYTHON3_PYCPARSER).$(PYTHON3_PYCPARSER_SUFFIX)) @@ -23,7 +23,7 @@ PYTHON3_PYCPARSER_SOURCE := $(SRCDIR)/$(PYTHON3_PYCPARSER).$(PYTHON3_PYCPARSER_S PYTHON3_PYCPARSER_DIR := $(BUILDDIR)/$(PYTHON3_PYCPARSER) PYTHON3_PYCPARSER_LICENSE := BSD-3-Clause PYTHON3_PYCPARSER_LICENSE_FILES := \ - file://LICENSE;md5=86f1cedb4e6410a88ce8e30b91079169 + file://LICENSE;md5=2c28cdeabcb88f5843d934381b4b4fea # # Prepare -- 2.43.0
[ptxdist] [PATCH] python3-cryptography: version bump 40.0.1 -> 41.0.7
LICENSE file change: dropped following clause: - The code used in the OS random engine is derived from CPython, and is licensed - under the terms of the PSF License Agreement. Signed-off-by: Artur Wiebe --- rules/python3-cryptography.cargo.make | 434 -- rules/python3-cryptography.make | 6 +- 2 files changed, 136 insertions(+), 304 deletions(-) diff --git a/rules/python3-cryptography.cargo.make b/rules/python3-cryptography.cargo.make index abc51ee6e..4421d1460 100644 --- a/rules/python3-cryptography.cargo.make +++ b/rules/python3-cryptography.cargo.make @@ -11,7 +11,7 @@ # should not be modified manually! # -PYTHON3_CRYPTOGRAPHY_CARGO_LOCK_MD5 := 0bd35601df312aa6ae9fb55e9ac95a80 +PYTHON3_CRYPTOGRAPHY_CARGO_LOCK_MD5 := 0fed108832cd2e6f383e680053feeadc PYTHON3_CRYPTOGRAPHY_INFLECTOR_0_11_4_MD5 := b7f1a4cd029f5b6ffbc31b3acd5ae605 PYTHON3_CRYPTOGRAPHY_INFLECTOR_0_11_4_URL := https://crates.io/api/v1/crates/Inflector/0.11.4/download @@ -25,23 +25,17 @@ PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3_SOURCE := $(SRCDIR)/aliasable-0.1.3.crate $(PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3_SOURCE) := PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3 PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3_SOURCE) -PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_MD5 := bf23cd323c33a8c283c41bb9b79e4ce4 -PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_URL := https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_SOURCE:= $(SRCDIR)/android_system_properties-0.1.5.crate -$(PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_SOURCE) := PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5 -PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_SOURCE) +PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_MD5 := eab04ea9e3f12685eb2c7e3d720f38ee +PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_URL := https://crates.io/api/v1/crates/asn1/0.15.2/download +PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_SOURCE:= $(SRCDIR)/asn1-0.15.2.crate +$(PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_SOURCE) := PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2 +PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_SOURCE) -PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_MD5 := fccc99a9d7209cb9dac58d4844967f1e -PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_URL := https://crates.io/api/v1/crates/asn1/0.13.0/download -PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_SOURCE:= $(SRCDIR)/asn1-0.13.0.crate -$(PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_SOURCE) := PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0 -PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_SOURCE) - -PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_MD5:= 64f71a2af5210b79e9b3de5817abd295 -PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_URL:= https://crates.io/api/v1/crates/asn1_derive/0.13.0/download -PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_SOURCE := $(SRCDIR)/asn1_derive-0.13.0.crate -$(PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_SOURCE) := PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0 -PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_SOURCE) +PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_MD5:= ec8b3e5e64b9602b3a99118e42bd8266 +PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_URL:= https://crates.io/api/v1/crates/asn1_derive/0.15.2/download +PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_SOURCE := $(SRCDIR)/asn1_derive-0.15.2.crate +$(PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_SOURCE) := PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2 +PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_SOURCE) PYTHON3_CRYPTOGRAPHY_AUTOCFG_1_1_0_MD5 := 05d77ef52e90ad161fdd41b252420467 PYTHON3_CRYPTOGRAPHY_AUTOCFG_1_1_0_URL := https://crates.io/api/v1/crates/autocfg/1.1.0/download @@ -61,11 +55,11 @@ PYTHON3_CRYPTOGRAPHY_BITFLAGS_1_3_2_SOURCE := $(SRCDIR)/bitflags-1.3.2.crate $(PYTHON3_CRYPTOGRAPHY_BITFLAGS_1_3_2_SOURCE) := PYTHON3_CRYPTOGRAPHY_BITFLAGS_1_3_2 PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_BITFLAGS_1_3_2_SOURCE) -PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_MD5:= 67b7cc02856cad7f081e9dc0d8a74427 -PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_URL:= https://crates.io/api/v1/crates/bumpalo/3.10.0/download -PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_SOURCE := $(SRCDIR)/bumpalo-3.10.0.crate -$(PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_SOURCE) := PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0 -PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_SOURCE) +PYTHON3_CRYPTOGRAPHY_BITFLAGS_2_4_1_MD5:= ebcf604c44976809506192718f439dc1 +PYTHON3_CRYPTOGRAPHY_BITFLAGS_2_4_1_URL:= https://crates.io/api/v1/crates/bitflags/2.4.1/download
[ptxdist] [PATCH] python3-pycparser: version bump 2.18 -> 2.21
LICENSE file change: "Slightly tweak the LICENSE file to be more canonical" Signed-off-by: Artur Wiebe --- rules/python3-pycparser.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/python3-pycparser.make b/rules/python3-pycparser.make index 484410713..a4a644778 100644 --- a/rules/python3-pycparser.make +++ b/rules/python3-pycparser.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_PYCPARSER) += python3-pycparser # # Paths and names # -PYTHON3_PYCPARSER_VERSION := 2.18 -PYTHON3_PYCPARSER_MD5 := 72370da54358202a60130e223d488136 +PYTHON3_PYCPARSER_VERSION := 2.21 +PYTHON3_PYCPARSER_MD5 := 48f7d743bf018f7bb2ffc5fb976d1492 PYTHON3_PYCPARSER := pycparser-$(PYTHON3_PYCPARSER_VERSION) PYTHON3_PYCPARSER_SUFFIX := tar.gz PYTHON3_PYCPARSER_URL := $(call ptx/mirror-pypi, pycparser, $(PYTHON3_PYCPARSER).$(PYTHON3_PYCPARSER_SUFFIX)) @@ -23,7 +23,7 @@ PYTHON3_PYCPARSER_SOURCE := $(SRCDIR)/$(PYTHON3_PYCPARSER).$(PYTHON3_PYCPARSER_S PYTHON3_PYCPARSER_DIR := $(BUILDDIR)/$(PYTHON3_PYCPARSER) PYTHON3_PYCPARSER_LICENSE := BSD-3-Clause PYTHON3_PYCPARSER_LICENSE_FILES := \ - file://LICENSE;md5=86f1cedb4e6410a88ce8e30b91079169 + file://LICENSE;md5=2c28cdeabcb88f5843d934381b4b4fea # # Prepare -- 2.43.0
[ptxdist] [PATCH] python3-pycparser: version bump 2.18 -> 2.21
Signed-off-by: Artur Wiebe --- rules/python3-pycparser.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/python3-pycparser.make b/rules/python3-pycparser.make index 484410713..a4a644778 100644 --- a/rules/python3-pycparser.make +++ b/rules/python3-pycparser.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_PYCPARSER) += python3-pycparser # # Paths and names # -PYTHON3_PYCPARSER_VERSION := 2.18 -PYTHON3_PYCPARSER_MD5 := 72370da54358202a60130e223d488136 +PYTHON3_PYCPARSER_VERSION := 2.21 +PYTHON3_PYCPARSER_MD5 := 48f7d743bf018f7bb2ffc5fb976d1492 PYTHON3_PYCPARSER := pycparser-$(PYTHON3_PYCPARSER_VERSION) PYTHON3_PYCPARSER_SUFFIX := tar.gz PYTHON3_PYCPARSER_URL := $(call ptx/mirror-pypi, pycparser, $(PYTHON3_PYCPARSER).$(PYTHON3_PYCPARSER_SUFFIX)) @@ -23,7 +23,7 @@ PYTHON3_PYCPARSER_SOURCE := $(SRCDIR)/$(PYTHON3_PYCPARSER).$(PYTHON3_PYCPARSER_S PYTHON3_PYCPARSER_DIR := $(BUILDDIR)/$(PYTHON3_PYCPARSER) PYTHON3_PYCPARSER_LICENSE := BSD-3-Clause PYTHON3_PYCPARSER_LICENSE_FILES := \ - file://LICENSE;md5=86f1cedb4e6410a88ce8e30b91079169 + file://LICENSE;md5=2c28cdeabcb88f5843d934381b4b4fea # # Prepare -- 2.43.0
[ptxdist] [PATCH] python3-cryptography: version bump 40.0.1 -> 41.0.7
Signed-off-by: Artur Wiebe --- rules/python3-cryptography.cargo.make | 434 -- rules/python3-cryptography.make | 6 +- 2 files changed, 136 insertions(+), 304 deletions(-) diff --git a/rules/python3-cryptography.cargo.make b/rules/python3-cryptography.cargo.make index abc51ee6e..4421d1460 100644 --- a/rules/python3-cryptography.cargo.make +++ b/rules/python3-cryptography.cargo.make @@ -11,7 +11,7 @@ # should not be modified manually! # -PYTHON3_CRYPTOGRAPHY_CARGO_LOCK_MD5 := 0bd35601df312aa6ae9fb55e9ac95a80 +PYTHON3_CRYPTOGRAPHY_CARGO_LOCK_MD5 := 0fed108832cd2e6f383e680053feeadc PYTHON3_CRYPTOGRAPHY_INFLECTOR_0_11_4_MD5 := b7f1a4cd029f5b6ffbc31b3acd5ae605 PYTHON3_CRYPTOGRAPHY_INFLECTOR_0_11_4_URL := https://crates.io/api/v1/crates/Inflector/0.11.4/download @@ -25,23 +25,17 @@ PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3_SOURCE := $(SRCDIR)/aliasable-0.1.3.crate $(PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3_SOURCE) := PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3 PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3_SOURCE) -PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_MD5 := bf23cd323c33a8c283c41bb9b79e4ce4 -PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_URL := https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_SOURCE:= $(SRCDIR)/android_system_properties-0.1.5.crate -$(PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_SOURCE) := PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5 -PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_SOURCE) +PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_MD5 := eab04ea9e3f12685eb2c7e3d720f38ee +PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_URL := https://crates.io/api/v1/crates/asn1/0.15.2/download +PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_SOURCE:= $(SRCDIR)/asn1-0.15.2.crate +$(PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_SOURCE) := PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2 +PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_SOURCE) -PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_MD5 := fccc99a9d7209cb9dac58d4844967f1e -PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_URL := https://crates.io/api/v1/crates/asn1/0.13.0/download -PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_SOURCE:= $(SRCDIR)/asn1-0.13.0.crate -$(PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_SOURCE) := PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0 -PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_SOURCE) - -PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_MD5:= 64f71a2af5210b79e9b3de5817abd295 -PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_URL:= https://crates.io/api/v1/crates/asn1_derive/0.13.0/download -PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_SOURCE := $(SRCDIR)/asn1_derive-0.13.0.crate -$(PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_SOURCE) := PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0 -PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_SOURCE) +PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_MD5:= ec8b3e5e64b9602b3a99118e42bd8266 +PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_URL:= https://crates.io/api/v1/crates/asn1_derive/0.15.2/download +PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_SOURCE := $(SRCDIR)/asn1_derive-0.15.2.crate +$(PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_SOURCE) := PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2 +PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_SOURCE) PYTHON3_CRYPTOGRAPHY_AUTOCFG_1_1_0_MD5 := 05d77ef52e90ad161fdd41b252420467 PYTHON3_CRYPTOGRAPHY_AUTOCFG_1_1_0_URL := https://crates.io/api/v1/crates/autocfg/1.1.0/download @@ -61,11 +55,11 @@ PYTHON3_CRYPTOGRAPHY_BITFLAGS_1_3_2_SOURCE := $(SRCDIR)/bitflags-1.3.2.crate $(PYTHON3_CRYPTOGRAPHY_BITFLAGS_1_3_2_SOURCE) := PYTHON3_CRYPTOGRAPHY_BITFLAGS_1_3_2 PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_BITFLAGS_1_3_2_SOURCE) -PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_MD5:= 67b7cc02856cad7f081e9dc0d8a74427 -PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_URL:= https://crates.io/api/v1/crates/bumpalo/3.10.0/download -PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_SOURCE := $(SRCDIR)/bumpalo-3.10.0.crate -$(PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_SOURCE) := PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0 -PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_SOURCE) +PYTHON3_CRYPTOGRAPHY_BITFLAGS_2_4_1_MD5:= ebcf604c44976809506192718f439dc1 +PYTHON3_CRYPTOGRAPHY_BITFLAGS_2_4_1_URL:= https://crates.io/api/v1/crates/bitflags/2.4.1/download +PYTHON3_CRYPTOGRAPHY_BITFLAGS_2_4_1_SOURCE := $(SRCDIR)/bitflags-2.4.1.crate +$(PYTHON3_CRYPTOGRAPHY_BITFLAGS_2_4_1_SOURCE) := PYTHON3_CRYPTOGRAPHY_BITFLAGS_2_4_1
[ptxdist] [PATCH] python3-tornado: version bump 6.3.2 -> 6.4
Signed-off-by: Artur Wiebe --- rules/python3-tornado.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-tornado.make b/rules/python3-tornado.make index f2e9b8511..8cd89651e 100644 --- a/rules/python3-tornado.make +++ b/rules/python3-tornado.make @@ -11,8 +11,8 @@ # PACKAGES-$(PTXCONF_PYTHON3_TORNADO) += python3-tornado -PYTHON3_TORNADO_VERSION:= 6.3.2 -PYTHON3_TORNADO_MD5:= cabfe39cb7eb09d8128d4ac3deb934ce +PYTHON3_TORNADO_VERSION:= 6.4 +PYTHON3_TORNADO_MD5:= 460b467761e5ff74202b5bf8054c8116 PYTHON3_TORNADO:= tornado-$(PYTHON3_TORNADO_VERSION) PYTHON3_TORNADO_SUFFIX := tar.gz PYTHON3_TORNADO_URL:= $(call ptx/mirror-pypi, tornado, $(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX)) -- 2.43.0
[ptxdist] [PATCH 4/5] python3-cryptography: version bump 40.0.1 -> 41.0.7
Signed-off-by: Artur Wiebe --- rules/python3-cryptography.cargo.make | 434 -- rules/python3-cryptography.make | 4 +- 2 files changed, 135 insertions(+), 303 deletions(-) diff --git a/rules/python3-cryptography.cargo.make b/rules/python3-cryptography.cargo.make index abc51ee6e..4421d1460 100644 --- a/rules/python3-cryptography.cargo.make +++ b/rules/python3-cryptography.cargo.make @@ -11,7 +11,7 @@ # should not be modified manually! # -PYTHON3_CRYPTOGRAPHY_CARGO_LOCK_MD5 := 0bd35601df312aa6ae9fb55e9ac95a80 +PYTHON3_CRYPTOGRAPHY_CARGO_LOCK_MD5 := 0fed108832cd2e6f383e680053feeadc PYTHON3_CRYPTOGRAPHY_INFLECTOR_0_11_4_MD5 := b7f1a4cd029f5b6ffbc31b3acd5ae605 PYTHON3_CRYPTOGRAPHY_INFLECTOR_0_11_4_URL := https://crates.io/api/v1/crates/Inflector/0.11.4/download @@ -25,23 +25,17 @@ PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3_SOURCE := $(SRCDIR)/aliasable-0.1.3.crate $(PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3_SOURCE) := PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3 PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3_SOURCE) -PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_MD5 := bf23cd323c33a8c283c41bb9b79e4ce4 -PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_URL := https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_SOURCE:= $(SRCDIR)/android_system_properties-0.1.5.crate -$(PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_SOURCE) := PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5 -PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_SOURCE) +PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_MD5 := eab04ea9e3f12685eb2c7e3d720f38ee +PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_URL := https://crates.io/api/v1/crates/asn1/0.15.2/download +PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_SOURCE:= $(SRCDIR)/asn1-0.15.2.crate +$(PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_SOURCE) := PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2 +PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ASN1_0_15_2_SOURCE) -PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_MD5 := fccc99a9d7209cb9dac58d4844967f1e -PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_URL := https://crates.io/api/v1/crates/asn1/0.13.0/download -PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_SOURCE:= $(SRCDIR)/asn1-0.13.0.crate -$(PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_SOURCE) := PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0 -PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ASN1_0_13_0_SOURCE) - -PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_MD5:= 64f71a2af5210b79e9b3de5817abd295 -PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_URL:= https://crates.io/api/v1/crates/asn1_derive/0.13.0/download -PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_SOURCE := $(SRCDIR)/asn1_derive-0.13.0.crate -$(PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_SOURCE) := PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0 -PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_13_0_SOURCE) +PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_MD5:= ec8b3e5e64b9602b3a99118e42bd8266 +PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_URL:= https://crates.io/api/v1/crates/asn1_derive/0.15.2/download +PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_SOURCE := $(SRCDIR)/asn1_derive-0.15.2.crate +$(PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_SOURCE) := PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2 +PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ASN1_DERIVE_0_15_2_SOURCE) PYTHON3_CRYPTOGRAPHY_AUTOCFG_1_1_0_MD5 := 05d77ef52e90ad161fdd41b252420467 PYTHON3_CRYPTOGRAPHY_AUTOCFG_1_1_0_URL := https://crates.io/api/v1/crates/autocfg/1.1.0/download @@ -61,11 +55,11 @@ PYTHON3_CRYPTOGRAPHY_BITFLAGS_1_3_2_SOURCE := $(SRCDIR)/bitflags-1.3.2.crate $(PYTHON3_CRYPTOGRAPHY_BITFLAGS_1_3_2_SOURCE) := PYTHON3_CRYPTOGRAPHY_BITFLAGS_1_3_2 PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_BITFLAGS_1_3_2_SOURCE) -PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_MD5:= 67b7cc02856cad7f081e9dc0d8a74427 -PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_URL:= https://crates.io/api/v1/crates/bumpalo/3.10.0/download -PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_SOURCE := $(SRCDIR)/bumpalo-3.10.0.crate -$(PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_SOURCE) := PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0 -PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_BUMPALO_3_10_0_SOURCE) +PYTHON3_CRYPTOGRAPHY_BITFLAGS_2_4_1_MD5:= ebcf604c44976809506192718f439dc1 +PYTHON3_CRYPTOGRAPHY_BITFLAGS_2_4_1_URL:= https://crates.io/api/v1/crates/bitflags/2.4.1/download +PYTHON3_CRYPTOGRAPHY_BITFLAGS_2_4_1_SOURCE := $(SRCDIR)/bitflags-2.4.1.crate +$(PYTHON3_CRYPTOGRAPHY_BITFLAGS_2_4_1_SOURCE) := PYTHON3_CRYPTOGRAPHY_BITFLAGS_2_4_1
[ptxdist] [PATCH 2/5] python3-pycparser: version bump 2.18 -> 2.21
Signed-off-by: Artur Wiebe --- rules/python3-pycparser.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-pycparser.make b/rules/python3-pycparser.make index 484410713..114df1a55 100644 --- a/rules/python3-pycparser.make +++ b/rules/python3-pycparser.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_PYCPARSER) += python3-pycparser # # Paths and names # -PYTHON3_PYCPARSER_VERSION := 2.18 -PYTHON3_PYCPARSER_MD5 := 72370da54358202a60130e223d488136 +PYTHON3_PYCPARSER_VERSION := 2.21 +PYTHON3_PYCPARSER_MD5 := 48f7d743bf018f7bb2ffc5fb976d1492 PYTHON3_PYCPARSER := pycparser-$(PYTHON3_PYCPARSER_VERSION) PYTHON3_PYCPARSER_SUFFIX := tar.gz PYTHON3_PYCPARSER_URL := $(call ptx/mirror-pypi, pycparser, $(PYTHON3_PYCPARSER).$(PYTHON3_PYCPARSER_SUFFIX)) -- 2.43.0
[ptxdist] [PATCH 5/5] python3-asyncua: version bump 1.0.2 -> 1.0.6
Signed-off-by: Artur Wiebe --- rules/python3-asyncua.in | 1 + rules/python3-asyncua.make | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/python3-asyncua.in b/rules/python3-asyncua.in index be6210a8b..552a139ee 100644 --- a/rules/python3-asyncua.in +++ b/rules/python3-asyncua.in @@ -9,6 +9,7 @@ config PYTHON3_ASYNCUA select PYTHON3_PYTZ if RUNTIME select PYTHON3_CRYPTOGRAPHY if RUNTIME select PYTHON3_SORTEDCONTAINERS if RUNTIME + select PYTHON3_PYOPENSSLif RUNTIME prompt "asyncua" help OPC UA / IEC 62541 Client and Server for Python diff --git a/rules/python3-asyncua.make b/rules/python3-asyncua.make index 46be8e635..4f26db722 100644 --- a/rules/python3-asyncua.make +++ b/rules/python3-asyncua.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_ASYNCUA) += python3-asyncua # # Paths and names # -PYTHON3_ASYNCUA_VERSION:= 1.0.2 -PYTHON3_ASYNCUA_MD5:= 2253852226cae8c893508e84676c465b +PYTHON3_ASYNCUA_VERSION:= 1.0.6 +PYTHON3_ASYNCUA_MD5:= 6353843cb95ba72a4e71bf623c26bff0 PYTHON3_ASYNCUA:= asyncua-$(PYTHON3_ASYNCUA_VERSION) PYTHON3_ASYNCUA_SUFFIX := tar.gz PYTHON3_ASYNCUA_URL:= $(call ptx/mirror-pypi, asyncua, $(PYTHON3_ASYNCUA).$(PYTHON3_ASYNCUA_SUFFIX)) -- 2.43.0
[ptxdist] [PATCH 1/5] python3-cffi: version bump 1.15.0 -> 1.16.0
Signed-off-by: Artur Wiebe --- rules/python3-cffi.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-cffi.make b/rules/python3-cffi.make index d23ce5c46..7edf9fb6f 100644 --- a/rules/python3-cffi.make +++ b/rules/python3-cffi.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_CFFI) += python3-cffi # # Paths and names # -PYTHON3_CFFI_VERSION := 1.15.0 -PYTHON3_CFFI_MD5 := f3a3f26cd3335fc597479c9475da0a0b +PYTHON3_CFFI_VERSION := 1.16.0 +PYTHON3_CFFI_MD5 := 0bcaed453da3004d0bea103038345c1e PYTHON3_CFFI := cffi-$(PYTHON3_CFFI_VERSION) PYTHON3_CFFI_SUFFIX:= tar.gz PYTHON3_CFFI_URL := $(call ptx/mirror-pypi, cffi, $(PYTHON3_CFFI).$(PYTHON3_CFFI_SUFFIX)) -- 2.43.0
[ptxdist] [PATCH 3/5] python3-pyopenssl: new package
Signed-off-by: Artur Wiebe --- rules/python3-pyopenssl.in | 9 ++ rules/python3-pyopenssl.make | 53 2 files changed, 62 insertions(+) create mode 100644 rules/python3-pyopenssl.in create mode 100644 rules/python3-pyopenssl.make diff --git a/rules/python3-pyopenssl.in b/rules/python3-pyopenssl.in new file mode 100644 index 0..6157b9649 --- /dev/null +++ b/rules/python3-pyopenssl.in @@ -0,0 +1,9 @@ +## SECTION=python3 + +config PYTHON3_PYOPENSSL + tristate + select PYTHON3 + select PYTHON3_SSL + prompt "pyOpenSSL" + help + High-level wrapper around a subset of the OpenSSL library. diff --git a/rules/python3-pyopenssl.make b/rules/python3-pyopenssl.make new file mode 100644 index 0..ce7f570b9 --- /dev/null +++ b/rules/python3-pyopenssl.make @@ -0,0 +1,53 @@ +# -*-makefile-*- +# +# Copyright (C) 2024 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_PYOPENSSL) += python3-pyopenssl + +# +# Paths and names +# +PYTHON3_PYOPENSSL_VERSION := 24.0.0 +PYTHON3_PYOPENSSL_MD5 := e4e9f1519cbb54dfb6426bde212ca922 +PYTHON3_PYOPENSSL := pyOpenSSL-$(PYTHON3_PYOPENSSL_VERSION) +PYTHON3_PYOPENSSL_SUFFIX := tar.gz +PYTHON3_PYOPENSSL_URL := $(call ptx/mirror-pypi, pyopenssl, $(PYTHON3_PYOPENSSL).$(PYTHON3_PYOPENSSL_SUFFIX)) +PYTHON3_PYOPENSSL_SOURCE := $(SRCDIR)/$(PYTHON3_PYOPENSSL).$(PYTHON3_PYOPENSSL_SUFFIX) +PYTHON3_PYOPENSSL_DIR := $(BUILDDIR)/$(PYTHON3_PYOPENSSL) +PYTHON3_PYOPENSSL_LICENSE := Apache-2.0 +PYTHON3_PYOPENSSL_LICENSE_FILES:= file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 + +# +# Prepare +# + +PYTHON3_PYOPENSSL_CONF_TOOL:= python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-pyopenssl.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-pyopenssl) + @$(call install_fixup, python3-pyopenssl,PRIORITY,optional) + @$(call install_fixup, python3-pyopenssl,SECTION,base) + @$(call install_fixup, python3-pyopenssl,AUTHOR,"Artur Wiebe ") + @$(call install_fixup, python3-pyopenssl,DESCRIPTION,missing) + + @$(call install_glob, python3-pyopenssl, 0, 0, -, \ + $(PYTHON3_SITEPACKAGES),, *.py) + + @$(call install_finish, python3-pyopenssl) + + @$(call touch) + +# vim: syntax=make -- 2.43.0
[ptxdist] [PATCH] /etc/group: add group 'codesysuser'
Signed-off-by: Artur Wiebe --- projectroot/etc/group | 1 + 1 file changed, 1 insertion(+) diff --git a/projectroot/etc/group b/projectroot/etc/group index 8f0af165e..142c4e2c2 100644 --- a/projectroot/etc/group +++ b/projectroot/etc/group @@ -37,4 +37,5 @@ redis:x:213: sgx:x:214: seat:x:215: pipewire:x:216: +codesysuser:x:217: nogroup:x:65534: -- 2.42.1
[ptxdist] [PATCH 1/2] python3: version bump 3.11.2 -> 3.11.6
Signed-off-by: Artur Wiebe --- rules/python3.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3.make b/rules/python3.make index 822a40e51..99a553c00 100644 --- a/rules/python3.make +++ b/rules/python3.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PYTHON3) += python3 # # Paths and names # -PYTHON3_VERSION:= 3.11.2 -PYTHON3_MD5:= a957cffb58a89303b62124896881950b +PYTHON3_VERSION:= 3.11.6 +PYTHON3_MD5:= d0c5a1a31efe879723e51addf56dd206 PYTHON3_MAJORMINOR := $(basename $(PYTHON3_VERSION)) PYTHON3_SITEPACKAGES := /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages PYTHON3:= Python-$(PYTHON3_VERSION) -- 2.42.1
[ptxdist] [PATCH 2/2] systemd: version bump 254.5 -> 254.7
Signed-off-by: Artur Wiebe --- rules/systemd.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/systemd.make b/rules/systemd.make index 2d76a432b..31233b907 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd # # Paths and names # -SYSTEMD_VERSION:= 254.5 +SYSTEMD_VERSION:= 254.7 SYSTEMD_VERSION_MAJOR := $(firstword $(subst -, ,$(subst ., ,$(SYSTEMD_VERSION -SYSTEMD_MD5:= 40f4a2f9dfb842522ec1056e863e1cd3 +SYSTEMD_MD5:= 743d70c4b1c64417871baba168b1e0dc SYSTEMD:= systemd-$(SYSTEMD_VERSION) SYSTEMD_SUFFIX := tar.gz ifeq ($(SYSTEMD_VERSION),$(SYSTEMD_VERSION_MAJOR)) -- 2.42.1
[ptxdist] [PATCH] kexec-tools: version bump 2.0.26 -> 2.0.27
Signed-off-by: Artur Wiebe --- rules/kexec-tools.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/kexec-tools.make b/rules/kexec-tools.make index 71085f049..e76aa34e9 100644 --- a/rules/kexec-tools.make +++ b/rules/kexec-tools.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_KEXEC_TOOLS) += kexec-tools # # Paths and names # -KEXEC_TOOLS_VERSION:= 2.0.26 -KEXEC_TOOLS_MD5:= ce3c79e0f639035ef7ddfc39b286a61a +KEXEC_TOOLS_VERSION:= 2.0.27 +KEXEC_TOOLS_MD5:= 70472060cdcbfdb0de6ae651193fbc7d KEXEC_TOOLS:= kexec-tools-$(KEXEC_TOOLS_VERSION) KEXEC_TOOLS_SUFFIX := tar.xz KEXEC_TOOLS_URL:= $(call ptx/mirror, KERNEL, utils/kernel/kexec/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX)) -- 2.42.1
[ptxdist] [PATCH] python3-tornado: version bump 6.2 -> 6.3.2
Signed-off-by: Artur Wiebe --- rules/python3-tornado.make | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/python3-tornado.make b/rules/python3-tornado.make index 3b71858dc..f2e9b8511 100644 --- a/rules/python3-tornado.make +++ b/rules/python3-tornado.make @@ -11,14 +11,16 @@ # PACKAGES-$(PTXCONF_PYTHON3_TORNADO) += python3-tornado -PYTHON3_TORNADO_VERSION:= 6.2 -PYTHON3_TORNADO_MD5:= 32fbad606b439c3e1bf4e79d4e872741 +PYTHON3_TORNADO_VERSION:= 6.3.2 +PYTHON3_TORNADO_MD5:= cabfe39cb7eb09d8128d4ac3deb934ce PYTHON3_TORNADO:= tornado-$(PYTHON3_TORNADO_VERSION) PYTHON3_TORNADO_SUFFIX := tar.gz PYTHON3_TORNADO_URL:= $(call ptx/mirror-pypi, tornado, $(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX)) PYTHON3_TORNADO_SOURCE := $(SRCDIR)/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX) PYTHON3_TORNADO_DIR:= $(BUILDDIR)/$(PYTHON3_TORNADO) PYTHON3_TORNADO_LICENSE:= Apache-2.0 +PYTHON3_TORNADO_LICENSE_FILES:= \ + file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 # # Prepare -- 2.41.0
[ptxdist] [PATCH] python3-systemd: version bump 234 -> 235
Signed-off-by: Artur Wiebe --- rules/python3-systemd.make | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/rules/python3-systemd.make b/rules/python3-systemd.make index fe20b0959..e522d9700 100644 --- a/rules/python3-systemd.make +++ b/rules/python3-systemd.make @@ -14,14 +14,15 @@ PACKAGES-$(PTXCONF_PYTHON3_SYSTEMD) += python3-systemd # # Paths and names # -PYTHON3_SYSTEMD_VERSION:= 234 -PYTHON3_SYSTEMD_MD5:= 752929b651d1c6b2a42d454f58b94974 -PYTHON3_SYSTEMD:= python3-systemd-$(PYTHON3_SYSTEMD_VERSION) -PYTHON3_SYSTEMD_SUFFIX := tar.gz -PYTHON3_SYSTEMD_URL:= https://github.com/systemd/python-systemd/archive/v$(PYTHON3_SYSTEMD_VERSION).$(PYTHON3_SYSTEMD_SUFFIX) -PYTHON3_SYSTEMD_SOURCE := $(SRCDIR)/$(PYTHON3_SYSTEMD).$(PYTHON3_SYSTEMD_SUFFIX) -PYTHON3_SYSTEMD_DIR:= $(BUILDDIR)/$(PYTHON3_SYSTEMD) -PYTHON3_SYSTEMD_LICENSE:= LGPL-2.1-or-later +PYTHON3_SYSTEMD_VERSION:= 235 +PYTHON3_SYSTEMD_MD5:= 760003406e2fac84ff1bcc40ae696af6 +PYTHON3_SYSTEMD:= python3-systemd-$(PYTHON3_SYSTEMD_VERSION) +PYTHON3_SYSTEMD_SUFFIX := tar.gz +PYTHON3_SYSTEMD_URL:= https://github.com/systemd/python-systemd/archive/v$(PYTHON3_SYSTEMD_VERSION).$(PYTHON3_SYSTEMD_SUFFIX) +PYTHON3_SYSTEMD_SOURCE := $(SRCDIR)/$(PYTHON3_SYSTEMD).$(PYTHON3_SYSTEMD_SUFFIX) +PYTHON3_SYSTEMD_DIR:= $(BUILDDIR)/$(PYTHON3_SYSTEMD) +PYTHON3_SYSTEMD_LICENSE:= LGPL-2.1-or-later +PYTHON3_SYSTEMD_LICENSE_FILES := file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c # # Prepare -- 2.40.1
[ptxdist] [PATCH] python3-posix_ipc: new package
Signed-off-by: Artur Wiebe --- rules/python3-posix_ipc.in | 10 +++ rules/python3-posix_ipc.make | 53 2 files changed, 63 insertions(+) create mode 100644 rules/python3-posix_ipc.in create mode 100644 rules/python3-posix_ipc.make diff --git a/rules/python3-posix_ipc.in b/rules/python3-posix_ipc.in new file mode 100644 index 0..ace39885d --- /dev/null +++ b/rules/python3-posix_ipc.in @@ -0,0 +1,10 @@ +## SECTION=python3 + +config PYTHON3_POSIX_IPC + tristate + select PYTHON3 + prompt "posix_ipc" + help + posix_ipc is a Python module (written in C) that permits + creation and manipulation of POSIX inter-process + semaphores, shared memory and message queues diff --git a/rules/python3-posix_ipc.make b/rules/python3-posix_ipc.make new file mode 100644 index 0..9a45d48c4 --- /dev/null +++ b/rules/python3-posix_ipc.make @@ -0,0 +1,53 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_POSIX_IPC) += python3-posix_ipc + +# +# Paths and names +# +PYTHON3_POSIX_IPC_VERSION := 1.1.1 +PYTHON3_POSIX_IPC_MD5 := 523a31c4dbd56e0d4fd677f33e126e5d +PYTHON3_POSIX_IPC := posix_ipc-$(PYTHON3_POSIX_IPC_VERSION) +PYTHON3_POSIX_IPC_SUFFIX := tar.gz +PYTHON3_POSIX_IPC_URL := $(call ptx/mirror-pypi, posix_ipc, $(PYTHON3_POSIX_IPC).$(PYTHON3_POSIX_IPC_SUFFIX)) +PYTHON3_POSIX_IPC_SOURCE := $(SRCDIR)/$(PYTHON3_POSIX_IPC).$(PYTHON3_POSIX_IPC_SUFFIX) +PYTHON3_POSIX_IPC_DIR := $(BUILDDIR)/$(PYTHON3_POSIX_IPC) +PYTHON3_POSIX_IPC_LICENSE := BSD +PYTHON3_POSIX_IPC_LICENSE_FILES:= file://LICENSE;md5=513d94a7390d4d72f3475e2d45c739b5 + +# +# Prepare +# + +PYTHON3_POSIX_IPC_CONF_TOOL:= python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-posix_ipc.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-posix_ipc) + @$(call install_fixup, python3-posix_ipc,PRIORITY,optional) + @$(call install_fixup, python3-posix_ipc,SECTION,base) + @$(call install_fixup, python3-posix_ipc,AUTHOR,"Artur Wiebe ") + @$(call install_fixup, python3-posix_ipc,DESCRIPTION,missing) + + @$(call install_glob, python3-posix_ipc, 0, 0, -, \ + $(PYTHON3_SITEPACKAGES), *.so,) + + @$(call install_finish, python3-posix_ipc) + + @$(call touch) + +# vim: syntax=make -- 2.40.0
Re: [ptxdist] ?==?utf-8?q? python3-asyncua: new package
Here is the full patch series for python3-asyncua (async OPC-UA server/client for python). Everything is building and the examples are running. python3-cryptography builds a rust module using cargo. The make file is a bit hacky, maybe you know a better way to handle this. python3-semantic-version is updated with dependency to setuptools. Looking forward for comments and improvements. BR, Artur
[ptxdist] [PATCH 11/11] python3-cryptography: new package
Signed-off-by: Artur Wiebe --- patches/cryptography-40.0.1/series| 2 + .../set-python-include-from-evn.patch | 32 ++ .../symlink-to-Cargo.lock.patch | 21 + rules/python3-cryptography.cargo.make | 509 ++ rules/python3-cryptography.in | 15 + rules/python3-cryptography.make | 78 +++ 6 files changed, 657 insertions(+) create mode 100644 patches/cryptography-40.0.1/series create mode 100644 patches/cryptography-40.0.1/set-python-include-from-evn.patch create mode 100644 patches/cryptography-40.0.1/symlink-to-Cargo.lock.patch create mode 100644 rules/python3-cryptography.cargo.make create mode 100644 rules/python3-cryptography.in create mode 100644 rules/python3-cryptography.make diff --git a/patches/cryptography-40.0.1/series b/patches/cryptography-40.0.1/series new file mode 100644 index 0..419ec0af6 --- /dev/null +++ b/patches/cryptography-40.0.1/series @@ -0,0 +1,2 @@ +symlink-to-Cargo.lock.patch +set-python-include-from-evn.patch diff --git a/patches/cryptography-40.0.1/set-python-include-from-evn.patch b/patches/cryptography-40.0.1/set-python-include-from-evn.patch new file mode 100644 index 0..b5689b548 --- /dev/null +++ b/patches/cryptography-40.0.1/set-python-include-from-evn.patch @@ -0,0 +1,32 @@ +From 705e4987dcc1fa29ff24fc9b14bf3f8e45ed109f Mon Sep 17 00:00:00 2001 +From: Artur Wiebe +Date: Fri, 14 Apr 2023 10:21:32 +0200 +Subject: [PATCH] set python include from evn + +--- + src/rust/build.rs | 9 + + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/rust/build.rs b/src/rust/build.rs +index 01177ac..ddc2cab 100644 +--- a/src/rust/build.rs b/src/rust/build.rs +@@ -43,10 +43,11 @@ fn main() { + ) + .unwrap(); + println!("cargo:rustc-cfg=python_implementation=\"{}\"", python_impl); +-let python_include = run_python_script( +-&python, +-"import sysconfig; print(sysconfig.get_path('include'), end='')", +-) ++//let python_include = run_python_script( ++//&python, ++//"import sysconfig; print(sysconfig.get_path('include'), end='')", ++//) ++let python_include = env::var("PYTHON_INCLUDE") + .unwrap(); + let openssl_include = + std::env::var_os("DEP_OPENSSL_INCLUDE").expect("unable to find openssl include path"); +-- +2.40.0 + diff --git a/patches/cryptography-40.0.1/symlink-to-Cargo.lock.patch b/patches/cryptography-40.0.1/symlink-to-Cargo.lock.patch new file mode 100644 index 0..a7c027d7f --- /dev/null +++ b/patches/cryptography-40.0.1/symlink-to-Cargo.lock.patch @@ -0,0 +1,21 @@ +From bdc7332719d114557a4a14ff655549f1b447ee8c Mon Sep 17 00:00:00 2001 +From: Artur Wiebe +Date: Fri, 14 Apr 2023 10:16:37 +0200 +Subject: [PATCH] symlink to Cargo.lock + +--- + Cargo.lock | 1 + + 1 file changed, 1 insertion(+) + create mode 12 Cargo.lock + +diff --git a/Cargo.lock b/Cargo.lock +new file mode 12 +index 000..a048b8f +--- /dev/null b/Cargo.lock +@@ -0,0 +1 @@ ++src/rust/Cargo.lock +\ No newline at end of file +-- +2.40.0 + diff --git a/rules/python3-cryptography.cargo.make b/rules/python3-cryptography.cargo.make new file mode 100644 index 0..52435cb91 --- /dev/null +++ b/rules/python3-cryptography.cargo.make @@ -0,0 +1,509 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# WARNING: This file is generated with 'ptxdist cargosync python3-cryptography' and +# should not be modified manually! +# + +PYTHON3_CRYPTOGRAPHY_CONF_OPT += cargo-lock-md5 0bd35601df312aa6ae9fb55e9ac95a80 + +PYTHON3_CRYPTOGRAPHY_INFLECTOR_0_11_4_MD5 := b7f1a4cd029f5b6ffbc31b3acd5ae605 +PYTHON3_CRYPTOGRAPHY_INFLECTOR_0_11_4_URL := https://crates.io/api/v1/crates/Inflector/0.11.4/download +PYTHON3_CRYPTOGRAPHY_INFLECTOR_0_11_4_SOURCE := $(SRCDIR)/Inflector-0.11.4.crate +$(PYTHON3_CRYPTOGRAPHY_INFLECTOR_0_11_4_SOURCE):= PYTHON3_CRYPTOGRAPHY_INFLECTOR_0_11_4 +PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_INFLECTOR_0_11_4_SOURCE) + +PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3_MD5 := f02c179eca8c70ccdfa3f17b5c33563a +PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3_URL := https://crates.io/api/v1/crates/aliasable/0.1.3/download +PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3_SOURCE:= $(SRCDIR)/aliasable-0.1.3.crate +$(PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3_SOURCE) := PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3 +PYTHON3_CRYPTOGRAPHY_SOURCES += $(PYTHON3_CRYPTOGRAPHY_ALIASABLE_0_1_3_SOURCE) + +PYTHON3_CRYPTOGRAPHY_ANDROID_SYSTEM_PROPERTIES_0_1_5_MD5 := bf23cd323c33a8c283c41bb9b79e4ce4 +PYTHON3_CRYPTOGRAPH
[ptxdist] [PATCH 03/11] python3-aiofiles: version bump 0.8.0 -> 23.1.0
Signed-off-by: Artur Wiebe --- rules/python3-aiofiles.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/python3-aiofiles.make b/rules/python3-aiofiles.make index 7fe76c4de..30117ac9d 100644 --- a/rules/python3-aiofiles.make +++ b/rules/python3-aiofiles.make @@ -14,14 +14,15 @@ PACKAGES-$(PTXCONF_PYTHON3_AIOFILES) += python3-aiofiles # # Paths and names # -PYTHON3_AIOFILES_VERSION := 0.8.0 -PYTHON3_AIOFILES_MD5 := 697deeb4fdcb620c45f114f173ed7c0d +PYTHON3_AIOFILES_VERSION := 23.1.0 +PYTHON3_AIOFILES_MD5 := d648a31366030470c97401741747065f PYTHON3_AIOFILES := aiofiles-$(PYTHON3_AIOFILES_VERSION) PYTHON3_AIOFILES_SUFFIX:= tar.gz PYTHON3_AIOFILES_URL := $(call ptx/mirror-pypi, aiofiles, $(PYTHON3_AIOFILES).$(PYTHON3_AIOFILES_SUFFIX)) PYTHON3_AIOFILES_SOURCE:= $(SRCDIR)/$(PYTHON3_AIOFILES).$(PYTHON3_AIOFILES_SUFFIX) PYTHON3_AIOFILES_DIR := $(BUILDDIR)/$(PYTHON3_AIOFILES) PYTHON3_AIOFILES_LICENSE := Apache-2.0 +PYTHON3_AIOFILES_LICENSE_FILES := file://LICENSE;md5=d2794c0df5b907fdace235a619d80314 # # Prepare -- 2.40.0
[ptxdist] [PATCH 04/11] python3-sortedcontainers: new package
Signed-off-by: Artur Wiebe --- rules/python3-sortedcontainers.in | 9 + rules/python3-sortedcontainers.make | 53 + 2 files changed, 62 insertions(+) create mode 100644 rules/python3-sortedcontainers.in create mode 100644 rules/python3-sortedcontainers.make diff --git a/rules/python3-sortedcontainers.in b/rules/python3-sortedcontainers.in new file mode 100644 index 0..8380dbdb4 --- /dev/null +++ b/rules/python3-sortedcontainers.in @@ -0,0 +1,9 @@ +## SECTION=python3 + +config PYTHON3_SORTEDCONTAINERS + tristate + select PYTHON3 + prompt "sortedcontainers" + help + Sorted Containers is an Apache2 licensed sorted collections library, + written in pure-Python, and fast as C-extensions. diff --git a/rules/python3-sortedcontainers.make b/rules/python3-sortedcontainers.make new file mode 100644 index 0..8956c617f --- /dev/null +++ b/rules/python3-sortedcontainers.make @@ -0,0 +1,53 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_SORTEDCONTAINERS) += python3-sortedcontainers + +# +# Paths and names +# +PYTHON3_SORTEDCONTAINERS_VERSION := 2.4.0 +PYTHON3_SORTEDCONTAINERS_MD5 := 50eeb6cb739568b590b28f9a3f445c78 +PYTHON3_SORTEDCONTAINERS := sortedcontainers-$(PYTHON3_SORTEDCONTAINERS_VERSION) +PYTHON3_SORTEDCONTAINERS_SUFFIX:= tar.gz +PYTHON3_SORTEDCONTAINERS_URL := $(call ptx/mirror-pypi, sortedcontainers, $(PYTHON3_SORTEDCONTAINERS).$(PYTHON3_SORTEDCONTAINERS_SUFFIX)) +PYTHON3_SORTEDCONTAINERS_SOURCE:= $(SRCDIR)/$(PYTHON3_SORTEDCONTAINERS).$(PYTHON3_SORTEDCONTAINERS_SUFFIX) +PYTHON3_SORTEDCONTAINERS_DIR := $(BUILDDIR)/$(PYTHON3_SORTEDCONTAINERS) +PYTHON3_SORTEDCONTAINERS_LICENSE := Apache-2.0 +PYTHON3_SORTEDCONTAINERS_LICENSE_FILES := file://LICENSE;md5=7c7c6a1a12ec816da16c1839137d53ae + +# +# Prepare +# + +PYTHON3_SORTEDCONTAINERS_CONF_TOOL := python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-sortedcontainers.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-sortedcontainers) + @$(call install_fixup, python3-sortedcontainers,PRIORITY,optional) + @$(call install_fixup, python3-sortedcontainers,SECTION,base) + @$(call install_fixup, python3-sortedcontainers,AUTHOR,"Artur Wiebe ") + @$(call install_fixup, python3-sortedcontainers,DESCRIPTION,missing) + + @$(call install_glob, python3-sortedcontainers, 0, 0, -, \ + $(PYTHON3_SITEPACKAGES)/sortedcontainers,, *.py) + + @$(call install_finish, python3-sortedcontainers) + + @$(call touch) + +# vim: syntax=make -- 2.40.0
[ptxdist] [PATCH 05/11] python3-aiosqlite: new package
Signed-off-by: Artur Wiebe --- .../aiosqlite-0.18.0/0001-add-setup.py.patch | 25 + patches/aiosqlite-0.18.0/series | 1 + rules/python3-aiosqlite.in| 12 + rules/python3-aiosqlite.make | 53 +++ 4 files changed, 91 insertions(+) create mode 100644 patches/aiosqlite-0.18.0/0001-add-setup.py.patch create mode 100644 patches/aiosqlite-0.18.0/series create mode 100644 rules/python3-aiosqlite.in create mode 100644 rules/python3-aiosqlite.make diff --git a/patches/aiosqlite-0.18.0/0001-add-setup.py.patch b/patches/aiosqlite-0.18.0/0001-add-setup.py.patch new file mode 100644 index 0..b7ef9455e --- /dev/null +++ b/patches/aiosqlite-0.18.0/0001-add-setup.py.patch @@ -0,0 +1,25 @@ +From 0e7a0cafda6599d4af114fc0154a90b8786af7c6 Mon Sep 17 00:00:00 2001 +From: Artur Wiebe +Date: Thu, 13 Apr 2023 16:47:50 +0200 +Subject: [PATCH] add setup.py + +--- + setup.py | 6 ++ + 1 file changed, 6 insertions(+) + create mode 100644 setup.py + +diff --git a/setup.py b/setup.py +new file mode 100644 +index 000..358320c +--- /dev/null b/setup.py +@@ -0,0 +1,6 @@ ++from setuptools import setup ++ ++setup( ++ name='aiosqlite', ++ packages=['aiosqlite'], ++) +-- +2.40.0 + diff --git a/patches/aiosqlite-0.18.0/series b/patches/aiosqlite-0.18.0/series new file mode 100644 index 0..737b1f8cb --- /dev/null +++ b/patches/aiosqlite-0.18.0/series @@ -0,0 +1 @@ +0001-add-setup.py.patch diff --git a/rules/python3-aiosqlite.in b/rules/python3-aiosqlite.in new file mode 100644 index 0..199da0449 --- /dev/null +++ b/rules/python3-aiosqlite.in @@ -0,0 +1,12 @@ +## SECTION=python3 + +config PYTHON3_AIOSQLITE + tristate + select PYTHON3 + select PYTHON3_SQLITE + prompt "aiosqlite" + help + aiosqlite provides a friendly, async interface to sqlite databases. + It replicates the standard sqlite3 module, + but with async versions of all the standard connection and cursor methods, + plus context managers for automatically closing connections and cursors diff --git a/rules/python3-aiosqlite.make b/rules/python3-aiosqlite.make new file mode 100644 index 0..f8795022c --- /dev/null +++ b/rules/python3-aiosqlite.make @@ -0,0 +1,53 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_AIOSQLITE) += python3-aiosqlite + +# +# Paths and names +# +PYTHON3_AIOSQLITE_VERSION := 0.18.0 +PYTHON3_AIOSQLITE_MD5 := 1ebed736d07d246f473d0e09a5d1cbf7 +PYTHON3_AIOSQLITE := aiosqlite-$(PYTHON3_AIOSQLITE_VERSION) +PYTHON3_AIOSQLITE_SUFFIX := tar.gz +PYTHON3_AIOSQLITE_URL := $(call ptx/mirror-pypi, aiosqlite, $(PYTHON3_AIOSQLITE).$(PYTHON3_AIOSQLITE_SUFFIX)) +PYTHON3_AIOSQLITE_SOURCE := $(SRCDIR)/$(PYTHON3_AIOSQLITE).$(PYTHON3_AIOSQLITE_SUFFIX) +PYTHON3_AIOSQLITE_DIR := $(BUILDDIR)/$(PYTHON3_AIOSQLITE) +PYTHON3_AIOSQLITE_LICENSE := MIT +PYTHON3_AIOSQLITE_LICENSE_FILES:= file://LICENSE;md5=f0c422eaa1f23d09f8203dc0af3e2d54 + +# +# Prepare +# + +PYTHON3_AIOSQLITE_CONF_TOOL:= python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-aiosqlite.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-aiosqlite) + @$(call install_fixup, python3-aiosqlite,PRIORITY,optional) + @$(call install_fixup, python3-aiosqlite,SECTION,base) + @$(call install_fixup, python3-aiosqlite,AUTHOR,"Artur Wiebe ") + @$(call install_fixup, python3-aiosqlite,DESCRIPTION,missing) + + @$(call install_glob, python3-aiosqlite, 0, 0, -, \ + $(PYTHON3_SITEPACKAGES)/aiosqlite,, *.py) + + @$(call install_finish, python3-aiosqlite) + + @$(call touch) + +# vim: syntax=make -- 2.40.0
[ptxdist] [PATCH 09/11] host-python3-setuptools-rust: new package
Signed-off-by: Artur Wiebe --- patches/setuptools-rust-1.5.2/series | 1 + .../use-Literal-from-typing.patch | 53 +++ rules/host-python3-setuptools-rust.in | 7 +++ rules/host-python3-setuptools-rust.make | 33 4 files changed, 94 insertions(+) create mode 100644 patches/setuptools-rust-1.5.2/series create mode 100644 patches/setuptools-rust-1.5.2/use-Literal-from-typing.patch create mode 100644 rules/host-python3-setuptools-rust.in create mode 100644 rules/host-python3-setuptools-rust.make diff --git a/patches/setuptools-rust-1.5.2/series b/patches/setuptools-rust-1.5.2/series new file mode 100644 index 0..b69a0d2bb --- /dev/null +++ b/patches/setuptools-rust-1.5.2/series @@ -0,0 +1 @@ +use-Literal-from-typing.patch diff --git a/patches/setuptools-rust-1.5.2/use-Literal-from-typing.patch b/patches/setuptools-rust-1.5.2/use-Literal-from-typing.patch new file mode 100644 index 0..186a0279e --- /dev/null +++ b/patches/setuptools-rust-1.5.2/use-Literal-from-typing.patch @@ -0,0 +1,53 @@ +From b3ac96d620caae2834770f5a744db507846868c6 Mon Sep 17 00:00:00 2001 +From: Artur Wiebe +Date: Mon, 27 Mar 2023 14:49:44 +0200 +Subject: [PATCH] use Literal from typing + +--- + setuptools_rust/build.py | 2 +- + setuptools_rust/extension.py | 2 +- + setuptools_rust/setuptools_ext.py | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/setuptools_rust/build.py b/setuptools_rust/build.py +index 21c1975..ff94cb0 100644 +--- a/setuptools_rust/build.py b/setuptools_rust/build.py +@@ -23,7 +23,7 @@ import pkg_resources + from setuptools.command.build import build as CommandBuild # type: ignore[import] + from setuptools.command.build_ext import build_ext as CommandBuildExt + from setuptools.command.build_ext import get_abi3_suffix +-from typing_extensions import Literal ++from typing import Literal + + from ._utils import format_called_process_error + from .command import RustCommand +diff --git a/setuptools_rust/extension.py b/setuptools_rust/extension.py +index f7a09d1..537a8db 100644 +--- a/setuptools_rust/extension.py b/setuptools_rust/extension.py +@@ -9,7 +9,7 @@ from functools import lru_cache + from typing import Any, Dict, List, NewType, Optional, Sequence, Union, cast + + from semantic_version import SimpleSpec +-from typing_extensions import Literal ++from typing import Literal + + from ._utils import format_called_process_error + +diff --git a/setuptools_rust/setuptools_ext.py b/setuptools_rust/setuptools_ext.py +index 8ce281e..943b2e9 100644 +--- a/setuptools_rust/setuptools_ext.py b/setuptools_rust/setuptools_ext.py +@@ -11,7 +11,7 @@ from setuptools.command.install_lib import install_lib + from setuptools.command.install_scripts import install_scripts + from setuptools.command.sdist import sdist + from setuptools.dist import Distribution +-from typing_extensions import Literal ++from typing import Literal + + from .extension import RustBin, RustExtension + +-- +2.39.2 + diff --git a/rules/host-python3-setuptools-rust.in b/rules/host-python3-setuptools-rust.in new file mode 100644 index 0..37af602f3 --- /dev/null +++ b/rules/host-python3-setuptools-rust.in @@ -0,0 +1,7 @@ +## SECTION=hosttools_noprompt + +config HOST_PYTHON3_SETUPTOOLS_RUST + tristate + default y if ALLYES + select HOST_PYTHON3_SETUPTOOLS + select HOST_PYTHON3_SEMANTIC_VERSION diff --git a/rules/host-python3-setuptools-rust.make b/rules/host-python3-setuptools-rust.make new file mode 100644 index 0..6414ac062 --- /dev/null +++ b/rules/host-python3-setuptools-rust.make @@ -0,0 +1,33 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3_SETUPTOOLS_RUST) += host-python3-setuptools-rust + +# +# Paths and names +# +HOST_PYTHON3_SETUPTOOLS_RUST_VERSION := 1.5.2 +HOST_PYTHON3_SETUPTOOLS_RUST_MD5 := fd3412ca77ffd6e06e2e83d0e9636084 +HOST_PYTHON3_SETUPTOOLS_RUST := setuptools-rust-$(HOST_PYTHON3_SETUPTOOLS_RUST_VERSION) +HOST_PYTHON3_SETUPTOOLS_RUST_SUFFIX:= tar.gz +HOST_PYTHON3_SETUPTOOLS_RUST_URL := $(call ptx/mirror-pypi, setuptools-rust, $(HOST_PYTHON3_SETUPTOOLS_RUST).$(HOST_PYTHON3_SETUPTOOLS_RUST_SUFFIX)) +HOST_PYTHON3_SETUPTOOLS_RUST_SOURCE:= $(SRCDIR)/$(HOST_PYTHON3_SETUPTOOLS_RUST).$(HOST_PYTHON3_SETUPTOOLS_RUST_SUFFIX) +HOST_PYTHON3_SETUPTOOLS_RUST_DIR := $(HOST_BUILDDIR)/$(HOST_PYTHON3_SETUPTOOLS_RUST) +HOST_PYTHON3_SETUPTOOLS_RUST_LICENSE := MIT +HOST_PYTHON3_SETUPTOOLS_RUST_LICENSE_FILES := file://LICENSE;md5=011cd92e702dd9e6b1a26157b6fd53f5 + +# +# Prepare
[ptxdist] [PATCH 02/11] python3-pytz: version bump 2020.1 -> 2023.3
Signed-off-by: Artur Wiebe --- .../0001-use-system-timezone-data.patch | 0 patches/{pytz-2020.1 => pytz-2023.3}/series | 0 rules/python3-pytz.make | 17 + 3 files changed, 9 insertions(+), 8 deletions(-) rename patches/{pytz-2020.1 => pytz-2023.3}/0001-use-system-timezone-data.patch (100%) rename patches/{pytz-2020.1 => pytz-2023.3}/series (100%) diff --git a/patches/pytz-2020.1/0001-use-system-timezone-data.patch b/patches/pytz-2023.3/0001-use-system-timezone-data.patch similarity index 100% rename from patches/pytz-2020.1/0001-use-system-timezone-data.patch rename to patches/pytz-2023.3/0001-use-system-timezone-data.patch diff --git a/patches/pytz-2020.1/series b/patches/pytz-2023.3/series similarity index 100% rename from patches/pytz-2020.1/series rename to patches/pytz-2023.3/series diff --git a/rules/python3-pytz.make b/rules/python3-pytz.make index b0a05a476..2c01f769e 100644 --- a/rules/python3-pytz.make +++ b/rules/python3-pytz.make @@ -11,14 +11,15 @@ # PACKAGES-$(PTXCONF_PYTHON3_PYTZ) += python3-pytz -PYTHON3_PYTZ_VERSION := 2020.1 -PYTHON3_PYTZ_MD5 := 0349106ac02f2bfe565dd6d5594e3a15 -PYTHON3_PYTZ := pytz-$(PYTHON3_PYTZ_VERSION) -PYTHON3_PYTZ_SUFFIX:= tar.gz -PYTHON3_PYTZ_URL := $(call ptx/mirror-pypi, pytz, $(PYTHON3_PYTZ).$(PYTHON3_PYTZ_SUFFIX)) -PYTHON3_PYTZ_SOURCE:= $(SRCDIR)/$(PYTHON3_PYTZ).$(PYTHON3_PYTZ_SUFFIX) -PYTHON3_PYTZ_DIR := $(BUILDDIR)/$(PYTHON3_PYTZ) -PYTHON3_PYTZ_LICENSE := MIT +PYTHON3_PYTZ_VERSION := 2023.3 +PYTHON3_PYTZ_MD5 := fe54c8f8a1544b4e78b523b264ab071b +PYTHON3_PYTZ := pytz-$(PYTHON3_PYTZ_VERSION) +PYTHON3_PYTZ_SUFFIX:= tar.gz +PYTHON3_PYTZ_URL := $(call ptx/mirror-pypi, pytz, $(PYTHON3_PYTZ).$(PYTHON3_PYTZ_SUFFIX)) +PYTHON3_PYTZ_SOURCE:= $(SRCDIR)/$(PYTHON3_PYTZ).$(PYTHON3_PYTZ_SUFFIX) +PYTHON3_PYTZ_DIR := $(BUILDDIR)/$(PYTHON3_PYTZ) +PYTHON3_PYTZ_LICENSE := MIT +PYTHON3_PYTZ_LICENSE_FILES := file://LICENSE.txt;md5=1a67fc46c1b596cce5d21209bbe75999 # # Prepare -- 2.40.0
[ptxdist] [PATCH 08/11] python3-semantic-version: new package
Signed-off-by: Artur Wiebe --- rules/host-python3-semantic-version.in | 6 +++ rules/host-python3-semantic-version.make | 20 + rules/python3-semantic-version.in| 9 rules/python3-semantic-version.make | 53 4 files changed, 88 insertions(+) create mode 100644 rules/host-python3-semantic-version.in create mode 100644 rules/host-python3-semantic-version.make create mode 100644 rules/python3-semantic-version.in create mode 100644 rules/python3-semantic-version.make diff --git a/rules/host-python3-semantic-version.in b/rules/host-python3-semantic-version.in new file mode 100644 index 0..57561f054 --- /dev/null +++ b/rules/host-python3-semantic-version.in @@ -0,0 +1,6 @@ +## SECTION=hosttools_noprompt + +config HOST_PYTHON3_SEMANTIC_VERSION + tristate + default y if ALLYES + select HOST_PYTHON3_SETUPTOOLS diff --git a/rules/host-python3-semantic-version.make b/rules/host-python3-semantic-version.make new file mode 100644 index 0..4b8dee89b --- /dev/null +++ b/rules/host-python3-semantic-version.make @@ -0,0 +1,20 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3_SEMANTIC_VERSION) += host-python3-semantic-version + +# +# Prepare +# + +HOST_PYTHON3_SEMANTIC_VERSION_CONF_TOOL:= python3 + +# vim: syntax=make diff --git a/rules/python3-semantic-version.in b/rules/python3-semantic-version.in new file mode 100644 index 0..0bb578534 --- /dev/null +++ b/rules/python3-semantic-version.in @@ -0,0 +1,9 @@ +## SECTION=python3 + +config PYTHON3_SEMANTIC_VERSION + tristate + select PYTHON3 + prompt "semantic-version" + help + This small python library provides a few tools to handle SemVer in Python. + It follows strictly the 2.0.0 version of the SemVer scheme. diff --git a/rules/python3-semantic-version.make b/rules/python3-semantic-version.make new file mode 100644 index 0..8ace780bb --- /dev/null +++ b/rules/python3-semantic-version.make @@ -0,0 +1,53 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_SEMANTIC_VERSION) += python3-semantic-version + +# +# Paths and names +# +PYTHON3_SEMANTIC_VERSION_VERSION := 2.10.0 +PYTHON3_SEMANTIC_VERSION_MD5 := e48abef93ba69abcd4eaf4640edfc38b +PYTHON3_SEMANTIC_VERSION := semantic_version-$(PYTHON3_SEMANTIC_VERSION_VERSION) +PYTHON3_SEMANTIC_VERSION_SUFFIX:= tar.gz +PYTHON3_SEMANTIC_VERSION_URL := $(call ptx/mirror-pypi, semantic_version, $(PYTHON3_SEMANTIC_VERSION).$(PYTHON3_SEMANTIC_VERSION_SUFFIX)) +PYTHON3_SEMANTIC_VERSION_SOURCE:= $(SRCDIR)/$(PYTHON3_SEMANTIC_VERSION).$(PYTHON3_SEMANTIC_VERSION_SUFFIX) +PYTHON3_SEMANTIC_VERSION_DIR := $(BUILDDIR)/$(PYTHON3_SEMANTIC_VERSION) +PYTHON3_SEMANTIC_VERSION_LICENSE := BSD +PYTHON3_SEMANTIC_VERSION_LICENSE_FILES := file://LICENSE;md5=4fb31e3c1c7eeb8b5e8c07657cdd54e2 + +# +# Prepare +# + +PYTHON3_SEMANTIC_VERSION_CONF_TOOL := python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-semantic-version.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-semantic-version) + @$(call install_fixup, python3-semantic-version,PRIORITY,optional) + @$(call install_fixup, python3-semantic-version,SECTION,base) + @$(call install_fixup, python3-semantic-version,AUTHOR,"Artur Wiebe ") + @$(call install_fixup, python3-semantic-version,DESCRIPTION,missing) + + @$(call install_glob, python3-semantic-version, 0, 0, -, \ + $(PYTHON3_SITEPACKAGES)/semantic_version,, *.py) + + @$(call install_finish, python3-semantic-version) + + @$(call touch) + +# vim: syntax=make -- 2.40.0
[ptxdist] [PATCH 07/11] python3-cffi: add dependency to pycparser
Signed-off-by: Artur Wiebe --- rules/host-python3-cffi.in | 1 + rules/python3-cffi.in | 1 + 2 files changed, 2 insertions(+) diff --git a/rules/host-python3-cffi.in b/rules/host-python3-cffi.in index a151897d5..f1ef95cad 100644 --- a/rules/host-python3-cffi.in +++ b/rules/host-python3-cffi.in @@ -3,5 +3,6 @@ config HOST_PYTHON3_CFFI tristate select HOST_PYTHON3 + select HOST_PYTHON3_PYCPARSER help Foreign Function Interface for Python calling C code. diff --git a/rules/python3-cffi.in b/rules/python3-cffi.in index e26714d51..78e3d915f 100644 --- a/rules/python3-cffi.in +++ b/rules/python3-cffi.in @@ -3,6 +3,7 @@ config PYTHON3_CFFI tristate select PYTHON3 + select PYTHON3_PYCPARSERif RUNTIME prompt "python3-cffi" help Foreign Function Interface for Python calling C code. -- 2.40.0
[ptxdist] [PATCH 06/11] host-python3-pycparser: new package (from python3-pycparser)
Signed-off-by: Artur Wiebe --- rules/host-python3-pycparser.in | 6 ++ rules/host-python3-pycparser.make | 20 2 files changed, 26 insertions(+) create mode 100644 rules/host-python3-pycparser.in create mode 100644 rules/host-python3-pycparser.make diff --git a/rules/host-python3-pycparser.in b/rules/host-python3-pycparser.in new file mode 100644 index 0..33c6e93ac --- /dev/null +++ b/rules/host-python3-pycparser.in @@ -0,0 +1,6 @@ +## SECTION=hosttools_noprompt + +config HOST_PYTHON3_PYCPARSER + tristate + default y if ALLYES + select HOST_PYTHON3_SETUPTOOLS diff --git a/rules/host-python3-pycparser.make b/rules/host-python3-pycparser.make new file mode 100644 index 0..c6e8c0d3d --- /dev/null +++ b/rules/host-python3-pycparser.make @@ -0,0 +1,20 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3_PYCPARSER) += host-python3-pycparser + +# +# Prepare +# + +HOST_PYTHON3_PYCPARSER_CONF_TOOL:= python3 + +# vim: syntax=make -- 2.40.0
[ptxdist] [PATCH 10/11] python3-asyncua: new package
Signed-off-by: Artur Wiebe --- rules/python3-asyncua.in | 14 ++ rules/python3-asyncua.make | 54 ++ 2 files changed, 68 insertions(+) create mode 100644 rules/python3-asyncua.in create mode 100644 rules/python3-asyncua.make diff --git a/rules/python3-asyncua.in b/rules/python3-asyncua.in new file mode 100644 index 0..be6210a8b --- /dev/null +++ b/rules/python3-asyncua.in @@ -0,0 +1,14 @@ +## SECTION=python3 + +config PYTHON3_ASYNCUA + tristate + select PYTHON3 + select PYTHON3_AIOFILES if RUNTIME + select PYTHON3_AIOSQLITEif RUNTIME + select PYTHON3_DATEUTIL if RUNTIME + select PYTHON3_PYTZ if RUNTIME + select PYTHON3_CRYPTOGRAPHY if RUNTIME + select PYTHON3_SORTEDCONTAINERS if RUNTIME + prompt "asyncua" + help + OPC UA / IEC 62541 Client and Server for Python diff --git a/rules/python3-asyncua.make b/rules/python3-asyncua.make new file mode 100644 index 0..46be8e635 --- /dev/null +++ b/rules/python3-asyncua.make @@ -0,0 +1,54 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_ASYNCUA) += python3-asyncua + +# +# Paths and names +# +PYTHON3_ASYNCUA_VERSION:= 1.0.2 +PYTHON3_ASYNCUA_MD5:= 2253852226cae8c893508e84676c465b +PYTHON3_ASYNCUA:= asyncua-$(PYTHON3_ASYNCUA_VERSION) +PYTHON3_ASYNCUA_SUFFIX := tar.gz +PYTHON3_ASYNCUA_URL:= $(call ptx/mirror-pypi, asyncua, $(PYTHON3_ASYNCUA).$(PYTHON3_ASYNCUA_SUFFIX)) +PYTHON3_ASYNCUA_SOURCE := $(SRCDIR)/$(PYTHON3_ASYNCUA).$(PYTHON3_ASYNCUA_SUFFIX) +PYTHON3_ASYNCUA_DIR:= $(BUILDDIR)/$(PYTHON3_ASYNCUA) +PYTHON3_ASYNCUA_LICENSE:= LGPL-3.0-or-later +PYTHON3_ASYNCUA_LICENSE_FILES := file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 + +# +# Prepare +# + +PYTHON3_ASYNCUA_CONF_TOOL := python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-asyncua.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-asyncua) + @$(call install_fixup, python3-asyncua,PRIORITY,optional) + @$(call install_fixup, python3-asyncua,SECTION,base) + @$(call install_fixup, python3-asyncua,AUTHOR,"Artur Wiebe ") + @$(call install_fixup, python3-asyncua,DESCRIPTION,missing) + + # asyncua needs its $(PYTHON3_SITEPACKAGES)/*.egg-info directory! + @$(call install_glob, python3-asyncua, 0, 0, -, \ + $(PYTHON3_SITEPACKAGES),, *.py) + + @$(call install_finish, python3-asyncua) + + @$(call touch) + +# vim: syntax=make -- 2.40.0
[ptxdist] [PATCH 01/11] python3-dateutil: version bump 2.7.3 -> 2.8.2
Signed-off-by: Artur Wiebe --- rules/python3-dateutil.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/python3-dateutil.make b/rules/python3-dateutil.make index 67ea8f8f8..4571a3e20 100644 --- a/rules/python3-dateutil.make +++ b/rules/python3-dateutil.make @@ -11,14 +11,15 @@ # PACKAGES-$(PTXCONF_PYTHON3_DATEUTIL) += python3-dateutil -PYTHON3_DATEUTIL_VERSION := 2.7.3 -PYTHON3_DATEUTIL_MD5 := 175b7c1a3cc0cb01151eced07c61c0b8 +PYTHON3_DATEUTIL_VERSION := 2.8.2 +PYTHON3_DATEUTIL_MD5 := 5970010bb72452344df3d76a10281b65 PYTHON3_DATEUTIL := python-dateutil-$(PYTHON3_DATEUTIL_VERSION) PYTHON3_DATEUTIL_SUFFIX:= tar.gz PYTHON3_DATEUTIL_URL := $(call ptx/mirror-pypi, python-dateutil, $(PYTHON3_DATEUTIL).$(PYTHON3_DATEUTIL_SUFFIX)) PYTHON3_DATEUTIL_SOURCE:= $(SRCDIR)/$(PYTHON3_DATEUTIL).$(PYTHON3_DATEUTIL_SUFFIX) PYTHON3_DATEUTIL_DIR := $(BUILDDIR)/$(PYTHON3_DATEUTIL) PYTHON3_DATEUTIL_LICENSE := Apache-2.0 +PYTHON3_DATEUTIL_LICENSE_FILES := file://LICENSE;md5=e3155c7bdc71f66e02678411d2abf996 # # Prepare -- 2.40.0
[ptxdist] [PATCH] host-python3-setuptools-rust: new package
Signed-off-by: Artur Wiebe --- patches/setuptools-rust-1.5.2/series | 1 + .../use-Literal-from-typing.patch | 53 +++ rules/host-python3-setuptools-rust.in | 7 +++ rules/host-python3-setuptools-rust.make | 33 4 files changed, 94 insertions(+) create mode 100644 patches/setuptools-rust-1.5.2/series create mode 100644 patches/setuptools-rust-1.5.2/use-Literal-from-typing.patch create mode 100644 rules/host-python3-setuptools-rust.in create mode 100644 rules/host-python3-setuptools-rust.make diff --git a/patches/setuptools-rust-1.5.2/series b/patches/setuptools-rust-1.5.2/series new file mode 100644 index 0..b69a0d2bb --- /dev/null +++ b/patches/setuptools-rust-1.5.2/series @@ -0,0 +1 @@ +use-Literal-from-typing.patch diff --git a/patches/setuptools-rust-1.5.2/use-Literal-from-typing.patch b/patches/setuptools-rust-1.5.2/use-Literal-from-typing.patch new file mode 100644 index 0..186a0279e --- /dev/null +++ b/patches/setuptools-rust-1.5.2/use-Literal-from-typing.patch @@ -0,0 +1,53 @@ +From b3ac96d620caae2834770f5a744db507846868c6 Mon Sep 17 00:00:00 2001 +From: Artur Wiebe +Date: Mon, 27 Mar 2023 14:49:44 +0200 +Subject: [PATCH] use Literal from typing + +--- + setuptools_rust/build.py | 2 +- + setuptools_rust/extension.py | 2 +- + setuptools_rust/setuptools_ext.py | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/setuptools_rust/build.py b/setuptools_rust/build.py +index 21c1975..ff94cb0 100644 +--- a/setuptools_rust/build.py b/setuptools_rust/build.py +@@ -23,7 +23,7 @@ import pkg_resources + from setuptools.command.build import build as CommandBuild # type: ignore[import] + from setuptools.command.build_ext import build_ext as CommandBuildExt + from setuptools.command.build_ext import get_abi3_suffix +-from typing_extensions import Literal ++from typing import Literal + + from ._utils import format_called_process_error + from .command import RustCommand +diff --git a/setuptools_rust/extension.py b/setuptools_rust/extension.py +index f7a09d1..537a8db 100644 +--- a/setuptools_rust/extension.py b/setuptools_rust/extension.py +@@ -9,7 +9,7 @@ from functools import lru_cache + from typing import Any, Dict, List, NewType, Optional, Sequence, Union, cast + + from semantic_version import SimpleSpec +-from typing_extensions import Literal ++from typing import Literal + + from ._utils import format_called_process_error + +diff --git a/setuptools_rust/setuptools_ext.py b/setuptools_rust/setuptools_ext.py +index 8ce281e..943b2e9 100644 +--- a/setuptools_rust/setuptools_ext.py b/setuptools_rust/setuptools_ext.py +@@ -11,7 +11,7 @@ from setuptools.command.install_lib import install_lib + from setuptools.command.install_scripts import install_scripts + from setuptools.command.sdist import sdist + from setuptools.dist import Distribution +-from typing_extensions import Literal ++from typing import Literal + + from .extension import RustBin, RustExtension + +-- +2.39.2 + diff --git a/rules/host-python3-setuptools-rust.in b/rules/host-python3-setuptools-rust.in new file mode 100644 index 0..37af602f3 --- /dev/null +++ b/rules/host-python3-setuptools-rust.in @@ -0,0 +1,7 @@ +## SECTION=hosttools_noprompt + +config HOST_PYTHON3_SETUPTOOLS_RUST + tristate + default y if ALLYES + select HOST_PYTHON3_SETUPTOOLS + select HOST_PYTHON3_SEMANTIC_VERSION diff --git a/rules/host-python3-setuptools-rust.make b/rules/host-python3-setuptools-rust.make new file mode 100644 index 0..6414ac062 --- /dev/null +++ b/rules/host-python3-setuptools-rust.make @@ -0,0 +1,33 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3_SETUPTOOLS_RUST) += host-python3-setuptools-rust + +# +# Paths and names +# +HOST_PYTHON3_SETUPTOOLS_RUST_VERSION := 1.5.2 +HOST_PYTHON3_SETUPTOOLS_RUST_MD5 := fd3412ca77ffd6e06e2e83d0e9636084 +HOST_PYTHON3_SETUPTOOLS_RUST := setuptools-rust-$(HOST_PYTHON3_SETUPTOOLS_RUST_VERSION) +HOST_PYTHON3_SETUPTOOLS_RUST_SUFFIX:= tar.gz +HOST_PYTHON3_SETUPTOOLS_RUST_URL := $(call ptx/mirror-pypi, setuptools-rust, $(HOST_PYTHON3_SETUPTOOLS_RUST).$(HOST_PYTHON3_SETUPTOOLS_RUST_SUFFIX)) +HOST_PYTHON3_SETUPTOOLS_RUST_SOURCE:= $(SRCDIR)/$(HOST_PYTHON3_SETUPTOOLS_RUST).$(HOST_PYTHON3_SETUPTOOLS_RUST_SUFFIX) +HOST_PYTHON3_SETUPTOOLS_RUST_DIR := $(HOST_BUILDDIR)/$(HOST_PYTHON3_SETUPTOOLS_RUST) +HOST_PYTHON3_SETUPTOOLS_RUST_LICENSE := MIT +HOST_PYTHON3_SETUPTOOLS_RUST_LICENSE_FILES := file://LICENSE;md5=011cd92e702dd9e6b1a26157b6fd53f5 + +# +# Prepare
[ptxdist] [PATCH] python3-semantic-version: new package
Signed-off-by: Artur Wiebe --- rules/host-python3-semantic-version.in | 6 +++ rules/host-python3-semantic-version.make | 20 + rules/python3-semantic-version.in| 9 rules/python3-semantic-version.make | 53 4 files changed, 88 insertions(+) create mode 100644 rules/host-python3-semantic-version.in create mode 100644 rules/host-python3-semantic-version.make create mode 100644 rules/python3-semantic-version.in create mode 100644 rules/python3-semantic-version.make diff --git a/rules/host-python3-semantic-version.in b/rules/host-python3-semantic-version.in new file mode 100644 index 0..c2dc91487 --- /dev/null +++ b/rules/host-python3-semantic-version.in @@ -0,0 +1,6 @@ +## SECTION=hosttools_noprompt + +config HOST_PYTHON3_SEMANTIC_VERSION + tristate + default y if ALLYES + select HOST_PYTHON3 diff --git a/rules/host-python3-semantic-version.make b/rules/host-python3-semantic-version.make new file mode 100644 index 0..4b8dee89b --- /dev/null +++ b/rules/host-python3-semantic-version.make @@ -0,0 +1,20 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3_SEMANTIC_VERSION) += host-python3-semantic-version + +# +# Prepare +# + +HOST_PYTHON3_SEMANTIC_VERSION_CONF_TOOL:= python3 + +# vim: syntax=make diff --git a/rules/python3-semantic-version.in b/rules/python3-semantic-version.in new file mode 100644 index 0..0bb578534 --- /dev/null +++ b/rules/python3-semantic-version.in @@ -0,0 +1,9 @@ +## SECTION=python3 + +config PYTHON3_SEMANTIC_VERSION + tristate + select PYTHON3 + prompt "semantic-version" + help + This small python library provides a few tools to handle SemVer in Python. + It follows strictly the 2.0.0 version of the SemVer scheme. diff --git a/rules/python3-semantic-version.make b/rules/python3-semantic-version.make new file mode 100644 index 0..edde01fbf --- /dev/null +++ b/rules/python3-semantic-version.make @@ -0,0 +1,53 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_SEMANTIC_VERSION) += python3-semantic-version + +# +# Paths and names +# +PYTHON3_SEMANTIC_VERSION_VERSION := 2.10.0 +PYTHON3_SEMANTIC_VERSION_MD5 := e48abef93ba69abcd4eaf4640edfc38b +PYTHON3_SEMANTIC_VERSION := semantic_version-$(PYTHON3_SEMANTIC_VERSION_VERSION) +PYTHON3_SEMANTIC_VERSION_SUFFIX:= tar.gz +PYTHON3_SEMANTIC_VERSION_URL := $(call ptx/mirror-pypi, semantic_version, $(PYTHON3_SEMANTIC_VERSION).$(PYTHON3_SEMANTIC_VERSION_SUFFIX)) +PYTHON3_SEMANTIC_VERSION_SOURCE:= $(SRCDIR)/$(PYTHON3_SEMANTIC_VERSION).$(PYTHON3_SEMANTIC_VERSION_SUFFIX) +PYTHON3_SEMANTIC_VERSION_DIR := $(BUILDDIR)/$(PYTHON3_SEMANTIC_VERSION) +PYTHON3_SEMANTIC_VERSION_LICENSE := BSD +PYTHON3_SEMANTIC_VERSION_LICENSE_FILES := file://LICENSE;md5=4fb31e3c1c7eeb8b5e8c07657cdd54e2 + +# +# Prepare +# + +PYTHON3_SEMANTIC_VERSION_CONF_TOOL := python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-semantic-version.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-semantic-version) + @$(call install_fixup, python3-semantic-version,PRIORITY,optional) + @$(call install_fixup, python3-semantic-version,SECTION,base) + @$(call install_fixup, python3-semantic-version,AUTHOR,"Artur Wiebe ") + @$(call install_fixup, python3-semantic-version,DESCRIPTION,missing) + + @$(call install_glob, python3-semantic-version, 0, 0, -, \ + $(PYTHON3_SITEPACKAGES),, *.py) + + @$(call install_finish, python3-semantic-version) + + @$(call touch) + +# vim: syntax=make -- 2.40.0
Re: [ptxdist] [PATCH 3/3] python3-cryptography: Python package that wants to compile with rust and cargo...
Hi, cryptography is a python package that uses setuptools-rust to compile a module with rust/cargo. This is the first one in PTXdist, but I think it will not be the last. It is needed by python3-asyncua (OPC/UA) that I am trying to add. While pure cargo packages already work well (I've tried few weeks ago), the python-setuptools scenario is not covered yet. I am not that deep into PTXdist so I could send a patch. I hope someone can help. My suggestion is to add a PKG_CARGO_LOCK variable that points to the Cargo.lock file. If it exists ptxdist cargosync should use it and also CARGO_HOME should be set in env. PYTHON3_CRYPTOGRAPHY_CARGO_LOCK := $(PYTHON3_CRYPTOGRAPHY_DIR)/src/rust/Cargo.lock BR, Artur On Monday, 27 March, 2023 16:09 CEST, Artur Wiebe wrote: > --- > rules/python3-cryptography.in | 10 ++ > rules/python3-cryptography.make | 56 + > 2 files changed, 66 insertions(+) > create mode 100644 rules/python3-cryptography.in > create mode 100644 rules/python3-cryptography.make > > diff --git a/rules/python3-cryptography.in b/rules/python3-cryptography.in > new file mode 100644 > index 0..97187de02 > --- /dev/null > +++ b/rules/python3-cryptography.in > @@ -0,0 +1,10 @@ > +## SECTION=python3 > + > +config PYTHON3_CRYPTOGRAPHY > + tristate > + select PYTHON3 > + select HOST_PYTHON3_SETUPTOOLS_RUST > + prompt "cryptography" > + help > + Cryptography is a package which provides cryptographic recipes and > primitives to Python developers. > + Our goal is for it to be your “cryptographic standard library” > diff --git a/rules/python3-cryptography.make b/rules/python3-cryptography.make > new file mode 100644 > index 0..7c5ac9885 > --- /dev/null > +++ b/rules/python3-cryptography.make > @@ -0,0 +1,56 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2023 by Artur Wiebe > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_PYTHON3_CRYPTOGRAPHY) += python3-cryptography > + > +# > +# Paths and names > +# > +PYTHON3_CRYPTOGRAPHY_VERSION := 40.0.1 > +PYTHON3_CRYPTOGRAPHY_MD5 := 24dec990fce1d4a614ad86076c8e347f > +PYTHON3_CRYPTOGRAPHY := > cryptography-$(PYTHON3_CRYPTOGRAPHY_VERSION) > +PYTHON3_CRYPTOGRAPHY_SUFFIX := tar.gz > +PYTHON3_CRYPTOGRAPHY_URL := $(call ptx/mirror-pypi, > cryptography, $(PYTHON3_CRYPTOGRAPHY).$(PYTHON3_CRYPTOGRAPHY_SUFFIX)) > +PYTHON3_CRYPTOGRAPHY_SOURCE := > $(SRCDIR)/$(PYTHON3_CRYPTOGRAPHY).$(PYTHON3_CRYPTOGRAPHY_SUFFIX) > +PYTHON3_CRYPTOGRAPHY_DIR := $(BUILDDIR)/$(PYTHON3_CRYPTOGRAPHY) > +PYTHON3_CRYPTOGRAPHY_LICENSE := Apache-2.0 OR BSD-3-Clause > +PYTHON3_CRYPTOGRAPHY_LICENSE_FILES := > + > +PYTHON3_CRYPTOGRAPHY_CARGO_LOCK := > $(PYTHON3_CRYPTOGRAPHY_DIR)/src/rust/Cargo.lock > + > + > +# > > +# Prepare > +# > > + > +PYTHON3_CRYPTOGRAPHY_CONF_TOOL := python3 > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/python3-cryptography.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, python3-cryptography) > + @$(call install_fixup, python3-cryptography,PRIORITY,optional) > + @$(call install_fixup, python3-cryptography,SECTION,base) > + @$(call install_fixup, python3-cryptography,AUTHOR,"Artur Wiebe > ") > + @$(call install_fixup, python3-cryptography,DESCRIPTION,missing) > + > + @$(call install_glob, python3-cryptography, 0, 0, -, \ > + $(PYTHON3_SITEPACKAGES),, *.py) > + > + @$(call install_finish, python3-cryptography) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 2.39.2 > >
[ptxdist] [PATCH 3/3] python3-cryptography: Python package that wants to compile with rust and cargo...
--- rules/python3-cryptography.in | 10 ++ rules/python3-cryptography.make | 56 + 2 files changed, 66 insertions(+) create mode 100644 rules/python3-cryptography.in create mode 100644 rules/python3-cryptography.make diff --git a/rules/python3-cryptography.in b/rules/python3-cryptography.in new file mode 100644 index 0..97187de02 --- /dev/null +++ b/rules/python3-cryptography.in @@ -0,0 +1,10 @@ +## SECTION=python3 + +config PYTHON3_CRYPTOGRAPHY + tristate + select PYTHON3 + select HOST_PYTHON3_SETUPTOOLS_RUST + prompt "cryptography" + help + Cryptography is a package which provides cryptographic recipes and primitives to Python developers. + Our goal is for it to be your “cryptographic standard library” diff --git a/rules/python3-cryptography.make b/rules/python3-cryptography.make new file mode 100644 index 0..7c5ac9885 --- /dev/null +++ b/rules/python3-cryptography.make @@ -0,0 +1,56 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_CRYPTOGRAPHY) += python3-cryptography + +# +# Paths and names +# +PYTHON3_CRYPTOGRAPHY_VERSION := 40.0.1 +PYTHON3_CRYPTOGRAPHY_MD5 := 24dec990fce1d4a614ad86076c8e347f +PYTHON3_CRYPTOGRAPHY := cryptography-$(PYTHON3_CRYPTOGRAPHY_VERSION) +PYTHON3_CRYPTOGRAPHY_SUFFIX:= tar.gz +PYTHON3_CRYPTOGRAPHY_URL := $(call ptx/mirror-pypi, cryptography, $(PYTHON3_CRYPTOGRAPHY).$(PYTHON3_CRYPTOGRAPHY_SUFFIX)) +PYTHON3_CRYPTOGRAPHY_SOURCE:= $(SRCDIR)/$(PYTHON3_CRYPTOGRAPHY).$(PYTHON3_CRYPTOGRAPHY_SUFFIX) +PYTHON3_CRYPTOGRAPHY_DIR := $(BUILDDIR)/$(PYTHON3_CRYPTOGRAPHY) +PYTHON3_CRYPTOGRAPHY_LICENSE := Apache-2.0 OR BSD-3-Clause +PYTHON3_CRYPTOGRAPHY_LICENSE_FILES := + +PYTHON3_CRYPTOGRAPHY_CARGO_LOCK:= $(PYTHON3_CRYPTOGRAPHY_DIR)/src/rust/Cargo.lock + + +# +# Prepare +# + +PYTHON3_CRYPTOGRAPHY_CONF_TOOL := python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-cryptography.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-cryptography) + @$(call install_fixup, python3-cryptography,PRIORITY,optional) + @$(call install_fixup, python3-cryptography,SECTION,base) + @$(call install_fixup, python3-cryptography,AUTHOR,"Artur Wiebe ") + @$(call install_fixup, python3-cryptography,DESCRIPTION,missing) + + @$(call install_glob, python3-cryptography, 0, 0, -, \ + $(PYTHON3_SITEPACKAGES),, *.py) + + @$(call install_finish, python3-cryptography) + + @$(call touch) + +# vim: syntax=make -- 2.39.2
[ptxdist] [PATCH 2/3] host-python3-setuptools-rust: new package
Signed-off-by: Artur Wiebe --- patches/setuptools-rust-1.5.2/series | 1 + .../use-Literal-from-typing.patch | 53 +++ rules/host-python3-setuptools-rust.in | 7 +++ rules/host-python3-setuptools-rust.make | 32 +++ 4 files changed, 93 insertions(+) create mode 100644 patches/setuptools-rust-1.5.2/series create mode 100644 patches/setuptools-rust-1.5.2/use-Literal-from-typing.patch create mode 100644 rules/host-python3-setuptools-rust.in create mode 100644 rules/host-python3-setuptools-rust.make diff --git a/patches/setuptools-rust-1.5.2/series b/patches/setuptools-rust-1.5.2/series new file mode 100644 index 0..b69a0d2bb --- /dev/null +++ b/patches/setuptools-rust-1.5.2/series @@ -0,0 +1 @@ +use-Literal-from-typing.patch diff --git a/patches/setuptools-rust-1.5.2/use-Literal-from-typing.patch b/patches/setuptools-rust-1.5.2/use-Literal-from-typing.patch new file mode 100644 index 0..186a0279e --- /dev/null +++ b/patches/setuptools-rust-1.5.2/use-Literal-from-typing.patch @@ -0,0 +1,53 @@ +From b3ac96d620caae2834770f5a744db507846868c6 Mon Sep 17 00:00:00 2001 +From: Artur Wiebe +Date: Mon, 27 Mar 2023 14:49:44 +0200 +Subject: [PATCH] use Literal from typing + +--- + setuptools_rust/build.py | 2 +- + setuptools_rust/extension.py | 2 +- + setuptools_rust/setuptools_ext.py | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/setuptools_rust/build.py b/setuptools_rust/build.py +index 21c1975..ff94cb0 100644 +--- a/setuptools_rust/build.py b/setuptools_rust/build.py +@@ -23,7 +23,7 @@ import pkg_resources + from setuptools.command.build import build as CommandBuild # type: ignore[import] + from setuptools.command.build_ext import build_ext as CommandBuildExt + from setuptools.command.build_ext import get_abi3_suffix +-from typing_extensions import Literal ++from typing import Literal + + from ._utils import format_called_process_error + from .command import RustCommand +diff --git a/setuptools_rust/extension.py b/setuptools_rust/extension.py +index f7a09d1..537a8db 100644 +--- a/setuptools_rust/extension.py b/setuptools_rust/extension.py +@@ -9,7 +9,7 @@ from functools import lru_cache + from typing import Any, Dict, List, NewType, Optional, Sequence, Union, cast + + from semantic_version import SimpleSpec +-from typing_extensions import Literal ++from typing import Literal + + from ._utils import format_called_process_error + +diff --git a/setuptools_rust/setuptools_ext.py b/setuptools_rust/setuptools_ext.py +index 8ce281e..943b2e9 100644 +--- a/setuptools_rust/setuptools_ext.py b/setuptools_rust/setuptools_ext.py +@@ -11,7 +11,7 @@ from setuptools.command.install_lib import install_lib + from setuptools.command.install_scripts import install_scripts + from setuptools.command.sdist import sdist + from setuptools.dist import Distribution +-from typing_extensions import Literal ++from typing import Literal + + from .extension import RustBin, RustExtension + +-- +2.39.2 + diff --git a/rules/host-python3-setuptools-rust.in b/rules/host-python3-setuptools-rust.in new file mode 100644 index 0..37af602f3 --- /dev/null +++ b/rules/host-python3-setuptools-rust.in @@ -0,0 +1,7 @@ +## SECTION=hosttools_noprompt + +config HOST_PYTHON3_SETUPTOOLS_RUST + tristate + default y if ALLYES + select HOST_PYTHON3_SETUPTOOLS + select HOST_PYTHON3_SEMANTIC_VERSION diff --git a/rules/host-python3-setuptools-rust.make b/rules/host-python3-setuptools-rust.make new file mode 100644 index 0..b5863ce7c --- /dev/null +++ b/rules/host-python3-setuptools-rust.make @@ -0,0 +1,32 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3_SETUPTOOLS_RUST) += host-python3-setuptools-rust + +# +# Paths and names +# +HOST_PYTHON3_SETUPTOOLS_RUST_VERSION := 1.5.2 +HOST_PYTHON3_SETUPTOOLS_RUST_MD5 := fd3412ca77ffd6e06e2e83d0e9636084 +HOST_PYTHON3_SETUPTOOLS_RUST := setuptools-rust-$(HOST_PYTHON3_SETUPTOOLS_RUST_VERSION) +HOST_PYTHON3_SETUPTOOLS_RUST_SUFFIX:= tar.gz +HOST_PYTHON3_SETUPTOOLS_RUST_URL := $(call ptx/mirror-pypi, setuptools-rust, $(HOST_PYTHON3_SETUPTOOLS_RUST).$(HOST_PYTHON3_SETUPTOOLS_RUST_SUFFIX)) +HOST_PYTHON3_SETUPTOOLS_RUST_SOURCE:= $(SRCDIR)/$(HOST_PYTHON3_SETUPTOOLS_RUST).$(HOST_PYTHON3_SETUPTOOLS_RUST_SUFFIX) +HOST_PYTHON3_SETUPTOOLS_RUST_DIR := $(HOST_BUILDDIR)/$(HOST_PYTHON3_SETUPTOOLS_RUST) +HOST_PYTHON3_SETUPTOOLS_RUST_LICENSE := MIT + +# +# Prepare +# + +HOST_PYTHON3_SETUPTOOLS_RUST_CONF_TOOL := python3 + +# vim: syntax=make -- 2.39.2
[ptxdist] [PATCH 1/3] python3-semantic-version: new package
Signed-off-by: Artur Wiebe --- rules/host-python3-semantic-version.in | 6 +++ rules/host-python3-semantic-version.make | 20 + rules/python3-semantic-version.in| 9 rules/python3-semantic-version.make | 53 4 files changed, 88 insertions(+) create mode 100644 rules/host-python3-semantic-version.in create mode 100644 rules/host-python3-semantic-version.make create mode 100644 rules/python3-semantic-version.in create mode 100644 rules/python3-semantic-version.make diff --git a/rules/host-python3-semantic-version.in b/rules/host-python3-semantic-version.in new file mode 100644 index 0..c2dc91487 --- /dev/null +++ b/rules/host-python3-semantic-version.in @@ -0,0 +1,6 @@ +## SECTION=hosttools_noprompt + +config HOST_PYTHON3_SEMANTIC_VERSION + tristate + default y if ALLYES + select HOST_PYTHON3 diff --git a/rules/host-python3-semantic-version.make b/rules/host-python3-semantic-version.make new file mode 100644 index 0..4b8dee89b --- /dev/null +++ b/rules/host-python3-semantic-version.make @@ -0,0 +1,20 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3_SEMANTIC_VERSION) += host-python3-semantic-version + +# +# Prepare +# + +HOST_PYTHON3_SEMANTIC_VERSION_CONF_TOOL:= python3 + +# vim: syntax=make diff --git a/rules/python3-semantic-version.in b/rules/python3-semantic-version.in new file mode 100644 index 0..0bb578534 --- /dev/null +++ b/rules/python3-semantic-version.in @@ -0,0 +1,9 @@ +## SECTION=python3 + +config PYTHON3_SEMANTIC_VERSION + tristate + select PYTHON3 + prompt "semantic-version" + help + This small python library provides a few tools to handle SemVer in Python. + It follows strictly the 2.0.0 version of the SemVer scheme. diff --git a/rules/python3-semantic-version.make b/rules/python3-semantic-version.make new file mode 100644 index 0..edbda8c2e --- /dev/null +++ b/rules/python3-semantic-version.make @@ -0,0 +1,53 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Artur Wiebe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_SEMANTIC_VERSION) += python3-semantic-version + +# +# Paths and names +# +PYTHON3_SEMANTIC_VERSION_VERSION := 2.10.0 +PYTHON3_SEMANTIC_VERSION_MD5 := e48abef93ba69abcd4eaf4640edfc38b +PYTHON3_SEMANTIC_VERSION := semantic_version-$(PYTHON3_SEMANTIC_VERSION_VERSION) +PYTHON3_SEMANTIC_VERSION_SUFFIX:= tar.gz +PYTHON3_SEMANTIC_VERSION_URL := $(call ptx/mirror-pypi, semantic_version, $(PYTHON3_SEMANTIC_VERSION).$(PYTHON3_SEMANTIC_VERSION_SUFFIX)) +PYTHON3_SEMANTIC_VERSION_SOURCE:= $(SRCDIR)/$(PYTHON3_SEMANTIC_VERSION).$(PYTHON3_SEMANTIC_VERSION_SUFFIX) +PYTHON3_SEMANTIC_VERSION_DIR := $(BUILDDIR)/$(PYTHON3_SEMANTIC_VERSION) +PYTHON3_SEMANTIC_VERSION_LICENSE := BSD +PYTHON3_SEMANTIC_VERSION_LICENSE_FILES := + +# +# Prepare +# + +PYTHON3_SEMANTIC_VERSION_CONF_TOOL := python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-semantic-version.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-semantic-version) + @$(call install_fixup, python3-semantic-version,PRIORITY,optional) + @$(call install_fixup, python3-semantic-version,SECTION,base) + @$(call install_fixup, python3-semantic-version,AUTHOR,"Artur Wiebe ") + @$(call install_fixup, python3-semantic-version,DESCRIPTION,missing) + + @$(call install_glob, python3-semantic-version, 0, 0, -, \ + $(PYTHON3_SITEPACKAGES),, *.py) + + @$(call install_finish, python3-semantic-version) + + @$(call touch) + +# vim: syntax=make -- 2.39.2
[ptxdist] Custom kernel URL
Hi there, I wonder if it is possible to configure a custom kernel URL and suffix in platformconfig. In my case the kernel has to be downloaded from: https://github.com/beagleboard/linux/archive/refs/tags/5.10.162-ti-r58.tar.gz If not yet, does it make sense to add these options to the kernel rule? BR, Artur
[ptxdist] [PATCH] python3-setuptools: version bump 54.1.0 -> 67.4.0
Signed-off-by: Artur Wiebe --- rules/python3-setuptools.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-setuptools.make b/rules/python3-setuptools.make index 85e42ce97..9e2cabccc 100644 --- a/rules/python3-setuptools.make +++ b/rules/python3-setuptools.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_SETUPTOOLS) += python3-setuptools # # Paths and names # -PYTHON3_SETUPTOOLS_VERSION := 54.1.0 -PYTHON3_SETUPTOOLS_MD5 := a39914ec4d991aeb3397cd2f37dda66c +PYTHON3_SETUPTOOLS_VERSION := 67.4.0 +PYTHON3_SETUPTOOLS_MD5 := a15e7546790b932a94fd9ccca7f839de PYTHON3_SETUPTOOLS := setuptools-$(PYTHON3_SETUPTOOLS_VERSION) PYTHON3_SETUPTOOLS_SUFFIX := tar.gz PYTHON3_SETUPTOOLS_URL := $(call ptx/mirror-pypi, setuptools, $(PYTHON3_SETUPTOOLS).$(PYTHON3_SETUPTOOLS_SUFFIX)) -- 2.39.2
[ptxdist] [PATCH] python3-tornado: version bump 6.1 -> 6.2
Signed-off-by: Artur Wiebe --- rules/python3-tornado.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-tornado.make b/rules/python3-tornado.make index ba37df435..3b71858dc 100644 --- a/rules/python3-tornado.make +++ b/rules/python3-tornado.make @@ -11,8 +11,8 @@ # PACKAGES-$(PTXCONF_PYTHON3_TORNADO) += python3-tornado -PYTHON3_TORNADO_VERSION:= 6.1 -PYTHON3_TORNADO_MD5:= f324f5e7607798552359d6ab054c4321 +PYTHON3_TORNADO_VERSION:= 6.2 +PYTHON3_TORNADO_MD5:= 32fbad606b439c3e1bf4e79d4e872741 PYTHON3_TORNADO:= tornado-$(PYTHON3_TORNADO_VERSION) PYTHON3_TORNADO_SUFFIX := tar.gz PYTHON3_TORNADO_URL:= $(call ptx/mirror-pypi, tornado, $(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX)) -- 2.39.1
[ptxdist] [PATCH] rsync3: disable simd optimizations
rsync tests for cpu flags on the host and fails with invalid opcode on x86_64 targets that do not have these flags Signed-off-by: Artur Wiebe --- rules/rsync3.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/rsync3.make b/rules/rsync3.make index c814c44d9..68eadc2aa 100644 --- a/rules/rsync3.make +++ b/rules/rsync3.make @@ -40,7 +40,7 @@ RSYNC3_CONF_OPT := \ --disable-debug \ --disable-profile \ --disable-md2man \ - --$(call ptx/endis, PTXCONF_ARCH_X86_64)-roll-simd \ + --disable-roll-simd \ $(GLOBAL_LARGE_FILE_OPTION) \ $(GLOBAL_IPV6_OPTION) \ --disable-locale \ -- 2.39.1
[ptxdist] [PATCH] systemd: regexp matching support using pcre2
Signed-off-by: Artur Wiebe --- rules/systemd.in | 5 + rules/systemd.make | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rules/systemd.in b/rules/systemd.in index 17997574b..e18bdb24f 100644 --- a/rules/systemd.in +++ b/rules/systemd.in @@ -23,6 +23,7 @@ menuconfig SYSTEMD select XZ if SYSTEMD_XZ select LZ4 if SYSTEMD_LZ4 select ZSTD if SYSTEMD_ZSTD + select PCRE2if SYSTEMD_PCRE2 select LIBMICROHTTPDif SYSTEMD_MICROHTTPD select LIBSECCOMP if SYSTEMD_SECCOMP select IPTABLES if SYSTEMD_IPMASQUERADE @@ -180,6 +181,10 @@ config SYSTEMD_ZSTD bool prompt "ZSTD compressed journal support" +config SYSTEMD_PCRE2 + bool + prompt "regexp matching support using pcre2" + config SYSTEMD_JOURNAL_REMOTE bool select SYSTEMD_MICROHTTPD diff --git a/rules/systemd.make b/rules/systemd.make index 7e085f49d..298b05702 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -151,7 +151,7 @@ SYSTEMD_CONF_OPT:= \ -Doss-fuzz=false \ -Dp11kit=false \ -Dpam=false \ - -Dpcre2=false \ + -Dpcre2=$(call ptx/truefalse,PTXCONF_SYSTEMD_PCRE2) \ -Dpolkit=$(call ptx/truefalse,PTXCONF_SYSTEMD_POLKIT) \ -Dportabled=false \ -Dpstore=false \ -- 2.39.1
[ptxdist] [PATCH] systemd: version bump 252.3 -> 252.5
Signed-off-by: Artur Wiebe --- rules/systemd.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/systemd.make b/rules/systemd.make index 69b044bb8..7e085f49d 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd # # Paths and names # -SYSTEMD_VERSION:= 252.3 +SYSTEMD_VERSION:= 252.5 SYSTEMD_VERSION_MAJOR := $(firstword $(subst -, ,$(subst ., ,$(SYSTEMD_VERSION -SYSTEMD_MD5:= 64ce9350af3a1e80aaf18be7b8994b6b +SYSTEMD_MD5:= 31d247df965121f453f1339371cca831 SYSTEMD:= systemd-$(SYSTEMD_VERSION) SYSTEMD_SUFFIX := tar.gz ifeq ($(SYSTEMD_VERSION),$(SYSTEMD_VERSION_MAJOR)) -- 2.39.1
[ptxdist] rsync3: trap invalid opcode on x86_64 (ptxdist 2023.02.0)
Hi, rsync fails with invalid opcode on my x86_64 target: traps: rsync[245] trap invalid opcode ip:441a40 sp:7ffef7883068 error:0 in rsync[403000+51000] It works when roll-simd is disabled: --disable-roll-simd Are maybe some host CPU flags used in the build which are not present on the target? Maybe it is better not to enable this by default? Host-CPU: model name : Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid xsaveopt dtherm ida arat pln pts md_clear flush_l1d Target-CPU: model name : Intel(R) Atom(TM) CPU N2800 @ 1.86GHz flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx lm constant_tsc arch_perfmon pebs bts nopl nonstop_tsc cpuid aperfmperf pni dtes64 monitor ds_cpl est tm2 ssse3 cx16 xtpr pdcm movbe lahf_lm dtherm arat BR, Artur
[ptxdist] [PATCH] php8: enable short tags
Is there any reason not to enable them by default? >From documentation: Short tags are available by default but can be disabled either via the short_open_tag php.ini configuration file directive, or are disabled by default if PHP is built with the --disable-short-tags configuration. Signed-off-by: Artur Wiebe --- rules/php8.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/php8.make b/rules/php8.make index 212a1c382..131cd567a 100644 --- a/rules/php8.make +++ b/rules/php8.make @@ -77,7 +77,7 @@ PHP8_CONF_OPT := \ --without-config-file-scan-dir \ --disable-sigchild \ --disable-libgcc \ - --disable-short-tags \ + --enable-short-tags \ --disable-dmalloc \ --$(call ptx/endis, PTXCONF_GLOBAL_IPV6)-ipv6 \ --disable-dtrace \ -- 2.39.1
[ptxdist] [PATCH] kexec-tools: version bump 2.0.23 -> 2.0.26
Signed-off-by: Artur Wiebe --- rules/kexec-tools.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/kexec-tools.make b/rules/kexec-tools.make index 71e124f07..71085f049 100644 --- a/rules/kexec-tools.make +++ b/rules/kexec-tools.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_KEXEC_TOOLS) += kexec-tools # # Paths and names # -KEXEC_TOOLS_VERSION:= 2.0.23 -KEXEC_TOOLS_MD5:= 483f3d35de59b3fffeab10d386cb7364 +KEXEC_TOOLS_VERSION:= 2.0.26 +KEXEC_TOOLS_MD5:= ce3c79e0f639035ef7ddfc39b286a61a KEXEC_TOOLS:= kexec-tools-$(KEXEC_TOOLS_VERSION) KEXEC_TOOLS_SUFFIX := tar.xz KEXEC_TOOLS_URL:= $(call ptx/mirror, KERNEL, utils/kernel/kexec/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX)) -- 2.39.1
[ptxdist] [PATCH] gdb: select LIBGMP
Requirements for Building GDB: GDB now uses GMP to perform some of its arithmetics... (At least GDB 11.1 is not compiling without GMP) Signed-off-by: Artur Wiebe --- rules/gdb.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/gdb.in b/rules/gdb.in index 65c6fff01..840917f0b 100644 --- a/rules/gdb.in +++ b/rules/gdb.in @@ -7,6 +7,7 @@ menuconfig GDB select LIBC_DL select GCCLIBS_GCC_S select NCURSES + select LIBGMP help The GNU Debugger -- 2.36.1
[ptxdist] [PATCH] rootfs: added group 'sgx' (missed by udev)
systemd-udevd: /usr/lib/udev/rules.d/50-udev-default.rules:42 Unknown group 'sgx', ignoring SUBSYSTEM=="misc", KERNEL=="sgx_enclave", GROUP="sgx", MODE="0660" Signed-off-by: Artur Wiebe --- projectroot/etc/group | 1 + 1 file changed, 1 insertion(+) diff --git a/projectroot/etc/group b/projectroot/etc/group index 69d650510..f9363c1e4 100644 --- a/projectroot/etc/group +++ b/projectroot/etc/group @@ -34,4 +34,5 @@ pulse:x:210: chrony:x:211: rauc-hawkbit:x:212: redis:x:213: +sgx:x:214: nogroup:x:65534: -- 2.35.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] ?==?utf-8?q? ?==?utf-8?q? [PATCH] machine-id: make using rc-once optional
Hi Michael, sorry, I misunderstood some parts of your review on the first reading. I think the new patch does what you suggested. Artur On Friday, December 04, 2020 07:32 CET, Michael Olbrich wrote: > On Mon, Nov 30, 2020 at 11:42:54AM +0100, Artur Wiebe wrote: > > If not set only an empty /etc/machine-id will be installed. > > I'm ok with keeping the prompt for MACHINE_ID_RC_ONCE, but you have ignored > all my other review as well. That still needs to be fixed. > > Michael > > > > > Signed-off-by: Artur Wiebe > > --- > > projectroot/etc/machine-id | 0 > > rules/machine-id.in| 22 ++ > > rules/machine-id.make | 4 > > rules/machine-id.postinst | 5 +++-- > > 4 files changed, 25 insertions(+), 6 deletions(-) > > create mode 100644 projectroot/etc/machine-id > > > > diff --git a/projectroot/etc/machine-id b/projectroot/etc/machine-id > > new file mode 100644 > > index 0..e69de29bb > > diff --git a/rules/machine-id.in b/rules/machine-id.in > > index f18fec554..2a3901f41 100644 > > --- a/rules/machine-id.in > > +++ b/rules/machine-id.in > > @@ -1,11 +1,25 @@ > > ## SECTION=initmethod > > > > -config MACHINE_ID > > +menuconfig MACHINE_ID > > tristate > > prompt "create /etc/machine-id" > > - select RC_ONCE if RUNTIME > > - select UTIL_LINUX_NGif !INITMETHOD_SYSTEMD > > - select UTIL_LINUX_NG_UUIDGENif !INITMETHOD_SYSTEMD > > + select RC_ONCE if MACHINE_ID_RC_ONCE && RUNTIME > > + select UTIL_LINUX_NGif MACHINE_ID_RC_ONCE && > > !INITMETHOD_SYSTEMD > > + select UTIL_LINUX_NG_UUIDGENif MACHINE_ID_RC_ONCE && > > !INITMETHOD_SYSTEMD > > help > > Enable this to make sure there is always a unique /etc/machine-id > > available in the system. > > + > > +if MACHINE_ID > > + > > +config MACHINE_ID_RC_ONCE > > + bool "generate (bbinit) or save (systemd) machine-id using rc-once at > > first boot" > > + default y > > + help > > + If not set only an empty /etc/machine-id will be installed. > > + Systemd: > > + If /etc/machine-id exists and is empty, systemd will bind-mount > > + a file containing the new machine-id over it and later try > > + to commit it to disk (if /etc/ is writable). > > + > > +endif > > diff --git a/rules/machine-id.make b/rules/machine-id.make > > index 3883d64cb..5d66829da 100644 > > --- a/rules/machine-id.make > > +++ b/rules/machine-id.make > > @@ -27,7 +27,11 @@ $(STATEDIR)/machine-id.targetinstall: > > @$(call install_fixup,machine-id,AUTHOR,"Michael Olbrich > > ") > > @$(call install_fixup,machine-id,DESCRIPTION,missing) > > > > + @$(call install_alternative, machine-id, 0, 0, 0444, /etc/machine-id) > > + > > +ifdef MACHINE_ID_RC_ONCE > > @$(call install_alternative, machine-id, 0, 0, 0755, > > /etc/rc.once.d/machine-id) > > +endif > > > > @$(call install_finish,machine-id) > > > > diff --git a/rules/machine-id.postinst b/rules/machine-id.postinst > > index 2060129d1..f1648226b 100644 > > --- a/rules/machine-id.postinst > > +++ b/rules/machine-id.postinst > > @@ -1,3 +1,4 @@ > > #!/bin/sh > > -touch "$DESTDIR/etc/machine-id" > > -$DESTDIR/usr/sbin/enable-rc-once machine-id > > +if [ -f $DESTDIR/etc/rc.once.d/machine-id ]; then > > + $DESTDIR/usr/sbin/enable-rc-once machine-id > > +fi > > -- > > 2.29.2 > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > > To unsubscribe, send a mail with subject "unsubscribe" to > > ptxdist-requ...@pengutronix.de > > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] machine-id: make using rc-once optional
If not set /etc/machine-id will be installed from projectroot (default: empty file). Signed-off-by: Artur Wiebe --- projectroot/etc/machine-id | 0 rules/machine-id.in| 23 +++ rules/machine-id.make | 4 rules/machine-id.postinst | 6 -- 4 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 projectroot/etc/machine-id diff --git a/projectroot/etc/machine-id b/projectroot/etc/machine-id new file mode 100644 index 0..e69de29bb diff --git a/rules/machine-id.in b/rules/machine-id.in index f18fec554..36fa0f6df 100644 --- a/rules/machine-id.in +++ b/rules/machine-id.in @@ -1,11 +1,26 @@ ## SECTION=initmethod -config MACHINE_ID +menuconfig MACHINE_ID tristate prompt "create /etc/machine-id" - select RC_ONCE if RUNTIME - select UTIL_LINUX_NGif !INITMETHOD_SYSTEMD - select UTIL_LINUX_NG_UUIDGENif !INITMETHOD_SYSTEMD + select RC_ONCE if MACHINE_ID_RC_ONCE && RUNTIME + select UTIL_LINUX_NGif MACHINE_ID_RC_ONCE && !INITMETHOD_SYSTEMD + select UTIL_LINUX_NG_UUIDGENif MACHINE_ID_RC_ONCE && !INITMETHOD_SYSTEMD help Enable this to make sure there is always a unique /etc/machine-id available in the system. + +if MACHINE_ID + +config MACHINE_ID_RC_ONCE + bool "generate (bbinit) or save (systemd) machine-id using rc-once at first boot" + default y + help + If not set /etc/machine-id will be installed from projectroot + (default: empty file). + Systemd: + If /etc/machine-id exists and is empty, systemd will bind-mount + a file containing the new machine-id over it and later try + to commit it to disk (if /etc/ is writable). + +endif diff --git a/rules/machine-id.make b/rules/machine-id.make index 3883d64cb..50e9b99ee 100644 --- a/rules/machine-id.make +++ b/rules/machine-id.make @@ -27,7 +27,11 @@ $(STATEDIR)/machine-id.targetinstall: @$(call install_fixup,machine-id,AUTHOR,"Michael Olbrich ") @$(call install_fixup,machine-id,DESCRIPTION,missing) +ifdef PTXCONF_MACHINE_ID_RC_ONCE @$(call install_alternative, machine-id, 0, 0, 0755, /etc/rc.once.d/machine-id) +else + @$(call install_alternative, machine-id, 0, 0, 0444, /etc/machine-id) +endif @$(call install_finish,machine-id) diff --git a/rules/machine-id.postinst b/rules/machine-id.postinst index 2060129d1..208f7b4b8 100644 --- a/rules/machine-id.postinst +++ b/rules/machine-id.postinst @@ -1,3 +1,5 @@ #!/bin/sh -touch "$DESTDIR/etc/machine-id" -$DESTDIR/usr/sbin/enable-rc-once machine-id +if [ -f $DESTDIR/etc/rc.once.d/machine-id ]; then + touch "$DESTDIR/etc/machine-id" + $DESTDIR/usr/sbin/enable-rc-once machine-id +fi -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] machine-id: make using rc-once optional
If not set only an empty /etc/machine-id will be installed. Signed-off-by: Artur Wiebe --- projectroot/etc/machine-id | 0 rules/machine-id.in| 22 ++ rules/machine-id.make | 4 rules/machine-id.postinst | 5 +++-- 4 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 projectroot/etc/machine-id diff --git a/projectroot/etc/machine-id b/projectroot/etc/machine-id new file mode 100644 index 0..e69de29bb diff --git a/rules/machine-id.in b/rules/machine-id.in index f18fec554..2a3901f41 100644 --- a/rules/machine-id.in +++ b/rules/machine-id.in @@ -1,11 +1,25 @@ ## SECTION=initmethod -config MACHINE_ID +menuconfig MACHINE_ID tristate prompt "create /etc/machine-id" - select RC_ONCE if RUNTIME - select UTIL_LINUX_NGif !INITMETHOD_SYSTEMD - select UTIL_LINUX_NG_UUIDGENif !INITMETHOD_SYSTEMD + select RC_ONCE if MACHINE_ID_RC_ONCE && RUNTIME + select UTIL_LINUX_NGif MACHINE_ID_RC_ONCE && !INITMETHOD_SYSTEMD + select UTIL_LINUX_NG_UUIDGENif MACHINE_ID_RC_ONCE && !INITMETHOD_SYSTEMD help Enable this to make sure there is always a unique /etc/machine-id available in the system. + +if MACHINE_ID + +config MACHINE_ID_RC_ONCE + bool "generate (bbinit) or save (systemd) machine-id using rc-once at first boot" + default y + help + If not set only an empty /etc/machine-id will be installed. + Systemd: + If /etc/machine-id exists and is empty, systemd will bind-mount + a file containing the new machine-id over it and later try + to commit it to disk (if /etc/ is writable). + +endif diff --git a/rules/machine-id.make b/rules/machine-id.make index 3883d64cb..5d66829da 100644 --- a/rules/machine-id.make +++ b/rules/machine-id.make @@ -27,7 +27,11 @@ $(STATEDIR)/machine-id.targetinstall: @$(call install_fixup,machine-id,AUTHOR,"Michael Olbrich ") @$(call install_fixup,machine-id,DESCRIPTION,missing) + @$(call install_alternative, machine-id, 0, 0, 0444, /etc/machine-id) + +ifdef MACHINE_ID_RC_ONCE @$(call install_alternative, machine-id, 0, 0, 0755, /etc/rc.once.d/machine-id) +endif @$(call install_finish,machine-id) diff --git a/rules/machine-id.postinst b/rules/machine-id.postinst index 2060129d1..f1648226b 100644 --- a/rules/machine-id.postinst +++ b/rules/machine-id.postinst @@ -1,3 +1,4 @@ #!/bin/sh -touch "$DESTDIR/etc/machine-id" -$DESTDIR/usr/sbin/enable-rc-once machine-id +if [ -f $DESTDIR/etc/rc.once.d/machine-id ]; then + $DESTDIR/usr/sbin/enable-rc-once machine-id +fi -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] ?==?utf-8?q? ?==?utf-8?q? [PATCH] machine-id: make using rc-once optional
Hi Michael, On Friday, November 27, 2020 09:38 CET, Michael Olbrich wrote: > On Wed, Nov 25, 2020 at 05:56:49PM +0100, Artur Wiebe wrote: > > If not set only an empty /etc/machine-id will be installed. > > > > Signed-off-by: Artur Wiebe > > --- > > rules/machine-id.in | 22 ++ > > rules/machine-id.make | 4 > > rules/machine-id.postinst | 5 +++-- > > 3 files changed, 25 insertions(+), 6 deletions(-) > > > > diff --git a/rules/machine-id.in b/rules/machine-id.in > > index f18fec554..2a3901f41 100644 > > --- a/rules/machine-id.in > > +++ b/rules/machine-id.in > > @@ -1,11 +1,25 @@ > > ## SECTION=initmethod > > > > -config MACHINE_ID > > +menuconfig MACHINE_ID > > tristate > > prompt "create /etc/machine-id" > > - select RC_ONCE if RUNTIME > > - select UTIL_LINUX_NGif !INITMETHOD_SYSTEMD > > - select UTIL_LINUX_NG_UUIDGENif !INITMETHOD_SYSTEMD > > + select RC_ONCE if MACHINE_ID_RC_ONCE && RUNTIME > > + select UTIL_LINUX_NGif MACHINE_ID_RC_ONCE && > > !INITMETHOD_SYSTEMD > > + select UTIL_LINUX_NG_UUIDGENif MACHINE_ID_RC_ONCE && > > !INITMETHOD_SYSTEMD > > help > > Enable this to make sure there is always a unique /etc/machine-id > > available in the system. > > + > > +if MACHINE_ID > > + > > +config MACHINE_ID_RC_ONCE > > + bool "generate (bbinit) or save (systemd) machine-id using rc-once at > > first boot" > > + default y > > Hmmm, maybe should have no prompt and 'depends on RC_ONCE' (instead of > selecting it above). I don't think there is a use-case for not persisting > the machine-id if rc-once is available. > > This is different from the ssh server key case: There are other ways to > create the keys. Why should one select rc-once, if it is not needed by any other package? Maybe make it even invisible? In my projects I use an initramfs where I mount an overlayfs over /etc. When systemd starts /etc/mancine-id is writable while / is never mounted rw. So I want just to install an empty /etc/machine-id and let systemd generate and write the new one. rc-once just jeopardize this. > > > + help > > + If not set only an empty /etc/machine-id will be installed. > > + Systemd: > > + If /etc/machine-id exists and is empty, systemd will bind-mount > > + a file containing the new machine-id over it and later try > > + to commit it to disk (if /etc/ is writable). > > + > > +endif > > diff --git a/rules/machine-id.make b/rules/machine-id.make > > index 3883d64cb..e1cbdcc42 100644 > > --- a/rules/machine-id.make > > +++ b/rules/machine-id.make > > @@ -27,7 +27,11 @@ $(STATEDIR)/machine-id.targetinstall: > > @$(call install_fixup,machine-id,AUTHOR,"Michael Olbrich > > ") > > @$(call install_fixup,machine-id,DESCRIPTION,missing) > > > > + @$(call install_copy, machine-id, 0, 0, 0644, /dev/null, > > /etc/machine-id) > > Maybe install_alternative and an empty on in projectroot/. Sometimes it's > better to share the same machine-id across devices than having a new one > after rebooting. Good idea. I'll change this. > > Also, this should only happen for !PTXCONF_MACHINE_ID_RC_ONCE. It's not a > good idea to modify files that are installed by a package. This is the case for almost all files in /etc if they are modified on the target. I avoid it with the overlayfs. In this way defaults are installed by the packages and changes are stored on the target. > > > + > > +ifdef MACHINE_ID_RC_ONCE > > ifdef PTXCONF_MACHINE_ID_RC_ONCE > > > @$(call install_alternative, machine-id, 0, 0, 0755, > > /etc/rc.once.d/machine-id) > > +endif > > > > @$(call install_finish,machine-id) > > > > diff --git a/rules/machine-id.postinst b/rules/machine-id.postinst > > index 2060129d1..f1648226b 100644 > > --- a/rules/machine-id.postinst > > +++ b/rules/machine-id.postinst > > @@ -1,3 +1,4 @@ > > #!/bin/sh > > -touch "$DESTDIR/etc/machine-id" > > So this is still needed inside the 'if'. I moved it into the package because otherwise an empty package is not generated. ERROR: no files installed With this patch machine-id would be reset on reinstall, but why should someone reinstall the machine-id package? Artur > > Michael > > > -$DESTDIR/usr/sbin/enable-rc-once machine-id > > +if [ -f $DESTDIR/etc/rc.once.d/mac
[ptxdist] [PATCH] machine-id: make using rc-once optional
If not set only an empty /etc/machine-id will be installed. Signed-off-by: Artur Wiebe --- rules/machine-id.in | 22 ++ rules/machine-id.make | 4 rules/machine-id.postinst | 5 +++-- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/rules/machine-id.in b/rules/machine-id.in index f18fec554..2a3901f41 100644 --- a/rules/machine-id.in +++ b/rules/machine-id.in @@ -1,11 +1,25 @@ ## SECTION=initmethod -config MACHINE_ID +menuconfig MACHINE_ID tristate prompt "create /etc/machine-id" - select RC_ONCE if RUNTIME - select UTIL_LINUX_NGif !INITMETHOD_SYSTEMD - select UTIL_LINUX_NG_UUIDGENif !INITMETHOD_SYSTEMD + select RC_ONCE if MACHINE_ID_RC_ONCE && RUNTIME + select UTIL_LINUX_NGif MACHINE_ID_RC_ONCE && !INITMETHOD_SYSTEMD + select UTIL_LINUX_NG_UUIDGENif MACHINE_ID_RC_ONCE && !INITMETHOD_SYSTEMD help Enable this to make sure there is always a unique /etc/machine-id available in the system. + +if MACHINE_ID + +config MACHINE_ID_RC_ONCE + bool "generate (bbinit) or save (systemd) machine-id using rc-once at first boot" + default y + help + If not set only an empty /etc/machine-id will be installed. + Systemd: + If /etc/machine-id exists and is empty, systemd will bind-mount + a file containing the new machine-id over it and later try + to commit it to disk (if /etc/ is writable). + +endif diff --git a/rules/machine-id.make b/rules/machine-id.make index 3883d64cb..e1cbdcc42 100644 --- a/rules/machine-id.make +++ b/rules/machine-id.make @@ -27,7 +27,11 @@ $(STATEDIR)/machine-id.targetinstall: @$(call install_fixup,machine-id,AUTHOR,"Michael Olbrich ") @$(call install_fixup,machine-id,DESCRIPTION,missing) + @$(call install_copy, machine-id, 0, 0, 0644, /dev/null, /etc/machine-id) + +ifdef MACHINE_ID_RC_ONCE @$(call install_alternative, machine-id, 0, 0, 0755, /etc/rc.once.d/machine-id) +endif @$(call install_finish,machine-id) diff --git a/rules/machine-id.postinst b/rules/machine-id.postinst index 2060129d1..f1648226b 100644 --- a/rules/machine-id.postinst +++ b/rules/machine-id.postinst @@ -1,3 +1,4 @@ #!/bin/sh -touch "$DESTDIR/etc/machine-id" -$DESTDIR/usr/sbin/enable-rc-once machine-id +if [ -f $DESTDIR/etc/rc.once.d/machine-id ]; then + $DESTDIR/usr/sbin/enable-rc-once machine-id +fi -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] ?==?utf-8?q? ?==?utf-8?q? ?= [PATCH]?==?utf-8?q? DRAFT:l
Hi Michael, I found a solution. What do you think? Artur On Monday, November 16, 2020 11:32 CET, Michael Olbrich wrote: > On Mon, Nov 16, 2020 at 10:45:07AM +0100, Artur Wiebe wrote: > > On Monday, November 16, 2020 10:36 CET, Michael Olbrich > > wrote: > > > On Sun, Nov 15, 2020 at 06:08:56PM +0100, Roland Hieber wrote: > > > > On Sun, Nov 15, 2020 at 11:06:12AM +0100, Ladislav Michl wrote: > > > > > On Sat, Nov 14, 2020 at 09:34:47PM +0100, Roland Hieber wrote: > > > > > > On Fri, Nov 13, 2020 at 06:46:48PM +0100, Ladislav Michl wrote: > > > > > > > On Fri, Nov 13, 2020 at 03:19:55PM +0100, Artur Wiebe wrote: > > > > > > > > How can openssh.postinst be disabled from within the rule files? > > > > > > > > > > > > > > The very same could be achieved with symlink in your BSP: > > > > > > > projectroot/etc/rc.once.d/openssh -> /dev/null > > > > > > > > > > > > I don't understand why you want to disable this. The SSH server > > > > > > will not > > > > > > start without host keys. Or do you want to install a static version > > > > > > of > > > > > > the host keys generated at build time? > > > > > > > > > > Yes, keys are static, generated at build time. Root filesystem is > > > > > read-only. > > > > > > > > > > > If so, there should be an option for this. But for now, in my > > > > > > opinion, > > > > > > disabling OPENSSH_SSHD_GENKEYS will just lead to a broken SSH > > > > > > server. > > > > > > > > > > As this is easy to solve at BSP level I never thought it could > > > > > be a thing :) > > > > > > > > OK, but at least I would mention it in the kconfig help text. The > > > > > > Ack. > > > > > > > openssh recipe could also just pick up /etc/ssh/ssh_host_*_key via > > > > install_alternative if this option is disabled. > > > > > > No. Shared ssh server keys are a bad idea. That's not something I want to > > > merge upstream. > > > > This was also my concern... > > > > > > > > But there are other use-cases to not use rc-once, e.g. if the server keys > > > are generated during provisioning. And not selecting rc-once in this case > > > makes sense, so this is acceptable im general. > > > > I still need a way to disable openssh.postinst if OPENSSH_SSHD_GENKEYS is > > not set. > > Hmmm, right. In the BSP, a /dev/null symlinks works for this as well, but > we currently don't have a way to not install the postinst script. We could > do something like this (untested): > > $(call install_script_replace, openssh, postinst, @RC_ONCE@, \ > $(call ptx/ifdef, PTXCONF_OPENSSH_SSHD_GENKEYS,,#)) > > And in rules/openssh.postinst: > > #!/bin/sh > @RC_ONCE@$DESTDIR/usr/sbin/enable-rc-once openssh > > This way the script may be installed, but it will do nothing. If > PTXCONF_OPENSSH_SSHD_GENKEYS is disabled. > > 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 > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] openssh: fix INITMETHOD dependencies
Signed-off-by: Artur Wiebe --- rules/openssh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/openssh.in b/rules/openssh.in index 37013250c..b04a7a8a5 100644 --- a/rules/openssh.in +++ b/rules/openssh.in @@ -40,13 +40,13 @@ config OPENSSH_SSHD config OPENSSH_SSHD_STARTSCRIPT bool default y - depends on OPENSSH_SSHD + depends on OPENSSH_SSHD && INITMETHOD_BBINIT prompt "install /etc/init.d/openssh" config OPENSSH_SSHD_SYSTEMD_UNIT bool default y - depends on OPENSSH_SSHD && SYSTEMD + depends on OPENSSH_SSHD && INITMETHOD_SYSTEMD prompt "install systemd unit files for sshd" config OPENSSH_SSHD_GENKEYS -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] openssh: make host key generation optional
If not set host keys must be provided in some other way (otherwise sshd will not start) Signed-off-by: Artur Wiebe --- rules/openssh.in | 12 ++-- rules/openssh.make | 2 ++ rules/openssh.postinst | 4 +++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/rules/openssh.in b/rules/openssh.in index 09f5c..37013250c 100644 --- a/rules/openssh.in +++ b/rules/openssh.in @@ -6,10 +6,10 @@ menuconfig OPENSSH select OPENSSL select LIBC_CRYPT select LIBC_UTIL - select RC_ONCE if OPENSSH_SSHD && RUNTIME + select RC_ONCE if OPENSSH_SSHD_GENKEYS && RUNTIME select BUSYBOX_START_STOP_DAEMON if OPENSSH_SSHD_STARTSCRIPT select LIBSELINUX if GLOBAL_SELINUX - select OPENSSH_KEYGEN if OPENSSH_SSHD + select OPENSSH_KEYGEN if OPENSSH_SSHD_GENKEYS prompt "openssh " help secure shell client/server, an rlogin/rsh/rcp replacement @@ -49,6 +49,14 @@ config OPENSSH_SSHD_SYSTEMD_UNIT depends on OPENSSH_SSHD && SYSTEMD prompt "install systemd unit files for sshd" +config OPENSSH_SSHD_GENKEYS + bool "generate sshd host keys at first boot" + default y + depends on OPENSSH_SSHD + help + If not set host keys must be provided in some other way + (otherwise sshd will not start) + config OPENSSH_SCP bool "scp" help diff --git a/rules/openssh.make b/rules/openssh.make index cae04487f..99fca3f46 100644 --- a/rules/openssh.make +++ b/rules/openssh.make @@ -105,8 +105,10 @@ ifdef PTXCONF_OPENSSH_SSHD /etc/ssh/moduli) @$(call install_copy, openssh, 0, 0, 0755, -, \ /usr/sbin/sshd) +ifdef PTXCONF_OPENSSH_SSHD_GENKEYS @$(call install_alternative, openssh, 0, 0, 0755, /etc/rc.once.d/openssh) endif +endif ifdef PTXCONF_INITMETHOD_BBINIT ifdef PTXCONF_OPENSSH_SSHD_STARTSCRIPT diff --git a/rules/openssh.postinst b/rules/openssh.postinst index fcfbf9149..a7bbf1c58 100644 --- a/rules/openssh.postinst +++ b/rules/openssh.postinst @@ -1,2 +1,4 @@ #!/bin/sh -$DESTDIR/usr/sbin/enable-rc-once openssh +if [ -f $DESTDIR/etc/rc.once.d/openssh ]; then + $DESTDIR/usr/sbin/enable-rc-once openssh +fi -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] ?==?utf-8?q? ?==?utf-8?q? ?= [PATCH]?==?utf-8?q? DRAFT:l
Doesn't work... :( On Monday, November 16, 2020 11:32 CET, Michael Olbrich wrote: > On Mon, Nov 16, 2020 at 10:45:07AM +0100, Artur Wiebe wrote: > > On Monday, November 16, 2020 10:36 CET, Michael Olbrich > > wrote: > > > On Sun, Nov 15, 2020 at 06:08:56PM +0100, Roland Hieber wrote: > > > > On Sun, Nov 15, 2020 at 11:06:12AM +0100, Ladislav Michl wrote: > > > > > On Sat, Nov 14, 2020 at 09:34:47PM +0100, Roland Hieber wrote: > > > > > > On Fri, Nov 13, 2020 at 06:46:48PM +0100, Ladislav Michl wrote: > > > > > > > On Fri, Nov 13, 2020 at 03:19:55PM +0100, Artur Wiebe wrote: > > > > > > > > How can openssh.postinst be disabled from within the rule files? > > > > > > > > > > > > > > The very same could be achieved with symlink in your BSP: > > > > > > > projectroot/etc/rc.once.d/openssh -> /dev/null > > > > > > > > > > > > I don't understand why you want to disable this. The SSH server > > > > > > will not > > > > > > start without host keys. Or do you want to install a static version > > > > > > of > > > > > > the host keys generated at build time? > > > > > > > > > > Yes, keys are static, generated at build time. Root filesystem is > > > > > read-only. > > > > > > > > > > > If so, there should be an option for this. But for now, in my > > > > > > opinion, > > > > > > disabling OPENSSH_SSHD_GENKEYS will just lead to a broken SSH > > > > > > server. > > > > > > > > > > As this is easy to solve at BSP level I never thought it could > > > > > be a thing :) > > > > > > > > OK, but at least I would mention it in the kconfig help text. The > > > > > > Ack. > > > > > > > openssh recipe could also just pick up /etc/ssh/ssh_host_*_key via > > > > install_alternative if this option is disabled. > > > > > > No. Shared ssh server keys are a bad idea. That's not something I want to > > > merge upstream. > > > > This was also my concern... > > > > > > > > But there are other use-cases to not use rc-once, e.g. if the server keys > > > are generated during provisioning. And not selecting rc-once in this case > > > makes sense, so this is acceptable im general. > > > > I still need a way to disable openssh.postinst if OPENSSH_SSHD_GENKEYS is > > not set. > > Hmmm, right. In the BSP, a /dev/null symlinks works for this as well, but > we currently don't have a way to not install the postinst script. We could > do something like this (untested): > > $(call install_script_replace, openssh, postinst, @RC_ONCE@, \ > $(call ptx/ifdef, PTXCONF_OPENSSH_SSHD_GENKEYS,,#)) - target: openssh.targetinstall - install_init: preparing for image creation of 'openssh'... install_init: @ARCH@ -> x86_64 install_init: @PACKAGE@ -> openssh install_init: @VERSION@ -> 8.3p1 install_init: @DEPENDS@ -> openssl, rc-once, zlib install_init: preinst not available install_init: postinst packaging: 'root/rules/openssh.postinst' install_init: prerm not available install_init: postrm not available install_fixup: @PRIORITY@ -> optional ... done. install_fixup: @SECTION@ -> base ... done. install_fixup: @AUTHOR@ -> "Marc Kleine-Budde " ... done. install_fixup: @DESCRIPTION@ -> missing ... done. XPKG=openssh; FILE=postinst; PLACEHOLDER=@RC_ONCE@; VALUE=; CMD="install_script_replace"; if [ ! -f "/tmp/ptxdist.qS1dcP/openssh.targetinstall.$XPKG" ]; then echo; echo "Error: install_init was not called for package '$XPKG'!"; echo "This is probably caused by a typo in the package name of:"; echo "\$(call $CMD, $XPKG, ...)"; echo; exit 1; fi; echo "ptxd_install_script_replace '$FILE' '$PLACEHOLDER' '$VALUE'" >> "/mnt/root/platform-x86/state/$XPKG.cmds" xpkg_finish:collecting license (BSD AND BSD-2-Clause AND BSD-3-Clause AND MIT AND Beerware AND ISC) ... done. xpkg_finish:creating opkg package ... ptxdist: error: ptxd_install_script_replace: 'dst' must be an absolute path! xpkg_finish: failed. > > And in rules/openssh.postinst: > > #!/bin/sh > @RC_ONCE@$DESTDIR/usr/sbin/enable-rc-once openssh > > This way the script may be installed, but it will do nothing. If > PTXCONF_OPENSSH_SSHD_GENKEYS is disabled. > > 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 > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] ?==?utf-8?q? ?==?utf-8?q? [PATCH] DRAFT:?==?utf-8?q? openssh: make host key generation optional
On Monday, November 16, 2020 10:36 CET, Michael Olbrich wrote: > On Sun, Nov 15, 2020 at 06:08:56PM +0100, Roland Hieber wrote: > > On Sun, Nov 15, 2020 at 11:06:12AM +0100, Ladislav Michl wrote: > > > On Sat, Nov 14, 2020 at 09:34:47PM +0100, Roland Hieber wrote: > > > > On Fri, Nov 13, 2020 at 06:46:48PM +0100, Ladislav Michl wrote: > > > > > On Fri, Nov 13, 2020 at 03:19:55PM +0100, Artur Wiebe wrote: > > > > > > How can openssh.postinst be disabled from within the rule files? > > > > > > > > > > The very same could be achieved with symlink in your BSP: > > > > > projectroot/etc/rc.once.d/openssh -> /dev/null > > > > > > > > I don't understand why you want to disable this. The SSH server will not > > > > start without host keys. Or do you want to install a static version of > > > > the host keys generated at build time? > > > > > > Yes, keys are static, generated at build time. Root filesystem is > > > read-only. > > > > > > > If so, there should be an option for this. But for now, in my opinion, > > > > disabling OPENSSH_SSHD_GENKEYS will just lead to a broken SSH server. > > > > > > As this is easy to solve at BSP level I never thought it could > > > be a thing :) > > > > OK, but at least I would mention it in the kconfig help text. The > > Ack. > > > openssh recipe could also just pick up /etc/ssh/ssh_host_*_key via > > install_alternative if this option is disabled. > > No. Shared ssh server keys are a bad idea. That's not something I want to > merge upstream. This was also my concern... > > But there are other use-cases to not use rc-once, e.g. if the server keys > are generated during provisioning. And not selecting rc-once in this case > makes sense, so this is acceptable im general. I still need a way to disable openssh.postinst if OPENSSH_SSHD_GENKEYS is not set. > > Michael > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] DRAFT: openssh: make host key generation optional
How can openssh.postinst be disabled from within the rule files? --- rules/openssh.in | 14 ++ rules/openssh.make | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/rules/openssh.in b/rules/openssh.in index 09f5c..f9d1affbd 100644 --- a/rules/openssh.in +++ b/rules/openssh.in @@ -6,10 +6,10 @@ menuconfig OPENSSH select OPENSSL select LIBC_CRYPT select LIBC_UTIL - select RC_ONCE if OPENSSH_SSHD && RUNTIME + select RC_ONCE if OPENSSH_SSHD_GENKEYS && RUNTIME select BUSYBOX_START_STOP_DAEMON if OPENSSH_SSHD_STARTSCRIPT select LIBSELINUX if GLOBAL_SELINUX - select OPENSSH_KEYGEN if OPENSSH_SSHD + select OPENSSH_KEYGEN if OPENSSH_SSHD_GENKEYS prompt "openssh " help secure shell client/server, an rlogin/rsh/rcp replacement @@ -40,15 +40,21 @@ config OPENSSH_SSHD config OPENSSH_SSHD_STARTSCRIPT bool default y - depends on OPENSSH_SSHD + depends on OPENSSH_SSHD && INITMETHOD_BBINIT prompt "install /etc/init.d/openssh" config OPENSSH_SSHD_SYSTEMD_UNIT bool default y - depends on OPENSSH_SSHD && SYSTEMD + depends on OPENSSH_SSHD && INITMETHOD_SYSTEMD prompt "install systemd unit files for sshd" +config OPENSSH_SSHD_GENKEYS + bool + default y + depends on OPENSSH_SSHD + prompt "generate sshd host keys at first boot" + config OPENSSH_SCP bool "scp" help diff --git a/rules/openssh.make b/rules/openssh.make index cae04487f..0da2f23cd 100644 --- a/rules/openssh.make +++ b/rules/openssh.make @@ -105,8 +105,10 @@ ifdef PTXCONF_OPENSSH_SSHD /etc/ssh/moduli) @$(call install_copy, openssh, 0, 0, 0755, -, \ /usr/sbin/sshd) +ifdef OPENSSH_SSHD_GENKEYS @$(call install_alternative, openssh, 0, 0, 0755, /etc/rc.once.d/openssh) endif +endif ifdef PTXCONF_INITMETHOD_BBINIT ifdef PTXCONF_OPENSSH_SSHD_STARTSCRIPT -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 3/4] python3-pexpect: added missing dependency to PYTHON3_PTYPROCESS
Signed-off-by: Artur Wiebe --- rules/python3-pexpect.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/python3-pexpect.in b/rules/python3-pexpect.in index 703f9540a..5c340e98a 100644 --- a/rules/python3-pexpect.in +++ b/rules/python3-pexpect.in @@ -3,6 +3,7 @@ config PYTHON3_PEXPECT tristate select PYTHON3 + select PYTHON3_PTYPROCESS if RUNTIME prompt "pexpect" help Pexpect allows easy control of interactive console applications. -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 2/4] python3-pexpect: version bump 4.6.0 -> 4.8.0
Signed-off-by: Artur Wiebe --- rules/python3-pexpect.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/python3-pexpect.make b/rules/python3-pexpect.make index ea7188541..e736434e1 100644 --- a/rules/python3-pexpect.make +++ b/rules/python3-pexpect.make @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_PYTHON3_PEXPECT) += python3-pexpect # # Paths and names # -PYTHON3_PEXPECT_VERSION:= 4.6.0 -PYTHON3_PEXPECT_MD5:= d4f3372965a996238d57d19b95d2e03a +PYTHON3_PEXPECT_VERSION:= 4.8.0 +PYTHON3_PEXPECT_MD5:= 153eb25184249d6a85fde9acf4804085 PYTHON3_PEXPECT:= pexpect-$(PYTHON3_PEXPECT_VERSION) PYTHON3_PEXPECT_SUFFIX := tar.gz -PYTHON3_PEXPECT_URL:= https://pypi.io/packages/source/p/pexpect/$(PYTHON3_PEXPECT).$(PYTHON3_PEXPECT_SUFFIX) +PYTHON3_PEXPECT_URL:= $(call ptx/mirror-pypi, pexpect, $(PYTHON3_PEXPECT).$(PYTHON3_PEXPECT_SUFFIX)) PYTHON3_PEXPECT_SOURCE := $(SRCDIR)/$(PYTHON3_PEXPECT).$(PYTHON3_PEXPECT_SUFFIX) PYTHON3_PEXPECT_DIR:= $(BUILDDIR)/$(PYTHON3_PEXPECT) PYTHON3_PEXPECT_LICENSE:= ISC -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 1/4] python3-ptyprocess: version bump 0.5.1 -> 0.6.0
Signed-off-by: Artur Wiebe --- rules/python3-ptyprocess.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/python3-ptyprocess.make b/rules/python3-ptyprocess.make index fdfd0f4e4..505d63d45 100644 --- a/rules/python3-ptyprocess.make +++ b/rules/python3-ptyprocess.make @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_PYTHON3_PTYPROCESS) += python3-ptyprocess # # Paths and names # -PYTHON3_PTYPROCESS_VERSION := 0.5.1 -PYTHON3_PTYPROCESS_MD5 := 94e537122914cc9ec9c1eadcd36e73a1 +PYTHON3_PTYPROCESS_VERSION := 0.6.0 +PYTHON3_PTYPROCESS_MD5 := 37402d69f3b50913d4d483587bffad8f PYTHON3_PTYPROCESS := ptyprocess-$(PYTHON3_PTYPROCESS_VERSION) PYTHON3_PTYPROCESS_SUFFIX := tar.gz -PYTHON3_PTYPROCESS_URL := https://pypi.python.org/packages/source/p/ptyprocess/$(PYTHON3_PTYPROCESS).$(PYTHON3_PTYPROCESS_SUFFIX)\#md5=$(PYTHON3_PTYPROCESS_MD5) +PYTHON3_PTYPROCESS_URL := $(call ptx/mirror-pypi, ptyprocess, $(PYTHON3_PTYPROCESS).$(PYTHON3_PTYPROCESS_SUFFIX)) PYTHON3_PTYPROCESS_SOURCE := $(SRCDIR)/$(PYTHON3_PTYPROCESS).$(PYTHON3_PTYPROCESS_SUFFIX) PYTHON3_PTYPROCESS_DIR := $(BUILDDIR)/$(PYTHON3_PTYPROCESS) PYTHON3_PTYPROCESS_LICENSE := ISC -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 4/4] python3-tornado: version bump 6.0.4 -> 6.1
Signed-off-by: Artur Wiebe --- rules/python3-tornado.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/python3-tornado.make b/rules/python3-tornado.make index 7ec6c51ac..ba37df435 100644 --- a/rules/python3-tornado.make +++ b/rules/python3-tornado.make @@ -11,11 +11,11 @@ # PACKAGES-$(PTXCONF_PYTHON3_TORNADO) += python3-tornado -PYTHON3_TORNADO_VERSION:= 6.0.4 -PYTHON3_TORNADO_MD5:= cf39425f3d7eba9a54287f3e795a2f23 +PYTHON3_TORNADO_VERSION:= 6.1 +PYTHON3_TORNADO_MD5:= f324f5e7607798552359d6ab054c4321 PYTHON3_TORNADO:= tornado-$(PYTHON3_TORNADO_VERSION) PYTHON3_TORNADO_SUFFIX := tar.gz -PYTHON3_TORNADO_URL:= https://files.pythonhosted.org/packages/source/t/tornado/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX) +PYTHON3_TORNADO_URL:= $(call ptx/mirror-pypi, tornado, $(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX)) PYTHON3_TORNADO_SOURCE := $(SRCDIR)/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX) PYTHON3_TORNADO_DIR:= $(BUILDDIR)/$(PYTHON3_TORNADO) PYTHON3_TORNADO_LICENSE:= Apache-2.0 -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] ?==?utf-8?q? ?==?utf-8?q? [PATCH] opencv: added option to build/install python bindings
HI Michael, On Tuesday, September 22, 2020 12:16 CEST, Michael Olbrich wrote: > On Wed, Sep 16, 2020 at 01:19:28PM +0200, Artur Wiebe wrote: > > Signed-off-by: Artur Wiebe > > --- > > rules/opencv.in | 7 +++ > > rules/opencv.make | 17 + > > 2 files changed, 20 insertions(+), 4 deletions(-) > > > > diff --git a/rules/opencv.in b/rules/opencv.in > > index 328786aed..bbf907b64 100644 > > --- a/rules/opencv.in > > +++ b/rules/opencv.in > > @@ -16,6 +16,7 @@ menuconfig OPENCV > > select V4L_UTILSif OPENCV_V4L_LIBV4L2 > > select V4L_UTILS_LIBV4L1if OPENCV_V4L_LIBV4L2 > > select V4L_UTILS_LIBV4L2if OPENCV_V4L_LIBV4L2 > > + select PYTHON3_NUMPYif OPENCV_PYTHON > > help > > Open Source Computer Vision Library > > > > @@ -140,6 +141,12 @@ config OPENCV_QT > > help > > QT GUI Support > > > > +config OPENCV_PYTHON > > + bool > > + prompt "Python bindings" > > + help > > + Python bindings > > + > > config OPENCV_EXAMPLES > > bool > > prompt "Build Examples" > > diff --git a/rules/opencv.make b/rules/opencv.make > > index 8da4beb98..3e5ac8b2b 100644 > > --- a/rules/opencv.make > > +++ b/rules/opencv.make > > @@ -35,7 +35,7 @@ OPENCV_BUILD_DIR := $(OPENCV_DIR)-build > > > > OPENCV_CONF_TOOL := cmake > > > > -# Note: not configure_helper.py does not show some options that are only > > +# Note: configure_helper.py does not show some options that are only > > # valid on other architectures. Run is for ARM and x86_64 and mix the > > results. > > # Variables that are not shown by configure_helper.py are added at the end. > > OPENCV_CONF_OPT:= \ > > @@ -78,7 +78,8 @@ OPENCV_CONF_OPT := \ > > -DBUILD_opencv_ml=$(call ptx/onoff,PTXCONF_OPENCV_ML) \ > > -DBUILD_opencv_objdetect=$(call ptx/onoff,PTXCONF_OPENCV_OBJDETECT) \ > > -DBUILD_opencv_photo=$(call ptx/onoff,PTXCONF_OPENCV_PHOTO) \ > > - -DBUILD_opencv_python_bindings_generator=ON \ > > + -DBUILD_opencv_python3=$(call ptx/onoff,PTXCONF_OPENCV_PYTHON) \ > My configure_helper.py shows this exactly on this place (maybe only with other python options set?). > This option should remain at the end with all other options that are not > visible with configure_helper.py > > > + -DBUILD_opencv_python_bindings_generator=$(call > > ptx/onoff,PTXCONF_OPENCV_PYTHON) \ > > -DBUILD_opencv_python_tests=ON \ > > -DBUILD_opencv_stitching=$(call ptx/onoff,PTXCONF_OPENCV_STITCHING) \ > > -DBUILD_opencv_ts=OFF \ > > @@ -130,9 +131,11 @@ OPENCV_CONF_OPT:= \ > > -DOPENCV_GENERATE_SETUPVARS=ON \ > > -DOPENCV_IPP_GAUSSIAN_BLUR=OFF \ > > > > -DOPENCV_MATHJAX_RELPATH=https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0 > > \ > > - -DOPENCV_PYTHON3_VERSION=OFF \ > > + -DOPENCV_PYTHON3_VERSION=$(PYTHON3_MAJORMINOR) \ > > -DOPENCV_WARNINGS_ARE_ERRORS=OFF \ > > -DPROTOBUF_UPDATE_FILES=OFF \ > > + > > -DPYTHON3_EXECUTABLE=$(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR) > > \ > > + > > -DPYTHON3_NUMPY_INCLUDE_DIRS=$(PTXDIST_SYSROOT_TARGET)$(PYTHON3_SITEPACKAGES)/numpy/core/include/ > > \ > > -DWITH_1394=OFF \ > > -DWITH_ADE=OFF \ > > -DWITH_ARAVIS=OFF \ > > @@ -203,7 +206,10 @@ OPENCV_CONF_OPT:= \ > > \ > > -DCMAKE_SKIP_RPATH=ON \ > > -DBUILD_opencv_python2=OFF \ > > - -DBUILD_opencv_python3=OFF > > + > > -DPYTHON_INCLUDE_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/include/python$(PYTHON3_MAJORMINOR)m > > \ > > + > > -DPYTHON_LIBRARY=$(PTXDIST_SYSROOT_TARGET)/bin/python$(PYTHON3_MAJORMINOR) \ > These variables are described here: https://docs.opencv.org/master/d7/d9f/tutorial_linux_install.html I tried with the ones from configure_helper.py, but it does not work. During prepare configure tells to set the options above! > Hmmm, from what I can tell, you can use PYTHON3_INCLUDE_DIR and > PYTHON3_LIBRARY here to make it explicit. And configure_helper.py knows > about PYTHON3_LIBRARY, so move it to the correct location. > > Michael > > > + -DOPENCV_PYTHON3_INSTALL_PATH=$(PYTHON3_SITEPACKAGES) \ > > + -DOPENCV_SKIP_PYTHON_LOADER=ON > > > > > > $(STATEDIR)/opencv.install: > > @@ -243,6 +249,9 @@ $(STATEDIR)/opencv.targetinstall: > > $(call install_lib, opencv, 0, 0, 0644,
Re: [ptxdist] ?==?utf-8?q? ?==?utf-8?q? [PATCH v2 16/18]?==?utf-8?q? python3-pytz: version bump 2018.5?==?utf-8?q? ->?==?utf-8?q? 2020.1
Hi Bastian, there is also a patch series for pytz: root/patches/pytz-2018.5 Regards, Artur On Monday, September 21, 2020 14:33 CEST, Bastian Krause wrote: > Signed-off-by: Bastian Krause > --- > Changes since (implicit) v1: > - use ptx/mirror-pypi macro for URL > --- > rules/python3-pytz.make | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/rules/python3-pytz.make b/rules/python3-pytz.make > index bf7bb982a..b0a05a476 100644 > --- a/rules/python3-pytz.make > +++ b/rules/python3-pytz.make > @@ -11,11 +11,11 @@ > # > PACKAGES-$(PTXCONF_PYTHON3_PYTZ) += python3-pytz > > -PYTHON3_PYTZ_VERSION := 2018.5 > -PYTHON3_PYTZ_MD5 := 45409cbfa3927bdd2f3ee914dd5b1060 > +PYTHON3_PYTZ_VERSION := 2020.1 > +PYTHON3_PYTZ_MD5 := 0349106ac02f2bfe565dd6d5594e3a15 > PYTHON3_PYTZ := pytz-$(PYTHON3_PYTZ_VERSION) > PYTHON3_PYTZ_SUFFIX := tar.gz > -PYTHON3_PYTZ_URL := > https://pypi.python.org/packages/ca/a9/62f96decb1e309d6300ebe7eee9acfd7bccaeedd693794437005b9067b44/$(PYTHON3_PYTZ).$(PYTHON3_PYTZ_SUFFIX)\#md5=$(PYTHON3_PYTZ_MD5) > +PYTHON3_PYTZ_URL := $(call ptx/mirror-pypi, pytz, > $(PYTHON3_PYTZ).$(PYTHON3_PYTZ_SUFFIX)) > PYTHON3_PYTZ_SOURCE := $(SRCDIR)/$(PYTHON3_PYTZ).$(PYTHON3_PYTZ_SUFFIX) > PYTHON3_PYTZ_DIR := $(BUILDDIR)/$(PYTHON3_PYTZ) > PYTHON3_PYTZ_LICENSE := MIT > -- > 2.28.0 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] opencv: added option to build/install python bindings
Signed-off-by: Artur Wiebe --- rules/opencv.in | 7 +++ rules/opencv.make | 17 + 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index 328786aed..bbf907b64 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -16,6 +16,7 @@ menuconfig OPENCV select V4L_UTILSif OPENCV_V4L_LIBV4L2 select V4L_UTILS_LIBV4L1if OPENCV_V4L_LIBV4L2 select V4L_UTILS_LIBV4L2if OPENCV_V4L_LIBV4L2 + select PYTHON3_NUMPYif OPENCV_PYTHON help Open Source Computer Vision Library @@ -140,6 +141,12 @@ config OPENCV_QT help QT GUI Support +config OPENCV_PYTHON + bool + prompt "Python bindings" + help + Python bindings + config OPENCV_EXAMPLES bool prompt "Build Examples" diff --git a/rules/opencv.make b/rules/opencv.make index 8da4beb98..3e5ac8b2b 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -35,7 +35,7 @@ OPENCV_BUILD_DIR := $(OPENCV_DIR)-build OPENCV_CONF_TOOL := cmake -# Note: not configure_helper.py does not show some options that are only +# Note: configure_helper.py does not show some options that are only # valid on other architectures. Run is for ARM and x86_64 and mix the results. # Variables that are not shown by configure_helper.py are added at the end. OPENCV_CONF_OPT:= \ @@ -78,7 +78,8 @@ OPENCV_CONF_OPT := \ -DBUILD_opencv_ml=$(call ptx/onoff,PTXCONF_OPENCV_ML) \ -DBUILD_opencv_objdetect=$(call ptx/onoff,PTXCONF_OPENCV_OBJDETECT) \ -DBUILD_opencv_photo=$(call ptx/onoff,PTXCONF_OPENCV_PHOTO) \ - -DBUILD_opencv_python_bindings_generator=ON \ + -DBUILD_opencv_python3=$(call ptx/onoff,PTXCONF_OPENCV_PYTHON) \ + -DBUILD_opencv_python_bindings_generator=$(call ptx/onoff,PTXCONF_OPENCV_PYTHON) \ -DBUILD_opencv_python_tests=ON \ -DBUILD_opencv_stitching=$(call ptx/onoff,PTXCONF_OPENCV_STITCHING) \ -DBUILD_opencv_ts=OFF \ @@ -130,9 +131,11 @@ OPENCV_CONF_OPT:= \ -DOPENCV_GENERATE_SETUPVARS=ON \ -DOPENCV_IPP_GAUSSIAN_BLUR=OFF \ -DOPENCV_MATHJAX_RELPATH=https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0 \ - -DOPENCV_PYTHON3_VERSION=OFF \ + -DOPENCV_PYTHON3_VERSION=$(PYTHON3_MAJORMINOR) \ -DOPENCV_WARNINGS_ARE_ERRORS=OFF \ -DPROTOBUF_UPDATE_FILES=OFF \ + -DPYTHON3_EXECUTABLE=$(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR) \ + -DPYTHON3_NUMPY_INCLUDE_DIRS=$(PTXDIST_SYSROOT_TARGET)$(PYTHON3_SITEPACKAGES)/numpy/core/include/ \ -DWITH_1394=OFF \ -DWITH_ADE=OFF \ -DWITH_ARAVIS=OFF \ @@ -203,7 +206,10 @@ OPENCV_CONF_OPT:= \ \ -DCMAKE_SKIP_RPATH=ON \ -DBUILD_opencv_python2=OFF \ - -DBUILD_opencv_python3=OFF + -DPYTHON_INCLUDE_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/include/python$(PYTHON3_MAJORMINOR)m \ + -DPYTHON_LIBRARY=$(PTXDIST_SYSROOT_TARGET)/bin/python$(PYTHON3_MAJORMINOR) \ + -DOPENCV_PYTHON3_INSTALL_PATH=$(PYTHON3_SITEPACKAGES) \ + -DOPENCV_SKIP_PYTHON_LOADER=ON $(STATEDIR)/opencv.install: @@ -243,6 +249,9 @@ $(STATEDIR)/opencv.targetinstall: $(call install_lib, opencv, 0, 0, 0644, $(lib))$(ptx/nl)) ifdef PTXCONF_OPENCV_EXAMPLES @$(call install_tree, opencv, 0, 0, $(OPENCV_BUILD_DIR)/bin, /bin) +endif +ifdef PTXCONF_OPENCV_PYTHON + @$(call install_tree, opencv, 0, 0, -, $(PYTHON3_SITEPACKAGES)) endif @$(call install_finish, opencv) @$(call touch) -- 2.28.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] python3-tornado: version bump 6.0.3 -> 6.0.4
Signed-off-by: Artur Wiebe --- rules/python3-tornado.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-tornado.make b/rules/python3-tornado.make index 1dea021a3..7ec6c51ac 100644 --- a/rules/python3-tornado.make +++ b/rules/python3-tornado.make @@ -11,8 +11,8 @@ # PACKAGES-$(PTXCONF_PYTHON3_TORNADO) += python3-tornado -PYTHON3_TORNADO_VERSION:= 6.0.3 -PYTHON3_TORNADO_MD5:= cab4b11480f6d032e46465586192d343 +PYTHON3_TORNADO_VERSION:= 6.0.4 +PYTHON3_TORNADO_MD5:= cf39425f3d7eba9a54287f3e795a2f23 PYTHON3_TORNADO:= tornado-$(PYTHON3_TORNADO_VERSION) PYTHON3_TORNADO_SUFFIX := tar.gz PYTHON3_TORNADO_URL:= https://files.pythonhosted.org/packages/source/t/tornado/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX) -- 2.28.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] opencv: version bump 4.2.0 -> 4.4.0
Signed-off-by: Artur Wiebe --- rules/opencv.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index 29b29bd2e..1011b8645 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv # Paths and names # -OPENCV_VERSION := 4.2.0 -OPENCV_MD5 := b02b54115f1f99cb9e885d1e5988ff70 +OPENCV_VERSION := 4.4.0 +OPENCV_MD5 := 4b00f5cdb1cf393c4a84696362c5a72a OPENCV := opencv-$(OPENCV_VERSION) OPENCV_SUFFIX := zip OPENCV_URL := \ -- 2.28.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] opencv: added option to build/install python bindings
Signed-off-by: Artur Wiebe --- rules/opencv.in | 7 +++ rules/opencv.make | 18 +++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index 8f39ec395..9c50bb4dc 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -15,6 +15,7 @@ menuconfig OPENCV select V4L_UTILSif OPENCV_V4L_LIBV4L2 select V4L_UTILS_LIBV4L1if OPENCV_V4L_LIBV4L2 select V4L_UTILS_LIBV4L2if OPENCV_V4L_LIBV4L2 + select PYTHON3_NUMPYif OPENCV_PYTHON help Open Source Computer Vision Library @@ -138,6 +139,12 @@ config OPENCV_QT help QT GUI Support +config OPENCV_PYTHON + bool + prompt "Python bindings" + help + Python bindings + config OPENCV_EXAMPLES bool prompt "Build Examples" diff --git a/rules/opencv.make b/rules/opencv.make index 844b39f05..29b29bd2e 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -73,7 +73,8 @@ OPENCV_CONF_OPT := \ -DBUILD_opencv_ml:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_ML) \ -DBUILD_opencv_objdetect:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_OBJDETECT) \ -DBUILD_opencv_photo:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_PHOTO) \ - -DBUILD_opencv_python_bindings_generator=ON \ + -DBUILD_opencv_python3=$(call ptx/onoff,PTXCONF_OPENCV_PYTHON) \ + -DBUILD_opencv_python_bindings_generator=$(call ptx/onoff,PTXCONF_OPENCV_PYTHON) \ -DBUILD_opencv_python_tests=ON \ -DBUILD_opencv_stitching:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_STITCHING) \ -DBUILD_opencv_ts:BOOL=OFF \ @@ -120,7 +121,13 @@ OPENCV_CONF_OPT:= \ -DOPENCV_FORCE_3RDPARTY_BUILD=OFF \ -DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_GENERATE_SETUPVARS=ON \ - -DOPENCV_PYTHON3_VERSION=OFF \ + -DOPENCV_PYTHON3_VERSION=$(PYTHON3_MAJORMINOR) \ + -DPYTHON3_EXECUTABLE=$(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR) \ + -DPYTHON_INCLUDE_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/include/python$(PYTHON3_MAJORMINOR)m \ + -DPYTHON_LIBRARY=$(PTXDIST_SYSROOT_TARGET)/bin/python$(PYTHON3_MAJORMINOR) \ + -DPYTHON3_NUMPY_INCLUDE_DIRS=$(PTXDIST_SYSROOT_TARGET)$(PYTHON3_SITEPACKAGES)/numpy/core/include/ \ + -DOPENCV_PYTHON3_INSTALL_PATH=$(PYTHON3_SITEPACKAGES) \ + -DOPENCV_SKIP_PYTHON_LOADER=ON \ -DOPENCV_WARNINGS_ARE_ERRORS:BOOL=OFF \ -DPROTOBUF_UPDATE_FILES=OFF \ -DWITH_1394:BOOL=OFF \ @@ -221,7 +228,12 @@ $(STATEDIR)/opencv.targetinstall: @$(foreach lib, $(OPENCV_LIBS-y), \ $(call install_lib, opencv, 0, 0, 0644, $(lib));) - @$(call install_tree, opencv, 0, 0, $(OPENCV_BUILD_DIR)/bin, /bin) + @$(call install_tree, opencv, 0, 0, -, /usr/bin) + +ifdef PTXCONF_OPENCV_PYTHON + @$(call install_tree, opencv, 0, 0, -, $(PYTHON3_SITEPACKAGES)) +endif + @$(call install_finish, opencv) @$(call touch) -- 2.28.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] ?==?utf-8?q? ?==?utf-8?q? ?= 8
Hi Michael, That was it!!! Now it compiles. PTXCONF_KERNEL_VERSION="5.4.58 " The trailng space is invisible in ptxdist platformconfig. I was digging in a completely wrong place... Thank you very much for support!! Artur -- Dipl.-Ing. Artur Wiebe Software-Ingenieur Email: ar...@4wiebe.de Telefon: +491632699840 Web: artur.4wiebe.de Quellenstraße 49, 72124 Pliezhausen USt-IdNr: DE299286057 On Friday, August 14, 2020 09:33 CEST, Michael Olbrich wrote: > On Wed, Aug 12, 2020 at 03:59:58PM +0200, Artur Wiebe wrote: > > Hi Michael, > > > > same problem as below... > > > > make --version > > GNU Make 4.2.1 > > > > ptxdist clean nss && ptxdist -j1 compile nss > > > > --- > > target: nss.extract > > --- > > > > extract: pkg_src=/home/client/src/nss-3.54.tar.gz > > extract: pkg_extract_dir=root/platform-x86/build-target/nss-3.54 > > > > pkg_patch_dir: 'ptxdist-2020.08.0/patches/nss-3.54' > > pkg_patch_series: 'ptxdist-2020.08.0/patches/nss-3.54/series' > > > > patchin: patch: apply 'ptxdist-2020.08.0/patches/nss-3.54/series' > > applying '0001-nss-fix-nsinstall-build.patch' > > patching file nss/coreconf/nsinstall/Makefile > > applying '0002-add-nss.pc.in.patch' > > patching file nss/nss.pc.in > > applying '0003-HACK-don-t-build-the-commands.patch' > > patching file nss/manifest.mn > > applying '0004-HACK-fix-parallel-building-issue.patch' > > patching file nss/coreconf/rules.mk > > applying '0005-fix-dependency-generation.patch' > > patching file nss/coreconf/rules.mk > > patchin: patch: done > > > > finished target nss.extract > > > > --- > > target: nss.compile > > --- > > > > make: Entering directory '/mnt/root/platform-x86/build-target/nss-3.54/nss' > > coreconf/rules.mk:287: *** mixed implicit and normal rules: deprecated > > syntax > > coreconf/rules.mk:311: warning: overriding recipe for target 'Linux5.4.58' > > Right, we use OS_RELEASE=$(PTXCONF_KERNEL_VERSION) and this is with quotes. > Maybe PTXCONF_KERNEL_VERSION contains a trailing whitespace in your > platformconfig? The kernel package won't care, because we remove the quotes > there and any whitespace is lost. > > Michael > > > coreconf/rules.mk:294: warning: ignoring old recipe for target 'Linux5.4.58' > > coreconf/rules.mk:310: *** mixed implicit and normal rules: deprecated > > syntax > > coreconf/rules.mk:311: warning: overriding recipe for target > > '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' > > coreconf/rules.mk:294: warning: ignoring old recipe for target > > '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' > > coreconf/rules.mk:315: warning: overriding recipe for target 'Linux5.4.58' > > coreconf/rules.mk:311: warning: ignoring old recipe for target 'Linux5.4.58' > > coreconf/rules.mk:314: *** mixed implicit and normal rules: deprecated > > syntax > > coreconf/rules.mk:315: warning: overriding recipe for target > > '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' > > coreconf/rules.mk:311: warning: ignoring old recipe for target > > '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' > > coreconf/rules.mk:318: warning: overriding recipe for target 'Linux5.4.58' > > coreconf/rules.mk:315: warning: ignoring old recipe for target 'Linux5.4.58' > > coreconf/rules.mk:317: *** mixed implicit and normal rules: deprecated > > syntax > > coreconf/rules.mk:318: warning: overriding recipe for target > > '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' > > coreconf/rules.mk:315: warning: ignoring old recipe for target > > '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' > > coreconf/rules.mk:327: warning: overriding recipe for target 'Linux5.4.58' > > coreconf/rules.mk:318: warning: ignoring old recipe for target 'Linux5.4.58' > > coreconf/rules.mk:320: *** mixed implicit and normal rules: deprecated > > syntax > > coreconf/rules.mk:351: warning: overriding recipe for target 'Linux5.4.58' > > coreconf/rules.mk:327: warning: ignoring old recipe for target 'Linux5.4.58' > > coreconf/rules.mk:351: *** mixed implicit and normal rules: deprecated > > syntax > > coreconf/rules.mk:351: warning: overriding recipe for target > > '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' > > coreconf/rules.mk:318: warning: ignoring old recipe for target > > '_x86_64_glibc_PTH_64_OPT.
Re: [ptxdist] ?==?utf-8?q? ?==?utf-8?q? nss: build fails with linux 5.4.58
Hi Michael, same problem as below... make --version GNU Make 4.2.1 ptxdist clean nss && ptxdist -j1 compile nss --- target: nss.extract --- extract: pkg_src=/home/client/src/nss-3.54.tar.gz extract: pkg_extract_dir=root/platform-x86/build-target/nss-3.54 pkg_patch_dir: 'ptxdist-2020.08.0/patches/nss-3.54' pkg_patch_series: 'ptxdist-2020.08.0/patches/nss-3.54/series' patchin: patch: apply 'ptxdist-2020.08.0/patches/nss-3.54/series' applying '0001-nss-fix-nsinstall-build.patch' patching file nss/coreconf/nsinstall/Makefile applying '0002-add-nss.pc.in.patch' patching file nss/nss.pc.in applying '0003-HACK-don-t-build-the-commands.patch' patching file nss/manifest.mn applying '0004-HACK-fix-parallel-building-issue.patch' patching file nss/coreconf/rules.mk applying '0005-fix-dependency-generation.patch' patching file nss/coreconf/rules.mk patchin: patch: done finished target nss.extract --- target: nss.compile --- make: Entering directory '/mnt/root/platform-x86/build-target/nss-3.54/nss' coreconf/rules.mk:287: *** mixed implicit and normal rules: deprecated syntax coreconf/rules.mk:311: warning: overriding recipe for target 'Linux5.4.58' coreconf/rules.mk:294: warning: ignoring old recipe for target 'Linux5.4.58' coreconf/rules.mk:310: *** mixed implicit and normal rules: deprecated syntax coreconf/rules.mk:311: warning: overriding recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:294: warning: ignoring old recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:315: warning: overriding recipe for target 'Linux5.4.58' coreconf/rules.mk:311: warning: ignoring old recipe for target 'Linux5.4.58' coreconf/rules.mk:314: *** mixed implicit and normal rules: deprecated syntax coreconf/rules.mk:315: warning: overriding recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:311: warning: ignoring old recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:318: warning: overriding recipe for target 'Linux5.4.58' coreconf/rules.mk:315: warning: ignoring old recipe for target 'Linux5.4.58' coreconf/rules.mk:317: *** mixed implicit and normal rules: deprecated syntax coreconf/rules.mk:318: warning: overriding recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:315: warning: ignoring old recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:327: warning: overriding recipe for target 'Linux5.4.58' coreconf/rules.mk:318: warning: ignoring old recipe for target 'Linux5.4.58' coreconf/rules.mk:320: *** mixed implicit and normal rules: deprecated syntax coreconf/rules.mk:351: warning: overriding recipe for target 'Linux5.4.58' coreconf/rules.mk:327: warning: ignoring old recipe for target 'Linux5.4.58' coreconf/rules.mk:351: *** mixed implicit and normal rules: deprecated syntax coreconf/rules.mk:351: warning: overriding recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:318: warning: ignoring old recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:352: warning: overriding recipe for target 'Linux5.4.58' coreconf/rules.mk:351: warning: ignoring old recipe for target 'Linux5.4.58' coreconf/rules.mk:352: *** mixed implicit and normal rules: deprecated syntax coreconf/rules.mk:352: warning: overriding recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:351: warning: ignoring old recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' # no real way to encode these in any sensible way make -C coreconf/nsinstall program ../../coreconf/rules.mk:164: *** invalid syntax in conditional. Stop. make: *** [manifest.mn:24: prepare_build] Error 2 make: Leaving directory '/mnt/root/platform-x86/build-target/nss-3.54/nss' make: *** [/usr/local/lib/ptxdist-2020.08.0/rules/post/ptxd_make_world_compile.make:20: /mnt/root/platform-x86/state/nss.compile] Error 2 On Wednesday, August 12, 2020 15:40 CEST, Michael Olbrich wrote: > On Wed, Aug 12, 2020 at 11:50:53AM +0200, Artur Wiebe wrote: > > I have a problem to compile nss with the latest lts-linux 5.4.58. With > > linux 4.19 everything built well. > > > > ptxdist version 2020.08.0 > > Toolchain: > > OSELAS.Toolchain-2019.09.1/x86_64-unknown-linux-gnu/gcc-9.2.1-clang-8.0.1-glibc-2.30-binutils-2.32-kernel-5.0-sanitized > > > > Does anyone have a clue? > > Hmm, I'm guess there is still something broken with parallel building. Can > you verify, that you use all patches? This was broken in ptxdist-2020.07.0. > > Does 'ptxdist -j1 compile
[ptxdist] nss: build fails with linux 5.4.58
Hi ptxdist, I have a problem to compile nss with the latest lts-linux 5.4.58. With linux 4.19 everything built well. ptxdist version 2020.08.0 Toolchain: OSELAS.Toolchain-2019.09.1/x86_64-unknown-linux-gnu/gcc-9.2.1-clang-8.0.1-glibc-2.30-binutils-2.32-kernel-5.0-sanitized Does anyone have a clue? Thank you in advance! Artur --- target: nss.compile --- make: Entering directory '/mnt/root/platform-x86/build-target/nss-3.54/nss' coreconf/rules.mk:287: *** mixed implicit and normal rules: deprecated syntax coreconf/rules.mk:311: warning: overriding recipe for target 'Linux5.4.58' coreconf/rules.mk:294: warning: ignoring old recipe for target 'Linux5.4.58' coreconf/rules.mk:310: *** mixed implicit and normal rules: deprecated syntax coreconf/rules.mk:311: warning: overriding recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:294: warning: ignoring old recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:315: warning: overriding recipe for target 'Linux5.4.58' coreconf/rules.mk:311: warning: ignoring old recipe for target 'Linux5.4.58' coreconf/rules.mk:314: *** mixed implicit and normal rules: deprecated syntax coreconf/rules.mk:315: warning: overriding recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:311: warning: ignoring old recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:318: warning: overriding recipe for target 'Linux5.4.58' coreconf/rules.mk:315: warning: ignoring old recipe for target 'Linux5.4.58' coreconf/rules.mk:317: *** mixed implicit and normal rules: deprecated syntax coreconf/rules.mk:318: warning: overriding recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:315: warning: ignoring old recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:327: warning: overriding recipe for target 'Linux5.4.58' coreconf/rules.mk:318: warning: ignoring old recipe for target 'Linux5.4.58' coreconf/rules.mk:320: *** mixed implicit and normal rules: deprecated syntax coreconf/rules.mk:351: warning: overriding recipe for target 'Linux5.4.58' coreconf/rules.mk:327: warning: ignoring old recipe for target 'Linux5.4.58' coreconf/rules.mk:351: *** mixed implicit and normal rules: deprecated syntax coreconf/rules.mk:351: warning: overriding recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:318: warning: ignoring old recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:352: warning: overriding recipe for target 'Linux5.4.58' coreconf/rules.mk:351: warning: ignoring old recipe for target 'Linux5.4.58' coreconf/rules.mk:352: *** mixed implicit and normal rules: deprecated syntax coreconf/rules.mk:352: warning: overriding recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' coreconf/rules.mk:351: warning: ignoring old recipe for target '_x86_64_glibc_PTH_64_OPT.OBJ/%.o' # no real way to encode these in any sensible way make -C coreconf/nsinstall program ../../coreconf/rules.mk:164: *** invalid syntax in conditional. Stop. make: *** [manifest.mn:24: prepare_build] Error 2 make: Leaving directory '/mnt/root/platform-x86/build-target/nss-3.54/nss' make: *** [/usr/local/lib/ptxdist-2020.08.0/rules/post/ptxd_make_world_compile.make:20: /mnt/root/platform-x86/state/nss.compile] Error 2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] ?==?utf-8?q? fail to install_alternative a file like dev-disk-by\x2dlabel-INSTALL.device (backslash?= x2d
Hi Michael, I just updated to the latest ptxdist and tried your fix. It works now as expected! Thank you very much! Artur On Thursday, January 30, 2020 14:35 CET, Michael Olbrich wrote: > On Fri, Jan 10, 2020 at 02:19:24PM +0100, Michael Olbrich wrote: > > On Wed, Jan 08, 2020 at 04:00:57PM +0100, Artur Wiebe wrote: > > > I am trying to use the following inside a rules file: > > > @$(call install_alternative, system, 0, 0, 0644, > > > /usr/lib/systemd/system/dev-disk-by\\x2dlabel-INSTALL.device) > > > > > > The file exists inside of projectroot: > > > -rw-r--r-- 1 client client 27 18. Jul 12:20 > > > 'base/projectroot/usr/lib/systemd/system/dev-disk-by\x2dlabel-INSTALL.device' > > > > > > Unfortunately the build fails with an error: > > > No suitable file > > > '/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device' could be found > > > in any of these locations: > > > /mnt/root/projectroot.x86/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device > > > /mnt/root/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device.x86 > > > /mnt/root/configs/platform-x86/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device.x86 > > > /mnt/root/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device > > > /mnt/root/configs/platform-x86/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device > > > /mnt/root/base/projectroot.x86/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device > > > /mnt/root/base/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device.x86 > > > /mnt/root/base/configs/platform-x86/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device.x86 > > > /mnt/root/base/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device > > > /mnt/root/base/configs/platform-x86/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device > > > /usr/local/lib/ptxdist-2019.11.0/projectroot.x86/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device > > > /usr/local/lib/ptxdist-2019.11.0/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device.x86 > > > /usr/local/lib/ptxdist-2019.11.0/configs/platform-x86/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device.x86 > > > /usr/local/lib/ptxdist-2019.11.0/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device > > > /usr/local/lib/ptxdist-2019.11.0/configs/platform-x86/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device > > > > > > install alternative: > > > src= > > > dst=/usr/lib/systemd/system/dev-disk-by\x2dlabel-INSTALL.device > > > owner=0 > > > group=0 > > > permissions=0644 > > > > > > Error: file not found: > > > Error: install_alternative failed! > > > > > > Is there any way to escape "\x2d" ? > > > > Not right now. It's a bug in PTXdist. I'm working on a fix, but it's in a > > core shell function and I need to make sure that there are no unexpected > > side effects. > > FYI, this should work with ptxdist master. > > 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 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] kexec-tools: version bump 2.0.16 -> 2.0.20
as kdump was removed from kexec-tools there is no need to select installed binaries Signed-off-by: Artur Wiebe --- rules/kexec-tools.in | 16 rules/kexec-tools.make | 11 +++ 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/rules/kexec-tools.in b/rules/kexec-tools.in index afb1f1d18..9dc7c6e59 100644 --- a/rules/kexec-tools.in +++ b/rules/kexec-tools.in @@ -23,20 +23,4 @@ config KEXEC_TOOLS_XEN help kexec has been ported to xen for the hypervisor and domain 0. -config KEXEC_TOOLS_KEXEC - bool - prompt "Install kexec" - help - FIXME - -config KEXEC_TOOLS_KDUMP - bool - prompt "Install kdump" - help - Kdump is a kexec based crash dumping mechansim for Linux. - Its functionality is broken mainly into two components, - user space and kernel space. Kernel space patches are - already part of main line kernel tree. User space component - is nothing but a patch on top of existing kexec tools. - endif diff --git a/rules/kexec-tools.make b/rules/kexec-tools.make index 665ea828f..48a782ed7 100644 --- a/rules/kexec-tools.make +++ b/rules/kexec-tools.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_KEXEC_TOOLS) += kexec-tools # # Paths and names # -KEXEC_TOOLS_VERSION:= 2.0.16 -KEXEC_TOOLS_MD5:= b6bd3e0cc59ae0206ef0197b76a1f0b9 +KEXEC_TOOLS_VERSION:= 2.0.20 +KEXEC_TOOLS_MD5:= 3b3ee68064648b1b9e86ad93b1c50644 KEXEC_TOOLS:= kexec-tools-$(KEXEC_TOOLS_VERSION) KEXEC_TOOLS_SUFFIX := tar.xz KEXEC_TOOLS_URL:= $(call ptx/mirror, KERNEL, utils/kernel/kexec/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX)) @@ -39,6 +39,7 @@ endif # KEXEC_TOOLS_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ + --without-gamecube \ --$(call ptx/wwo, PTXCONF_KEXEC_TOOLS_ZLIB)-zlib \ --without-lzma \ --$(call ptx/wwo, PTXCONF_KEXEC_TOOLS_XEN)-xen \ @@ -57,13 +58,7 @@ $(STATEDIR)/kexec-tools.targetinstall: @$(call install_fixup, kexec-tools,AUTHOR,"Erwin Rol ") @$(call install_fixup, kexec-tools,DESCRIPTION,missing) -ifdef PTXCONF_KEXEC_TOOLS_KEXEC @$(call install_copy, kexec-tools, 0, 0, 0755, -, /usr/sbin/kexec) -endif - -ifdef PTXCONF_KEXEC_TOOLS_KDUMP - @$(call install_copy, kexec-tools, 0, 0, 0755, -, /usr/sbin/kdump) -endif @$(call install_finish, kexec-tools) -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] polkit: use 4 digits for permissions
(allows extending localauthority dir by other packages) Signed-off-by: Artur Wiebe --- rules/polkit.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/polkit.make b/rules/polkit.make index ba5d9a299..ac9b49e45 100644 --- a/rules/polkit.make +++ b/rules/polkit.make @@ -68,7 +68,7 @@ $(STATEDIR)/polkit.targetinstall: /usr/share/dbus-1/system-services/org.freedesktop.PolicyKit1.service) # config - @$(call install_copy, polkit, 0, 0, 700, /etc/polkit-1/localauthority) + @$(call install_copy, polkit, 0, 0, 0700, /etc/polkit-1/localauthority) @$(call install_copy, polkit, 0, 0, 0644, -, \ /etc/polkit-1/localauthority.conf.d/50-localauthority.conf) @$(call install_copy, polkit, 0, 0, 0644, -, \ -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] imagemagick: enabled WEBP support
Signed-off-by: Artur Wiebe --- rules/imagemagick.in | 8 rules/imagemagick.make | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/rules/imagemagick.in b/rules/imagemagick.in index 7bf7b9b99..3885339f8 100644 --- a/rules/imagemagick.in +++ b/rules/imagemagick.in @@ -5,6 +5,7 @@ menuconfig IMAGEMAGICK select ZLIB if IMAGEMAGICK_USE_ZLIB select LIBPNG if IMAGEMAGICK_USE_LIBPNG select LIBJPEG if IMAGEMAGICK_USE_LIBJPEG + select LIBWEBP if IMAGEMAGICK_USE_LIBWEBP prompt "imagemagick " help ImageMagick® is a software suite to create, edit, compose, or convert @@ -37,5 +38,12 @@ config IMAGEMAGICK_USE_LIBJPEG prompt "Enable JPEG" help Enable JPEG support + +config IMAGEMAGICK_USE_LIBWEBP + bool + default y + prompt "Enable WEBP" + help + Enable WEBP support endif diff --git a/rules/imagemagick.make b/rules/imagemagick.make index efe36d358..f0a8c7062 100644 --- a/rules/imagemagick.make +++ b/rules/imagemagick.make @@ -87,7 +87,7 @@ IMAGEMAGICK_AUTOCONF := \ --$(call ptx/wwo, PTXCONF_IMAGEMAGICK_USE_LIBPNG)-png \ --without-rsvg \ --without-tiff \ - --without-webp \ + --$(call ptx/wwo, PTXCONF_IMAGEMAGICK_USE_LIBWEBP)-webp \ --without-wmf \ --without-xml -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] fail to install_alternative a file like dev-disk-by\x2dlabel-INSTALL.device (backslash?==?utf-8?q? x2d)
Hi PTXdist, I am trying to use the following inside a rules file: @$(call install_alternative, system, 0, 0, 0644, /usr/lib/systemd/system/dev-disk-by\\x2dlabel-INSTALL.device) The file exists inside of projectroot: -rw-r--r-- 1 client client 27 18. Jul 12:20 'base/projectroot/usr/lib/systemd/system/dev-disk-by\x2dlabel-INSTALL.device' Unfortunately the build fails with an error: No suitable file '/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device' could be found in any of these locations: /mnt/root/projectroot.x86/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device /mnt/root/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device.x86 /mnt/root/configs/platform-x86/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device.x86 /mnt/root/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device /mnt/root/configs/platform-x86/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device /mnt/root/base/projectroot.x86/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device /mnt/root/base/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device.x86 /mnt/root/base/configs/platform-x86/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device.x86 /mnt/root/base/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device /mnt/root/base/configs/platform-x86/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device /usr/local/lib/ptxdist-2019.11.0/projectroot.x86/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device /usr/local/lib/ptxdist-2019.11.0/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device.x86 /usr/local/lib/ptxdist-2019.11.0/configs/platform-x86/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device.x86 /usr/local/lib/ptxdist-2019.11.0/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device /usr/local/lib/ptxdist-2019.11.0/configs/platform-x86/projectroot/usr/lib/systemd/system/dev-disk-by-label-INSTALL.device install alternative: src= dst=/usr/lib/systemd/system/dev-disk-by\x2dlabel-INSTALL.device owner=0 group=0 permissions=0644 Error: file not found: Error: install_alternative failed! Is there any way to escape "\x2d" ? Thank you, Artur ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] python3-lxml: version bump 4.2.4 -> 4.4.2
Signed-off-by: Artur Wiebe --- .../0001-do-not-use-libdirs-from-xslt-config.patch | 0 patches/{lxml-4.2.4 => lxml-4.4.2}/series | 0 rules/python3-lxml.make | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) rename patches/{lxml-4.2.4 => lxml-4.4.2}/0001-do-not-use-libdirs-from-xslt-config.patch (100%) rename patches/{lxml-4.2.4 => lxml-4.4.2}/series (100%) diff --git a/patches/lxml-4.2.4/0001-do-not-use-libdirs-from-xslt-config.patch b/patches/lxml-4.4.2/0001-do-not-use-libdirs-from-xslt-config.patch similarity index 100% rename from patches/lxml-4.2.4/0001-do-not-use-libdirs-from-xslt-config.patch rename to patches/lxml-4.4.2/0001-do-not-use-libdirs-from-xslt-config.patch diff --git a/patches/lxml-4.2.4/series b/patches/lxml-4.4.2/series similarity index 100% rename from patches/lxml-4.2.4/series rename to patches/lxml-4.4.2/series diff --git a/rules/python3-lxml.make b/rules/python3-lxml.make index 15de1f253..cf4d0870f 100644 --- a/rules/python3-lxml.make +++ b/rules/python3-lxml.make @@ -11,11 +11,11 @@ # PACKAGES-$(PTXCONF_PYTHON3_LXML) += python3-lxml -PYTHON3_LXML_VERSION := 4.2.4 -PYTHON3_LXML_MD5 := 31239400ca4e130b69993bb3c14204b3 +PYTHON3_LXML_VERSION := 4.4.2 +PYTHON3_LXML_MD5 := 235c1a22d97a174144e76b66ce62ae46 PYTHON3_LXML := lxml-$(PYTHON3_LXML_VERSION) PYTHON3_LXML_SUFFIX:= tar.gz -PYTHON3_LXML_URL := https://pypi.python.org/packages/ca/63/139b710671c1655aed3b20c1e6776118c62e9f9311152f4c6031e12a0554/$(PYTHON3_LXML).$(PYTHON3_LXML_SUFFIX)\#md5=$(PYTHON3_LXML_MD5) +PYTHON3_LXML_URL := https://files.pythonhosted.org/packages/source/l/lxml/$(PYTHON3_LXML).$(PYTHON3_LXML_SUFFIX) PYTHON3_LXML_SOURCE:= $(SRCDIR)/$(PYTHON3_LXML).$(PYTHON3_LXML_SUFFIX) PYTHON3_LXML_DIR := $(BUILDDIR)/$(PYTHON3_LXML) PYTHON3_LXML_LICENSE := BSD -- 2.24.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] python3-opcua: version bump 0.98.5 -> 0.98.7
Signed-off-by: Artur Wiebe --- rules/python3-opcua.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/python3-opcua.make b/rules/python3-opcua.make index ec0d414e4..54e38249c 100644 --- a/rules/python3-opcua.make +++ b/rules/python3-opcua.make @@ -11,11 +11,11 @@ # PACKAGES-$(PTXCONF_PYTHON3_OPCUA) += python3-opcua -PYTHON3_OPCUA_VERSION := 0.98.5 -PYTHON3_OPCUA_MD5 := 38c7fce58838117389e939157116c7c3 +PYTHON3_OPCUA_VERSION := 0.98.7 +PYTHON3_OPCUA_MD5 := beca06f61d4acd4349a118b81fc37aad PYTHON3_OPCUA := opcua-$(PYTHON3_OPCUA_VERSION) PYTHON3_OPCUA_SUFFIX := tar.gz -PYTHON3_OPCUA_URL := https://pypi.python.org/packages/7f/a5/238323697fb928bfc7f64193f00cb1cc315ad407fd5411f0110930dfca7c/$(PYTHON3_OPCUA).$(PYTHON3_OPCUA_SUFFIX)\#md5=$(PYTHON3_OPCUA_MD5) +PYTHON3_OPCUA_URL := https://files.pythonhosted.org/packages/source/o/opcua/$(PYTHON3_OPCUA).$(PYTHON3_OPCUA_SUFFIX) PYTHON3_OPCUA_SOURCE := $(SRCDIR)/$(PYTHON3_OPCUA).$(PYTHON3_OPCUA_SUFFIX) PYTHON3_OPCUA_DIR := $(BUILDDIR)/$(PYTHON3_OPCUA) PYTHON3_OPCUA_LICENSE := LGPL-3.0-only -- 2.24.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] ?==?utf-8?q? ?==?utf-8?q? [PATCH] polkit: build fails without HOST_GLIB
This is the error message: configure.ac:446: error: possibly undefined macro: AM_GLIB_GNU_GETTEXT If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. autoreconf: /mnt/root/platform-x86/sysroot-host/bin/autoconf failed with exit status: 1 /usr/local/lib/ptxdist-2019.10.1/rules/post/ptxd_make_world_extract.make:45: recipe for target '/mnt/root/platform-x86/state/polkit.extract.post' failed make: *** [/mnt/root/platform-x86/state/polkit.extract.post] Error 1 Artur On Friday, October 18, 2019 12:08 CEST, Michael Olbrich wrote: > It needs glib-mkenums, or is it something else? > > Michael > > On Thu, Oct 17, 2019 at 04:46:17PM +0200, Artur Wiebe wrote: > > Signed-off-by: Artur Wiebe > > --- > > rules/polkit.in | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/rules/polkit.in b/rules/polkit.in > > index 02e1a9671..4488ae300 100644 > > --- a/rules/polkit.in > > +++ b/rules/polkit.in > > @@ -8,6 +8,7 @@ menuconfig POLKIT > > select HOST_GTK_DOC > > select EXPAT > > select GLIB > > + select HOST_GLIB > > select SYSTEMD if POLKIT_SYSTEMD > > select SYSTEMD_LOGIND if POLKIT_SYSTEMD > > select ROOTFS_VAR_LIB if RUNTIME > > -- > > 2.23.0 > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > > > > -- > Pengutronix e.K. | | > Industrial Linux Solutions | http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | > > ___ > ptxdist mailing list > ptxdist@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] polkit: build fails without HOST_GLIB
Signed-off-by: Artur Wiebe --- rules/polkit.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/polkit.in b/rules/polkit.in index 02e1a9671..4488ae300 100644 --- a/rules/polkit.in +++ b/rules/polkit.in @@ -8,6 +8,7 @@ menuconfig POLKIT select HOST_GTK_DOC select EXPAT select GLIB + select HOST_GLIB select SYSTEMD if POLKIT_SYSTEMD select SYSTEMD_LOGIND if POLKIT_SYSTEMD select ROOTFS_VAR_LIB if RUNTIME -- 2.23.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] ?==?utf-8?q? ?==?utf-8?q? [ANNOUNCE] PTXdist 2019.10.1 released
Hi Michael, Unfortunately the kernel build fails if rootfs is included as initramfs. Please see the error message below. Best Regards, Artur # # Generate images/linuximage # PTXCONF_IMAGE_KERNEL_INITRAMFS=y PTXCONF_IMAGE_KERNEL_INSTALL_LATE=y # PTXCONF_IMAGE_KERNEL_LZOP is not set -- target: kernel.prepare -- Using config file: 'boot/configs/platform-x86/kernelconfig' make: Entering directory '/mnt/boot/platform-x86/build-target/linux-4.19.79' make[1]: Entering directory '/mnt/boot/platform-x86/build-target/linux-4.19.79-build' HOSTCC scripts/basic/fixdep GEN ./Makefile HOSTCC scripts/kconfig/conf.o YACCscripts/kconfig/zconf.tab.c LEX scripts/kconfig/zconf.lex.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --oldconfig Kconfig # # configuration written to .config # make[1]: Leaving directory '/mnt/boot/platform-x86/build-target/linux-4.19.79-build' make: Leaving directory '/mnt/boot/platform-x86/build-target/linux-4.19.79' touch: cannot touch '/mnt/boot/platform-x86/state-build/empty.cpio': No such file or directory /usr/local/lib/ptxdist-2019.10.1/rules/kernel.make:104: recipe for target '/mnt/boot/platform-x86/state/kernel.prepare' failed make: *** [/mnt/boot/platform-x86/state/kernel.prepare] Error 1 -- Dipl.-Ing. Artur Wiebe Software-Ingenieur Email: ar...@4wiebe.de Telefon: +491632699840 Web: artur.4wiebe.de Quellenstraße 49, 72124 Pliezhausen USt-IdNr: DE299286057 On Thursday, October 17, 2019 11:40 CEST, Michael Olbrich wrote: > Hi, > > I'm (not so) happy to announce that I've just released ptxdist-2019.10.1. > > This just fixes building images packages that have a config file. > > It's just one commit, but the shortlog below is as always below. > > Enjoy, > Michael Olbrich > > > Michael Olbrich (1): > ptxd_lib_dgen: fix _CONFIG handling > > -- > Pengutronix e.K. | | > Industrial Linux Solutions | http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] python3-tornado: version bump 6.0.2 → 6.0.3
Signed-off-by: Artur Wiebe --- rules/python3-tornado.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/python3-tornado.make b/rules/python3-tornado.make index b1d3507a7..350cf7de1 100644 --- a/rules/python3-tornado.make +++ b/rules/python3-tornado.make @@ -11,8 +11,8 @@ # PACKAGES-$(PTXCONF_PYTHON3_TORNADO) += python3-tornado -PYTHON3_TORNADO_VERSION:= 6.0.2 -PYTHON3_TORNADO_MD5:= 7d13a9ffbd232c7e89a8215e2cf0f5cd +PYTHON3_TORNADO_VERSION:= 6.0.3 +PYTHON3_TORNADO_MD5:= cab4b11480f6d032e46465586192d343 PYTHON3_TORNADO:= tornado-$(PYTHON3_TORNADO_VERSION) PYTHON3_TORNADO_SUFFIX := tar.gz PYTHON3_TORNADO_URL:= https://files.pythonhosted.org/packages/source/t/tornado/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX) -- 2.23.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] kexec-tools: version bump 2.0.16 -> 2.0.19
Signed-off-by: Artur Wiebe --- rules/kexec-tools.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/kexec-tools.make b/rules/kexec-tools.make index 89b86d28a..dc6866f24 100644 --- a/rules/kexec-tools.make +++ b/rules/kexec-tools.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_KEXEC_TOOLS) += kexec-tools # # Paths and names # -KEXEC_TOOLS_VERSION:= 2.0.16 -KEXEC_TOOLS_MD5:= b6bd3e0cc59ae0206ef0197b76a1f0b9 +KEXEC_TOOLS_VERSION:= 2.0.19 +KEXEC_TOOLS_MD5:= d399dc099fac5f384b429f09d79b2608 KEXEC_TOOLS:= kexec-tools-$(KEXEC_TOOLS_VERSION) KEXEC_TOOLS_SUFFIX := tar.xz KEXEC_TOOLS_URL:= $(call ptx/mirror, KERNEL, utils/kernel/kexec/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX)) -- 2.21.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] ?==?utf-8?q? ?==?utf-8?q? [PATCH] python3-tornado: version bump 5.1.1 →?==?utf-8?q? 6.0.2
Hi Michael, as noticed here: https://status.python.org/incidents/1y1f44q6srh2 Previously, files uploaded to PyPI were hosted with URLs like: https://pypi.python.org/packages/ And in the new PyPI, they are hosted with URLs like: https://files.pythonhosted.org/packages/... --2019-05-20 09:53:10-- https://pypi.io/packages/source/t/tornado/tornado-6.0.2.tar.gz Resolving pypi.io (pypi.io)... 2a04:4e42:400::223, 2a04:4e42::223, 2a04:4e42:600::223, ... Connecting to pypi.io (pypi.io)|2a04:4e42:400::223|:443... connected. HTTP request sent, awaiting response... 301 Redirect to Primary Domain Location: https://pypi.org/packages/source/t/tornado/tornado-6.0.2.tar.gz [following] --2019-05-20 09:53:10-- https://pypi.org/packages/source/t/tornado/tornado-6.0.2.tar.gz Resolving pypi.org (pypi.org)... 2a04:4e42::223, 2a04:4e42:200::223, 2a04:4e42:400::223, ... Connecting to pypi.org (pypi.org)|2a04:4e42::223|:443... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://files.pythonhosted.org/packages/source/t/tornado/tornado-6.0.2.tar.gz [following] --2019-05-20 09:53:11-- https://files.pythonhosted.org/packages/source/t/tornado/tornado-6.0.2.tar.gz Resolving files.pythonhosted.org (files.pythonhosted.org)... 2a04:4e42:1b::319, 151.101.113.63 Connecting to files.pythonhosted.org (files.pythonhosted.org)|2a04:4e42:1b::319|:443... connected. HTTP request sent, awaiting response... 302 Found Location: https://files.pythonhosted.org/packages/03/3f/5f89d99fca3c0100c8cede4f53f660b126d39e0d6a1e943e95cc3ed386fb/tornado-6.0.2.tar.gz [following] --2019-05-20 09:53:11-- https://files.pythonhosted.org/packages/03/3f/5f89d99fca3c0100c8cede4f53f660b126d39e0d6a1e943e95cc3ed386fb/tornado-6.0.2.tar.gz Reusing existing connection to [files.pythonhosted.org]:443. HTTP request sent, awaiting response... 200 OK Length: 481808 (471K) [binary/octet-stream] Artur -- Dipl.-Ing. Artur Wiebe Software-Ingenieur Email: ar...@4wiebe.de Telefon: +491632699840 Web: artur.4wiebe.de Quellenstraße 49, 72124 Pliezhausen USt-IdNr: DE299286057 On Monday, May 20, 2019 16:19 CEST, Michael Olbrich wrote: > On Mon, May 20, 2019 at 10:41:34AM +0200, Roland Hieber wrote: > > that looks like the same patch you sent earlier? > > The URL is different. > > > On Mon, May 20, 2019 at 10:02:51AM +0200, Artur Wiebe wrote: > > > Signed-off-by: Artur Wiebe > > > --- > > > rules/python3-tornado.make | 6 +++--- > > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/rules/python3-tornado.make b/rules/python3-tornado.make > > > index 37195f5ef..f4150f5e0 100644 > > > --- a/rules/python3-tornado.make > > > +++ b/rules/python3-tornado.make > > > @@ -13,11 +13,11 @@ > > > # > > > PACKAGES-$(PTXCONF_PYTHON3_TORNADO) += python3-tornado > > > > > > -PYTHON3_TORNADO_VERSION := 5.1.1 > > > -PYTHON3_TORNADO_MD5 := a1ce4f392d30ff0ebcb255150d89b826 > > > +PYTHON3_TORNADO_VERSION := 6.0.2 > > > +PYTHON3_TORNADO_MD5 := 7d13a9ffbd232c7e89a8215e2cf0f5cd > > > PYTHON3_TORNADO := tornado-$(PYTHON3_TORNADO_VERSION) > > > PYTHON3_TORNADO_SUFFIX := tar.gz > > > -PYTHON3_TORNADO_URL := > > > https://pypi.io/packages/source/t/tornado/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX) > > > +PYTHON3_TORNADO_URL := > > > https://files.pythonhosted.org/packages/source/t/tornado/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX) > > Please add to the commit message why the URL change is needed. > The old URL works for me with the new version. > > Michael > > > > PYTHON3_TORNADO_SOURCE := > > > $(SRCDIR)/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX) > > > PYTHON3_TORNADO_DIR := $(BUILDDIR)/$(PYTHON3_TORNADO) > > > PYTHON3_TORNADO_LICENSE := Apache-2.0 > > > -- > > > 2.21.0 > > > > > > > > > ___ > > > ptxdist mailing list > > > ptxdist@pengutronix.de > > > > -- > > Roland Hieber | r.hie...@pengutronix.de | > > Pengutronix e.K. | https://www.pengutronix.de/ | > > Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 | > > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > > -- > Pengutronix e.K. | | > Industrial Linux Solutions | http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | > > ___ > ptxdist mailing list > ptxdist@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] python3-tornado: version bump 5.1.1 → 6.0.2
Signed-off-by: Artur Wiebe --- rules/python3-tornado.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/python3-tornado.make b/rules/python3-tornado.make index 37195f5ef..f4150f5e0 100644 --- a/rules/python3-tornado.make +++ b/rules/python3-tornado.make @@ -13,11 +13,11 @@ # PACKAGES-$(PTXCONF_PYTHON3_TORNADO) += python3-tornado -PYTHON3_TORNADO_VERSION:= 5.1.1 -PYTHON3_TORNADO_MD5:= a1ce4f392d30ff0ebcb255150d89b826 +PYTHON3_TORNADO_VERSION:= 6.0.2 +PYTHON3_TORNADO_MD5:= 7d13a9ffbd232c7e89a8215e2cf0f5cd PYTHON3_TORNADO:= tornado-$(PYTHON3_TORNADO_VERSION) PYTHON3_TORNADO_SUFFIX := tar.gz -PYTHON3_TORNADO_URL:= https://pypi.io/packages/source/t/tornado/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX) +PYTHON3_TORNADO_URL:= https://files.pythonhosted.org/packages/source/t/tornado/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX) PYTHON3_TORNADO_SOURCE := $(SRCDIR)/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX) PYTHON3_TORNADO_DIR:= $(BUILDDIR)/$(PYTHON3_TORNADO) PYTHON3_TORNADO_LICENSE:= Apache-2.0 -- 2.21.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] /usr/lib/systemd/network/eth0.network: DHCP=v4 is deprecated, please use DHCP=ipv4 instead.
Signed-off-by: Artur Wiebe --- projectroot/usr/lib/systemd/network/eth0.network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projectroot/usr/lib/systemd/network/eth0.network b/projectroot/usr/lib/systemd/network/eth0.network index 78553268b..818a6bd5b 100644 --- a/projectroot/usr/lib/systemd/network/eth0.network +++ b/projectroot/usr/lib/systemd/network/eth0.network @@ -3,4 +3,4 @@ Name=eth0 KernelCommandLine=!root=/dev/nfs [Network] -DHCP=v4 +DHCP=ipv4 -- 2.21.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] python3-tornado: version bump 5.1.1 → 6.0.2
Signed-off-by: Artur Wiebe --- rules/python3-tornado.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/python3-tornado.make b/rules/python3-tornado.make index 37195f5ef..408916a2b 100644 --- a/rules/python3-tornado.make +++ b/rules/python3-tornado.make @@ -13,11 +13,11 @@ # PACKAGES-$(PTXCONF_PYTHON3_TORNADO) += python3-tornado -PYTHON3_TORNADO_VERSION:= 5.1.1 -PYTHON3_TORNADO_MD5:= a1ce4f392d30ff0ebcb255150d89b826 +PYTHON3_TORNADO_VERSION:= 6.0.2 +PYTHON3_TORNADO_MD5:= 7d13a9ffbd232c7e89a8215e2cf0f5cd PYTHON3_TORNADO:= tornado-$(PYTHON3_TORNADO_VERSION) PYTHON3_TORNADO_SUFFIX := tar.gz -PYTHON3_TORNADO_URL:= https://pypi.io/packages/source/t/tornado/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX) +PYTHON3_TORNADO_URL:= https://files.pythonhosted.org/packages/03/3f/5f89d99fca3c0100c8cede4f53f660b126d39e0d6a1e943e95cc3ed386fb/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX) PYTHON3_TORNADO_SOURCE := $(SRCDIR)/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX) PYTHON3_TORNADO_DIR:= $(BUILDDIR)/$(PYTHON3_TORNADO) PYTHON3_TORNADO_LICENSE:= Apache-2.0 -- 2.21.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] efibootmgr: new package
Signed-off-by: Artur Wiebe --- rules/efibootmgr.in | 12 + rules/efibootmgr.make | 57 +++ 2 files changed, 69 insertions(+) create mode 100644 rules/efibootmgr.in create mode 100644 rules/efibootmgr.make diff --git a/rules/efibootmgr.in b/rules/efibootmgr.in new file mode 100644 index 0..c48787120 --- /dev/null +++ b/rules/efibootmgr.in @@ -0,0 +1,12 @@ +## SECTION=shell_and_console + +config EFIBOOTMGR + tristate + select LIBPOPT + select EFIVAR + prompt "efibootmgr" + help + This is efibootmgr, a Linux user-space application to modify the + Intel Extensible Firmware Interface (EFI) Boot Manager. + This application can create and destroy boot entries, + change the boot order, change the next running boot option, and more. diff --git a/rules/efibootmgr.make b/rules/efibootmgr.make new file mode 100644 index 0..ca9b4b895 --- /dev/null +++ b/rules/efibootmgr.make @@ -0,0 +1,57 @@ +# -*-makefile-*- +# +# Copyright (C) 2018 by Artur Wiebe +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_EFIBOOTMGR) += efibootmgr + +# +# Paths and names +# +EFIBOOTMGR_VERSION := 16 +EFIBOOTMGR_MD5 := ab7cf46774fda951a0e8a40beb65a90e +EFIBOOTMGR := efibootmgr-$(EFIBOOTMGR_VERSION) +EFIBOOTMGR_SUFFIX := tar.bz2 +EFIBOOTMGR_URL := https://github.com/rhboot/efibootmgr/releases/download/$(EFIBOOTMGR_VERSION)/$(EFIBOOTMGR).$(EFIBOOTMGR_SUFFIX) +EFIBOOTMGR_SOURCE := $(SRCDIR)/$(EFIBOOTMGR).$(EFIBOOTMGR_SUFFIX) +EFIBOOTMGR_DIR := $(BUILDDIR)/$(EFIBOOTMGR) +EFIBOOTMGR_LICENSE := GPL-2.0-only + +# +# Prepare +# + +EFIBOOTMGR_CONF_TOOL := NO +EFIBOOTMGR_MAKE_ENV:= $(CROSS_ENV) +EFIBOOTMGR_MAKE_OPT:= EFIDIR="/boot/EFI" +EFIBOOTMGR_INSTALL_OPT := EFIDIR="/boot/EFI" install + +# +# Target-Install +# + +$(STATEDIR)/efibootmgr.targetinstall: + @$(call targetinfo) + + @$(call install_init, efibootmgr) + @$(call install_fixup, efibootmgr,PRIORITY,optional) + @$(call install_fixup, efibootmgr,SECTION,base) + @$(call install_fixup, efibootmgr,AUTHOR,"Artur Wiebe ") + @$(call install_fixup, efibootmgr,DESCRIPTION,missing) + + @$(call install_copy, efibootmgr, 0, 0, 0755, -, /usr/sbin/efibootmgr) + + @$(call install_finish, efibootmgr) + + @$(call touch) + + +# vim: syntax=make -- 2.19.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] efivar: new package
Signed-off-by: Artur Wiebe --- rules/efivar.in | 8 +++ rules/efivar.make | 59 +++ 2 files changed, 67 insertions(+) create mode 100644 rules/efivar.in create mode 100644 rules/efivar.make diff --git a/rules/efivar.in b/rules/efivar.in new file mode 100644 index 0..508e412aa --- /dev/null +++ b/rules/efivar.in @@ -0,0 +1,8 @@ +## SECTION=shell_and_console + +config EFIVAR + tristate + select LIBC_DL + prompt "efivar" + help + Tools and libraries to manipulate EFI variables diff --git a/rules/efivar.make b/rules/efivar.make new file mode 100644 index 0..105d5a902 --- /dev/null +++ b/rules/efivar.make @@ -0,0 +1,59 @@ +# -*-makefile-*- +# +# Copyright (C) 2018 by Artur Wiebe +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_EFIVAR) += efivar + +# +# Paths and names +# +EFIVAR_VERSION := 36 +EFIVAR_MD5 := e98140ab7105e90059dc57a67c8c07e9 +EFIVAR := efivar-$(EFIVAR_VERSION) +EFIVAR_SUFFIX := tar.bz2 +EFIVAR_URL := https://github.com/rhboot/efivar/releases/download/$(EFIVAR_VERSION)/$(EFIVAR).$(EFIVAR_SUFFIX) +EFIVAR_SOURCE := $(SRCDIR)/$(EFIVAR).$(EFIVAR_SUFFIX) +EFIVAR_DIR := $(BUILDDIR)/$(EFIVAR) +EFIVAR_LICENSE := LGPL-2.1-only + +# +# Prepare +# + +EFIVAR_CONF_TOOL := NO +EFIVAR_MAKE_ENV:= $(CROSS_ENV) +EFIVAR_INSTALL_OPT := libdir="/usr/lib/" install + +# +# Target-Install +# + +$(STATEDIR)/efivar.targetinstall: + @$(call targetinfo) + + @$(call install_init, efivar) + @$(call install_fixup, efivar,PRIORITY,optional) + @$(call install_fixup, efivar,SECTION,base) + @$(call install_fixup, efivar,AUTHOR,"Artur Wiebe ") + @$(call install_fixup, efivar,DESCRIPTION,missing) + + @$(call install_lib, efivar, 0, 0, 0644, libefivar) + @$(call install_lib, efivar, 0, 0, 0644, libefiboot) + + @$(call install_copy, efivar, 0, 0, 0755, -, /usr/bin/efivar) + + @$(call install_finish, efivar) + + @$(call touch) + + +# vim: syntax=make -- 2.19.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] group: added group 'render' (missed by udev)
Signed-off-by: Artur Wiebe --- projectroot/etc/group | 1 + 1 file changed, 1 insertion(+) diff --git a/projectroot/etc/group b/projectroot/etc/group index f11d2759c..ea6127b7a 100644 --- a/projectroot/etc/group +++ b/projectroot/etc/group @@ -26,4 +26,5 @@ systemd-network:x:202: systemd-journal-gateway:x:206: systemd-journal-remote:x:203: systemd-journal-upload:x:208: +render:x:209: nogroup:x:65534: -- 2.18.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] efibootmgr: new package
Signed-off-by: Artur Wiebe --- rules/efibootmgr.in | 12 + rules/efibootmgr.make | 103 ++ 2 files changed, 115 insertions(+) create mode 100644 rules/efibootmgr.in create mode 100644 rules/efibootmgr.make diff --git a/rules/efibootmgr.in b/rules/efibootmgr.in new file mode 100644 index 0..c48787120 --- /dev/null +++ b/rules/efibootmgr.in @@ -0,0 +1,12 @@ +## SECTION=shell_and_console + +config EFIBOOTMGR + tristate + select LIBPOPT + select EFIVAR + prompt "efibootmgr" + help + This is efibootmgr, a Linux user-space application to modify the + Intel Extensible Firmware Interface (EFI) Boot Manager. + This application can create and destroy boot entries, + change the boot order, change the next running boot option, and more. diff --git a/rules/efibootmgr.make b/rules/efibootmgr.make new file mode 100644 index 0..86df9ab16 --- /dev/null +++ b/rules/efibootmgr.make @@ -0,0 +1,103 @@ +# -*-makefile-*- +# +# Copyright (C) 2018 by Artur Wiebe +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_EFIBOOTMGR) += efibootmgr + +# +# Paths and names +# +EFIBOOTMGR_VERSION := 16 +EFIBOOTMGR_MD5 := ab7cf46774fda951a0e8a40beb65a90e +EFIBOOTMGR := efibootmgr-$(EFIBOOTMGR_VERSION) +EFIBOOTMGR_SUFFIX := tar.bz2 +EFIBOOTMGR_URL := https://github.com/rhboot/efibootmgr/releases/download/$(EFIBOOTMGR_VERSION)/$(EFIBOOTMGR).$(EFIBOOTMGR_SUFFIX) +EFIBOOTMGR_SOURCE := $(SRCDIR)/$(EFIBOOTMGR).$(EFIBOOTMGR_SUFFIX) +EFIBOOTMGR_DIR := $(BUILDDIR)/$(EFIBOOTMGR) +EFIBOOTMGR_LICENSE := GPL-2.0-only + +# +# Get +# + +#$(EFIBOOTMGR_SOURCE): +# @$(call targetinfo) +# @$(call get, EFIBOOTMGR) + +# +# Prepare +# + +EFIBOOTMGR_MAKE_ENV:= $(CROSS_ENV) +EFIBOOTMGR_MAKE_OPT:= EFIDIR="/boot/EFI" +EFIBOOTMGR_INSTALL_OPT := EFIDIR="/boot/EFI" install + +# +# autoconf +# +EFIBOOTMGR_CONF_TOOL := NO +#EFIBOOTMGR_CONF_OPT := $(CROSS_AUTOCONF_USR) + +#$(STATEDIR)/efibootmgr.prepare: +# @$(call targetinfo) +# @$(call clean, $(EFIBOOTMGR_DIR)/config.cache) +# cd $(EFIBOOTMGR_DIR) && \ +# $(EFIBOOTMGR_PATH) $(EFIBOOTMGR_ENV) \ +# ./configure $(EFIBOOTMGR_CONF_OPT) +# @$(call touch) + +# +# Compile +# + +#$(STATEDIR)/efibootmgr.compile: +# @$(call targetinfo) +# @$(call world/compile, EFIBOOTMGR) +# @$(call touch) + +# +# Install +# + +#$(STATEDIR)/efibootmgr.install: +# @$(call targetinfo) +# @$(call world/install, EFIBOOTMGR) +# @$(call touch) + +# +# Target-Install +# + +$(STATEDIR)/efibootmgr.targetinstall: + @$(call targetinfo) + + @$(call install_init, efibootmgr) + @$(call install_fixup, efibootmgr,PRIORITY,optional) + @$(call install_fixup, efibootmgr,SECTION,base) + @$(call install_fixup, efibootmgr,AUTHOR,"Artur Wiebe ") + @$(call install_fixup, efibootmgr,DESCRIPTION,missing) + + @$(call install_copy, efibootmgr, 0, 0, 0755, -, /usr/sbin/efibootmgr) + + @$(call install_finish, efibootmgr) + + @$(call touch) + +# +# Clean +# + +#$(STATEDIR)/efibootmgr.clean: +# @$(call targetinfo) +# @$(call clean_pkg, EFIBOOTMGR) + +# vim: syntax=make -- 2.18.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] efivar: new package
Signed-off-by: Artur Wiebe --- rules/efivar.in | 8 rules/efivar.make | 105 ++ 2 files changed, 113 insertions(+) create mode 100644 rules/efivar.in create mode 100644 rules/efivar.make diff --git a/rules/efivar.in b/rules/efivar.in new file mode 100644 index 0..86f944107 --- /dev/null +++ b/rules/efivar.in @@ -0,0 +1,8 @@ +## SECTION=shell_and_console + +config EFIVAR + tristate + select GLIBC_DL + prompt "efivar" + help + Tools and libraries to manipulate EFI variables diff --git a/rules/efivar.make b/rules/efivar.make new file mode 100644 index 0..6aae4807e --- /dev/null +++ b/rules/efivar.make @@ -0,0 +1,105 @@ +# -*-makefile-*- +# +# Copyright (C) 2018 by Artur Wiebe +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_EFIVAR) += efivar + +# +# Paths and names +# +EFIVAR_VERSION := 36 +EFIVAR_MD5 := e98140ab7105e90059dc57a67c8c07e9 +EFIVAR := efivar-$(EFIVAR_VERSION) +EFIVAR_SUFFIX := tar.bz2 +EFIVAR_URL := https://github.com/rhboot/efivar/releases/download/$(EFIVAR_VERSION)/$(EFIVAR).$(EFIVAR_SUFFIX) +EFIVAR_SOURCE := $(SRCDIR)/$(EFIVAR).$(EFIVAR_SUFFIX) +EFIVAR_DIR := $(BUILDDIR)/$(EFIVAR) +EFIVAR_LICENSE := LGPL-2.1-only + +# +# Get +# + +#$(EFIVAR_SOURCE): +# @$(call targetinfo) +# @$(call get, EFIVAR) + +# +# Prepare +# + +EFIVAR_MAKE_ENV:= $(CROSS_ENV) +EFIVAR_INSTALL_OPT := libdir="/usr/lib/" install + +# +# autoconf +# +EFIVAR_CONF_TOOL := NO +#EFIVAR_CONF_OPT := $(CROSS_AUTOCONF_USR) + +#$(STATEDIR)/efivar.prepare: +# @$(call targetinfo) +# @$(call clean, $(EFIVAR_DIR)/config.cache) +# cd $(EFIVAR_DIR) && \ +# $(EFIVAR_PATH) $(EFIVAR_ENV) \ +# ./configure $(EFIVAR_CONF_OPT) +# @$(call touch) + +# +# Compile +# + +#$(STATEDIR)/efivar.compile: +# @$(call targetinfo) +# @$(call world/compile, EFIVAR) +# @$(call touch) + +# +# Install +# + +#$(STATEDIR)/efivar.install: +# @$(call targetinfo) +# @$(call world/install, EFIVAR) +# @$(call touch) + +# +# Target-Install +# + +$(STATEDIR)/efivar.targetinstall: + @$(call targetinfo) + + @$(call install_init, efivar) + @$(call install_fixup, efivar,PRIORITY,optional) + @$(call install_fixup, efivar,SECTION,base) + @$(call install_fixup, efivar,AUTHOR,"Artur Wiebe ") + @$(call install_fixup, efivar,DESCRIPTION,missing) + + @$(call install_lib, efivar, 0, 0, 0644, libefivar) + @$(call install_lib, efivar, 0, 0, 0644, libefiboot) + + @$(call install_copy, efivar, 0, 0, 0755, -, /usr/bin/efivar) + + @$(call install_finish, efivar) + + @$(call touch) + +# +# Clean +# + +#$(STATEDIR)/efivar.clean: +# @$(call targetinfo) +# @$(call clean_pkg, EFIVAR) + +# vim: syntax=make -- 2.18.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] python3-pytz: use system timezone data
Signed-off-by: Artur Wiebe --- .../0001-use-system-timezone-data.patch | 40 +++ patches/pytz-2018.5/series| 1 + rules/python3-pytz.in | 1 + rules/python3-pytz.make | 2 +- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 patches/pytz-2018.5/0001-use-system-timezone-data.patch create mode 100644 patches/pytz-2018.5/series diff --git a/patches/pytz-2018.5/0001-use-system-timezone-data.patch b/patches/pytz-2018.5/0001-use-system-timezone-data.patch new file mode 100644 index 0..def117ee7 --- /dev/null +++ b/patches/pytz-2018.5/0001-use-system-timezone-data.patch @@ -0,0 +1,40 @@ +From 09acc56fe52e53042c8d2dcb458b017de55a626d Mon Sep 17 00:00:00 2001 +From: Artur Wiebe +Date: Tue, 11 Sep 2018 10:07:27 +0200 +Subject: [PATCH] use system timezone data + +--- + pytz/__init__.py | 2 +- + pytz/tzfile.py | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/pytz/__init__.py b/pytz/__init__.py +index 120fab4..006db4d 100644 +--- a/pytz/__init__.py b/pytz/__init__.py +@@ -91,7 +91,7 @@ def open_resource(name): + if zoneinfo_dir is not None: + filename = os.path.join(zoneinfo_dir, *name_parts) + else: +-filename = os.path.join(os.path.dirname(__file__), ++filename = os.path.join('/usr','share', + 'zoneinfo', *name_parts) + if not os.path.exists(filename): + # http://bugs.launchpad.net/bugs/383171 - we avoid using this +diff --git a/pytz/tzfile.py b/pytz/tzfile.py +index 25117f3..e06ce77 100644 +--- a/pytz/tzfile.py b/pytz/tzfile.py +@@ -126,7 +126,8 @@ def build_tzinfo(zone, fp): + if __name__ == '__main__': + import os.path + from pprint import pprint +-base = os.path.join(os.path.dirname(__file__), 'zoneinfo') ++# use system timezone data ++base = '/usr/share/zoneinfo' + tz = build_tzinfo('Australia/Melbourne', + open(os.path.join(base, 'Australia', 'Melbourne'), 'rb')) + tz = build_tzinfo('US/Eastern', +-- +2.18.0 + diff --git a/patches/pytz-2018.5/series b/patches/pytz-2018.5/series new file mode 100644 index 0..f205d3297 --- /dev/null +++ b/patches/pytz-2018.5/series @@ -0,0 +1 @@ +0001-use-system-timezone-data.patch diff --git a/rules/python3-pytz.in b/rules/python3-pytz.in index d2aff7acf..24146309c 100644 --- a/rules/python3-pytz.in +++ b/rules/python3-pytz.in @@ -4,6 +4,7 @@ config PYTHON3_PYTZ tristate select PYTHON3 select HOST_PYTHON3_SETUPTOOLS + select TIMEZONE if RUNTIME prompt "pytz" help pytz brings the Olson tz database into Python. diff --git a/rules/python3-pytz.make b/rules/python3-pytz.make index c054ab850..538bc7a46 100644 --- a/rules/python3-pytz.make +++ b/rules/python3-pytz.make @@ -42,7 +42,7 @@ $(STATEDIR)/python3-pytz.targetinstall: @$(call install_fixup,python3-pytz,DESCRIPTION,missing) @$(call install_glob, python3-pytz, 0, 0, -, \ - /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/pytz,, *.py) + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/pytz,, *.py */zoneinfo*) @$(call install_finish,python3-pytz) -- 2.18.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] ?==?utf-8?q? ?==?utf-8?q? [PATCH 1/4]?==?utf-8?q? python3-lxml: new package
Hi Roland, I copied that scheme from one of the existing packages. But looks like it is not needed any more. If you really want, I'll remove the md5 suffix... Artur grep -r "\#md5=\$(PYTHON3" rules/* rules/python3-aiohttp-json-rpc.make:PYTHON3_AIOHTTP_JSON_RPC_URL := https://pypi.python.org/packages/3b/a8/04a2b02bb68b8a7f9eff84ab2241fba8df14a2796613a830a70b8eeecaa6/$(PYTHON3_AIOHTTP_JSON_RPC).$(PYTHON3_AIOHTTP_JSON_RPC_SUFFIX)\#md5=$(PYTHON3_AIOHTTP_JSON_RPC_MD5) rules/python3-dateutil.make:PYTHON3_DATEUTIL_URL:= https://pypi.python.org/packages/a0/b0/a4e3241d2dee665fea11baec21389aec6886655cd4db7647ddf96c3fad15/$(PYTHON3_DATEUTIL).$(PYTHON3_DATEUTIL_SUFFIX)\#md5=$(PYTHON3_DATEUTIL_MD5) rules/python3-decorator.make:PYTHON3_DECORATOR_URL := https://pypi.python.org/packages/source/d/decorator/$(PYTHON3_DECORATOR).$(PYTHON3_DECORATOR_SUFFIX)#md5=$(PYTHON3_DECORATOR_MD5) rules/python3-ipython-genutils.make:PYTHON3_IPYTHON_GENUTILS_URL := https://pypi.python.org/packages/source/i/ipython_genutils/$(PYTHON3_IPYTHON_GENUTILS).$(PYTHON3_IPYTHON_GENUTILS_SUFFIX)\#md5=$(PYTHON3_IPYTHON_GENUTILS_MD5) rules/python3-lxml.make:PYTHON3_LXML_URL:= https://pypi.python.org/packages/ca/63/139b710671c1655aed3b20c1e6776118c62e9f9311152f4c6031e12a0554/$(PYTHON3_LXML).$(PYTHON3_LXML_SUFFIX)\#md5=$(PYTHON3_LXML_MD5) rules/python3-msgpack.make:PYTHON3_MSGPACK_URL := https://pypi.python.org/packages/21/27/8a1d82041c7a2a51fcc73675875a5f9ea06c2663e02fcfeb708be1d081a0/$(PYTHON3_MSGPACK).$(PYTHON3_MSGPACK_SUFFIX)\#md5=$(PYTHON3_MSGPACK_MD5) rules/python3-opcua.make:PYTHON3_OPCUA_URL := https://pypi.python.org/packages/7f/a5/238323697fb928bfc7f64193f00cb1cc315ad407fd5411f0110930dfca7c/$(PYTHON3_OPCUA).$(PYTHON3_OPCUA_SUFFIX)\#md5=$(PYTHON3_OPCUA_MD5) rules/python3-path-py.make:PYTHON3_PATH_PY_URL := https://pypi.python.org/packages/source/p/path.py/$(PYTHON3_PATH_PY).$(PYTHON3_PATH_PY_SUFFIX)\#md5=$(PYTHON3_PATH_PY_MD5) rules/python3-pexpect.make:PYTHON3_PEXPECT_URL := https://pypi.python.org/packages/source/p/pexpect/$(PYTHON3_PEXPECT).$(PYTHON3_PEXPECT_SUFFIX)\#md5=$(PYTHON3_PEXPECT_MD5) rules/python3-pickleshare.make:PYTHON3_PICKLESHARE_URL := https://pypi.python.org/packages/source/p/pickleshare/$(PYTHON3_PICKLESHARE).$(PYTHON3_PICKLESHARE_SUFFIX)\#md5=$(PYTHON3_PICKLESHARE_MD5) rules/python3-ptyprocess.make:PYTHON3_PTYPROCESS_URL:= https://pypi.python.org/packages/source/p/ptyprocess/$(PYTHON3_PTYPROCESS).$(PYTHON3_PTYPROCESS_SUFFIX)\#md5=$(PYTHON3_PTYPROCESS_MD5) rules/python3-pytz.make:PYTHON3_PYTZ_URL:= https://pypi.python.org/packages/ca/a9/62f96decb1e309d6300ebe7eee9acfd7bccaeedd693794437005b9067b44/$(PYTHON3_PYTZ).$(PYTHON3_PYTZ_SUFFIX)\#md5=$(PYTHON3_PYTZ_MD5) rules/python3-simplegeneric.make:PYTHON3_SIMPLEGENERIC_URL := https://pypi.python.org/packages/source/s/simplegeneric/$(PYTHON3_SIMPLEGENERIC).$(PYTHON3_SIMPLEGENERIC_SUFFIX)\#md5=$(PYTHON3_SIMPLEGENERIC_MD5) rules/python3-tornado.make:PYTHON3_TORNADO_URL := https://pypi.python.org/packages/df/42/a180ee540e12e2ec1007ac82a42b09dd92e5461e09c98bf465e98646d187/$(PYTHON3_TORNADO).$(PYTHON3_TORNADO_SUFFIX)\#md5=$(PYTHON3_TORNADO_MD5) rules/python3-traitlets.make:PYTHON3_TRAITLETS_URL := https://pypi.python.org/packages/source/t/traitlets/$(PYTHON3_TRAITLETS).$(PYTHON3_TRAITLETS_SUFFIX)\#md5=$(PYTHON3_TRAITLETS_MD5) On Tuesday, September 04, 2018 15:33 CEST, Roland Hieber wrote: > On Fri, Aug 31, 2018 at 07:39:17PM +0200, Artur Wiebe wrote: > [...] > > diff --git a/rules/python3-lxml.make b/rules/python3-lxml.make > > new file mode 100644 > > index 0..70fadc372 > > --- /dev/null > > +++ b/rules/python3-lxml.make > > @@ -0,0 +1,51 @@ > > +# -*-makefile-*- > > +# > > +# Copyright (C) 2018 by Artur Wiebe > > +# > > +# See CREDITS for details about who has contributed to this project. > > +# > > +# For further information about the PTXdist project and license conditions > > +# see the README file. > > +# > > + > > +# > > +# We provide this package > > +# > > +PACKAGES-$(PTXCONF_PYTHON3_LXML) += python3-lxml > > + > > +PYTHON3_LXML_VERSION := 4.2.4 > > +PYTHON3_LXML_MD5 := 31239400ca4e130b69993bb3c14204b3 > > +PYTHON3_LXML := lxml-$(PYTHON3_LXML_VERSION) > > +PYTHON3_LXML_SUFFIX:= tar.gz > > +PYTHON3_LXML_URL := > > https://pypi.python.org/packages/ca/63/139b710671c1655aed3b20c1e6776118c62e9f9311152f4c6031e12a0554/$(PYTHON3_LXML).$(PYTHON3_LXML_SUFFIX)\#md5=$(PYTHON3_LXML_MD5) > > That URL looks unusual. What does the '\#md5=..." at the end do? > `ptxdist get` does not seem to use it at all. Same for the other > pypy packages in your ser
[ptxdist] [PATCH 4/4] python3-opcua: new package
Signed-off-by: Artur Wiebe --- rules/python3-opcua.in | 17 ++ rules/python3-opcua.make | 51 2 files changed, 68 insertions(+) create mode 100644 rules/python3-opcua.in create mode 100644 rules/python3-opcua.make diff --git a/rules/python3-opcua.in b/rules/python3-opcua.in new file mode 100644 index 0..0c0772247 --- /dev/null +++ b/rules/python3-opcua.in @@ -0,0 +1,17 @@ +## SECTION=python3 + +config PYTHON3_OPCUA + tristate + select PYTHON3 + select HOST_PYTHON3_SETUPTOOLS + select PYTHON3_DATEUTIL + select PYTHON3_PYTZ + select PYTHON3_LXML + prompt "OPC-UA" + help + OPC Unified Architecture (OPC UA) is a machine to machine + communication protocol for industrial automation + developed by the OPC Foundation. + https://github.com/FreeOpcUa/python-opcua + + diff --git a/rules/python3-opcua.make b/rules/python3-opcua.make new file mode 100644 index 0..9c542c908 --- /dev/null +++ b/rules/python3-opcua.make @@ -0,0 +1,51 @@ +# -*-makefile-*- +# +# Copyright (C) 2018 by Artur Wiebe +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_OPCUA) += python3-opcua + +PYTHON3_OPCUA_VERSION := 0.98.5 +PYTHON3_OPCUA_MD5 := 38c7fce58838117389e939157116c7c3 +PYTHON3_OPCUA := opcua-$(PYTHON3_OPCUA_VERSION) +PYTHON3_OPCUA_SUFFIX := tar.gz +PYTHON3_OPCUA_URL := https://pypi.python.org/packages/7f/a5/238323697fb928bfc7f64193f00cb1cc315ad407fd5411f0110930dfca7c/$(PYTHON3_OPCUA).$(PYTHON3_OPCUA_SUFFIX)\#md5=$(PYTHON3_OPCUA_MD5) +PYTHON3_OPCUA_SOURCE := $(SRCDIR)/$(PYTHON3_OPCUA).$(PYTHON3_OPCUA_SUFFIX) +PYTHON3_OPCUA_DIR := $(BUILDDIR)/$(PYTHON3_OPCUA) +PYTHON3_OPCUA_LICENSE := LGPL-3.0-only + +# +# Prepare +# + +PYTHON3_OPCUA_CONF_TOOL:= python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-opcua.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-opcua) + @$(call install_fixup,python3-opcua,PRIORITY,optional) + @$(call install_fixup,python3-opcua,SECTION,base) + @$(call install_fixup,python3-opcua,AUTHOR,"Artur Wiebe ") + @$(call install_fixup,python3-opcua,DESCRIPTION,missing) + + @$(call install_glob, python3-opcua, 0, 0, -, \ + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/opcua,, *.py) + + @$(call install_finish,python3-opcua) + + @$(call touch) + +# vim: syntax=make -- 2.18.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 3/4] python3-dateutil: new package
Signed-off-by: Artur Wiebe --- rules/python3-dateutil.in | 11 rules/python3-dateutil.make | 51 + 2 files changed, 62 insertions(+) create mode 100644 rules/python3-dateutil.in create mode 100644 rules/python3-dateutil.make diff --git a/rules/python3-dateutil.in b/rules/python3-dateutil.in new file mode 100644 index 0..7d38bd32a --- /dev/null +++ b/rules/python3-dateutil.in @@ -0,0 +1,11 @@ +## SECTION=python3 + +config PYTHON3_DATEUTIL + tristate + select PYTHON3 + select HOST_PYTHON3_SETUPTOOLS_SCM + select PYTHON3_SIX + prompt "dateutil" + help + The dateutil module provides powerful extensions to the + standard datetime module, available in Python. diff --git a/rules/python3-dateutil.make b/rules/python3-dateutil.make new file mode 100644 index 0..afed49c08 --- /dev/null +++ b/rules/python3-dateutil.make @@ -0,0 +1,51 @@ +# -*-makefile-*- +# +# Copyright (C) 2018 by Artur Wiebe +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_DATEUTIL) += python3-dateutil + +PYTHON3_DATEUTIL_VERSION := 2.7.3 +PYTHON3_DATEUTIL_MD5 := 175b7c1a3cc0cb01151eced07c61c0b8 +PYTHON3_DATEUTIL := python-dateutil-$(PYTHON3_DATEUTIL_VERSION) +PYTHON3_DATEUTIL_SUFFIX:= tar.gz +PYTHON3_DATEUTIL_URL := https://pypi.python.org/packages/a0/b0/a4e3241d2dee665fea11baec21389aec6886655cd4db7647ddf96c3fad15/$(PYTHON3_DATEUTIL).$(PYTHON3_DATEUTIL_SUFFIX)\#md5=$(PYTHON3_DATEUTIL_MD5) +PYTHON3_DATEUTIL_SOURCE:= $(SRCDIR)/$(PYTHON3_DATEUTIL).$(PYTHON3_DATEUTIL_SUFFIX) +PYTHON3_DATEUTIL_DIR := $(BUILDDIR)/$(PYTHON3_DATEUTIL) +PYTHON3_DATEUTIL_LICENSE := Apache-2.0 + +# +# Prepare +# + +PYTHON3_DATEUTIL_CONF_TOOL := python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-dateutil.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-dateutil) + @$(call install_fixup,python3-dateutil,PRIORITY,optional) + @$(call install_fixup,python3-dateutil,SECTION,base) + @$(call install_fixup,python3-dateutil,AUTHOR,"Artur Wiebe ") + @$(call install_fixup,python3-dateutil,DESCRIPTION,missing) + + @$(call install_glob, python3-dateutil, 0, 0, -, \ + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/dateutil,, *.py) + + @$(call install_finish,python3-dateutil) + + @$(call touch) + +# vim: syntax=make -- 2.18.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/4] python3-pytz: new package
Signed-off-by: Artur Wiebe --- rules/python3-pytz.in | 13 +++ rules/python3-pytz.make | 51 + 2 files changed, 64 insertions(+) create mode 100644 rules/python3-pytz.in create mode 100644 rules/python3-pytz.make diff --git a/rules/python3-pytz.in b/rules/python3-pytz.in new file mode 100644 index 0..d2aff7acf --- /dev/null +++ b/rules/python3-pytz.in @@ -0,0 +1,13 @@ +## SECTION=python3 + +config PYTHON3_PYTZ + tristate + select PYTHON3 + select HOST_PYTHON3_SETUPTOOLS + prompt "pytz" + help + pytz brings the Olson tz database into Python. + This library allows accurate and cross platform timezone calculations + using Python 2.4 or higher. It also solves the issue of ambiguous + times at the end of daylight saving time, which you can read + more about in the Python Library Reference (datetime.tzinfo). diff --git a/rules/python3-pytz.make b/rules/python3-pytz.make new file mode 100644 index 0..c054ab850 --- /dev/null +++ b/rules/python3-pytz.make @@ -0,0 +1,51 @@ +# -*-makefile-*- +# +# Copyright (C) 2018 by Artur Wiebe +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_PYTZ) += python3-pytz + +PYTHON3_PYTZ_VERSION := 2018.5 +PYTHON3_PYTZ_MD5 := 45409cbfa3927bdd2f3ee914dd5b1060 +PYTHON3_PYTZ := pytz-$(PYTHON3_PYTZ_VERSION) +PYTHON3_PYTZ_SUFFIX:= tar.gz +PYTHON3_PYTZ_URL := https://pypi.python.org/packages/ca/a9/62f96decb1e309d6300ebe7eee9acfd7bccaeedd693794437005b9067b44/$(PYTHON3_PYTZ).$(PYTHON3_PYTZ_SUFFIX)\#md5=$(PYTHON3_PYTZ_MD5) +PYTHON3_PYTZ_SOURCE:= $(SRCDIR)/$(PYTHON3_PYTZ).$(PYTHON3_PYTZ_SUFFIX) +PYTHON3_PYTZ_DIR := $(BUILDDIR)/$(PYTHON3_PYTZ) +PYTHON3_PYTZ_LICENSE := MIT + +# +# Prepare +# + +PYTHON3_PYTZ_CONF_TOOL:= python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-pytz.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-pytz) + @$(call install_fixup,python3-pytz,PRIORITY,optional) + @$(call install_fixup,python3-pytz,SECTION,base) + @$(call install_fixup,python3-pytz,AUTHOR,"Artur Wiebe ") + @$(call install_fixup,python3-pytz,DESCRIPTION,missing) + + @$(call install_glob, python3-pytz, 0, 0, -, \ + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/pytz,, *.py) + + @$(call install_finish,python3-pytz) + + @$(call touch) + +# vim: syntax=make -- 2.18.0 ___ ptxdist mailing list ptxdist@pengutronix.de