[ptxdist] [PATCH] netcat: Fix path to NETCAT_SOURCE

[ptxdist] [PATCH] netcat: Fix path to NETCAT_SOURCE

[Bernhard Sessler]

Signed-off-by: Bernhard Sessler <bernhard.sessler@corscience.de>
---
 rules/netcat.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/netcat.make b/rules/netcat.make
index 6cbf0aa..dbdd9e3 100644
--- a/rules/netcat.make
+++ b/rules/netcat.make
@@ -22,7 +22,7 @@ NETCAT		:= netcat-openbsd-$(NETCAT_VERSION)
 NETCAT_SUFFIX	:= tar.gz
 NETCAT_TARBALL	:= netcat-openbsd_$(NETCAT_VERSION).orig.$(NETCAT_SUFFIX)
 NETCAT_URL	:= $(call ptx/mirror, DEB, pool/main/n/netcat-openbsd/$(NETCAT_TARBALL))
-NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT).$(NETCAT_SUFFIX)
+NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT_TARBALL)
 NETCAT_DIR	:= $(BUILDDIR)/$(NETCAT)
 NETCAT_LICENSE	:= BSD
 
-- 
1.9.1


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] netcat: Fix path to NETCAT_SOURCE

[Alexander Aring]

Hi Bernhard,

On Tue, Jul 08, 2014 at 11:47:04AM +0200, Bernhard Sessler wrote:
> Signed-off-by: Bernhard Sessler <bernhard.sessler@corscience.de>
> ---
>  rules/netcat.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/netcat.make b/rules/netcat.make
> index 6cbf0aa..dbdd9e3 100644
> --- a/rules/netcat.make
> +++ b/rules/netcat.make
> @@ -22,7 +22,7 @@ NETCAT		:= netcat-openbsd-$(NETCAT_VERSION)
>  NETCAT_SUFFIX	:= tar.gz
>  NETCAT_TARBALL	:= netcat-openbsd_$(NETCAT_VERSION).orig.$(NETCAT_SUFFIX)
>  NETCAT_URL	:= $(call ptx/mirror, DEB, pool/main/n/netcat-openbsd/$(NETCAT_TARBALL))
> -NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT).$(NETCAT_SUFFIX)
> +NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT_TARBALL)

did you have any issues with that or it is just an improvement?

- Alex

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] netcat: Fix path to NETCAT_SOURCE

[Alexander Aring]

Again me,

On Tue, Jul 08, 2014 at 12:08:44PM +0200, Alexander Aring wrote:
> Hi Bernhard,
> 
> On Tue, Jul 08, 2014 at 11:47:04AM +0200, Bernhard Sessler wrote:
> > Signed-off-by: Bernhard Sessler <bernhard.sessler@corscience.de>
> > ---
> >  rules/netcat.make | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/rules/netcat.make b/rules/netcat.make
> > index 6cbf0aa..dbdd9e3 100644
> > --- a/rules/netcat.make
> > +++ b/rules/netcat.make
> > @@ -22,7 +22,7 @@ NETCAT		:= netcat-openbsd-$(NETCAT_VERSION)
> >  NETCAT_SUFFIX	:= tar.gz
> >  NETCAT_TARBALL	:= netcat-openbsd_$(NETCAT_VERSION).orig.$(NETCAT_SUFFIX)
> >  NETCAT_URL	:= $(call ptx/mirror, DEB, pool/main/n/netcat-openbsd/$(NETCAT_TARBALL))
> > -NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT).$(NETCAT_SUFFIX)
> > +NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT_TARBALL)
> 
> did you have any issues with that or it is just an improvement?
> 

I think we need to rename "patches/netcat-openbsd-1.105" with a .orig. in
the middle. :-)

Didn't test it yet.

- Alex

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] netcat: Fix path to NETCAT_SOURCE

[Bernhard Seßler]

Hi Alexander,

yes, I did have issues with the original rule - ptxdist-2014.07.0 tried to
download netcat-openbsd-1.105.tar.gz when it should have downloaded
netcat-openbsd-1.105.orig.tar.gz. Maybe I should mention that we're using an
internal FTP server at our company which provides all the packages ptxdist needs
to download. So it may work with the default ptxdist setup - I didn't try that.

Regards,
Bernhard

On 08.07.2014 12:08, Alexander Aring wrote:
> Hi Bernhard,
> 
> On Tue, Jul 08, 2014 at 11:47:04AM +0200, Bernhard Sessler wrote:
>> Signed-off-by: Bernhard Sessler <bernhard.sessler@corscience.de>
>> ---
>>  rules/netcat.make | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/rules/netcat.make b/rules/netcat.make
>> index 6cbf0aa..dbdd9e3 100644
>> --- a/rules/netcat.make
>> +++ b/rules/netcat.make
>> @@ -22,7 +22,7 @@ NETCAT		:= netcat-openbsd-$(NETCAT_VERSION)
>>  NETCAT_SUFFIX	:= tar.gz
>>  NETCAT_TARBALL	:= netcat-openbsd_$(NETCAT_VERSION).orig.$(NETCAT_SUFFIX)
>>  NETCAT_URL	:= $(call ptx/mirror, DEB, pool/main/n/netcat-openbsd/$(NETCAT_TARBALL))
>> -NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT).$(NETCAT_SUFFIX)
>> +NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT_TARBALL)
> 
> did you have any issues with that or it is just an improvement?
> 
> - Alex
> 

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] netcat: Fix path to NETCAT_SOURCE

[Bernhard Seßler]

Hi,

On 08.07.2014 12:21, Alexander Aring wrote:
> Again me,
> 
> On Tue, Jul 08, 2014 at 12:08:44PM +0200, Alexander Aring wrote:
>> Hi Bernhard,
>> 
>> On Tue, Jul 08, 2014 at 11:47:04AM +0200, Bernhard Sessler wrote:
>> > Signed-off-by: Bernhard Sessler <bernhard.sessler@corscience.de>
>> > ---
>> >  rules/netcat.make | 2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>> > 
>> > diff --git a/rules/netcat.make b/rules/netcat.make
>> > index 6cbf0aa..dbdd9e3 100644
>> > --- a/rules/netcat.make
>> > +++ b/rules/netcat.make
>> > @@ -22,7 +22,7 @@ NETCAT		:= netcat-openbsd-$(NETCAT_VERSION)
>> >  NETCAT_SUFFIX	:= tar.gz
>> >  NETCAT_TARBALL	:= netcat-openbsd_$(NETCAT_VERSION).orig.$(NETCAT_SUFFIX)
>> >  NETCAT_URL	:= $(call ptx/mirror, DEB, pool/main/n/netcat-openbsd/$(NETCAT_TARBALL))
>> > -NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT).$(NETCAT_SUFFIX)
>> > +NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT_TARBALL)
>> 
>> did you have any issues with that or it is just an improvement?
>> 
> 
> I think we need to rename "patches/netcat-openbsd-1.105" with a .orig. in
> the middle. :-)

Yes, you may be right with that - I didn't notice that there are patches for
netcat shipped with ptxdist. Oddly enough it seems that it was built
successfully though.

> 
> Didn't test it yet.
> 
> - Alex
> 

Regards,
Bernhard

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] netcat: Fix path to NETCAT_SOURCE

[Alexander Aring]

On Tue, Jul 08, 2014 at 12:34:25PM +0200, Bernhard Seßler wrote:
> Hi,
> 
> On 08.07.2014 12:21, Alexander Aring wrote:
> > Again me,
> > 
> > On Tue, Jul 08, 2014 at 12:08:44PM +0200, Alexander Aring wrote:
> >> Hi Bernhard,
> >> 
> >> On Tue, Jul 08, 2014 at 11:47:04AM +0200, Bernhard Sessler wrote:
> >> > Signed-off-by: Bernhard Sessler <bernhard.sessler@corscience.de>
> >> > ---
> >> >  rules/netcat.make | 2 +-
> >> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >> > 
> >> > diff --git a/rules/netcat.make b/rules/netcat.make
> >> > index 6cbf0aa..dbdd9e3 100644
> >> > --- a/rules/netcat.make
> >> > +++ b/rules/netcat.make
> >> > @@ -22,7 +22,7 @@ NETCAT		:= netcat-openbsd-$(NETCAT_VERSION)
> >> >  NETCAT_SUFFIX	:= tar.gz
> >> >  NETCAT_TARBALL	:= netcat-openbsd_$(NETCAT_VERSION).orig.$(NETCAT_SUFFIX)
> >> >  NETCAT_URL	:= $(call ptx/mirror, DEB, pool/main/n/netcat-openbsd/$(NETCAT_TARBALL))
> >> > -NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT).$(NETCAT_SUFFIX)
> >> > +NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT_TARBALL)
> >> 
> >> did you have any issues with that or it is just an improvement?
> >> 
> > 
> > I think we need to rename "patches/netcat-openbsd-1.105" with a .orig. in
> > the middle. :-)
> 
> Yes, you may be right with that - I didn't notice that there are patches for
> netcat shipped with ptxdist. Oddly enough it seems that it was built
> successfully though.
> 

No, I was wrong here, it should not build without patches -> cames from
bsd. :-)

I checked it inside of netcat-openbsd-1.105.tar.gz is a
netcat-openbsd-1.105/ directory. This should be the same in both rules.

We don't need to rename it.

- Alex

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] netcat: Fix path to NETCAT_SOURCE

[Bernhard Seßler]

And me again,

On 08.07.2014 12:34, Bernhard Seßler wrote:
> Hi,
> 
> On 08.07.2014 12:21, Alexander Aring wrote:
>> Again me,
>> 
>> On Tue, Jul 08, 2014 at 12:08:44PM +0200, Alexander Aring wrote:
>>> Hi Bernhard,
>>> 
>>> On Tue, Jul 08, 2014 at 11:47:04AM +0200, Bernhard Sessler wrote:
>>> > Signed-off-by: Bernhard Sessler <bernhard.sessler@corscience.de>
>>> > ---
>>> >  rules/netcat.make | 2 +-
>>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>>> > 
>>> > diff --git a/rules/netcat.make b/rules/netcat.make
>>> > index 6cbf0aa..dbdd9e3 100644
>>> > --- a/rules/netcat.make
>>> > +++ b/rules/netcat.make
>>> > @@ -22,7 +22,7 @@ NETCAT		:= netcat-openbsd-$(NETCAT_VERSION)
>>> >  NETCAT_SUFFIX	:= tar.gz
>>> >  NETCAT_TARBALL	:= netcat-openbsd_$(NETCAT_VERSION).orig.$(NETCAT_SUFFIX)
>>> >  NETCAT_URL	:= $(call ptx/mirror, DEB, pool/main/n/netcat-openbsd/$(NETCAT_TARBALL))
>>> > -NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT).$(NETCAT_SUFFIX)
>>> > +NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT_TARBALL)
>>> 
>>> did you have any issues with that or it is just an improvement?
>>> 
>> 
>> I think we need to rename "patches/netcat-openbsd-1.105" with a .orig. in
>> the middle. :-)
> 
> Yes, you may be right with that - I didn't notice that there are patches for
> netcat shipped with ptxdist. Oddly enough it seems that it was built
> successfully though.
> 

The patches were applied successfully, so no need to change anything. :)

>> 
>> Didn't test it yet.
>> 
>> - Alex
>> 
> 
> Regards,
> Bernhard
> 

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] netcat: Fix path to NETCAT_SOURCE

[Alexander Aring]

On Tue, Jul 08, 2014 at 12:34:25PM +0200, Bernhard Seßler wrote:
> Hi,
> 
> On 08.07.2014 12:21, Alexander Aring wrote:
> > Again me,
> > 
> > On Tue, Jul 08, 2014 at 12:08:44PM +0200, Alexander Aring wrote:
> >> Hi Bernhard,
> >> 
> >> On Tue, Jul 08, 2014 at 11:47:04AM +0200, Bernhard Sessler wrote:
> >> > Signed-off-by: Bernhard Sessler <bernhard.sessler@corscience.de>
> >> > ---
> >> >  rules/netcat.make | 2 +-
> >> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >> > 
> >> > diff --git a/rules/netcat.make b/rules/netcat.make
> >> > index 6cbf0aa..dbdd9e3 100644
> >> > --- a/rules/netcat.make
> >> > +++ b/rules/netcat.make
> >> > @@ -22,7 +22,7 @@ NETCAT		:= netcat-openbsd-$(NETCAT_VERSION)
> >> >  NETCAT_SUFFIX	:= tar.gz
> >> >  NETCAT_TARBALL	:= netcat-openbsd_$(NETCAT_VERSION).orig.$(NETCAT_SUFFIX)
> >> >  NETCAT_URL	:= $(call ptx/mirror, DEB, pool/main/n/netcat-openbsd/$(NETCAT_TARBALL))
> >> > -NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT).$(NETCAT_SUFFIX)
> >> > +NETCAT_SOURCE	:= $(SRCDIR)/$(NETCAT_TARBALL)
> >> 
> >> did you have any issues with that or it is just an improvement?
> >> 
> > 
> > I think we need to rename "patches/netcat-openbsd-1.105" with a .orig. in
> > the middle. :-)
> 
> Yes, you may be right with that - I didn't notice that there are patches for
> netcat shipped with ptxdist. Oddly enough it seems that it was built
> successfully though.

Tested-by: Alexander Aring <alex.aring@gmail.com>

Maybe there exist a issue with own ftp and PACKAGE_SOURCE, I test it
right now. This works also on my setup without a own ftp server.

Thanks Bernhard!

- Alex

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] netcat: Fix path to NETCAT_SOURCE

[Michael Olbrich]

Hi,

On Tue, Jul 08, 2014 at 12:30:51PM +0200, Bernhard Seßler wrote:
> yes, I did have issues with the original rule - ptxdist-2014.07.0 tried to
> download netcat-openbsd-1.105.tar.gz when it should have downloaded
> netcat-openbsd-1.105.orig.tar.gz. Maybe I should mention that we're using an
> internal FTP server at our company which provides all the packages ptxdist needs
> to download. So it may work with the default ptxdist setup - I didn't try that.

You're using SETUP_PTXMIRROR_ONLY for this, right? You should put the files
collected by 'ptxdist export_src' on your mirror. While the filename part
in <PKG>_URL and <PKG>_SOURCE is usually the same, it's not always
possible. Not all URLs end with a useful filename. So we can only use
'<PKG>_SOURCE' for the filenames on the mirror.

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-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] netcat: Fix path to NETCAT_SOURCE

[Bernhard Seßler]

Hi,

On 10.07.2014 10:50, Michael Olbrich wrote:
> Hi,
> 
> On Tue, Jul 08, 2014 at 12:30:51PM +0200, Bernhard Seßler wrote:
>> yes, I did have issues with the original rule - ptxdist-2014.07.0 tried to
>> download netcat-openbsd-1.105.tar.gz when it should have downloaded
>> netcat-openbsd-1.105.orig.tar.gz. Maybe I should mention that we're using an
>> internal FTP server at our company which provides all the packages ptxdist needs
>> to download. So it may work with the default ptxdist setup - I didn't try that.
> 
> You're using SETUP_PTXMIRROR_ONLY for this, right? You should put the files
> collected by 'ptxdist export_src' on your mirror. While the filename part
> in <PKG>_URL and <PKG>_SOURCE is usually the same, it's not always
> possible. Not all URLs end with a useful filename. So we can only use
> '<PKG>_SOURCE' for the filenames on the mirror.

Sorry for the delayed reply, but yes, you're right. Thanks for the help.

> 
> Michael
> 

Regards,
Bernhard

-- 
ptxdist mailing list
ptxdist@pengutronix.de