[elbe-devel] [PATCH v2 03/24] elbeproject: build_sysroot rework

[Torben Hohn]

On Thu, Feb 08, 2018 at 02:16:49PM +0100, Manuel Traut wrote:
> split out sysroot paths into private function to
> improve readability. The paths don't make sense for external usage, so
> keep the function private.
> 
> Signed-off-by: Manuel Traut <manut at linutronix.de>
> ---
>  elbepack/elbeproject.py | 42 ++++++++++++++++++++++++------------------
>  1 file changed, 24 insertions(+), 18 deletions(-)
> 
> diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
> index a06a99cb..986d08c5 100644
> --- a/elbepack/elbeproject.py
> +++ b/elbepack/elbeproject.py
> @@ -155,6 +155,29 @@ class ElbeProject (object):
>                  --exclude=./proc/* --exclude=./var/cache/* \
>                  -C %s ." % (self.builddir, self.chrootpath))
>  
> +    def __get_sysroot_paths(self):

please use _ or remove __ .

> +        triplet = self.xml.defs["triplet"]
> +
> +        paths = [
> +            './usr/include',
> +            './usr/include/' + triplet,
> +            './etc/ld.so.conf*',
> +            './opt/*/lib/*.so',
> +            '/opt/*lib/*.so.*',
missing "."  ?  ^^^   
> +            './opt/*/include/',
> +            './opt/*/lib/' + triplet,
> +            './opt/*/include/' + triplet,
> +            './lib/*.so',
> +            './lib/*.so.*',
> +            './lib/' + triplet,
> +            './usr/lib/*.so',
> +            './usr/lib/*.so',
> +            './usr/lib/*.so.*',
> +            './usr/lib/' + triplet]
> +
> +        return paths
> +
> +
>      def build_sysroot(self):
>  
>          # ignore packages from debootstrap
> @@ -187,24 +210,7 @@ class ElbeProject (object):
>              self.log.do("chroot %s /usr/bin/symlinks -cr /usr/lib" %
>                          self.chrootpath)
>  
> -        triplet = self.xml.defs["triplet"]
> -
> -        paths = [
> -            './usr/include',
> -            './usr/include/' + triplet,
> -            './etc/ld.so.conf*',
> -            './opt/*/lib/*.so',
> -            '/opt/*lib/*.so.*',
> -            './opt/*/include/',
> -            './opt/*/lib/' + triplet,
> -            './opt/*/include/' + triplet,
> -            './lib/*.so',
> -            './lib/*.so.*',
> -            './lib/' + triplet,
> -            './usr/lib/*.so',
> -            './usr/lib/*.so',
> -            './usr/lib/*.so.*',
> -            './usr/lib/' + triplet]
> +        paths = self.__get_sysrootpaths()
                        ^^^
                        
please use _ or remove __ .
>  
>          self.log.do("rm %s" % sysrootfilelist, allow_fail=True)
>  
> -- 
> 2.15.1
> 

-- 
Mit freundlichen Grüßen
Torben Hohn

Linutronix GmbH

Standort: Bremen

Phone: +49 7556 25 999 18; Fax.: +49 7556 25 999 99

Firmensitz / Registered Office: D-88690 Uhldingen, Bahnhofstr. 3
Registergericht / Local District Court: Amtsgericht Freiburg i. Br.; HRB
Nr. / Trade register no.: 700 806

Geschäftsführer / Managing Directors: Heinz Egger, Thomas Gleixner

Eine Bitte von uns: Sollten Sie diese E-Mail irrtümlich erhalten haben,
benachrichtigen Sie uns in diesem Falle bitte sobald wie es Ihnen
möglich ist, durch Antwort-Mail. Vielen Dank!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.linutronix.de/pipermail/elbe-devel/attachments/20180208/1f1c5de1/attachment.sig>