* [ptxdist] [PATCH] file: version bump 5.35 -> 5.36 @ 2020-01-07 18:21 Christian Hermann 2020-01-08 8:31 ` Alexander Dahl 2020-01-12 12:48 ` Michael Olbrich 0 siblings, 2 replies; 9+ messages in thread From: Christian Hermann @ 2020-01-07 18:21 UTC (permalink / raw) To: ptxdist * fetch via http instead of ftp * fix license identifier Signed-off-by: Christian Hermann <christian.hermann@hytera.de> --- rules/file.make | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rules/file.make b/rules/file.make index b721cf7e6..0d42cdece 100644 --- a/rules/file.make +++ b/rules/file.make @@ -14,14 +14,17 @@ PACKAGES-$(PTXCONF_FILE) += file # # Paths and names # -FILE_VERSION := 5.35 -FILE_MD5 := 5f10fb45bdaffd729a572e563783b78e +FILE_VERSION := 5.36 +FILE_MD5 := 9af0eb3f5db4ae00fffc37f7b861575c FILE := file-$(FILE_VERSION) FILE_SUFFIX := tar.gz -FILE_URL := ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) +FILE_URL := http://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) FILE_SOURCE := $(SRCDIR)/$(FILE).$(FILE_SUFFIX) FILE_DIR := $(BUILDDIR)/$(FILE) -FILE_LICENSE := BSD AND 2-term BSD +FILE_LICENSE := BSD-2-Clause +FILE_LICENSE_FILES := \ + file://COPYING;md5=8bafafc441e2e0b9660848c98760b5f3 \ + file://src/file.c;startline=1;endline=27;md5=c23a8098a761ce3193087925877307b9 # ---------------------------------------------------------------------------- # Prepare -- 2.24.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH] file: version bump 5.35 -> 5.36 2020-01-07 18:21 [ptxdist] [PATCH] file: version bump 5.35 -> 5.36 Christian Hermann @ 2020-01-08 8:31 ` Alexander Dahl 2020-01-08 13:28 ` Christian Hermann 2020-01-12 12:48 ` Michael Olbrich 1 sibling, 1 reply; 9+ messages in thread From: Alexander Dahl @ 2020-01-08 8:31 UTC (permalink / raw) To: ptxdist; +Cc: Christian Hermann Hello Christian, Am Dienstag, 7. Januar 2020, 19:21:42 CET schrieb Christian Hermann: > * fetch via http instead of ftp > * fix license identifier You might want to split up those in more than one commit for easier review and later reference? Greets Alex > > Signed-off-by: Christian Hermann <christian.hermann@hytera.de> > --- > rules/file.make | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/rules/file.make b/rules/file.make > index b721cf7e6..0d42cdece 100644 > --- a/rules/file.make > +++ b/rules/file.make > @@ -14,14 +14,17 @@ PACKAGES-$(PTXCONF_FILE) += file > # > # Paths and names > # > -FILE_VERSION := 5.35 > -FILE_MD5 := 5f10fb45bdaffd729a572e563783b78e > +FILE_VERSION := 5.36 > +FILE_MD5 := 9af0eb3f5db4ae00fffc37f7b861575c > FILE := file-$(FILE_VERSION) > FILE_SUFFIX := tar.gz > -FILE_URL := ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) > +FILE_URL := http://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) > FILE_SOURCE := $(SRCDIR)/$(FILE).$(FILE_SUFFIX) > FILE_DIR := $(BUILDDIR)/$(FILE) > -FILE_LICENSE := BSD AND 2-term BSD > +FILE_LICENSE := BSD-2-Clause > +FILE_LICENSE_FILES := \ > + file://COPYING;md5=8bafafc441e2e0b9660848c98760b5f3 \ > + file://src/file.c;startline=1;endline=27;md5=c23a8098a761ce319308792587730 > 7b9 > > # > --------------------------------------------------------------------------- > - # Prepare _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH] file: version bump 5.35 -> 5.36 2020-01-08 8:31 ` Alexander Dahl @ 2020-01-08 13:28 ` Christian Hermann 2020-01-08 15:00 ` [ptxdist] fail to install_alternative a file like dev-disk-by\x2dlabel-INSTALL.device (backslash?==?utf-8?q? x2d) Artur Wiebe 2020-01-10 12:02 ` [ptxdist] [PATCH] file: version bump 5.35 -> 5.36 Michael Olbrich 0 siblings, 2 replies; 9+ messages in thread From: Christian Hermann @ 2020-01-08 13:28 UTC (permalink / raw) To: ptxdist Hello Alex, thanks for taking a look at this commit. I consider this patch small enough for easy review and feedback. Kind regards On 08.01.20 09:31, Alexander Dahl wrote: > Hello Christian, > > Am Dienstag, 7. Januar 2020, 19:21:42 CET schrieb Christian Hermann: >> * fetch via http instead of ftp >> * fix license identifier > > You might want to split up those in more than one commit for easier review and > later reference? > > Greets > Alex > >> >> Signed-off-by: Christian Hermann <christian.hermann@hytera.de> >> --- >> rules/file.make | 11 +++++++---- >> 1 file changed, 7 insertions(+), 4 deletions(-) >> >> diff --git a/rules/file.make b/rules/file.make >> index b721cf7e6..0d42cdece 100644 >> --- a/rules/file.make >> +++ b/rules/file.make >> @@ -14,14 +14,17 @@ PACKAGES-$(PTXCONF_FILE) += file >> # >> # Paths and names >> # >> -FILE_VERSION := 5.35 >> -FILE_MD5 := 5f10fb45bdaffd729a572e563783b78e >> +FILE_VERSION := 5.36 >> +FILE_MD5 := 9af0eb3f5db4ae00fffc37f7b861575c >> FILE := file-$(FILE_VERSION) >> FILE_SUFFIX := tar.gz >> -FILE_URL := ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) >> +FILE_URL := http://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) >> FILE_SOURCE := $(SRCDIR)/$(FILE).$(FILE_SUFFIX) >> FILE_DIR := $(BUILDDIR)/$(FILE) >> -FILE_LICENSE := BSD AND 2-term BSD >> +FILE_LICENSE := BSD-2-Clause >> +FILE_LICENSE_FILES := \ >> + file://COPYING;md5=8bafafc441e2e0b9660848c98760b5f3 \ >> + file://src/file.c;startline=1;endline=27;md5=c23a8098a761ce319308792587730 >> 7b9 >> >> # >> --------------------------------------------------------------------------- >> - # Prepare > > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 9+ messages in thread
* [ptxdist] fail to install_alternative a file like dev-disk-by\x2dlabel-INSTALL.device (backslash?==?utf-8?q? x2d) 2020-01-08 13:28 ` Christian Hermann @ 2020-01-08 15:00 ` Artur Wiebe 2020-01-10 13:19 ` Michael Olbrich 2020-01-10 12:02 ` [ptxdist] [PATCH] file: version bump 5.35 -> 5.36 Michael Olbrich 1 sibling, 1 reply; 9+ messages in thread From: Artur Wiebe @ 2020-01-08 15:00 UTC (permalink / raw) To: ptxdist 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 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] fail to install_alternative a file like dev-disk-by\x2dlabel-INSTALL.device (backslash?==?utf-8?q? x2d) 2020-01-08 15:00 ` [ptxdist] fail to install_alternative a file like dev-disk-by\x2dlabel-INSTALL.device (backslash?==?utf-8?q? x2d) Artur Wiebe @ 2020-01-10 13:19 ` Michael Olbrich 2020-01-30 13:35 ` Michael Olbrich 0 siblings, 1 reply; 9+ messages in thread From: Michael Olbrich @ 2020-01-10 13:19 UTC (permalink / raw) To: ptxdist Hi, 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. 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-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] fail to install_alternative a file like dev-disk-by\x2dlabel-INSTALL.device (backslash?==?utf-8?q? x2d) 2020-01-10 13:19 ` Michael Olbrich @ 2020-01-30 13:35 ` Michael Olbrich 2020-08-12 8:01 ` [ptxdist] ?==?utf-8?q? fail to install_alternative a file like dev-disk-by\x2dlabel-INSTALL.device (backslash?= x2d Artur Wiebe 0 siblings, 1 reply; 9+ messages in thread From: Michael Olbrich @ 2020-01-30 13:35 UTC (permalink / raw) To: ptxdist 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-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] ?==?utf-8?q? fail to install_alternative a file like dev-disk-by\x2dlabel-INSTALL.device (backslash?= x2d 2020-01-30 13:35 ` Michael Olbrich @ 2020-08-12 8:01 ` Artur Wiebe 0 siblings, 0 replies; 9+ messages in thread From: Artur Wiebe @ 2020-08-12 8:01 UTC (permalink / raw) To: ptxdist 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 <m.olbrich@pengutronix.de> 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-5555 | > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH] file: version bump 5.35 -> 5.36 2020-01-08 13:28 ` Christian Hermann 2020-01-08 15:00 ` [ptxdist] fail to install_alternative a file like dev-disk-by\x2dlabel-INSTALL.device (backslash?==?utf-8?q? x2d) Artur Wiebe @ 2020-01-10 12:02 ` Michael Olbrich 1 sibling, 0 replies; 9+ messages in thread From: Michael Olbrich @ 2020-01-10 12:02 UTC (permalink / raw) To: ptxdist On Wed, Jan 08, 2020 at 02:28:56PM +0100, Christian Hermann wrote: > Hello Alex, > > thanks for taking a look at this commit. > I consider this patch small enough for easy review and feedback. One commit is fine in this case. Michael > On 08.01.20 09:31, Alexander Dahl wrote: > > Hello Christian, > > > > Am Dienstag, 7. Januar 2020, 19:21:42 CET schrieb Christian Hermann: > > > * fetch via http instead of ftp > > > * fix license identifier > > > > You might want to split up those in more than one commit for easier review and > > later reference? > > > > Greets > > Alex > > > > > > > > Signed-off-by: Christian Hermann <christian.hermann@hytera.de> > > > --- > > > rules/file.make | 11 +++++++---- > > > 1 file changed, 7 insertions(+), 4 deletions(-) > > > > > > diff --git a/rules/file.make b/rules/file.make > > > index b721cf7e6..0d42cdece 100644 > > > --- a/rules/file.make > > > +++ b/rules/file.make > > > @@ -14,14 +14,17 @@ PACKAGES-$(PTXCONF_FILE) += file > > > # > > > # Paths and names > > > # > > > -FILE_VERSION := 5.35 > > > -FILE_MD5 := 5f10fb45bdaffd729a572e563783b78e > > > +FILE_VERSION := 5.36 > > > +FILE_MD5 := 9af0eb3f5db4ae00fffc37f7b861575c > > > FILE := file-$(FILE_VERSION) > > > FILE_SUFFIX := tar.gz > > > -FILE_URL := ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) > > > +FILE_URL := http://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) > > > FILE_SOURCE := $(SRCDIR)/$(FILE).$(FILE_SUFFIX) > > > FILE_DIR := $(BUILDDIR)/$(FILE) > > > -FILE_LICENSE := BSD AND 2-term BSD > > > +FILE_LICENSE := BSD-2-Clause > > > +FILE_LICENSE_FILES := \ > > > + file://COPYING;md5=8bafafc441e2e0b9660848c98760b5f3 \ > > > + file://src/file.c;startline=1;endline=27;md5=c23a8098a761ce319308792587730 > > > 7b9 > > > > > > # > > > --------------------------------------------------------------------------- > > > - # Prepare > > > > > > > > _______________________________________________ > > ptxdist mailing list > > ptxdist@pengutronix.de > > > > _______________________________________________ > ptxdist mailing list > ptxdist@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-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH] file: version bump 5.35 -> 5.36 2020-01-07 18:21 [ptxdist] [PATCH] file: version bump 5.35 -> 5.36 Christian Hermann 2020-01-08 8:31 ` Alexander Dahl @ 2020-01-12 12:48 ` Michael Olbrich 1 sibling, 0 replies; 9+ messages in thread From: Michael Olbrich @ 2020-01-12 12:48 UTC (permalink / raw) To: ptxdist On Tue, Jan 07, 2020 at 07:21:42PM +0100, Christian Hermann wrote: > * fetch via http instead of ftp > * fix license identifier > > Signed-off-by: Christian Hermann <christian.hermann@hytera.de> > --- > rules/file.make | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/rules/file.make b/rules/file.make > index b721cf7e6..0d42cdece 100644 > --- a/rules/file.make > +++ b/rules/file.make > @@ -14,14 +14,17 @@ PACKAGES-$(PTXCONF_FILE) += file > # > # Paths and names > # > -FILE_VERSION := 5.35 > -FILE_MD5 := 5f10fb45bdaffd729a572e563783b78e > +FILE_VERSION := 5.36 > +FILE_MD5 := 9af0eb3f5db4ae00fffc37f7b861575c > FILE := file-$(FILE_VERSION) > FILE_SUFFIX := tar.gz > -FILE_URL := ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) > +FILE_URL := http://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) > FILE_SOURCE := $(SRCDIR)/$(FILE).$(FILE_SUFFIX) > FILE_DIR := $(BUILDDIR)/$(FILE) > -FILE_LICENSE := BSD AND 2-term BSD > +FILE_LICENSE := BSD-2-Clause Hmmm, I think there is a file with BSD-3-Clause and some with curl(?). Michael > +FILE_LICENSE_FILES := \ > + file://COPYING;md5=8bafafc441e2e0b9660848c98760b5f3 \ > + file://src/file.c;startline=1;endline=27;md5=c23a8098a761ce3193087925877307b9 > > # ---------------------------------------------------------------------------- > # Prepare > -- > 2.24.1 > > > _______________________________________________ > ptxdist mailing list > ptxdist@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-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-08-12 8:01 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-01-07 18:21 [ptxdist] [PATCH] file: version bump 5.35 -> 5.36 Christian Hermann 2020-01-08 8:31 ` Alexander Dahl 2020-01-08 13:28 ` Christian Hermann 2020-01-08 15:00 ` [ptxdist] fail to install_alternative a file like dev-disk-by\x2dlabel-INSTALL.device (backslash?==?utf-8?q? x2d) Artur Wiebe 2020-01-10 13:19 ` Michael Olbrich 2020-01-30 13:35 ` Michael Olbrich 2020-08-12 8:01 ` [ptxdist] ?==?utf-8?q? fail to install_alternative a file like dev-disk-by\x2dlabel-INSTALL.device (backslash?= x2d Artur Wiebe 2020-01-10 12:02 ` [ptxdist] [PATCH] file: version bump 5.35 -> 5.36 Michael Olbrich 2020-01-12 12:48 ` Michael Olbrich
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox