Re: [RFC][PATCH 2/6] base-apt: Add to pipeline

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

Am Tue, 2 Jan 2018 17:57:40 +0300
schrieb Alexander Smirnov <asmirnov@ilbers.de>:

> Add 'base-apt' recipe to build pipeline.
> 
> Signed-off-by: Alexander Smirnov <asmirnov@ilbers.de>
> ---
>  meta-isar/conf/local.conf.sample                 |  5 +++++
>  meta/classes/dpkg-base.bbclass                   | 14 ++++++++++++++
>  meta/classes/image.bbclass                       | 13 ++++++++++++-
>  meta/recipes-devtools/base-apt/base-apt.bb       |  5 ++++-
>  meta/recipes-devtools/buildchroot/buildchroot.bb | 12 ++++++++++++
>  5 files changed, 47 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-isar/conf/local.conf.sample
> b/meta-isar/conf/local.conf.sample index 660958f..2da803b 100644
> --- a/meta-isar/conf/local.conf.sample
> +++ b/meta-isar/conf/local.conf.sample
> @@ -162,3 +162,8 @@ BB_NUMBER_THREADS = "4"
>  #
>  # Number of attempts to try to get reprepro lock for access to apt
> cache REPREPRO_LOCK_ATTEMPTS = "16"
> +
> +#
> +# List of images, wich dependencies will be pre-fetched and put in
> base-apt. +# This will guarantee image building reproducibility.
> +BASE_APT_IMAGES ?= "isar-image-base isar-image-debug"
> diff --git a/meta/classes/dpkg-base.bbclass
> b/meta/classes/dpkg-base.bbclass index ad58f0b..c61f9a6 100644
> --- a/meta/classes/dpkg-base.bbclass
> +++ b/meta/classes/dpkg-base.bbclass
> @@ -8,6 +8,20 @@ do_build[depends] = "buildchroot:do_build"
>  # recipe name as identifier
>  PP = "/home/builder/${PN}"
>  
> +do_get_deps[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
> +
> +S = "${WORKDIR}/${SRC_DIR}"
> +
> +do_get_deps() {
> +    if [ -e ${S}/debian/control ]; then
> +        mkdir -p ${BASE_APT_DIR}/deps
> +        DEPS=$(perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ /
> or (/^ / and $p)); s/,|\n|\([^)]+\)|\[[^]]+\]//mg; print if $p' <
> ${S}/debian/control)
> +        echo $DEPS > ${BASE_APT_DIR}/deps/${PN}
> +    fi
> +}

This code comes from buildchroot/files/build.sh and should be in the
codebase only once.

Furthermore this version of do_get_deps should go into dpkg.bbclass and
we need another implementation for dpdk-raw.bbclass that takes care of
DEBIAN_DEPENDS

Henning

> +addtask get_deps after do_unpack before do_build
> +
>  BUILDROOT = "${BUILDCHROOT_DIR}/${PP}"
>  do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
>  
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index e2cb01b..457a525 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -66,6 +66,17 @@ do_cache_config() {
>  
>  addtask cache_config before do_populate
>  
> +IMAGE_PREINSTALL ?= ""
> +do_get_deps[stamp-extra-info] = "${DISTRO}-${MACHINE}"
> +
> +do_get_deps() {
> +    mkdir -p ${BASE_APT_DIR}/deps
> +    echo ${IMAGE_PREINSTALL} > ${BASE_APT_DIR}/deps/${PN}
> +}
> +
> +addtask get_deps before do_build after do_unpack
> +do_get_deps[deptask] = "do_get_deps"
> +
>  do_populate[stamp-extra-info] = "${DISTRO}-${MACHINE}"
>  
>  # Populate Isar apt repository by newly built packages
> @@ -79,7 +90,7 @@ do_populate() {
>      fi
>  }
>  
> -addtask populate before do_build after do_unpack
> +addtask populate before do_build after do_get_deps
>  do_populate[deptask] = "do_deploy_deb"
>  
>  do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}"
> diff --git a/meta/recipes-devtools/base-apt/base-apt.bb
> b/meta/recipes-devtools/base-apt/base-apt.bb index b292d89..108d501
> 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb
> +++ b/meta/recipes-devtools/base-apt/base-apt.bb
> @@ -13,7 +13,10 @@ SRC_URI = "file://distributions.in \
>             file://multistrap.conf.in \
>            "
>  
> -BASE_PREINSTALL ?= ""
> +DEPENDS = "${BASE_APT_IMAGES} buildchroot"
> +do_get_base_apt[deptask] = "do_get_deps"
> +
> +BASE_PREINSTALL ?= "apt"
>  
>  WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}"
>  
> diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb
> b/meta/recipes-devtools/buildchroot/buildchroot.bb index
> 59ad0e0..098f5c7 100644 ---
> a/meta/recipes-devtools/buildchroot/buildchroot.bb +++
> b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -29,8 +29,20 @@
> BUILDCHROOT_PREINSTALL ?= "gcc \ 
>  WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}"
>  
> +do_get_deps[stamp-extra-info] = "${DISTRO}-${MACHINE}"
> +
> +do_get_deps() {
> +    mkdir -p ${BASE_APT_DIR}/deps
> +    echo ${BUILDCHROOT_PREINSTALL} > ${BASE_APT_DIR}/deps/${PN}
> +}
> +
> +addtask get_deps before do_build after do_unpack
> +do_get_deps[deptask] = "do_get_deps"
> +
> +
>  do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
>  do_build[dirs] = "${WORKDIR}/hooks_multistrap"
> +do_build[depends] = "base-apt:do_get_base_apt"
>  
>  do_build() {
>      E="${@ bb.utils.export_proxies(d)}"