[PATCH v3] package.bbclass: copy dotfiles in root D to PKGD

[PATCH v3] package.bbclass: copy dotfiles in root D to PKGD

[Michael Smith]

The previous system("cp %s/* ...") missed dotfiles/dirs at the
top-level.

Signed-off-by: Michael Smith <msmith@cbnco.com>
Cc: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Cc: Graham Gower <graham.gower@gmail.com>
Cc: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---
 classes/package.bbclass |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/package.bbclass b/classes/package.bbclass
index e2a61bf..2769595 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -356,15 +356,15 @@ python package_do_split_locales() {
 }
 
 python perform_packagecopy () {
-	dest = bb.data.getVar('D', d, True)
-	dvar = bb.data.getVar('PKGD', d, True)
+	installdest = bb.data.getVar('D', d, True)
+	pkgcopy = bb.data.getVar('PKGD', d, True)
 
-	bb.mkdirhier(dvar)
+	bb.mkdirhier(pkgcopy)
 
 	# Start by package population by taking a copy of the installed 
 	# files to operate on
-	os.system('rm -rf %s/*' % (dvar))
-	os.system('cp -pPR %s/* %s/' % (dest, dvar))
+	os.system('rm -rf %s/*' % (pkgcopy))
+	os.system('cp -pPR %s/. %s/' % (installdest, pkgcopy))
 }
 
 python populate_packages () {
-- 
1.7.0.4

Re: [PATCH v3] package.bbclass: copy dotfiles in root D to PKGD

[Khem Raj]

On Mon, Oct 18, 2010 at 9:44 AM, Michael Smith <msmith@cbnco.com> wrote:
> The previous system("cp %s/* ...") missed dotfiles/dirs at the
> top-level.
>
> Signed-off-by: Michael Smith <msmith@cbnco.com>
> Cc: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
> Cc: Graham Gower <graham.gower@gmail.com>
> Cc: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
> ---
>  classes/package.bbclass |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/classes/package.bbclass b/classes/package.bbclass
> index e2a61bf..2769595 100644
> --- a/classes/package.bbclass
> +++ b/classes/package.bbclass
> @@ -356,15 +356,15 @@ python package_do_split_locales() {
>  }
>
>  python perform_packagecopy () {
> -       dest = bb.data.getVar('D', d, True)
> -       dvar = bb.data.getVar('PKGD', d, True)
> +       installdest = bb.data.getVar('D', d, True)
> +       pkgcopy = bb.data.getVar('PKGD', d, True)
>
> -       bb.mkdirhier(dvar)
> +       bb.mkdirhier(pkgcopy)
>
>        # Start by package population by taking a copy of the installed
>        # files to operate on
> -       os.system('rm -rf %s/*' % (dvar))
> -       os.system('cp -pPR %s/* %s/' % (dest, dvar))
> +       os.system('rm -rf %s/*' % (pkgcopy))
> +       os.system('cp -pPR %s/. %s/' % (installdest, pkgcopy))
>  }

will it also try to copy . and .. ?

>
>  python populate_packages () {
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [PATCH v3] package.bbclass: copy dotfiles in root D to PKGD

[Frans Meulenbroeks]

2010/10/18 Khem Raj <raj.khem@gmail.com>:
> On Mon, Oct 18, 2010 at 9:44 AM, Michael Smith <msmith@cbnco.com> wrote:
>> The previous system("cp %s/* ...") missed dotfiles/dirs at the
>> top-level.
>>
>> Signed-off-by: Michael Smith <msmith@cbnco.com>
>> Cc: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
>> Cc: Graham Gower <graham.gower@gmail.com>
>> Cc: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
>> ---
>>  classes/package.bbclass |   10 +++++-----
>>  1 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/classes/package.bbclass b/classes/package.bbclass
>> index e2a61bf..2769595 100644
>> --- a/classes/package.bbclass
>> +++ b/classes/package.bbclass
>> @@ -356,15 +356,15 @@ python package_do_split_locales() {
>>  }
>>
>>  python perform_packagecopy () {
>> -       dest = bb.data.getVar('D', d, True)
>> -       dvar = bb.data.getVar('PKGD', d, True)
>> +       installdest = bb.data.getVar('D', d, True)
>> +       pkgcopy = bb.data.getVar('PKGD', d, True)
>>
>> -       bb.mkdirhier(dvar)
>> +       bb.mkdirhier(pkgcopy)
>>
>>        # Start by package population by taking a copy of the installed
>>        # files to operate on
>> -       os.system('rm -rf %s/*' % (dvar))
>> -       os.system('cp -pPR %s/* %s/' % (dest, dvar))
>> +       os.system('rm -rf %s/*' % (pkgcopy))
>> +       os.system('cp -pPR %s/. %s/' % (installdest, pkgcopy))
>>  }
>
> will it also try to copy . and .. ?

No (tested that).

Frans.
>
>>
>>  python populate_packages () {
>> --
>> 1.7.0.4
>>
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [PATCH v3] package.bbclass: copy dotfiles in root D to PKGD

[Khem Raj]

On Mon, Oct 18, 2010 at 9:44 AM, Michael Smith <msmith@cbnco.com> wrote:
> The previous system("cp %s/* ...") missed dotfiles/dirs at the
> top-level.
>
> Signed-off-by: Michael Smith <msmith@cbnco.com>
> Cc: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
> Cc: Graham Gower <graham.gower@gmail.com>
> Cc: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

Acked-by: Khem Raj <raj.khem@gmail.com>

> ---
>  classes/package.bbclass |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/classes/package.bbclass b/classes/package.bbclass
> index e2a61bf..2769595 100644
> --- a/classes/package.bbclass
> +++ b/classes/package.bbclass
> @@ -356,15 +356,15 @@ python package_do_split_locales() {
>  }
>
>  python perform_packagecopy () {
> -       dest = bb.data.getVar('D', d, True)
> -       dvar = bb.data.getVar('PKGD', d, True)
> +       installdest = bb.data.getVar('D', d, True)
> +       pkgcopy = bb.data.getVar('PKGD', d, True)
>
> -       bb.mkdirhier(dvar)
> +       bb.mkdirhier(pkgcopy)
>
>        # Start by package population by taking a copy of the installed
>        # files to operate on
> -       os.system('rm -rf %s/*' % (dvar))
> -       os.system('cp -pPR %s/* %s/' % (dest, dvar))
> +       os.system('rm -rf %s/*' % (pkgcopy))
> +       os.system('cp -pPR %s/. %s/' % (installdest, pkgcopy))
>  }
>
>  python populate_packages () {
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [PATCH v3] package.bbclass: copy dotfiles in root D to PKGD

[Michael Smith]

Frans Meulenbroeks wrote:
> Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
> 
> but with a minor improvement suggestion.
> What aboout elimiating one os.system call by combining the two into one:
> 
> os.system('rm -rf %s/*;cp -pPR %s/. %s/' % (pkgcopy, installdest, pkgcopy))

Hi Frans,

Thanks for the SOB. I like it better as two separate lines. I would have 
preferred shutil.rmtree() if shutil.copytree() worked, actually - but 
since it doesn't, no point using shutil for one line and not the other.

Mike

Re: [PATCH v3] package.bbclass: copy dotfiles in root D to PKGD

[Enrico Scholz]

Michael Smith <msmith@cbnco.com> writes:

> +	os.system('rm -rf %s/*' % (pkgcopy))

Can be written as

  os.system('rm -rf %s' % (pkgcopy))

Every SUSv3 compliant 'cp' will create the 'pkgcopy' directory.


> +	os.system('cp -pPR %s/. %s/' % (installdest, pkgcopy))


Enrico

Re: [PATCH v3] package.bbclass: copy dotfiles in root D to PKGD

[Frans Meulenbroeks]

2010/10/19 Enrico Scholz <enrico.scholz@sigma-chemnitz.de>:
> Michael Smith <msmith@cbnco.com> writes:
>
>> +     os.system('rm -rf %s/*' % (pkgcopy))
>
> Can be written as
>
>  os.system('rm -rf %s' % (pkgcopy))
>
> Every SUSv3 compliant 'cp' will create the 'pkgcopy' directory.
>
>
>> +     os.system('cp -pPR %s/. %s/' % (installdest, pkgcopy))
>

No this is not good. The rm command you give will also remove the dir.
The cp command will copy %s/.
There is a subtle difference with %s (although %s and %s/. refer to
the same path)
If you want to use %s instead of %s/* you also need to change the %s/. into %s

Thinking of it doing both changes is better as the effect of
os.system('cp -pPR %s/. %s/' % (installdest, pkgcopy)) is different
depending on whether pkgcopy already exist or not, while in the new
case it is not.
I can submit a patch if needed.

See also this log on hte behaviour of cp

frans@frans-desktop:/tmp$ mkdir tst
frans@frans-desktop:/tmp$ mkdir dest
frans@frans-desktop:/tmp$ date >tst/f
frans@frans-desktop:/tmp$ cp -pPR tst/. dest
frans@frans-desktop:/tmp$ ls -l dest
total 4
-rw-r--r-- 1 frans frans 30 2010-10-19 15:20 f
frans@frans-desktop:/tmp$ rm dest/*
frans@frans-desktop:/tmp$ cp -pPR tst dest
frans@frans-desktop:/tmp$ ls dest
tst
frans@frans-desktop:/tmp$ rm -rf dest
frans@frans-desktop:/tmp$ cp -pPR tst dest
frans@frans-desktop:/tmp$ ls dest
f
frans@frans-desktop:/tmp$

Enjoy, Frans

Re: [PATCH v3] package.bbclass: copy dotfiles in root D to PKGD

[Henning Heinold]

Hm,

the overall question here is, why the class is still using os.system instead of subprocess.

Bye Henning

Re: [PATCH v3] package.bbclass: copy dotfiles in root D to PKGD

[Enrico Scholz]

Frans Meulenbroeks <fransmeulenbroeks@gmail.com> writes:

>>> +     os.system('rm -rf %s/*' % (pkgcopy))
>>
>> Can be written as
>>
>>  os.system('rm -rf %s' % (pkgcopy))
>> ...
>>> +     os.system('cp -pPR %s/. %s/' % (installdest, pkgcopy))
>>
>
> No this is not good. The rm command you give will also remove the dir.

Why is this bad?  The dir is recreated by the 'cp'.


> The cp command will copy %s/.

Only the final permissions of <dstdir> may differ between

  rm -rf <dstdir>
  cp -pPR <srcdir>/. <dstdir>/

and

  rm -rf <dstdir>
  mkdir <dstdir>
  cp -pPR <srcdir>/. <dstdir>/


In first case, <dstdir> gets permissions of <srcdir>. In the second it
keeps the permissions from <dstdir>.

Else, content (both the files and their attributes) of <dstdir> will be
the same for both operations.


Enrico

Re: [PATCH v3] package.bbclass: copy dotfiles in root D to PKGD

[Frans Meulenbroeks]

2010/10/19 Enrico Scholz <enrico.scholz@sigma-chemnitz.de>:
> Frans Meulenbroeks <fransmeulenbroeks@gmail.com> writes:
>
>>>> +     os.system('rm -rf %s/*' % (pkgcopy))
>>>
>>> Can be written as
>>>
>>>  os.system('rm -rf %s' % (pkgcopy))
>>> ...
>>>> +     os.system('cp -pPR %s/. %s/' % (installdest, pkgcopy))
>>>
>>
>> No this is not good. The rm command you give will also remove the dir.
>
> Why is this bad?  The dir is recreated by the 'cp'.
>
>
>> The cp command will copy %s/.
>
> Only the final permissions of <dstdir> may differ between
>
>  rm -rf <dstdir>
>  cp -pPR <srcdir>/. <dstdir>/
>
> and
>
>  rm -rf <dstdir>
>  mkdir <dstdir>
>  cp -pPR <srcdir>/. <dstdir>/
>
>
> In first case, <dstdir> gets permissions of <srcdir>. In the second it
> keeps the permissions from <dstdir>.
>
> Else, content (both the files and their attributes) of <dstdir> will be
> the same for both operations.

Yes, you're right. I accidenlty dropped off the / of the dstdir when I
tested this earlier.
Sorry for the noise.
Not sure if there is a gain though.

Frans.