Re: [PATCH 6/9] classes/dpkg*: Relocate dependency from buildchroot

[Jan Kiszka <jan.kiszka@siemens.com>]

On 2018-06-13 15:08, Alexander Smirnov wrote:
> Move dependency from buildchroot to the classes that actually require
> buildchroot. This will make possible to re-use dpkg-base class for
> buildchroot-cross.
> 
> Signed-off-by: Alexander Smirnov <asmirnov@ilbers.de>
> ---
>  meta/classes/dpkg-base.bbclass | 3 ---
>  meta/classes/dpkg-raw.bbclass  | 3 +++
>  meta/classes/dpkg.bbclass      | 3 +++
>  3 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
> index 75b45a7..24fe2ca 100644
> --- a/meta/classes/dpkg-base.bbclass
> +++ b/meta/classes/dpkg-base.bbclass
> @@ -14,9 +14,6 @@ do_adjust_git[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
>  inherit patch
>  addtask patch after do_adjust_git before do_build
>  
> -# Add dependency from buildchroot creation
> -do_build[depends] = "buildchroot:do_build"
> -
>  # Add dependency between Isar recipes
>  DEPENDS ?= ""
>  do_build[deptask] = "do_deploy_deb"
> diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass
> index 28233ac..5c7be6b 100644
> --- a/meta/classes/dpkg-raw.bbclass
> +++ b/meta/classes/dpkg-raw.bbclass
> @@ -6,6 +6,9 @@ inherit dpkg-base
>  DEBIAN_DEPENDS ?= ""
>  MAINTAINER ?= "FIXME Unknown maintainer"
>  
> +# Add dependency from buildchroot creation
> +do_build[depends] = "buildchroot:do_build"
> +
>  D = "${WORKDIR}/image/"
>  
>  # Populate folder that will be picked up as package
> diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
> index c8d4ac5..c483fe2 100644
> --- a/meta/classes/dpkg.bbclass
> +++ b/meta/classes/dpkg.bbclass
> @@ -3,6 +3,9 @@
>  
>  inherit dpkg-base
>  
> +# Add dependency from buildchroot creation
> +do_build[depends] = "buildchroot:do_build"
> +
>  # Build package from sources using build script
>  dpkg_runbuild() {
>      E="${@ bb.utils.export_proxies(d)}"
> 

You also need to update meta/recipes-kernel/linux/linux-custom.inc. It
inherits dpkg-base as well and, thus, now also needs this explicit
dependency.

Same is true for patch 7 regarding ROOTFS_DIR variable.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux