Re: [PATCH v2] dpkg-base: Remove newly deployed debs from buildchroots

[Harald Seiler <hws@denx.de>]

On Tue, 2020-08-11 at 09:05 +0200, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This ensures clean reinstallation after partial rebuilds.
> 
> A typical error pattern so far was that firmware packages pulled by the
> buildchroot-target were not updated there on rebuilds, causing the old
> firmware being deployed into the image.

Tested-by: Harald Seiler <hws@denx.de>
Reviewed-by: Harald Seiler <hws@denx.de>

> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> 
> Changes in v2:
>  - removed bogus -U options which sneaked in from reading the wrong man
>    page (zypper's apt-get wrapper: -U, --no-clean-deps)
> 
>  meta/classes/dpkg-base.bbclass | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
> index 9aa2d546..08880d7d 100644
> --- a/meta/classes/dpkg-base.bbclass
> +++ b/meta/classes/dpkg-base.bbclass
> @@ -154,20 +154,26 @@ python do_dpkg_build() {
>  
>  addtask dpkg_build before do_build
>  
> -CLEANFUNCS += "repo_clean"
> +CLEANFUNCS += "deb_clean"
>  
> -repo_clean() {
> +deb_clean() {
>      DEBS=$( find ${S}/.. -maxdepth 1 -name "*.deb" || [ ! -d ${S} ] )
>      if [ -n "${DEBS}" ]; then
>          for d in ${DEBS}; do
>              repo_del_package "${REPO_ISAR_DIR}"/"${DISTRO}" \
>                  "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${d}"
> +            package=$(basename "${d}")
> +            package_remove="/usr/bin/apt-get remove -y ${package%%_*}"
> +            sudo -E chroot ${BUILDCHROOT_DIR} ${package_remove} || true
> +            if [ "${BUILDCHROOT_DIR}" != "${BUILDCHROOT_TARGET_DIR}" ]; then
> +                    sudo -E chroot ${BUILDCHROOT_TARGET_DIR} ${package_remove} || true
> +            fi
>          done
>      fi
>  }
>  
>  do_deploy_deb() {
> -    repo_clean
> +    deb_clean
>      repo_add_packages "${REPO_ISAR_DIR}"/"${DISTRO}" \
>          "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" ${S}/../*.deb
>  }
> -- 
> 2.26.2
>