Re: [PATCH v2 5/5] class/dpkg: Unify workplace for packages

[Henning Schild <henning.schild@siemens.com>]

Am Fri, 8 Sep 2017 18:56:06 +0300
schrieb Alexander Smirnov <asmirnov@ilbers.de>:

> Get rid of splitting package's data between WORKDIR and BUILDCHROOT.
> Now everything is stored into WORKDIR, and BUILDCHROOT is used for
> compilation only.
> 
> Signed-off-by: Alexander Smirnov <asmirnov@ilbers.de>
> ---
>  meta/classes/dpkg.bbclass | 15 +++++++++------
>  1 file changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
> index 360a95c..f1a29aa 100644
> --- a/meta/classes/dpkg.bbclass
> +++ b/meta/classes/dpkg.bbclass
> @@ -3,12 +3,11 @@
>  
>  # Add dependency from buildchroot creation
>  DEPENDS += "buildchroot"
> -do_unpack[deptask] = "do_build"
> +do_build[deptask] = "do_build"
>  
>  # Each package should have its own unique build folder, so use
>  # recipe name as identifier
>  PP = "/home/builder/${PN}"
> -BUILDROOT = "${BUILDCHROOT_DIR}/${PP}"
>  
>  do_fetch[dirs] = "${DL_DIR}"
>  
> @@ -27,9 +26,8 @@ python do_fetch() {
>  
>  addtask fetch before do_unpack
>  
> -do_unpack[dirs] = "${BUILDROOT}"
> +do_unpack[dirs] = "${WORKDIR}"
>  do_unpack[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
> -S ?= "${BUILDROOT}"
>  
>  # Unpack package and put it into working directory in buildchroot
>  python do_unpack() {
> @@ -37,7 +35,7 @@ python do_unpack() {
>      if len(src_uri) == 0:
>          return
>  
> -    rootdir = d.getVar('BUILDROOT', True)
> +    rootdir = d.getVar('WORKDIR', True)

This change is in conflict with the comment, please fix the comment of
do_unpack.

Henning

>      try:
>          fetcher = bb.fetch2.Fetch(src_uri, d)
> @@ -48,17 +46,22 @@ python do_unpack() {
>  
>  addtask unpack after do_fetch before do_build
>  
> +BUILDROOT = "${BUILDCHROOT_DIR}/${PP}"
>  do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
>  
>  # Build package from sources using build script
>  do_build() {
> +    mkdir -p ${BUILDROOT}
> +    sudo mount --bind ${WORKDIR} ${BUILDROOT}
>      sudo chroot ${BUILDCHROOT_DIR} /build.sh ${PP}/${SRC_DIR}
> +    sudo umount ${BUILDROOT}
> +    rm -rf ${BUILDROOT}
>  }
>  
>  
>  # Install package to dedicated deploy directory
>  do_install() {
> -    install -m 644 ${BUILDROOT}/*.deb ${DEPLOY_DIR_DEB}/
> +    install -m 644 ${WORKDIR}/*.deb ${DEPLOY_DIR_DEB}/
>  }
>  
>  addtask install after do_build