Re: [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331
On Tue, Aug 04, 2020 at 04:56:28PM +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > --- > rules/glslang.in | 1 + > rules/glslang.make| 8 > rules/host-glslang.in | 1 + > 3 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/rules/glslang.in b/rules/glslang.in > index c2a660243d31..fba48e79e857 100644 > --- a/rules/glslang.in > +++ b/rules/glslang.in > @@ -4,6 +4,7 @@ menuconfig GLSLANG > tristate > prompt "glslang" > select HOST_CMAKE > + select HOST_SYSTEM_PYTHON3 > help > Khronos-reference SPIR-V generator > > diff --git a/rules/glslang.make b/rules/glslang.make > index ada329737ce1..904517d1a8ce 100644 > --- a/rules/glslang.make > +++ b/rules/glslang.make > @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang > # > # Paths and names > # > -GLSLANG_VERSION := 2020-05-27-ge00d27c6d65b > -GLSLANG_MD5 := 88f06a4835895a46fa073035084b0f48 > +GLSLANG_VERSION := 2020-07-23-g3ee5f2f1d331 > +GLSLANG_MD5 := 63686ec05a51d7c8c80fff79277924a7 > GLSLANG := glslang-$(GLSLANG_VERSION) > GLSLANG_SUFFIX := tar.gz > GLSLANG_URL := > https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) > GLSLANG_SOURCE := $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX) > GLSLANG_DIR := $(BUILDDIR)/$(GLSLANG) > -GLSLANG_LICENSE := BSD-3-clause AND MIT AND Apple-MIT-License > -GLSLANG_LICENSE_FILES := > file://LICENSE.txt;md5=918e668376010a04448a312fb37ae69b > +GLSLANG_LICENSE := BSD-3-clause AND BSD-2-clause AND MIT AND > Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH > Bison-exception-2.2) > +GLSLANG_LICENSE_FILES := > file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229 You need to update the license data in shaderc as well. Maybe don't hardcode it but reuse this. $(subst file://,file://third_party/glslang/,$(GLSLANG_LICENSE_FILES)) Michael > > # > > # Prepare > diff --git a/rules/host-glslang.in b/rules/host-glslang.in > index 69f255572c2b..8ef31f52937a 100644 > --- a/rules/host-glslang.in > +++ b/rules/host-glslang.in > @@ -4,3 +4,4 @@ config HOST_GLSLANG > tristate > default y if ALLYES > select HOST_CMAKE > + select HOST_SYSTEM_PYTHON3 > -- > 2.20.1 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v2] gpsd: version bump 3.20 -> 3.21
License checksum changed as '(c)' was removed from text, no
changes otherwise.
Also remove vanished options and modify systemd service files
to expect gpsd socket in /run.
Signed-off-by: Ladislav Michl
---
CHANGES:
v2: document license change
...ce-custom-CheckSizeOf-with-standard-.patch | 74
...s-install-xpgs-xgpsspeed-programs-ma.patch | 148 ---
...s-install-xgps-.-Only-test-if-deps-f.patch | 108 ---
...sizeof-time_t-test-when-cross-compil.patch | 39
...ix-merging-and-using-of-python-flags.patch | 45 -
...-Remove-redundant-CheckHeaderDefines.patch | 52 --
...emove-redundant-CheckCompilerDefines.patch | 67 ---
...thonValue-and-CheckPKG-were-using-wr.patch | 44 -
...ruct-Fix-GetPythonValue-for-python-3.patch | 57 --
...move-more-checks-into-GetPythonValue.patch | 98 --
...-target-python-version-not-scons-pyt.patch | 32
...ify-GetPythonValue-.-It-now-caches-p.patch | 174 --
...3-SConstruct-fix-polystr-for-python2.patch | 34
...arget_python-when-constructing-exten.patch | 36
...SConstruct-HACK-use-target-INCLUDEPY.patch | 25 ---
patches/gpsd-3.20/series | 20 --
.../0001-Search-for-ncursesw-pkgconfig.patch} | 6 +-
...arget-option-to-decide-whenewer-to-r.patch | 21 +++
patches/gpsd-3.21/series | 5 +
.../usr/lib/systemd/system/gpsd.socket| 2 +-
.../usr/lib/systemd/system/gpsdctl@.service | 2 +-
rules/gpsd.in | 12 --
rules/gpsd.make | 15 +-
23 files changed, 38 insertions(+), 1078 deletions(-)
delete mode 100644
patches/gpsd-3.20/0001-SConstruct-replace-custom-CheckSizeOf-with-standard-.patch
delete mode 100644
patches/gpsd-3.20/0002-SConstruct-Always-install-xpgs-xgpsspeed-programs-ma.patch
delete mode 100644
patches/gpsd-3.20/0003-SConstruct-Always-install-xgps-.-Only-test-if-deps-f.patch
delete mode 100644
patches/gpsd-3.20/0004-SConstruct-Skip-sizeof-time_t-test-when-cross-compil.patch
delete mode 100644
patches/gpsd-3.20/0005-Fix-merging-and-using-of-python-flags.patch
delete mode 100644
patches/gpsd-3.20/0006-SConstruct-Remove-redundant-CheckHeaderDefines.patch
delete mode 100644
patches/gpsd-3.20/0007-SConstruct-remove-redundant-CheckCompilerDefines.patch
delete mode 100644
patches/gpsd-3.20/0008-SConstruct-GetPythonValue-and-CheckPKG-were-using-wr.patch
delete mode 100644
patches/gpsd-3.20/0009-SConstruct-Fix-GetPythonValue-for-python-3.patch
delete mode 100644
patches/gpsd-3.20/0010-SConstruct-move-more-checks-into-GetPythonValue.patch
delete mode 100644
patches/gpsd-3.20/0011-SConstruct-Check-target-python-version-not-scons-pyt.patch
delete mode 100644
patches/gpsd-3.20/0012-SConstruct-Simplify-GetPythonValue-.-It-now-caches-p.patch
delete mode 100644
patches/gpsd-3.20/0013-SConstruct-fix-polystr-for-python2.patch
delete mode 100644
patches/gpsd-3.20/0100-SConstruct-Use-target_python-when-constructing-exten.patch
delete mode 100644
patches/gpsd-3.20/0102-SConstruct-HACK-use-target-INCLUDEPY.patch
delete mode 100644 patches/gpsd-3.20/series
rename patches/{gpsd-3.20/0101-SConstruct-Search-for-ncursesw-pkgconfig.patch
=> gpsd-3.21/0001-Search-for-ncursesw-pkgconfig.patch} (86%)
create mode 100644
patches/gpsd-3.21/0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch
create mode 100644 patches/gpsd-3.21/series
diff --git
a/patches/gpsd-3.20/0001-SConstruct-replace-custom-CheckSizeOf-with-standard-.patch
b/patches/gpsd-3.20/0001-SConstruct-replace-custom-CheckSizeOf-with-standard-.patch
deleted file mode 100644
index 0d5771bbe..0
---
a/patches/gpsd-3.20/0001-SConstruct-replace-custom-CheckSizeOf-with-standard-.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: "Gary E. Miller"
-Date: Fri, 3 Jan 2020 16:15:53 -0800
-Subject: [PATCH] SConstruct: replace custom CheckSizeOf() with standard
- CheckTypeSize()
-
- SConstruct | 40 ++--
- 1 file changed, 2 insertions(+), 38 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 33e0ff32665c..bd008207011d 100644
a/SConstruct
-+++ b/SConstruct
-@@ -597,42 +597,6 @@ def CheckHeaderDefines(context, file, define):
- return ret
-
-
--def CheckSizeOf(context, type):
--"""Check sizeof 'type'"""
--context.Message('Checking size of ' + type + '... ')
--
--program = """
--#include
--#include
--
--/*
-- * The CheckSizeOf function does not have a way for the caller to
-- * specify header files to be included to provide the type being
-- * checked. As a workaround until that is remedied, include the
-- * header required for time_t, which is the sole current use of this
-- * function.
-- */
--#include
--
--int main() {
--printf("%d", (int)sizeof(""" + type + """));
--return 0;
--}
--"""
--
--# compile it
--ret = context.TryCompile(program, '.c')
--if 0 == ret:
--
Re: [ptxdist] [PATCH] gpsd: version bump 3.20 -> 3.21
On Tue, Aug 04, 2020 at 11:04:24PM +0200, Ladislav Michl wrote:
> Also remove vanished options and modify systemd service files
> to expect gpsd socket in /run.
>
> Signed-off-by: Ladislav Michl
This changes the md5 of the license file. Please update and describe what
changed in the commit message.
Michael
> ---
> ...ce-custom-CheckSizeOf-with-standard-.patch | 74
> ...s-install-xpgs-xgpsspeed-programs-ma.patch | 148 ---
> ...s-install-xgps-.-Only-test-if-deps-f.patch | 108 ---
> ...sizeof-time_t-test-when-cross-compil.patch | 39
> ...ix-merging-and-using-of-python-flags.patch | 45 -
> ...-Remove-redundant-CheckHeaderDefines.patch | 52 --
> ...emove-redundant-CheckCompilerDefines.patch | 67 ---
> ...thonValue-and-CheckPKG-were-using-wr.patch | 44 -
> ...ruct-Fix-GetPythonValue-for-python-3.patch | 57 --
> ...move-more-checks-into-GetPythonValue.patch | 98 --
> ...-target-python-version-not-scons-pyt.patch | 32
> ...ify-GetPythonValue-.-It-now-caches-p.patch | 174 --
> ...3-SConstruct-fix-polystr-for-python2.patch | 34
> ...arget_python-when-constructing-exten.patch | 36
> ...SConstruct-HACK-use-target-INCLUDEPY.patch | 25 ---
> patches/gpsd-3.20/series | 20 --
> .../0001-Search-for-ncursesw-pkgconfig.patch} | 6 +-
> ...arget-option-to-decide-whenewer-to-r.patch | 21 +++
> patches/gpsd-3.21/series | 5 +
> .../usr/lib/systemd/system/gpsd.socket| 2 +-
> .../usr/lib/systemd/system/gpsdctl@.service | 2 +-
> rules/gpsd.in | 12 --
> rules/gpsd.make | 13 +-
> 23 files changed, 37 insertions(+), 1077 deletions(-)
> delete mode 100644
> patches/gpsd-3.20/0001-SConstruct-replace-custom-CheckSizeOf-with-standard-.patch
> delete mode 100644
> patches/gpsd-3.20/0002-SConstruct-Always-install-xpgs-xgpsspeed-programs-ma.patch
> delete mode 100644
> patches/gpsd-3.20/0003-SConstruct-Always-install-xgps-.-Only-test-if-deps-f.patch
> delete mode 100644
> patches/gpsd-3.20/0004-SConstruct-Skip-sizeof-time_t-test-when-cross-compil.patch
> delete mode 100644
> patches/gpsd-3.20/0005-Fix-merging-and-using-of-python-flags.patch
> delete mode 100644
> patches/gpsd-3.20/0006-SConstruct-Remove-redundant-CheckHeaderDefines.patch
> delete mode 100644
> patches/gpsd-3.20/0007-SConstruct-remove-redundant-CheckCompilerDefines.patch
> delete mode 100644
> patches/gpsd-3.20/0008-SConstruct-GetPythonValue-and-CheckPKG-were-using-wr.patch
> delete mode 100644
> patches/gpsd-3.20/0009-SConstruct-Fix-GetPythonValue-for-python-3.patch
> delete mode 100644
> patches/gpsd-3.20/0010-SConstruct-move-more-checks-into-GetPythonValue.patch
> delete mode 100644
> patches/gpsd-3.20/0011-SConstruct-Check-target-python-version-not-scons-pyt.patch
> delete mode 100644
> patches/gpsd-3.20/0012-SConstruct-Simplify-GetPythonValue-.-It-now-caches-p.patch
> delete mode 100644
> patches/gpsd-3.20/0013-SConstruct-fix-polystr-for-python2.patch
> delete mode 100644
> patches/gpsd-3.20/0100-SConstruct-Use-target_python-when-constructing-exten.patch
> delete mode 100644
> patches/gpsd-3.20/0102-SConstruct-HACK-use-target-INCLUDEPY.patch
> delete mode 100644 patches/gpsd-3.20/series
> rename
> patches/{gpsd-3.20/0101-SConstruct-Search-for-ncursesw-pkgconfig.patch =>
> gpsd-3.21/0001-Search-for-ncursesw-pkgconfig.patch} (86%)
> create mode 100644
> patches/gpsd-3.21/0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch
> create mode 100644 patches/gpsd-3.21/series
>
> diff --git
> a/patches/gpsd-3.20/0001-SConstruct-replace-custom-CheckSizeOf-with-standard-.patch
>
> b/patches/gpsd-3.20/0001-SConstruct-replace-custom-CheckSizeOf-with-standard-.patch
> deleted file mode 100644
> index 0d5771bbe..0
> ---
> a/patches/gpsd-3.20/0001-SConstruct-replace-custom-CheckSizeOf-with-standard-.patch
> +++ /dev/null
> @@ -1,74 +0,0 @@
> -From: "Gary E. Miller"
> -Date: Fri, 3 Jan 2020 16:15:53 -0800
> -Subject: [PATCH] SConstruct: replace custom CheckSizeOf() with standard
> - CheckTypeSize()
> -
>
> - SConstruct | 40 ++--
> - 1 file changed, 2 insertions(+), 38 deletions(-)
> -
> -diff --git a/SConstruct b/SConstruct
> -index 33e0ff32665c..bd008207011d 100644
> a/SConstruct
> -+++ b/SConstruct
> -@@ -597,42 +597,6 @@ def CheckHeaderDefines(context, file, define):
> - return ret
> -
> -
> --def CheckSizeOf(context, type):
> --"""Check sizeof 'type'"""
> --context.Message('Checking size of ' + type + '... ')
> --
> --program = """
> --#include
> --#include
> --
> --/*
> -- * The CheckSizeOf function does not have a way for the caller to
> -- * specify header files to be included to provide the type being
> -- * checked. As a workaround until that is remedied, include the
> -- * header required for
Re: [ptxdist] [PATCH 1/3] barebox, kernel: set _CONF_TOOL := kconfig explicitely
On Fri, Aug 07, 2020 at 12:44:23PM +0200, Roland Hieber wrote: > Until now this worked without setting the variable because > ptxd_make_world_init tries to autodetect the config tool, but we should > make this explicit. > > Signed-off-by: Roland Hieber > --- > rules/barebox.make | 1 + > rules/kernel.make | 1 + > rules/templates/template-barebox-imx-habv4-make | 1 + > rules/templates/template-barebox-make | 1 + > rules/templates/template-kernel-make| 1 + > 5 files changed, 5 insertions(+) > > diff --git a/rules/barebox.make b/rules/barebox.make > index 2a9262a44032..b2ca49b9fb85 100644 > --- a/rules/barebox.make > +++ b/rules/barebox.make > @@ -40,6 +40,7 @@ BAREBOX_PATH := PATH=$(HOST_PATH) > BAREBOX_WRAPPER_BLACKLIST := \ > $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) > > +BAREBOX_CONF_TOOL := kconfig > BAREBOX_CONF_OPT := \ I prefer tab aligned ':=' when there are multiple lines... > -C $(BAREBOX_DIR) \ > O=$(BAREBOX_BUILD_DIR) \ > diff --git a/rules/kernel.make b/rules/kernel.make > index 7032b0caaba0..d1df7f98f515 100644 > --- a/rules/kernel.make > +++ b/rules/kernel.make > @@ -79,6 +79,7 @@ KERNEL_SHARED_OPT += \ > HOSTCC="$(HOSTCC) -DGENERATOR_FILE" > endif > > +KERNEL_CONF_TOOL := kconfig > KERNEL_CONF_OPT := \ > $(KERNEL_SHARED_OPT) > > diff --git a/rules/templates/template-barebox-imx-habv4-make > b/rules/templates/template-barebox-imx-habv4-make > index 3ee6e83805bb..09c099bb5076 100644 > --- a/rules/templates/template-barebox-imx-habv4-make > +++ b/rules/templates/template-barebox-imx-habv4-make > @@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH) > BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \ > $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) > > +BAREBOX_@PACKAGE@_CONF_TOOL := kconfig > BAREBOX_@PACKAGE@_CONF_OPT := \ > -C $(BAREBOX_@PACKAGE@_DIR) \ > O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \ > diff --git a/rules/templates/template-barebox-make > b/rules/templates/template-barebox-make > index 9bed9dbeb7c9..dc30dc57c4b1 100644 > --- a/rules/templates/template-barebox-make > +++ b/rules/templates/template-barebox-make > @@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH) > BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \ > $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) > > +BAREBOX_@PACKAGE@_CONF_TOOL := kconfig > BAREBOX_@PACKAGE@_CONF_OPT := \ > -C $(BAREBOX_@PACKAGE@_DIR) \ > O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \ > diff --git a/rules/templates/template-kernel-make > b/rules/templates/template-kernel-make > index c53110165ec3..77bcd628948d 100644 > --- a/rules/templates/template-kernel-make > +++ b/rules/templates/template-kernel-make > @@ -46,6 +46,7 @@ KERNEL_@PACKAGE@_SHARED_OPT += \ > HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \ > HOSTCC="$(HOSTCC) -DGENERATOR_FILE" > > +KERNEL_@PACKAGE@_CONF_TOOL := kconfig > KERNEL_@PACKAGE@_CONF_OPT:= \ Especially here where the existing line already has the tab. Michael > $(KERNEL_@PACKAGE@_SHARED_OPT) > > -- > 2.28.0 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH] openssh/rc-once: deduplicate some function parameters
On Fri, Aug 07, 2020 at 11:16:04AM +0200, Uwe Kleine-König wrote:
> The create_keys() function passed the key type three times. Now it's
> only passed once. While at it also use the shell builtin case instead of
> echo | grep to find the needed keys.
>
> The only visible change is that the end message message changes from
>
> Creating RSA key; done.
>
> to
>
> Created RSA key.
>
> Signed-off-by: Uwe Kleine-König
> ---
> Hello,
>
> I noticed this "triplication" while updating a BSP and merging in some
> BSP specific features. I guess it is subjective if you consider this an
> improvement, so judge freely if you want it in ptxdist or not.
>
> Best regards
> Uwe
>
> projectroot/etc/rc.once.d/openssh | 35 +--
> 1 file changed, 19 insertions(+), 16 deletions(-)
>
> diff --git a/projectroot/etc/rc.once.d/openssh
> b/projectroot/etc/rc.once.d/openssh
> index 4a3c594cc3ae..813e7c620e49 100644
> --- a/projectroot/etc/rc.once.d/openssh
> +++ b/projectroot/etc/rc.once.d/openssh
> @@ -18,32 +18,35 @@ host_keys_required() {
> }
>
> create_key() {
> - msg="$1"
> + _type="$1"
> + prettytype="$(echo $_type | tr a-z A-Z)"
> shift
> hostkeys="$1"
> shift
> - file="$1"
> - shift
>
> - if echo "$hostkeys" | grep -x "$file" >/dev/null; then
> - echo "$msg; this may take some time ..."
> + file="/etc/ssh/ssh_host_${_type}_key"
> +
> + case "
> +$hostkeys
> +" in
> + *"
> +$file
> +"*)
This looks quite strange. Maybe:
case " $(echo $hostkeys) " in
*" $file "*)
Michael
> + echo "Create $prettytype key; this may take some time ..."
> rm -f $file &&
> - ssh-keygen -q -f "$file" -N '' "$@" || return
> - echo "$msg; done."
> - fi
> + ssh-keygen -q -f "$file" -N '' -t "$_type" "$@" || return
> + echo "Created $prettytype key."
> + ;;
> + esac
> }
>
> create_keys() {
> hostkeys="$(host_keys_required)"
>
> - create_key "Creating DSA key" \
> - "$hostkeys" /etc/ssh/ssh_host_dsa_key -t dsa &&
> - create_key "Creating ECDSA key" \
> - "$hostkeys" /etc/ssh/ssh_host_ecdsa_key -t ecdsa &&
> - create_key "Creating ED25519 key" \
> - "$hostkeys" /etc/ssh/ssh_host_ed25519_key -t ed25519 &&
> - create_key "Creating RSA key" \
> - "$hostkeys" /etc/ssh/ssh_host_rsa_key -t rsa -b 4096
> + create_key "dsa" "$hostkeys" &&
> + create_key "ecdsa" "$hostkeys" &&
> + create_key "ed25519" "$hostkeys" &&
> + create_key "rsa" "$hostkeys" -b 4096
> }
>
> if ! create_keys; then
> --
> 2.28.0
>
>
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to
> ptxdist-requ...@pengutronix.de
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 1/5] glslang: version bump 2020-05-27-ge00d27c6d65b -> 2020-07-23-g3ee5f2f1d331
On Wed, Aug 05, 2020 at 11:45:22AM +0200, Roland Hieber wrote: > On Tue, Aug 04, 2020 at 04:56:28PM +0200, Philipp Zabel wrote: > > Signed-off-by: Philipp Zabel > > --- > > rules/glslang.in | 1 + > > rules/glslang.make| 8 > > rules/host-glslang.in | 1 + > > 3 files changed, 6 insertions(+), 4 deletions(-) > > Reviewed-by: Roland Hieber For this patch or the whole series? Michael > > > > diff --git a/rules/glslang.in b/rules/glslang.in > > index c2a660243d31..fba48e79e857 100644 > > --- a/rules/glslang.in > > +++ b/rules/glslang.in > > @@ -4,6 +4,7 @@ menuconfig GLSLANG > > tristate > > prompt "glslang" > > select HOST_CMAKE > > + select HOST_SYSTEM_PYTHON3 > > help > > Khronos-reference SPIR-V generator > > > > diff --git a/rules/glslang.make b/rules/glslang.make > > index ada329737ce1..904517d1a8ce 100644 > > --- a/rules/glslang.make > > +++ b/rules/glslang.make > > @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang > > # > > # Paths and names > > # > > -GLSLANG_VERSION:= 2020-05-27-ge00d27c6d65b > > -GLSLANG_MD5:= 88f06a4835895a46fa073035084b0f48 > > +GLSLANG_VERSION:= 2020-07-23-g3ee5f2f1d331 > > +GLSLANG_MD5:= 63686ec05a51d7c8c80fff79277924a7 > > GLSLANG:= glslang-$(GLSLANG_VERSION) > > GLSLANG_SUFFIX := tar.gz > > GLSLANG_URL:= > > https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) > > GLSLANG_SOURCE := $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX) > > GLSLANG_DIR:= $(BUILDDIR)/$(GLSLANG) > > -GLSLANG_LICENSE:= BSD-3-clause AND MIT AND Apple-MIT-License > > -GLSLANG_LICENSE_FILES := > > file://LICENSE.txt;md5=918e668376010a04448a312fb37ae69b > > +GLSLANG_LICENSE:= BSD-3-clause AND BSD-2-clause AND MIT AND > > Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH > > Bison-exception-2.2) > > +GLSLANG_LICENSE_FILES := > > file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229 > > > > # > > > > # Prepare > > diff --git a/rules/host-glslang.in b/rules/host-glslang.in > > index 69f255572c2b..8ef31f52937a 100644 > > --- a/rules/host-glslang.in > > +++ b/rules/host-glslang.in > > @@ -4,3 +4,4 @@ config HOST_GLSLANG > > tristate > > default y if ALLYES > > select HOST_CMAKE > > + select HOST_SYSTEM_PYTHON3 > > -- > > 2.20.1 > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > > To unsubscribe, send a mail with subject "unsubscribe" to > > ptxdist-requ...@pengutronix.de > > > > -- > Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | > Steuerwalder Str. 21 | https://www.pengutronix.de/ | > 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 3/3] doc: ref parameter: document 'alldefconfig'
Signed-off-by: Roland Hieber --- doc/ref_parameter.rst | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/ref_parameter.rst b/doc/ref_parameter.rst index 3e6df6f83e55..1d54fa4b4428 100644 --- a/doc/ref_parameter.rst +++ b/doc/ref_parameter.rst @@ -95,12 +95,13 @@ Setup and Project Actions functionality as ``menuconfig``. It can be used instead of ``menuconfig`` for all the component described above. -``oldconfig []``, ``allmodconfig []``, ``allyesconfig []``, ``allnoconfig []``, ``randconfig []`` +``oldconfig []``, ``allmodconfig []``, ``allyesconfig []``, ``allnoconfig []``, ``alldefconfig []``, ``randconfig []`` this action will run the corresponding kconfig action for the specified component. ``oldconfig`` will prompt for all new options. - ``allmodconfig``, ``allyesconfig`` and ``allnoconfig`` will set all - options to 'm', 'y' or 'n' respectively. ``randconfig`` will randomize - the options. The ``KCONFIG_ALLCONFIG`` and ``KCONFIG_SEED`` environment + ``allmodconfig``, ``allyesconfig``, ``allnoconfig`` or ``alldefconfig`` + will set all options to 'm', 'y', 'n', or their default values respectively. + ``randconfig`` will randomize the options. + The ``KCONFIG_ALLCONFIG`` and ``KCONFIG_SEED`` environment variables can be used as described in the Linux kernel documentation. ``migrate`` -- 2.28.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 2/3] barebox, kernel: enable use of {allyes, allno, allmod, alldef, rand}config
These config targets are documented in the man page, but until now, they only resulted in an error: $ ptxdist alldefconfig kernel ptxdist: Checking dependencies. This may take some seconds. make: *** No rule to make target 'kernel_alldefconfig'. Stop. Both kernel and barebox support all config targets which can be given on the ptxdist command line, so keep the match in the make recipe broad, as the ptxdist option parser will catch unknown config targets. Signed-off-by: Roland Hieber --- rules/barebox.make | 2 +- rules/barebox_mlo.make | 2 +- rules/kernel.make | 2 +- rules/templates/template-barebox-imx-habv4-make | 2 +- rules/templates/template-barebox-make | 2 +- rules/templates/template-kernel-make| 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rules/barebox.make b/rules/barebox.make index b2ca49b9fb85..94534db39ebe 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -207,7 +207,7 @@ $(STATEDIR)/barebox.clean: # oldconfig / menuconfig # -barebox_oldconfig barebox_menuconfig barebox_nconfig: $(STATEDIR)/barebox.extract +barebox_%config: $(STATEDIR)/barebox.extract @$(call world/kconfig, BAREBOX, $(subst barebox_,,$@)) # vim: syntax=make diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make index f0d79f151e08..ffb2741dae7f 100644 --- a/rules/barebox_mlo.make +++ b/rules/barebox_mlo.make @@ -97,7 +97,7 @@ $(STATEDIR)/barebox_mlo.clean: # oldconfig / menuconfig # -barebox_mlo_oldconfig barebox_mlo_menuconfig barebox_mlo_nconfig: $(STATEDIR)/barebox_mlo.extract +barebox_mlo_%config: $(STATEDIR)/barebox_mlo.extract @if test -e $(BAREBOX_MLO_CONFIG); then \ cp $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config; \ fi diff --git a/rules/kernel.make b/rules/kernel.make index d1df7f98f515..89d4cf5daf7d 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -321,7 +321,7 @@ endif # oldconfig / menuconfig # -kernel_oldconfig kernel_menuconfig kernel_nconfig: $(STATEDIR)/kernel.extract +kernel_%config: $(STATEDIR)/kernel.extract @$(call world/kconfig, KERNEL, $(subst kernel_,,$@)) # vim: syntax=make diff --git a/rules/templates/template-barebox-imx-habv4-make b/rules/templates/template-barebox-imx-habv4-make index 09c099bb5076..cfe4c2de36eb 100644 --- a/rules/templates/template-barebox-imx-habv4-make +++ b/rules/templates/template-barebox-imx-habv4-make @@ -112,7 +112,7 @@ $(STATEDIR)/barebox-@package@.clean: # oldconfig / menuconfig # -barebox-@package@_oldconfig barebox-@package@_menuconfig barebox-@package@_nconfig: $(STATEDIR)/barebox-@package@.extract +barebox-@package@_%config: $(STATEDIR)/barebox-@package@.extract @$(call world/kconfig, BAREBOX_@PACKAGE@, $(subst barebox-@package@_,,$@)) # vim: syntax=make diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make index dc30dc57c4b1..6a9599240b64 100644 --- a/rules/templates/template-barebox-make +++ b/rules/templates/template-barebox-make @@ -92,7 +92,7 @@ $(STATEDIR)/barebox-@package@.clean: # oldconfig / menuconfig # -barebox-@package@_oldconfig barebox-@package@_menuconfig barebox-@package@_nconfig: $(STATEDIR)/barebox-@package@.extract +barebox-@package@_%config: $(STATEDIR)/barebox-@package@.extract @$(call world/kconfig, BAREBOX_@PACKAGE@, $(subst barebox-@package@_,,$@)) # vim: syntax=make diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make index 77bcd628948d..73b39d0db718 100644 --- a/rules/templates/template-kernel-make +++ b/rules/templates/template-kernel-make @@ -115,7 +115,7 @@ $(STATEDIR)/kernel-@package@.targetinstall: # oldconfig / menuconfig # -kernel-@package@_oldconfig kernel-@package@_menuconfig kernel-@package@_nconfig: $(STATEDIR)/kernel-@package@.extract +kernel-@package@_%config: $(STATEDIR)/kernel-@package@.extract @$(call world/kconfig, KERNEL_@PACKAGE@, $(subst kernel-@package@_,,$@)) # vim: syntax=make -- 2.28.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 1/3] barebox, kernel: set _CONF_TOOL := kconfig explicitely
Until now this worked without setting the variable because ptxd_make_world_init tries to autodetect the config tool, but we should make this explicit. Signed-off-by: Roland Hieber --- rules/barebox.make | 1 + rules/kernel.make | 1 + rules/templates/template-barebox-imx-habv4-make | 1 + rules/templates/template-barebox-make | 1 + rules/templates/template-kernel-make| 1 + 5 files changed, 5 insertions(+) diff --git a/rules/barebox.make b/rules/barebox.make index 2a9262a44032..b2ca49b9fb85 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -40,6 +40,7 @@ BAREBOX_PATH := PATH=$(HOST_PATH) BAREBOX_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) +BAREBOX_CONF_TOOL := kconfig BAREBOX_CONF_OPT := \ -C $(BAREBOX_DIR) \ O=$(BAREBOX_BUILD_DIR) \ diff --git a/rules/kernel.make b/rules/kernel.make index 7032b0caaba0..d1df7f98f515 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -79,6 +79,7 @@ KERNEL_SHARED_OPT += \ HOSTCC="$(HOSTCC) -DGENERATOR_FILE" endif +KERNEL_CONF_TOOL := kconfig KERNEL_CONF_OPT := \ $(KERNEL_SHARED_OPT) diff --git a/rules/templates/template-barebox-imx-habv4-make b/rules/templates/template-barebox-imx-habv4-make index 3ee6e83805bb..09c099bb5076 100644 --- a/rules/templates/template-barebox-imx-habv4-make +++ b/rules/templates/template-barebox-imx-habv4-make @@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH) BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) +BAREBOX_@PACKAGE@_CONF_TOOL := kconfig BAREBOX_@PACKAGE@_CONF_OPT := \ -C $(BAREBOX_@PACKAGE@_DIR) \ O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \ diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make index 9bed9dbeb7c9..dc30dc57c4b1 100644 --- a/rules/templates/template-barebox-make +++ b/rules/templates/template-barebox-make @@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH) BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) +BAREBOX_@PACKAGE@_CONF_TOOL := kconfig BAREBOX_@PACKAGE@_CONF_OPT := \ -C $(BAREBOX_@PACKAGE@_DIR) \ O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \ diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make index c53110165ec3..77bcd628948d 100644 --- a/rules/templates/template-kernel-make +++ b/rules/templates/template-kernel-make @@ -46,6 +46,7 @@ KERNEL_@PACKAGE@_SHARED_OPT += \ HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \ HOSTCC="$(HOSTCC) -DGENERATOR_FILE" +KERNEL_@PACKAGE@_CONF_TOOL := kconfig KERNEL_@PACKAGE@_CONF_OPT := \ $(KERNEL_@PACKAGE@_SHARED_OPT) -- 2.28.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] openssh/rc-once: deduplicate some function parameters
The create_keys() function passed the key type three times. Now it's
only passed once. While at it also use the shell builtin case instead of
echo | grep to find the needed keys.
The only visible change is that the end message message changes from
Creating RSA key; done.
to
Created RSA key.
Signed-off-by: Uwe Kleine-König
---
Hello,
I noticed this "triplication" while updating a BSP and merging in some
BSP specific features. I guess it is subjective if you consider this an
improvement, so judge freely if you want it in ptxdist or not.
Best regards
Uwe
projectroot/etc/rc.once.d/openssh | 35 +--
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/projectroot/etc/rc.once.d/openssh
b/projectroot/etc/rc.once.d/openssh
index 4a3c594cc3ae..813e7c620e49 100644
--- a/projectroot/etc/rc.once.d/openssh
+++ b/projectroot/etc/rc.once.d/openssh
@@ -18,32 +18,35 @@ host_keys_required() {
}
create_key() {
- msg="$1"
+ _type="$1"
+ prettytype="$(echo $_type | tr a-z A-Z)"
shift
hostkeys="$1"
shift
- file="$1"
- shift
- if echo "$hostkeys" | grep -x "$file" >/dev/null; then
- echo "$msg; this may take some time ..."
+ file="/etc/ssh/ssh_host_${_type}_key"
+
+ case "
+$hostkeys
+" in
+ *"
+$file
+"*)
+ echo "Create $prettytype key; this may take some time ..."
rm -f $file &&
- ssh-keygen -q -f "$file" -N '' "$@" || return
- echo "$msg; done."
- fi
+ ssh-keygen -q -f "$file" -N '' -t "$_type" "$@" || return
+ echo "Created $prettytype key."
+ ;;
+ esac
}
create_keys() {
hostkeys="$(host_keys_required)"
- create_key "Creating DSA key" \
- "$hostkeys" /etc/ssh/ssh_host_dsa_key -t dsa &&
- create_key "Creating ECDSA key" \
- "$hostkeys" /etc/ssh/ssh_host_ecdsa_key -t ecdsa &&
- create_key "Creating ED25519 key" \
- "$hostkeys" /etc/ssh/ssh_host_ed25519_key -t ed25519 &&
- create_key "Creating RSA key" \
- "$hostkeys" /etc/ssh/ssh_host_rsa_key -t rsa -b 4096
+ create_key "dsa" "$hostkeys" &&
+ create_key "ecdsa" "$hostkeys" &&
+ create_key "ed25519" "$hostkeys" &&
+ create_key "rsa" "$hostkeys" -b 4096
}
if ! create_keys; then
--
2.28.0
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
[ptxdist] [ANNOUNCE] PTXdist 2020.08.0 released
Hi, I'm happy to announce that I've just released ptxdist-2020.08.0. There are a lot of smaller changes all over the place, but nothing big stands out. Be careful if you have kernel module packages: The rules must be changed to use KERNEL_MODULE_OPT instead of KERNEL_MAKE_OPT. Several existing packages got improved. And there are a lot of version bumps this time. We have several new packages, mostly python3 modules, and, as always, some bugfixes. Thanks to all contributors and - as always - the shortlog below. Enjoy, Michael Olbrich Alexander Dahl (3): dropwatch: Update license information dropwatch: Update help text dropwatch: Add upstream patches Bastian Krause (1): u-boot-tools: version bump 2020.04 -> 2020.07 Bruno Thomsen (19): gettext: version bump 0.19.8.1 -> 0.20.2 Revert "gettext: move to staging" gettext: cli/lib install options squashfs-tools: add zstd compression support modemmanager: config: allow arbitrary AT command via DBus host-zstd: new package host-squashfs-tools: add support for zstd contitional image-root-squashfs: add zstd compression option host-squashfs-tools: conditional select lzo and xz dependencies host-squashfs-tools: fix lz4 compression option chrony: version bump 3.3 -> 3.5 chrony: nettle authentication support chrony: systemd unit option passwd/group: added chrony UID/GID chrony: run chronyd as chrony user chrony: advanced monitoring command option chrony: make unrecognized configure options fatal chrony: add seccomp sandbox option sqlite: config: enable foreign keys by default Christian Gieseler (1): jansson: version bump to 2.13.1 Ladislav Michl (1): gpsd: fix gpsdctl@.service Marc Kleine-Budde (3): ptxdist-set-keys-hsm: set_imx_habv4_keys(): declare variable r as local ptxd_lib_code_signing: remove double space ptxd_make_world_common: ptxd_make_world_init: pkg_build_oot: add missing option KEEP to error message Marco Felsch (2): cog: version bump to 0.7.1 wpewebkit: version bump to 2.28.2 Michael Olbrich (28): cairo: version bump 1.14.12 -> 1.16.0 v4l-utils: version bump 1.18.0 -> 1.20.0 kernel: cleanup and refactor KERNEL_MAKE_OPT and KERNEL_CONF_OPT kernel: add option to minimize changes to the kernelconfig template-kernel: improve ptx/in-path: handle complex cases in make as well ptxd_make_license_report: run ptxd_make_world_init ptxd_make_license_report: abort when ptxd_kconfig fails wpebackend-fdo: version bump 1.6.0 -> 1.6.1 docs: limit the characters allowed for the PDF file name nss: add parallel building fix urlcheck: use _ptx_source_to_pkg and ptx/nl kernel: kernel/deprecated: don't skip kernel-header.* ptx/in-path: fix with older make versions nss: one more build fix rootfs: don't create empty /media subdirs qt4: add patch to fix code generation with gcc-9 pango: add missing dependency stress-ng: version bump 0.09.58 -> 0.11.15 webrtc-audio-processing: new package busybox: add PAM support pulseaudio: add support for AEC with webrtc-audio-processing elfutils: reimport latest debian patches host-libtasn1: fix building with older compilers libinput: version bump 1.15.5 -> 1.16.0 ptxd_lib_dgen: make pakage source filename and md5 part of the source hash host-autotools-libtool: add missing dependency host-flex: add missing dependency Oleksij Rempel (1): ethtool: version bump 5.1 -> 5.7 Philipp Zabel (20): python3-attrs: new package python3-importlib-metadata: new package python3-more-itertools: new package python3-packaging: new package python3-pluggy: new package python3-py: new package python3-pyparsing: new package python3-wcwidth: new package python3-zipp: new package python3-pytest: new package glmark2: version bump 2019-03-27-geaa70888 -> 2020.04 libva-intel-driver: version bump 2.4.0 -> 2.4.1 configure_helper: blacklist Meson builtin options python3-zipp: fix missing version in setup.py cross-nasm: version bump 2.11.08 -> 2.15 mesalib: version bump 20.1.2 -> 20.1.3 libdrm: version bump 2.4.100 -> 2.4.102 shaderc: new package mesalib: version bump 20.1.3 -> 20.1.4 vulkan-tools: new package Robert Schwebel (23): glib: version bump 2.62.2 -> 2.64.4 (latest stable) networkmanager: version bump 1.22.10 -> 1.26.0 (latest stable) libusb: version bump 1.0.22 -> 1.0.23 dbus: version bump 1.12.10 -> 1.12.20 libpcre: version bump 8.43 -> 8.44 libcap: version bump 2.36 -> 2.41 e2fsprogs: version bump 1.44.4 -> 1.44.6 ncurses: version bump 6.1 -> 6.2 openssh: version bump 8.0p1 -> 8.3p1 libndp: version bump 1.6 -> 1.7
