Re: [ptxdist] tarballs from git URLs: git archive vs. git submodule
Hi all,
I'm having the same issue as described. Is there meanwhile any other
solution but the ones subscribed?
Kind regards,
wimpunk.
On 6 March 2014 at 19:03, Michael Olbrich wrote:
> Hi,
>
> On Mon, Mar 03, 2014 at 01:13:00PM +0100, Alexander Dahl wrote:
>> while trying the local_src feature (local_src/${PACKAGE}.{PLATFORM})
>> which is actually really cool, I came across a problem with the
>> automatic tarball creation from Git URLs. ptxd_make_get.sh uses `git
>> archive` for this purpose which does not support git submodules. There
>> are several scripts around the web by people who needed this in the past
>> and although there were feature requests and even patches years ago in
>> git, it's still not included mainline. :-(
>>
>> The possibilities I see are these:
>>
>> * waiting probably very long for a new git release with git archive
>> supporting submodules
>> * replace the use of submodules in the repositories I want to use with
>> something else, maybe git subtree
>> * scripting this and change ptxd_make_get.sh which could be quite
>> complicated
>
> * create a tarball for each repository and extract all in a custom extract
>stage.
>
> Take a look at e.g. host-tz-database on how to handle multiple tarballs.
>
>> For the third possibility: I would suggest cloning the repo with the
>> --mirror option into a --bare repository almost like it's done now. Then
>> do a `git clone --recursive` to a temporary folder followed by a
>> checkout to the desired tag. Make a tarball from this clone and remove
>> the directory right afterwards. The git url support was introduced in
>> June 2013 by Michael Olbrich and not touch since. Did anyone try to
>> improve it in any way? Would a change in the proposed direction have
>> chances to be accepted by the ptxdist developers? It would make the code
>> more complex I guess.
>
> 'git archive' always creates the exact same tarball. It's not that easy to
> do the same thing manually. I'd like to avoid too much complexity here.
> But I'd be open for a patch that puts the 'git archive' call in a separate
> function. Then you only need to overwrite this function locally in your
> BSP with a special version that handles submodules.
>
> Michael
>
> --
> 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 v2 1/3] openssh: bump version to 7.1p1
Signed-off-by: Clemens Gruber --- rules/openssh.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/openssh.make b/rules/openssh.make index 931b207..ba5032e 100644 --- a/rules/openssh.make +++ b/rules/openssh.make @@ -17,8 +17,9 @@ PACKAGES-$(PTXCONF_OPENSSH) += openssh # # Paths and names # -OPENSSH_VERSION:= 6.9p1 -OPENSSH_MD5:= 0b161c44fc31fbc6b76a6f8ae639f16f +OPENSSH_VERSION:= 7.1p1 +OPENSSH_MD5:= 8709736bc8a8c253bc4eeb4829888ca5 +OPENSSH_SHA256 := fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad8428 OPENSSH:= openssh-$(OPENSSH_VERSION) OPENSSH_SUFFIX := tar.gz OPENSSH_URL:= \ -- 2.5.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 2/3] file: bump version to 5.24
Bump version of the file tool to 5.24 (many security vulnerabilities
fixed since 5.19) and specify the used license.
Signed-off-by: Clemens Gruber
---
...p-around-Remi-Collet-at-redhat-cherry-pic.patch | 26 --
patches/file-5.19/series | 5 -
rules/file.make| 6 ++---
3 files changed, 3 insertions(+), 34 deletions(-)
delete mode 100644
patches/file-5.19/0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch
delete mode 100644 patches/file-5.19/series
diff --git
a/patches/file-5.19/0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch
b/patches/file-5.19/0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch
deleted file mode 100644
index bcb141f..000
---
a/patches/file-5.19/0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Christos Zoulas
-Date: Thu, 7 Aug 2014 09:38:35 +
-Subject: [PATCH] Prevent wrap around (Remi Collet at redhat) (cherry picked
- from commit 0641e56be1af003aa02c7c6b0184466540637233)
-
-Conflicts:
- src/cdf.c
- src/cdf.c |4
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/cdf.c b/src/cdf.c
-index 106fc7a..bc94cb9 100644
a/src/cdf.c
-+++ b/src/cdf.c
-@@ -824,6 +824,10 @@ cdf_read_property_info(const cdf_stream_t *sst, const
cdf_header_t *h,
- q = (const uint8_t *)(const void *)
- ((const char *)(const void *)p + ofs
- - 2 * sizeof(uint32_t));
-+ if (q < p) {
-+ DPRINTF(("Wrapped around %p < %p\n", q, p));
-+ goto out;
-+ }
- if (q > e) {
- DPRINTF(("Ran of the end %p > %p\n", q, e));
- goto out;
diff --git a/patches/file-5.19/series b/patches/file-5.19/series
deleted file mode 100644
index eacd4da..000
--- a/patches/file-5.19/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-#tag:upstream --start-number 1
-0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch
-# 5d28e91bad86a7562482bbcb752de1f1 - git-ptx-patches magic
diff --git a/rules/file.make b/rules/file.make
index 5435a8f..257e1bb 100644
--- a/rules/file.make
+++ b/rules/file.make
@@ -16,14 +16,14 @@ PACKAGES-$(PTXCONF_FILE) += file
#
# Paths and names
#
-FILE_VERSION := 5.19
-FILE_MD5 := e3526f59023f3f7d1ffa4d541335edab
+FILE_VERSION := 5.24
+FILE_MD5 := ec161b5a0d2aef147fb046e5630b1408
FILE := file-$(FILE_VERSION)
FILE_SUFFIX:= tar.gz
FILE_URL := ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
FILE_SOURCE:= $(SRCDIR)/$(FILE).$(FILE_SUFFIX)
FILE_DIR := $(BUILDDIR)/$(FILE)
-FILE_LICENSE := unknown
+FILE_LICENSE := BSD, 2-term BSD
#
# Prepare
--
2.5.0
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/3] file: bump version to 5.24
Hi Jürgen, On Thu, Aug 27, 2015 at 10:21:12AM +0200, Juergen Borleis wrote: > Hi Clemens, > > On Wednesday 26 August 2015 23:04:51 Clemens Gruber wrote: > > Bump version of the file tool to 5.24 (many security vulnerabilities > > fixed since 5.19) and specify the used license. > > > > Signed-off-by: Clemens Gruber > > --- > > rules/file.make | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/rules/file.make b/rules/file.make > > index 5435a8f..257e1bb 100644 > > --- a/rules/file.make > > +++ b/rules/file.make > > @@ -16,14 +16,14 @@ PACKAGES-$(PTXCONF_FILE) += file > > # > > # Paths and names > > # > > -FILE_VERSION := 5.19 > > -FILE_MD5 := e3526f59023f3f7d1ffa4d541335edab > > +FILE_VERSION := 5.24 > > +FILE_MD5 := ec161b5a0d2aef147fb046e5630b1408 > > FILE := file-$(FILE_VERSION) > > FILE_SUFFIX:= tar.gz > > FILE_URL := ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) > > FILE_SOURCE:= $(SRCDIR)/$(FILE).$(FILE_SUFFIX) > > FILE_DIR := $(BUILDDIR)/$(FILE) > > -FILE_LICENSE := unknown > > +FILE_LICENSE := BSD, 2-term BSD > > Please honor "patches/file-5.19/*" Sorry, forgot to delete that directory. The wraparound is handled in 5.24. Will send a new patch. Clemens -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/3] openssh: bump version to 7.1p1
Hi Jürgen, On Thu, Aug 27, 2015 at 10:19:22AM +0200, Juergen Borleis wrote: > Hi Clemens, > > On Wednesday 26 August 2015 23:04:50 Clemens Gruber wrote: > > Bump OpenSSH version to 7.1p1 and remove --without-ssh1 configure flag > > as SSH1 is now disabled by default. > > > > Signed-off-by: Clemens Gruber > > --- > > rules/openssh.make | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/rules/openssh.make b/rules/openssh.make > > index 931b207..3c81c11 100644 > > --- a/rules/openssh.make > > +++ b/rules/openssh.make > > @@ -17,8 +17,9 @@ PACKAGES-$(PTXCONF_OPENSSH) += openssh > > # > > # Paths and names > > # > > -OPENSSH_VERSION:= 6.9p1 > > -OPENSSH_MD5:= 0b161c44fc31fbc6b76a6f8ae639f16f > > +OPENSSH_VERSION:= 7.1p1 > > +OPENSSH_MD5:= 8709736bc8a8c253bc4eeb4829888ca5 > > +OPENSSH_SHA256 := > > fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad8428 > > OPENSSH := openssh-$(OPENSSH_VERSION) > > OPENSSH_SUFFIX := tar.gz > > OPENSSH_URL:= \ > > @@ -57,7 +58,6 @@ OPENSSH_CONF_OPT := \ > > --disable-pututline \ > > --disable-pututxline \ > > --with-openssl \ > > - --without-ssh1 \ > > Is this switch now obsolete and invalid? If it is still valid I would vote > for > keeping this switch for security reasons. Sometimes defaults change again and > again... No it is not invalid, just not necessary anymore. But you are right, keeping it for security reasons is a good idea in case the defaults change again. I'll send a new patch. Clemens -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/3] file: bump version to 5.24
Hi Clemens, On Wednesday 26 August 2015 23:04:51 Clemens Gruber wrote: > Bump version of the file tool to 5.24 (many security vulnerabilities > fixed since 5.19) and specify the used license. > > Signed-off-by: Clemens Gruber > --- > rules/file.make | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/rules/file.make b/rules/file.make > index 5435a8f..257e1bb 100644 > --- a/rules/file.make > +++ b/rules/file.make > @@ -16,14 +16,14 @@ PACKAGES-$(PTXCONF_FILE) += file > # > # Paths and names > # > -FILE_VERSION := 5.19 > -FILE_MD5 := e3526f59023f3f7d1ffa4d541335edab > +FILE_VERSION := 5.24 > +FILE_MD5 := ec161b5a0d2aef147fb046e5630b1408 > FILE := file-$(FILE_VERSION) > FILE_SUFFIX := tar.gz > FILE_URL := ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) > FILE_SOURCE := $(SRCDIR)/$(FILE).$(FILE_SUFFIX) > FILE_DIR := $(BUILDDIR)/$(FILE) > -FILE_LICENSE := unknown > +FILE_LICENSE := BSD, 2-term BSD Please honor "patches/file-5.19/*" jbe -- Pengutronix e.K. | Juergen Borleis | Industrial Linux Solutions | http://www.pengutronix.de/ | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/3] openssh: bump version to 7.1p1
Hi Clemens, On Wednesday 26 August 2015 23:04:50 Clemens Gruber wrote: > Bump OpenSSH version to 7.1p1 and remove --without-ssh1 configure flag > as SSH1 is now disabled by default. > > Signed-off-by: Clemens Gruber > --- > rules/openssh.make | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/rules/openssh.make b/rules/openssh.make > index 931b207..3c81c11 100644 > --- a/rules/openssh.make > +++ b/rules/openssh.make > @@ -17,8 +17,9 @@ PACKAGES-$(PTXCONF_OPENSSH) += openssh > # > # Paths and names > # > -OPENSSH_VERSION := 6.9p1 > -OPENSSH_MD5 := 0b161c44fc31fbc6b76a6f8ae639f16f > +OPENSSH_VERSION := 7.1p1 > +OPENSSH_MD5 := 8709736bc8a8c253bc4eeb4829888ca5 > +OPENSSH_SHA256 := > fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad8428 > OPENSSH := openssh-$(OPENSSH_VERSION) > OPENSSH_SUFFIX := tar.gz > OPENSSH_URL := \ > @@ -57,7 +58,6 @@ OPENSSH_CONF_OPT:= \ > --disable-pututline \ > --disable-pututxline \ > --with-openssl \ > - --without-ssh1 \ Is this switch now obsolete and invalid? If it is still valid I would vote for keeping this switch for security reasons. Sometimes defaults change again and again... jbe -- Pengutronix e.K. | Juergen Borleis | Industrial Linux Solutions | http://www.pengutronix.de/ | -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] How to add a compiler variable from another package?
Hi, I have a package that, when selected, should add a variable to a bunch of other packages. Is this possible? thanks, mwarning -- ptxdist mailing list ptxdist@pengutronix.de
