[ptxdist] Add patch series to ${PTXDIST_TEMPDIR}/pkghash-*

[ptxdist] Add patch series to ${PTXDIST_TEMPDIR}/pkghash-*

[Jon Ringle]

Michael,

When generating the ${PTXDIST_TEMPDIR}/pkghash-* in ptxd_lib_dgen.awk,
have you considered adding to that the contents of the first
${PTXDIST_PATH_PATCHES}/this_PKG/series file found if one exists? This
would make the *_CFGHASH change if the patch series changes for a
given package. I'm not sure how to do this in awk, since
${PTXDIST_PATH_PATCHES} is actually a : delimited search path.

Jon

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Add patch series to ${PTXDIST_TEMPDIR}/pkghash-*

[Michael Olbrich]

Hi,

On Mon, Jan 20, 2014 at 08:32:29PM -0500, Jon Ringle wrote:
> When generating the ${PTXDIST_TEMPDIR}/pkghash-* in ptxd_lib_dgen.awk,
> have you considered adding to that the contents of the first
> ${PTXDIST_PATH_PATCHES}/this_PKG/series file found if one exists? This
> would make the *_CFGHASH change if the patch series changes for a
> given package. I'm not sure how to do this in awk, since
> ${PTXDIST_PATH_PATCHES} is actually a : delimited search path.

It's not that simple. There are also things like $(KERNEL_SERIES) and the
last time I tried, the performance was not acceptable.

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] Add patch series to ${PTXDIST_TEMPDIR}/pkghash-*

[Jon Ringle]

On Tue, Jan 21, 2014 at 4:56 AM, Michael Olbrich
<m.olbrich@pengutronix.de> wrote:
> Hi,
>
> On Mon, Jan 20, 2014 at 08:32:29PM -0500, Jon Ringle wrote:
>> When generating the ${PTXDIST_TEMPDIR}/pkghash-* in ptxd_lib_dgen.awk,
>> have you considered adding to that the contents of the first
>> ${PTXDIST_PATH_PATCHES}/this_PKG/series file found if one exists? This
>> would make the *_CFGHASH change if the patch series changes for a
>> given package. I'm not sure how to do this in awk, since
>> ${PTXDIST_PATH_PATCHES} is actually a : delimited search path.
>
> It's not that simple. There are also things like $(KERNEL_SERIES) and the
> last time I tried, the performance was not acceptable.

Does the special case for $(KERNEL_SERIES) go away with what is being
discussed on the other thread today about adding
KERNEL_DEVPKG := NO

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Add patch series to ${PTXDIST_TEMPDIR}/pkghash-*

[Michael Olbrich]

On Tue, Jan 21, 2014 at 09:02:49AM -0500, Jon Ringle wrote:
> On Tue, Jan 21, 2014 at 4:56 AM, Michael Olbrich
> <m.olbrich@pengutronix.de> wrote:
> > Hi,
> >
> > On Mon, Jan 20, 2014 at 08:32:29PM -0500, Jon Ringle wrote:
> >> When generating the ${PTXDIST_TEMPDIR}/pkghash-* in ptxd_lib_dgen.awk,
> >> have you considered adding to that the contents of the first
> >> ${PTXDIST_PATH_PATCHES}/this_PKG/series file found if one exists? This
> >> would make the *_CFGHASH change if the patch series changes for a
> >> given package. I'm not sure how to do this in awk, since
> >> ${PTXDIST_PATH_PATCHES} is actually a : delimited search path.
> >
> > It's not that simple. There are also things like $(KERNEL_SERIES) and the
> > last time I tried, the performance was not acceptable.
> 
> Does the special case for $(KERNEL_SERIES) go away with what is being
> discussed on the other thread today about adding
> KERNEL_DEVPKG := NO

Now I remember why that doesn't work:
The name for the individual patch directories are not available yet, so we
cannot find the series file. :-/

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] Add patch series to ${PTXDIST_TEMPDIR}/pkghash-*

[Jon Ringle]

On Thu, Jan 23, 2014 at 11:10 AM, Michael Olbrich
<m.olbrich@pengutronix.de> wrote:
> On Tue, Jan 21, 2014 at 09:02:49AM -0500, Jon Ringle wrote:
>> On Tue, Jan 21, 2014 at 4:56 AM, Michael Olbrich
>> <m.olbrich@pengutronix.de> wrote:
>> > Hi,
>> >
>> > On Mon, Jan 20, 2014 at 08:32:29PM -0500, Jon Ringle wrote:
>> >> When generating the ${PTXDIST_TEMPDIR}/pkghash-* in ptxd_lib_dgen.awk,
>> >> have you considered adding to that the contents of the first
>> >> ${PTXDIST_PATH_PATCHES}/this_PKG/series file found if one exists? This
>> >> would make the *_CFGHASH change if the patch series changes for a
>> >> given package. I'm not sure how to do this in awk, since
>> >> ${PTXDIST_PATH_PATCHES} is actually a : delimited search path.
>> >
>> > It's not that simple. There are also things like $(KERNEL_SERIES) and the
>> > last time I tried, the performance was not acceptable.
>>
>> Does the special case for $(KERNEL_SERIES) go away with what is being
>> discussed on the other thread today about adding
>> KERNEL_DEVPKG := NO
>
> Now I remember why that doesn't work:
> The name for the individual patch directories are not available yet, so we
> cannot find the series file. :-/

It would be great if there was someway to get the series file so it
could be included in pkghash-*. I've been bitten by adding a custom
patch to a package only to have the old dev package used because the
series file change was not detected.

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Add patch series to ${PTXDIST_TEMPDIR}/pkghash-*

[Michael Olbrich]

On Thu, Jan 23, 2014 at 12:30:11PM -0500, Jon Ringle wrote:
> On Thu, Jan 23, 2014 at 11:10 AM, Michael Olbrich
> <m.olbrich@pengutronix.de> wrote:
> > On Tue, Jan 21, 2014 at 09:02:49AM -0500, Jon Ringle wrote:
> >> On Tue, Jan 21, 2014 at 4:56 AM, Michael Olbrich
> >> <m.olbrich@pengutronix.de> wrote:
> >> > Hi,
> >> >
> >> > On Mon, Jan 20, 2014 at 08:32:29PM -0500, Jon Ringle wrote:
> >> >> When generating the ${PTXDIST_TEMPDIR}/pkghash-* in ptxd_lib_dgen.awk,
> >> >> have you considered adding to that the contents of the first
> >> >> ${PTXDIST_PATH_PATCHES}/this_PKG/series file found if one exists? This
> >> >> would make the *_CFGHASH change if the patch series changes for a
> >> >> given package. I'm not sure how to do this in awk, since
> >> >> ${PTXDIST_PATH_PATCHES} is actually a : delimited search path.
> >> >
> >> > It's not that simple. There are also things like $(KERNEL_SERIES) and the
> >> > last time I tried, the performance was not acceptable.
> >>
> >> Does the special case for $(KERNEL_SERIES) go away with what is being
> >> discussed on the other thread today about adding
> >> KERNEL_DEVPKG := NO
> >
> > Now I remember why that doesn't work:
> > The name for the individual patch directories are not available yet, so we
> > cannot find the series file. :-/
> 
> It would be great if there was someway to get the series file so it
> could be included in pkghash-*. I've been bitten by adding a custom
> patch to a package only to have the old dev package used because the
> series file change was not detected.

I agree, but I have no idea how to do this.

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] Add patch series to ${PTXDIST_TEMPDIR}/pkghash-*

[Jon Ringle]

On Fri, Jan 24, 2014 at 4:16 AM, Michael Olbrich
<m.olbrich@pengutronix.de> wrote:
> On Thu, Jan 23, 2014 at 12:30:11PM -0500, Jon Ringle wrote:
>> On Thu, Jan 23, 2014 at 11:10 AM, Michael Olbrich
>> <m.olbrich@pengutronix.de> wrote:
>> > On Tue, Jan 21, 2014 at 09:02:49AM -0500, Jon Ringle wrote:
>> >> On Tue, Jan 21, 2014 at 4:56 AM, Michael Olbrich
>> >> <m.olbrich@pengutronix.de> wrote:
>> >> > Hi,
>> >> >
>> >> > On Mon, Jan 20, 2014 at 08:32:29PM -0500, Jon Ringle wrote:
>> >> >> When generating the ${PTXDIST_TEMPDIR}/pkghash-* in ptxd_lib_dgen.awk,
>> >> >> have you considered adding to that the contents of the first
>> >> >> ${PTXDIST_PATH_PATCHES}/this_PKG/series file found if one exists? This
>> >> >> would make the *_CFGHASH change if the patch series changes for a
>> >> >> given package. I'm not sure how to do this in awk, since
>> >> >> ${PTXDIST_PATH_PATCHES} is actually a : delimited search path.
>> >> >
>> >> > It's not that simple. There are also things like $(KERNEL_SERIES) and the
>> >> > last time I tried, the performance was not acceptable.
>> >>
>> >> Does the special case for $(KERNEL_SERIES) go away with what is being
>> >> discussed on the other thread today about adding
>> >> KERNEL_DEVPKG := NO
>> >
>> > Now I remember why that doesn't work:
>> > The name for the individual patch directories are not available yet, so we
>> > cannot find the series file. :-/
>>
>> It would be great if there was someway to get the series file so it
>> could be included in pkghash-*. I've been bitten by adding a custom
>> patch to a package only to have the old dev package used because the
>> series file change was not detected.
>
> I agree, but I have no idea how to do this.

Does the value of <PKG>_CFGHASH need to be generated in
scripts/lib/ptxd_lib_dgen.awk?
Why not have a dependency on ${PTXDIST_TEMPDIR}/pkghash-<pkg> so that
the md5sum is calculated later...

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Add patch series to ${PTXDIST_TEMPDIR}/pkghash-*

[Michael Olbrich]

On Fri, Jan 24, 2014 at 08:45:42AM -0500, Jon Ringle wrote:
> On Fri, Jan 24, 2014 at 4:16 AM, Michael Olbrich
> <m.olbrich@pengutronix.de> wrote:
> > On Thu, Jan 23, 2014 at 12:30:11PM -0500, Jon Ringle wrote:
> >> On Thu, Jan 23, 2014 at 11:10 AM, Michael Olbrich
> >> <m.olbrich@pengutronix.de> wrote:
> >> > On Tue, Jan 21, 2014 at 09:02:49AM -0500, Jon Ringle wrote:
> >> >> On Tue, Jan 21, 2014 at 4:56 AM, Michael Olbrich
> >> >> <m.olbrich@pengutronix.de> wrote:
> >> >> > Hi,
> >> >> >
> >> >> > On Mon, Jan 20, 2014 at 08:32:29PM -0500, Jon Ringle wrote:
> >> >> >> When generating the ${PTXDIST_TEMPDIR}/pkghash-* in ptxd_lib_dgen.awk,
> >> >> >> have you considered adding to that the contents of the first
> >> >> >> ${PTXDIST_PATH_PATCHES}/this_PKG/series file found if one exists? This
> >> >> >> would make the *_CFGHASH change if the patch series changes for a
> >> >> >> given package. I'm not sure how to do this in awk, since
> >> >> >> ${PTXDIST_PATH_PATCHES} is actually a : delimited search path.
> >> >> >
> >> >> > It's not that simple. There are also things like $(KERNEL_SERIES) and the
> >> >> > last time I tried, the performance was not acceptable.
> >> >>
> >> >> Does the special case for $(KERNEL_SERIES) go away with what is being
> >> >> discussed on the other thread today about adding
> >> >> KERNEL_DEVPKG := NO
> >> >
> >> > Now I remember why that doesn't work:
> >> > The name for the individual patch directories are not available yet, so we
> >> > cannot find the series file. :-/
> >>
> >> It would be great if there was someway to get the series file so it
> >> could be included in pkghash-*. I've been bitten by adding a custom
> >> patch to a package only to have the old dev package used because the
> >> series file change was not detected.
> >
> > I agree, but I have no idea how to do this.
> 
> Does the value of <PKG>_CFGHASH need to be generated in
> scripts/lib/ptxd_lib_dgen.awk?
> Why not have a dependency on ${PTXDIST_TEMPDIR}/pkghash-<pkg> so that
> the md5sum is calculated later...

I don't think that's possible. We change the dependencies based on the
existence of the devpkg:

"get -> extract -> prepare -> compile -> install -> targetinstall"
or
"unpack -> targetinstall"

This can only happen at the beginning, when the make dependencies are
resolved. I don't think this can be delayed.

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] Add patch series to ${PTXDIST_TEMPDIR}/pkghash-*

[Jon Ringle]

On Fri, Jan 24, 2014 at 10:03 AM, Michael Olbrich
<m.olbrich@pengutronix.de> wrote:
> On Fri, Jan 24, 2014 at 08:45:42AM -0500, Jon Ringle wrote:
>> On Fri, Jan 24, 2014 at 4:16 AM, Michael Olbrich
>> <m.olbrich@pengutronix.de> wrote:
>> > On Thu, Jan 23, 2014 at 12:30:11PM -0500, Jon Ringle wrote:
>> >> On Thu, Jan 23, 2014 at 11:10 AM, Michael Olbrich
>> >> <m.olbrich@pengutronix.de> wrote:
>> >> > On Tue, Jan 21, 2014 at 09:02:49AM -0500, Jon Ringle wrote:
>> >> >> On Tue, Jan 21, 2014 at 4:56 AM, Michael Olbrich
>> >> >> <m.olbrich@pengutronix.de> wrote:
>> >> >> > Hi,
>> >> >> >
>> >> >> > On Mon, Jan 20, 2014 at 08:32:29PM -0500, Jon Ringle wrote:
>> >> >> >> When generating the ${PTXDIST_TEMPDIR}/pkghash-* in ptxd_lib_dgen.awk,
>> >> >> >> have you considered adding to that the contents of the first
>> >> >> >> ${PTXDIST_PATH_PATCHES}/this_PKG/series file found if one exists? This
>> >> >> >> would make the *_CFGHASH change if the patch series changes for a
>> >> >> >> given package. I'm not sure how to do this in awk, since
>> >> >> >> ${PTXDIST_PATH_PATCHES} is actually a : delimited search path.
>> >> >> >
>> >> >> > It's not that simple. There are also things like $(KERNEL_SERIES) and the
>> >> >> > last time I tried, the performance was not acceptable.
>> >> >>
>> >> >> Does the special case for $(KERNEL_SERIES) go away with what is being
>> >> >> discussed on the other thread today about adding
>> >> >> KERNEL_DEVPKG := NO
>> >> >
>> >> > Now I remember why that doesn't work:
>> >> > The name for the individual patch directories are not available yet, so we
>> >> > cannot find the series file. :-/
>> >>
>> >> It would be great if there was someway to get the series file so it
>> >> could be included in pkghash-*. I've been bitten by adding a custom
>> >> patch to a package only to have the old dev package used because the
>> >> series file change was not detected.
>> >
>> > I agree, but I have no idea how to do this.
>>
>> Does the value of <PKG>_CFGHASH need to be generated in
>> scripts/lib/ptxd_lib_dgen.awk?
>> Why not have a dependency on ${PTXDIST_TEMPDIR}/pkghash-<pkg> so that
>> the md5sum is calculated later...
>
> I don't think that's possible. We change the dependencies based on the
> existence of the devpkg:
>
> "get -> extract -> prepare -> compile -> install -> targetinstall"
> or
> "unpack -> targetinstall"
>
> This can only happen at the beginning, when the make dependencies are
> resolved. I don't think this can be delayed.

Can we do this in 2 passes then? Have ptxdist call "ptxd_make_log
build_pkghash" first where the target builds the pkghash-* files at a
time where it can call ptxd_make_world_patchin_apply_init to figure
out the location of the series file,

do_go()
{
    check_premake_compiler &&
    ptxd_make_log build_pkghash &&
    ptxd_make_log world
}

-- 
ptxdist mailing list
ptxdist@pengutronix.de