2010/11/9 Michael Olbrich <[email protected]>:
> On Tue, Nov 09, 2010 at 02:53:25PM +0100, Bart vdr. Meulen wrote:
>> Commit 9d00746 introductes an issue where alternative files located in the
>> projectroot directory (which is a subdir from the platform directory) where
>> no longer saved in the deps file.
>
> hmmm, you're working with PTXCONF_PLATFORM="", right? Otherwise
> PTXDIST_PLATFORMDIR is ${PTXDIST_WORKSPACE}/platform-something/. And there
> is no projectroot there. I would prefer to do something like this:
>
Yes, we are working with PTXCONF_PLATFORM=""
> diff --git a/bin/ptxdist b/bin/ptxdist
> index a14cfde..a0ea376 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -2374,7 +2374,7 @@ setup_platform() {
>
> PTXDIST_PLATFORMDIR="${prefix}/platform-${platform}${platform_version}"
> PTXDIST_PLATFORMSUFFIX=".${platform}"
> else
> - PTXDIST_PLATFORMDIR="${prefix}"
> + PTXDIST_PLATFORMDIR="${prefix}/platform"
> PTXDIST_PLATFORMSUFFIX=""
> fi
>
>
> Then all files created/modified/deleted by ptxdist are in one directory
> (PTXDIST_PLATFORMDIR). That would be much cleaner.
>
That would work indeed, and be much cleaner
> Michael
>
>> Signed-off-by: Bart vdr. Meulen <[email protected]>
>> ---
>> scripts/lib/ptxd_make_xpkg_pkg.sh | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh
>> b/scripts/lib/ptxd_make_xpkg_pkg.sh
>> index 421abd8..bc752ab 100644
>> --- a/scripts/lib/ptxd_make_xpkg_pkg.sh
>> +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
>> @@ -81,7 +81,8 @@ ptxd_install_setup_src() {
>> for src in "${li...@]}"; do
>> if [ -e "${src}" ]; then
>> # don't provide dependencies for files in PTXDIST_PLATFORMDIR.
>> - if [ "${src}" = "${src#${PTXDIST_PLATFORMDIR}}" ]; then
>> + #but do add them when locating in the projectroot directory
>> + if [[ "${src}" = "${src#${PTXDIST_PLATFORMDIR}}" || "${src}" =~
>> "projectroot" ]]; then
>> # Since the dependency to the source files is dynamic we store
>> # the dependency information in a dependency file that can be
>> # included in the make files itself.
>> --
>> 1.7.0.4
>>
>>
>>
>> --
>> ptxdist mailing list
>> [email protected]
>>
>
> --
> 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
> [email protected]
>
Bart vdr. Meulen
--
ptxdist mailing list
[email protected]
