From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003121820762112 X-Received: by 2002:adf:df0e:: with SMTP id y14mr27728136wrl.377.1576497016182; Mon, 16 Dec 2019 03:50:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:ebc5:: with SMTP id v5ls6234927wrn.8.gmail; Mon, 16 Dec 2019 03:50:15 -0800 (PST) X-Google-Smtp-Source: APXvYqyIpbjU98Pyg0m/5EL/BG1SVbIXF+aw0a/ySbafQ/1Yg217uAbvHMyQrq9DJG+tviiXSheu X-Received: by 2002:adf:f3d1:: with SMTP id g17mr3470338wrp.378.1576497015692; Mon, 16 Dec 2019 03:50:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576497015; cv=none; d=google.com; s=arc-20160816; b=yi7WSKAGa4CbwwyB4HcAakQzuleBqgVou/TbxZ7nFWqcvBIQHxzyZlVA43r/qzi/Gi Cpc0rWCZndke379yqGxxksiV6Kpc+T0C+D2wfTpzS75zuVV0fpT9Rnhtih1TfX1MnLUn Hb02HU+NSqj1I4K1WfPRrWqcEdbCJ1Nic8Rat4cYWbBTkWaWTtetOhEboB8ubgBNt6mz Eqt9BH9eypPl2uWj2ZzuTWXvzeb2rA0CvIZZw13Y4fWVXx2ffGBqgLDVeMhXvBVpJd5X 0++IWJjCosQJUkEf+axtnQpq+93uvz5u/w4g5ObFj8Ehy7mGhht3WY44zuIaM0ozyRKr nZkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=87CfEkRhmVMTkwOsMdo0fgm0Pk2F3lbkxGVwQKQywVQ=; b=wvzVIklwYW51iTgszoYKaBfdoFkYPoo7e3IlJY374EfpkDTrZdJROP21CCfeqd7nLw 7g51k9J/rG8WUGXJWgg9zly8VAe2Axsf+X9IHerVh5eMHVuZmndd7ZNldFbII19W5sHH VwQOoBmDk3IlLTqCPhlc/08oMp/ssEf9c+RGwAeZloKIjvj0YJMClZpVeuLJpFdw6q/2 64aJTm3LMOSFpWKLxRKoTkLSI6YoUXqtzyJfPzMTnGQRDGaoAZPmSyhnnxymnwpXIojW opgZvW0nScblfZ+ftzgt+shuWybJ/ZyJ6LP4LaYCJQNFvTcGJMZEpFjxvdUxeCJw4mQl 2Lxg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id s82si300366wme.0.2019.12.16.03.50.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 03:50:15 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id xBGBoFcD022531 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Dec 2019 12:50:15 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.101]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xBGBoDWb009084; Mon, 16 Dec 2019 12:50:14 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Baurzhan Ismagulov , chombourger@gmail.com, Henning Schild Subject: [PATCHv2 16/25] base-apt: move class "base-apt-helper" into only user Date: Mon, 16 Dec 2019 12:50:02 +0100 Message-Id: <20191216115011.17664-17-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216115011.17664-1-henning.schild@siemens.com> References: <20191216115011.17664-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: iijecCeSk21a From: Henning Schild There is only one place we use that code, move it there instead of having an extra class. Signed-off-by: Henning Schild --- meta/classes/base-apt-helper.bbclass | 60 ---------------------- meta/classes/image-cache-extension.bbclass | 55 +++++++++++++++++++- 2 files changed, 54 insertions(+), 61 deletions(-) delete mode 100644 meta/classes/base-apt-helper.bbclass diff --git a/meta/classes/base-apt-helper.bbclass b/meta/classes/base-apt-helper.bbclass deleted file mode 100644 index 18d43aa..0000000 --- a/meta/classes/base-apt-helper.bbclass +++ /dev/null @@ -1,60 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2018 ilbers GmbH -# Copyright (C) 2019 Siemens AG -# -# SPDX-License-Identifier: MIT - -inherit repository - -compare_pkg_md5sums() { - pkg1=$1 - pkg2=$2 - - md1=$(md5sum $pkg1 | cut -d ' ' -f 1) - md2=$(md5sum $pkg2 | cut -d ' ' -f 1) - - [ "$md1" = "$md2" ] -} - -populate_base_apt() { - find "${DEBDIR}"/"${DISTRO}" -name '*\.deb' | while read package; do - # NOTE: due to packages stored by reprepro are not modified, we can - # use search by filename to check if package is already in repo. In - # addition, md5sums are compared to ensure that the package is the - # same and should not be overwritten. This method is easier and more - # robust than querying reprepro by name. - - # Check if this package is taken from Isar-apt, if so - ignore it. - base_name=${package##*/} - isar_apt_p=$(find ${REPO_ISAR_DIR}/${DISTRO} -name $base_name) - if [ -n "$isar_apt_p" ]; then - # Check if MD5 sums are identical. This helps to avoid the case - # when packages is overridden from another repo. - compare_pkg_md5sums "$package" "$isar_apt_p" && continue - fi - - # Check if this package is already in base-apt - base_apt_p=$(find ${REPO_BASE_DIR}/${BASE_DISTRO} -name $base_name) - if [ -n "$base_apt_p" ]; then - compare_pkg_md5sums "$package" "$base_apt_p" && continue - - # md5sum differs, so remove the package from base-apt - repo_del_package "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ - "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ - "${BASE_DISTRO_CODENAME}" \ - "${base_apt_p}" - fi - - repo_add_packages "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ - "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ - "${BASE_DISTRO_CODENAME}" \ - "${package}" - done - - find "${DEBSRCDIR}"/"${DISTRO}" -name '*\.dsc' | while read package; do - repo_add_srcpackage "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ - "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ - "${BASE_DISTRO_CODENAME}" \ - "${package}" - done -} diff --git a/meta/classes/image-cache-extension.bbclass b/meta/classes/image-cache-extension.bbclass index 7945e8b..c3ee7b8 100644 --- a/meta/classes/image-cache-extension.bbclass +++ b/meta/classes/image-cache-extension.bbclass @@ -5,7 +5,60 @@ # # This class extends the image.bbclass to supply the creation of cache repositories -inherit base-apt-helper +inherit repository + +compare_pkg_md5sums() { + pkg1=$1 + pkg2=$2 + + md1=$(md5sum $pkg1 | cut -d ' ' -f 1) + md2=$(md5sum $pkg2 | cut -d ' ' -f 1) + + [ "$md1" = "$md2" ] +} + +populate_base_apt() { + find "${DEBDIR}"/"${DISTRO}" -name '*\.deb' | while read package; do + # NOTE: due to packages stored by reprepro are not modified, we can + # use search by filename to check if package is already in repo. In + # addition, md5sums are compared to ensure that the package is the + # same and should not be overwritten. This method is easier and more + # robust than querying reprepro by name. + + # Check if this package is taken from Isar-apt, if so - ignore it. + base_name=${package##*/} + isar_apt_p=$(find ${REPO_ISAR_DIR}/${DISTRO} -name $base_name) + if [ -n "$isar_apt_p" ]; then + # Check if MD5 sums are identical. This helps to avoid the case + # when packages is overridden from another repo. + compare_pkg_md5sums "$package" "$isar_apt_p" && continue + fi + + # Check if this package is already in base-apt + base_apt_p=$(find ${REPO_BASE_DIR}/${BASE_DISTRO} -name $base_name) + if [ -n "$base_apt_p" ]; then + compare_pkg_md5sums "$package" "$base_apt_p" && continue + + # md5sum differs, so remove the package from base-apt + repo_del_package "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ + "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ + "${BASE_DISTRO_CODENAME}" \ + "${base_apt_p}" + fi + + repo_add_packages "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ + "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ + "${BASE_DISTRO_CODENAME}" \ + "${package}" + done + + find "${DEBSRCDIR}"/"${DISTRO}" -name '*\.dsc' | while read package; do + repo_add_srcpackage "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ + "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ + "${BASE_DISTRO_CODENAME}" \ + "${package}" + done +} do_cache_base_repo[depends] = "base-apt:do_cache_config" do_cache_base_repo[lockfiles] = "${REPO_BASE_DIR}/isar.lock" -- 2.24.1