Re: [PATCH 2/6] meta: Move 'do_fetch' and 'do_unpack' to base-class

[Alexander Smirnov <asmirnov@ilbers.de>]

On 08/30/2017 10:03 PM, Henning Schild wrote:
> Issues:
> unpack and fetch can only be used if you inherit dpkg, they should be
> available to others i.e. classes and images

For me it's ok to move fetch to base class. Unpack has dependency from 
dpkg class.

-- 
With best regards,
Alexander Smirnov

> 
> Change:
> Pull the code out of the dpdk-class and stick it into the base-class. It is the
> same code, no changes to it.
> 
> Impact:
> This patch does not change the behaviour of Isar. It addresses the
> issue, preparing for future patches.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>   meta/classes/base.bbclass | 36 ++++++++++++++++++++++++++++++++++++
>   meta/classes/dpkg.bbclass | 35 -----------------------------------
>   2 files changed, 36 insertions(+), 35 deletions(-)
> 
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index 2179ba9..3cace37 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -58,6 +58,42 @@ python do_listtasks() {
>   			sys.__stdout__.write("%s\n" % e)
>   }
>   
> +do_fetch[dirs] = "${DL_DIR}"
> +
> +# Fetch package from the source link
> +python do_fetch() {
> +    src_uri = (d.getVar('SRC_URI', True) or "").split()
> +    if len(src_uri) == 0:
> +        return
> +
> +    try:
> +        fetcher = bb.fetch2.Fetch(src_uri, d)
> +        fetcher.download()
> +    except bb.fetch2.BBFetchException as e:
> +        raise bb.build.FuncFailed(e)
> +}
> +
> +addtask fetch before do_build
> +
> +do_unpack[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
> +
> +# Unpack package and put it into working directory
> +python do_unpack() {
> +    src_uri = (d.getVar('SRC_URI', True) or "").split()
> +    if len(src_uri) == 0:
> +        return
> +
> +    rootdir = d.getVar('WORKDIR', True)
> +
> +    try:
> +        fetcher = bb.fetch2.Fetch(src_uri, d)
> +        fetcher.unpack(rootdir)
> +    except bb.fetch2.BBFetchException as e:
> +        raise bb.build.FuncFailed(e)
> +}
> +
> +addtask unpack after do_fetch before do_build
> +
>   addtask build
>   do_build[dirs] = "${TOPDIR}"
>   python base_do_build () {
> diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
> index 81e21ce..0b8c7c4 100644
> --- a/meta/classes/dpkg.bbclass
> +++ b/meta/classes/dpkg.bbclass
> @@ -10,46 +10,11 @@ do_unpack[deptask] = "do_build"
>   PP = "/home/builder/${PN}"
>   BUILDROOT = "${BUILDCHROOT_DIR}/${PP}"
>   
> -do_fetch[dirs] = "${DL_DIR}"
> -
> -# Fetch package from the source link
> -python do_fetch() {
> -    src_uri = (d.getVar('SRC_URI', True) or "").split()
> -    if len(src_uri) == 0:
> -        return
> -
> -    try:
> -        fetcher = bb.fetch2.Fetch(src_uri, d)
> -        fetcher.download()
> -    except bb.fetch2.BBFetchException as e:
> -        raise bb.build.FuncFailed(e)
> -}
> -
> -addtask fetch before do_build
> -
>   do_unpack[dirs] = "${BUILDROOT}"
> -do_unpack[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
>   S ?= "${BUILDROOT}"
>   
>   WORKDIR_task-unpack = "${BUILDROOT}"
>   
> -# Unpack package and put it into working directory
> -python do_unpack() {
> -    src_uri = (d.getVar('SRC_URI', True) or "").split()
> -    if len(src_uri) == 0:
> -        return
> -
> -    rootdir = d.getVar('WORKDIR', True)
> -
> -    try:
> -        fetcher = bb.fetch2.Fetch(src_uri, d)
> -        fetcher.unpack(rootdir)
> -    except bb.fetch2.BBFetchException as e:
> -        raise bb.build.FuncFailed(e)
> -}
> -
> -addtask unpack after do_fetch before do_build
> -
>   do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
>   
>   # Build package from sources using build script
>