Re: [ptxdist] How to override files from another package
On Wed, Nov 27, 2019 at 10:22:04AM +0100, Guillermo Rodriguez Garcia wrote: > > It's not possible. What exactly are you trying to achieve? Which files do > > you want to overwrite? > > As in the post from the ML above -- I am trying to overwrite the > generic GL libraries provided by Mesa and replace them with > vendor-provided binaries. You don't want to do that. Etnaviv supports your GPU just fine :-) rsc -- Pengutronix e.K. | Dipl.-Ing. Robert Schwebel | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] nginx: version bump 1.16.0 -> 1.16.1
Also regenerated patches with git-ptx-patches.
Signed-off-by: Clemens Gruber
---
...pe-sizeof-rework-autotest-to-be-cross-compila.patch | 0
...ature-add-mechanism-allowing-to-force-feature.patch | 0
...t-ngx_feature_run_force_result-for-each-featu.patch | 2 +-
.../0004-auto-lib-libxslt-conf-use-pkg-config.patch| 8
...to-unix-make-sys_nerr-guessing-cross-friendly.patch | 6 +++---
.../0006-auto-lib-openssl-conf-use-pkg-config.patch| 2 +-
.../0007-auto-lib-libgd-conf-use-pkg-config.patch | 0
...unix-ngx_linux_config.h-only-include-dlfcn.h-.patch | 2 +-
...dianness-add-mechanism-allowing-to-force-resu.patch | 0
...o-unix-allow-overriding-the-IPv6-build-tests.patch} | 10 +-
patches/{nginx-1.16.0 => nginx-1.16.1}/series | 4 ++--
rules/nginx.make | 4 ++--
12 files changed, 19 insertions(+), 19 deletions(-)
rename patches/{nginx-1.16.0 =>
nginx-1.16.1}/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
(100%)
rename patches/{nginx-1.16.0 =>
nginx-1.16.1}/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
(100%)
rename patches/{nginx-1.16.0 =>
nginx-1.16.1}/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
(99%)
rename patches/{nginx-1.16.0 =>
nginx-1.16.1}/0004-auto-lib-libxslt-conf-use-pkg-config.patch (84%)
rename patches/{nginx-1.16.0 =>
nginx-1.16.1}/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch (95%)
rename patches/{nginx-1.16.0 =>
nginx-1.16.1}/0006-auto-lib-openssl-conf-use-pkg-config.patch (99%)
rename patches/{nginx-1.16.0 =>
nginx-1.16.1}/0007-auto-lib-libgd-conf-use-pkg-config.patch (100%)
rename patches/{nginx-1.16.0 =>
nginx-1.16.1}/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
(94%)
rename patches/{nginx-1.16.0 =>
nginx-1.16.1}/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch
(100%)
rename
patches/{nginx-1.16.0/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
=> nginx-1.16.1/0101-auto-unix-allow-overriding-the-IPv6-build-tests.patch}
(89%)
rename patches/{nginx-1.16.0 => nginx-1.16.1}/series (84%)
diff --git
a/patches/nginx-1.16.0/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
b/patches/nginx-1.16.1/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
similarity index 100%
rename from
patches/nginx-1.16.0/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
rename to
patches/nginx-1.16.1/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
diff --git
a/patches/nginx-1.16.0/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
b/patches/nginx-1.16.1/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
similarity index 100%
rename from
patches/nginx-1.16.0/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
rename to
patches/nginx-1.16.1/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
diff --git
a/patches/nginx-1.16.0/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
b/patches/nginx-1.16.1/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
similarity index 99%
rename from
patches/nginx-1.16.0/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
rename to
patches/nginx-1.16.1/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
index d41f57968..b468812bd 100644
---
a/patches/nginx-1.16.0/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
+++
b/patches/nginx-1.16.1/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
@@ -104,7 +104,7 @@ index 429468f7fd40..1ed47cca5c89 100644
#include
#include
diff --git a/auto/os/linux b/auto/os/linux
-index 2c8a9bb8e380..eb4513eeed7c 100644
+index 5e280eca75db..50bf84d503d0 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -37,6 +37,7 @@ fi
diff --git
a/patches/nginx-1.16.0/0004-auto-lib-libxslt-conf-use-pkg-config.patch
b/patches/nginx-1.16.1/0004-auto-lib-libxslt-conf-use-pkg-config.patch
similarity index 84%
rename from patches/nginx-1.16.0/0004-auto-lib-libxslt-conf-use-pkg-config.patch
rename to patches/nginx-1.16.1/0004-auto-lib-libxslt-conf-use-pkg-config.patch
index b6bd50cc3..bd0c07b84 100644
--- a/patches/nginx-1.16.0/0004-auto-lib-libxslt-conf-use-pkg-config.patch
+++ b/patches/nginx-1.16.1/0004-auto-lib-libxslt-conf-use-pkg-config.patch
@@ -7,11 +7,11 @@ dependencies.
Signed-off-by: Martin Bark
---
- auto/lib/libxslt/conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ auto/lib/libxslt/conf | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
-index 3a0f37b..3c2a60e 100644
+index 3063ac7ce0c0..3209e3642fdc 100644
--- a/auto/lib/libxslt/conf
+++ b/auto/lib/libxslt/conf
@@ -12,8 +12,9 @@
@@ -25,4 +25,4 @@ index 3a0f37b..3c2a60e 100644
+ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs libxslt)"
[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 2/2] tpm2-tools: version bump 3.1.4 -> 4.1
v3.1.4 was actually BSD-2-Clause licensed. v4.1 is now BSD-3-Clause, so only fix the md5 sum. See: https://github.com/tpm2-software/tpm2-tools/issues/1478 Signed-off-by: Bastian Krause --- rules/tpm2-tools.make | 73 --- 1 file changed, 61 insertions(+), 12 deletions(-) diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make index e7fb757ec..9fbb0cbc7 100644 --- a/rules/tpm2-tools.make +++ b/rules/tpm2-tools.make @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_TPM2_TOOLS) += tpm2-tools # # Paths and names # -TPM2_TOOLS_VERSION := 3.1.4 -TPM2_TOOLS_MD5 := 61b4a382d24c950148a3f5fe41ac2306 +TPM2_TOOLS_VERSION := 4.1 +TPM2_TOOLS_MD5 := aecec22668233776922909f2ebf55e65 TPM2_TOOLS := tpm2-tools-$(TPM2_TOOLS_VERSION) TPM2_TOOLS_SUFFIX := tar.gz TPM2_TOOLS_URL := https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX) TPM2_TOOLS_SOURCE := $(SRCDIR)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX) TPM2_TOOLS_DIR := $(BUILDDIR)/$(TPM2_TOOLS) TPM2_TOOLS_LICENSE := BSD-3-Clause -TPM2_TOOLS_LICENSE_FILES := file://LICENSE;md5=91b7c548d73ea16537799e8060cea819 +TPM2_TOOLS_LICENSE_FILES := file://LICENSE;md5=0eb1216e46938bd723098d93a23c3bcc # # Prepare @@ -34,10 +34,12 @@ TPM2_TOOLS_LICENSE_FILES:= file://LICENSE;md5=91b7c548d73ea16537799e8060cea819 TPM2_TOOLS_CONF_TOOL := autoconf TPM2_TOOLS_CONF_OPT:= \ $(CROSS_AUTOCONF_USR) \ + --enable-debug=info \ --disable-code-coverage \ --disable-unit \ --enable-hardening \ - --without-gcov + --without-gcov \ + --without-bashcompdir # # Target-Install @@ -46,41 +48,88 @@ TPM2_TOOLS_CONF_OPT := \ TPM2_TOOLS_PROGS := \ tpm2_activatecredential \ tpm2_certify \ + tpm2_certifycreation \ + tpm2_changeauth \ + tpm2_changeeps \ + tpm2_changepps \ + tpm2_checkquote \ + tpm2_clear \ + tpm2_clearcontrol \ + tpm2_clockrateadjust \ tpm2_create \ + tpm2_createak \ + tpm2_createek \ tpm2_createpolicy \ tpm2_createprimary \ tpm2_dictionarylockout \ + tpm2_duplicate \ tpm2_encryptdecrypt \ tpm2_evictcontrol \ + tpm2_flushcontext \ tpm2_getcap \ - tpm2_getmanufec \ - tpm2_getpubak \ - tpm2_getpubek \ + tpm2_getekcertificate \ tpm2_getrandom \ + tpm2_gettestresult \ + tpm2_gettime \ tpm2_hash \ + tpm2_hierarchycontrol \ tpm2_hmac \ - tpm2_listpersistent \ + tpm2_import \ + tpm2_incrementalselftest \ tpm2_load \ tpm2_loadexternal \ tpm2_makecredential \ + tpm2_nvcertify \ tpm2_nvdefine \ - tpm2_nvlist \ + tpm2_nvextend \ + tpm2_nvincrement \ tpm2_nvread \ tpm2_nvreadlock \ - tpm2_nvrelease \ + tpm2_nvreadpublic \ + tpm2_nvsetbits \ + tpm2_nvundefine \ tpm2_nvwrite \ + tpm2_nvwritelock \ + tpm2_pcrallocate \ tpm2_pcrevent \ tpm2_pcrextend \ - tpm2_pcrlist \ + tpm2_pcrread \ + tpm2_pcrreset \ + tpm2_policyauthorize \ + tpm2_policyauthorizenv \ + tpm2_policyauthvalue \ + tpm2_policycommandcode \ + tpm2_policycountertimer \ + tpm2_policyduplicationselect \ + tpm2_policylocality \ + tpm2_policynamehash \ + tpm2_policynv \ + tpm2_policynvwritten \ + tpm2_policyor \ + tpm2_policypassword \ + tpm2_policypcr \ + tpm2_policyrestart \ + tpm2_policysecret \ + tpm2_policysigned \ + tpm2_policytemplate \ + tpm2_policyticket \ + tpm2_print \ tpm2_quote \ tpm2_rc_decode \ + tpm2_readclock \ tpm2_readpublic \ tpm2_rsadecrypt \ tpm2_rsaencrypt \ + tpm2_selftest \ tpm2_send \ + tpm2_setclock \ + tpm2_setprimarypolicy \ + tpm2_shutdown \ tpm2_sign \ + tpm2_startauthsession \ tpm2_startup \ - tpm2_takeownership \ + tpm2_stirrandom \ + tpm2_testparms \ tpm2_unseal \ tpm2_verifysignature -- 2.24.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] tpm2-tss: version bump 2.2.2 -> 2.3.1
Signed-off-by: Bastian Krause --- rules/tpm2-tss.make | 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make index 4bdaef17e..fe84e606f 100644 --- a/rules/tpm2-tss.make +++ b/rules/tpm2-tss.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss # # Paths and names # -TPM2_TSS_VERSION := 2.2.2 -TPM2_TSS_MD5 := db341b66daab34cbb4d6a4e5a8745001 +TPM2_TSS_VERSION := 2.3.1 +TPM2_TSS_MD5 := 5744b10e3cef56df5d65b50f51fb3fe9 TPM2_TSS := tpm2-tss-$(TPM2_TSS_VERSION) TPM2_TSS_SUFFIX:= tar.gz TPM2_TSS_URL := https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX) @@ -34,15 +34,23 @@ TPM2_TSS_LICENSE_FILES := file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da TPM2_TSS_CONF_TOOL := autoconf TPM2_TSS_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --enable-debug=info \ --disable-unit \ --enable-esapi \ --disable-tcti-device-async \ --disable-tcti-partial-reads \ --enable-tcti-device \ --enable-tcti-mssim \ + --disable-tcti-fuzzing \ + --disable-nodl \ --disable-integration \ - --disable-debug \ + --disable-valgrind \ + --disable-valgrind-memcheck \ + --disable-valgrind-helgrind \ + --disable-valgrind-drd \ + --disable-valgrind-sgcheck \ --disable-defaultflags \ + --disable-weakcrypto \ --disable-doxygen-doc \ --disable-doxygen-dot \ --disable-doxygen-man \ @@ -56,6 +64,7 @@ TPM2_TSS_CONF_OPT := \ --disable-code-coverage \ --with-crypto=ossl \ --with-udevrulesdir=/usr/lib/udev/rules.d \ + --with-fuzzing=none \ --without-gcov # @@ -76,6 +85,9 @@ $(STATEDIR)/tpm2-tss.targetinstall: @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-sys) @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tcti-device) @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tcti-mssim) + @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tctildr) + @$(call install_link, tpm2-tss, ./libtss2-tcti-device.so.0.0.0, /usr/lib/libtss2-tcti-default.so) + @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-rc) @$(call install_alternative, tpm2-tss, 0, 0, 0644, \ /usr/lib/udev/rules.d/70-tpm-udev.rules) -- 2.24.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] bash_completion: use '_have' instead of 'have'
'have' was deprecated upstream about 8 years ago. [0] Also, since it is only available inside of /etc/bash_completion [1], using it makes it harder to (re)load existing completions in a running shell: $ . ~/.bash_completion.d/ptxdist bash: have: command not found Use '_have' instead, which does not have these problems. [0]: https://github.com/scop/bash-completion/commit/20c05b43b6e44b [1]: https://github.com/scop/bash-completion/blob/31b5cbc8016b18/bash_completion#L2158 Signed-off-by: Roland Hieber --- scripts/bash_completion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bash_completion b/scripts/bash_completion index e0dd3428455c..deb14ad0cb8a 100644 --- a/scripts/bash_completion +++ b/scripts/bash_completion @@ -5,7 +5,7 @@ # part of PTXdist, so same licence. # -if have ptxdist; then +if _have ptxdist; then declare -a _ptxdist_completion_opts declare -a _ptxdist_completion_cmds -- 2.24.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] How to override files from another package
El mié., 27 nov. 2019 a las 10:38, Michael Olbrich () escribió: > > On Wed, Nov 27, 2019 at 10:22:04AM +0100, Guillermo Rodriguez Garcia wrote: > > El mié., 27 nov. 2019 a las 10:06, Michael Olbrich > > () escribió: > > > On Tue, Nov 26, 2019 at 07:21:32PM +0100, Guillermo Rodriguez Garcia > > > wrote: > > > > Is there a way for a ptxdist package to override files from another > > > > package? > > > > For example something similar to this: > > > > > > > > https://lists.linaro.org/pipermail/openembedded/2016-June/31.html > > > > > > > > I tried to create a package which depends on MESALIB (so that > > > > mesalib's targetinstall rule runs first), and then simply overwrite > > > > the files, but this fails when the package is generated, because there > > > > are multiple packages trying to provide the same files. > > > > > > It's not possible. What exactly are you trying to achieve? Which files do > > > you want to overwrite? > > > > As in the post from the ML above -- I am trying to overwrite the > > generic GL libraries provided by Mesa and replace them with > > vendor-provided binaries. > > Then you should not install mesa at all. Not all libraries are replaced. Also mesa is selected by other packages (such as weston), so if I wanted to skip mesa I would need to patch those as well.. BR; Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] How to override files from another package
Hi, El mié., 27 nov. 2019 a las 10:38, Ladislav Michl () escribió: > > On Wed, Nov 27, 2019 at 10:22:04AM +0100, Guillermo Rodriguez Garcia wrote: > > Hi, > > > > El mié., 27 nov. 2019 a las 10:06, Michael Olbrich > > () escribió: > > > > > > Hi, > > > > > > On Tue, Nov 26, 2019 at 07:21:32PM +0100, Guillermo Rodriguez Garcia > > > wrote: > > > > Is there a way for a ptxdist package to override files from another > > > > package? > > > > For example something similar to this: > > > > > > > > https://lists.linaro.org/pipermail/openembedded/2016-June/31.html > > > > > > > > I tried to create a package which depends on MESALIB (so that > > > > mesalib's targetinstall rule runs first), and then simply overwrite > > > > the files, but this fails when the package is generated, because there > > > > are multiple packages trying to provide the same files. > > > > > > It's not possible. What exactly are you trying to achieve? Which files do > > > you want to overwrite? > > > > As in the post from the ML above -- I am trying to overwrite the > > generic GL libraries provided by Mesa and replace them with > > vendor-provided binaries. > > A quick way is to copy mesa rules into your BSP and modify them not to copy > libraries you are not interested in to the target. Yes, that's what I am doing now. I was just wondering if there is a cleaner way. Thanks! Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3] git-ptx-patches: call git in a pristine environment
On Mon, Nov 18, 2019 at 08:39:22AM -0500, Jon Ringle wrote:
> On Mon, Nov 18, 2019 at 4:32 AM Roland Hieber wrote:
>
> >
> > @@ -129,7 +144,7 @@ fi
> > GIT_EXTRA_ARGS="$GIT_EXTRA_ARGS --summary --stat=80"
> >
> > cat .ptxdist/series.0 > .ptxdist/series
> > -git format-patch -N $GIT_EXTRA_ARGS ${tagopt} -o .ptxdist/patches/
> > ${range} | sed -e 's,^.ptxdist/patches/,,' > .ptxdist/series.auto
> > +${GIT} format-patch -N $GIT_EXTRA_ARGS ${tagopt} -o .ptxdist/patches/
> > ${range} | sed -e 's,^.ptxdist/patches/,,' > .ptxdist/series.auto
> >
>
> In my own ptxdist git repo, I have a patch that adds `-M` to make file
> renames less verbose. Adding this should not affect the output of any patch
> series maintained by ptxdist. I needed it to make less verbose some package
> I was changing locally:
> git format-patch -M -N $GIT_EXTRA_ARGS ${tagopt} -o .ptxdist/patches/
> ${range} | sed -e 's,^.ptxdist/patches/,,' > .ptxdist/series.auto
Does this do the right thing then even when the patches are not applied
by git during the extract stage?
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany| Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] doc: ref_make_macros: add missing binary ptx/* switches to header and usage
Ping? On Sun, Nov 17, 2019 at 10:45:42PM +0100, Roland Hieber wrote: > These macros are mentioned in the table below, but are not found in the > header or the usage. > > Signed-off-by: Roland Hieber > --- > doc/ref_make_macros.inc | 7 +-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/doc/ref_make_macros.inc b/doc/ref_make_macros.inc > index 2a5c1e452e17..fb98d42db660 100644 > --- a/doc/ref_make_macros.inc > +++ b/doc/ref_make_macros.inc > @@ -663,8 +663,8 @@ be installed with some other ``install_*`` command before > .. _ptx_ifdef: > .. _ptx_truefalse: > > -ptx/endis, ptx/disen, ptx/wwo, ptx/truefalse, ptx/ifdef > -~~~ > +ptx/endis, ptx/disen, ptx/wow, ptx/wwo, ptx/yesno, ptx/truefalse, > ptx/falsetrue, ptx/onoff, ptx/ifdef > +~ > > Usage: > > @@ -674,7 +674,10 @@ Usage: > $(call ptx/disen, VARIABLE) > $(call ptx/wow, VARIABLE) > $(call ptx/wwo, VARIABLE) > + $(call ptx/yesno, VARIABLE) > $(call ptx/truefalse, VARIABLE) > + $(call ptx/falsetrue, VARIABLE) > + $(call ptx/onoff, VARIABLE) > $(call ptx/ifdef, VARIABLE, [expansion-if-true], [expansion-if-false]) > > Several macros exist to convert the state (set/unset) of a variable into a > string. > -- > 2.24.0 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 3/3] ptxdist: add 'init', 'init-platform' commands to create new configs
On Sat, Nov 16, 2019 at 11:21:20AM +0100, Michael Olbrich wrote:
> On Fri, Nov 15, 2019 at 03:30:23PM +0100, Roland Hieber wrote:
> > On Fri, Nov 15, 2019 at 03:09:40PM +0100, Michael Olbrich wrote:
> > > On Thu, Nov 14, 2019 at 05:01:16PM +0100, Roland Hieber wrote:
> > > > Add small helpers to start from scratch with a new ptxconfig and/or
> > > > platformconfig. We do that by creating a standard directory structure,
> > > > then creating a minimal config file, selecting it, and calling oldconfig
> > > > on the created file while setting PTXDIST_FORCE to ignore all errors
> > > > about it not being a valid configuration file.
> > > >
> > > > When initialising a new BSP, create the platformconfig first so the
> > > > selection of the ptxconfig does not complain about a missing
> > > > platformconfig.
> > > >
> > > > Signed-off-by: Roland Hieber
> > > >
> > > > ---
> > > >
> > > > I was also thinking about using 'alldefconfig' instead of 'oldconfig' so
> > > > that PTXdist does not ask so many questions for every package that can
> > > > be enabled in the ptxconfig, but then several important settings get
> > > > lost, like project name, toolchain/compiler version, compiler triplet
> > > > etc. Maybe we can ask those up front instead and pre-prime the config
> > > > accordingly, like it is already done now for the platform name in
> > > > PLATFORM.
> > > > ---
> > > > bin/ptxdist | 19
> > > > doc/ref_parameter.inc| 5
> > > > scripts/lib/ptxd_lib_init.sh | 57
> > > > 3 files changed, 81 insertions(+)
> > > > create mode 100644 scripts/lib/ptxd_lib_init.sh
> > > >
> > > > diff --git a/bin/ptxdist b/bin/ptxdist
> > > > index cd673a9f3dd6..e1e0f5f7503d 100755
> > > > --- a/bin/ptxdist
> > > > +++ b/bin/ptxdist
> > > > @@ -938,6 +938,9 @@ PTXdist $(printf "%-24s" ${PTXDIST_VERSION_FULL})
> > > > Build System for Embedded Linu
> > > >
> > > > Setup and Project Actions:
> > > >
> > > > + init []initialise a new BSP in the
> > > > current directory
> > > > + init-platform [] initialise a new platform in the
> > > > current BSP
> > > > +
> > > >menu enter main control menu
> > > >
> > > >setupsetup per-user preferences
> > > > @@ -2035,6 +2038,22 @@ EOF
> > > > do_${cmd}
> > > > exit
> > > > ;;
> > > > + init)
> > > > + ptxd_lib_init_platform "$@" &&
> > > > + ptxd_lib_init &&
> > > > + ptxd_dialog_msgbox \
> > > > + "Adapt the new BSP to your needs by
> > > > running:\n\n" \
> > > > + "ptxdist menuconfig\n" \
> > > > + "ptxdist menuconfig platform"
> > > > + exit
> > > > + ;;
> > > > + init-platform)
> > > > + ptxd_lib_init_platform "$@" &&
> > > > + ptxd_dialog_msgbox \
> > > > + "Adapt the new platform to your needs
> > > > by running:\n\n" \
> > > > + "ptxdist menuconfig platform"
> > > > + exit
> > > > + ;;
> > > > image)
> > > > if [ ${#} -eq 0 ]; then
> > > > echo "No image given."
> > > > diff --git a/doc/ref_parameter.inc b/doc/ref_parameter.inc
> > > > index 74689b9d3cff..29203713f879 100644
> > > > --- a/doc/ref_parameter.inc
> > > > +++ b/doc/ref_parameter.inc
> > > > @@ -1,6 +1,11 @@
> > > > Setup and Project Actions
> > > > ~
> > > >
> > > > +``init ``, ``init-platform ``
> > > > + initialise a new BSP in the current directory, or add a new platform
> > > > to the
> > > > + current BSP. This action creates all required config files, and then
> > > > calls
> > > > + *menuconfig* on them, and can be used to start a new BSP from
> > > > scratch.
> > > > +
> > > > ``menu``
> > > >this starts a dialog based frontend for those who do not like typing
> > > >commands. It will gain us access to the most common parameters to
> > > > diff --git a/scripts/lib/ptxd_lib_init.sh b/scripts/lib/ptxd_lib_init.sh
> > > > new file mode 100644
> > > > index ..a5ff71f557f9
> > > > --- /dev/null
> > > > +++ b/scripts/lib/ptxd_lib_init.sh
> > > > @@ -0,0 +1,57 @@
> > > > +#!/bin/bash
> > > > +
> > > > +ptxd_lib_init() {
> > > > + PTXDIST_PTXCONFIG="configs/ptxconfig"
> > > > +
> > > > + if [ -z "${PTXDIST_FORCE}" ] && [ -e "${PTXDIST_PTXCONFIG}" ];
> > > > then
> > > > + echo -e \
> > > > + "error: the file '${PTXDIST_PTXCONFIG}' already
> > > > exists,\n" \
> > > > + " use '--force'
Re: [ptxdist] How to override files from another package
On Wed, Nov 27, 2019 at 10:22:04AM +0100, Guillermo Rodriguez Garcia wrote: > Hi, > > El mié., 27 nov. 2019 a las 10:06, Michael Olbrich > () escribió: > > > > Hi, > > > > On Tue, Nov 26, 2019 at 07:21:32PM +0100, Guillermo Rodriguez Garcia wrote: > > > Is there a way for a ptxdist package to override files from another > > > package? > > > For example something similar to this: > > > > > > https://lists.linaro.org/pipermail/openembedded/2016-June/31.html > > > > > > I tried to create a package which depends on MESALIB (so that > > > mesalib's targetinstall rule runs first), and then simply overwrite > > > the files, but this fails when the package is generated, because there > > > are multiple packages trying to provide the same files. > > > > It's not possible. What exactly are you trying to achieve? Which files do > > you want to overwrite? > > As in the post from the ML above -- I am trying to overwrite the > generic GL libraries provided by Mesa and replace them with > vendor-provided binaries. A quick way is to copy mesa rules into your BSP and modify them not to copy libraries you are not interested in to the target. ladis ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] How to override files from another package
On Wed, Nov 27, 2019 at 10:22:04AM +0100, Guillermo Rodriguez Garcia wrote: > El mié., 27 nov. 2019 a las 10:06, Michael Olbrich > () escribió: > > On Tue, Nov 26, 2019 at 07:21:32PM +0100, Guillermo Rodriguez Garcia wrote: > > > Is there a way for a ptxdist package to override files from another > > > package? > > > For example something similar to this: > > > > > > https://lists.linaro.org/pipermail/openembedded/2016-June/31.html > > > > > > I tried to create a package which depends on MESALIB (so that > > > mesalib's targetinstall rule runs first), and then simply overwrite > > > the files, but this fails when the package is generated, because there > > > are multiple packages trying to provide the same files. > > > > It's not possible. What exactly are you trying to achieve? Which files do > > you want to overwrite? > > As in the post from the ML above -- I am trying to overwrite the > generic GL libraries provided by Mesa and replace them with > vendor-provided binaries. Then you should not install mesa at all. Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] How to override files from another package
Hi, El mié., 27 nov. 2019 a las 10:06, Michael Olbrich () escribió: > > Hi, > > On Tue, Nov 26, 2019 at 07:21:32PM +0100, Guillermo Rodriguez Garcia wrote: > > Is there a way for a ptxdist package to override files from another package? > > For example something similar to this: > > > > https://lists.linaro.org/pipermail/openembedded/2016-June/31.html > > > > I tried to create a package which depends on MESALIB (so that > > mesalib's targetinstall rule runs first), and then simply overwrite > > the files, but this fails when the package is generated, because there > > are multiple packages trying to provide the same files. > > It's not possible. What exactly are you trying to achieve? Which files do > you want to overwrite? As in the post from the ML above -- I am trying to overwrite the generic GL libraries provided by Mesa and replace them with vendor-provided binaries. Guillermo ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] How to override files from another package
Hi, On Tue, Nov 26, 2019 at 07:21:32PM +0100, Guillermo Rodriguez Garcia wrote: > Is there a way for a ptxdist package to override files from another package? > For example something similar to this: > > https://lists.linaro.org/pipermail/openembedded/2016-June/31.html > > I tried to create a package which depends on MESALIB (so that > mesalib's targetinstall rule runs first), and then simply overwrite > the files, but this fails when the package is generated, because there > are multiple packages trying to provide the same files. It's not possible. What exactly are you trying to achieve? Which files do you want to overwrite? 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
