From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6752900179667451904 X-Received: by 2002:adf:e544:: with SMTP id z4mr16964510wrm.6.1572282096517; Mon, 28 Oct 2019 10:01:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:7e4f:: with SMTP id z76ls192824wmc.2.canary-gmail; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqwKxqvARpBhY5g4znwfVVJ5GO1wEWd7ZnbwVWx6sIYBejI4aQSOvy2xLjw6sZPr/OtwffMw X-Received: by 2002:a05:600c:2042:: with SMTP id p2mr264837wmg.13.1572282095839; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572282095; cv=none; d=google.com; s=arc-20160816; b=PCr7TUmmMHkhk+H2KSZGwZLm8Ibvv5X1V9OjAgXJyvjDAeIQjjrxkAiWdAXyIhD640 PKGQWcjBLHiJxa6A6oHzm8sFHY5R3cFL5msyZM/ZKfcFaxI3/TF921vAirIK2YR6W0rp +JR7h4VRVZoZKUoawYIKAWYcJM3Wt7UL9RHvmFnLRSEvk/OrDtaaPfRytaUsHeaLxPjS zOpGpEPay9h1OQoMSVJYhfBzx2KRSGfaGqzbUziZNnjcRqZXe8UT4al75vQkdyoN0rI0 BZ+a8iHNo5MynSPx0pBky0il6BpdwvJcjqIUF2LmlfW3Mz0BDSp6p7862YlJ5vgACwkk Hxug== 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=tckWm8xHZCTvvhRuXJAE/oHSk+g6tgyTZUoqSxfAyaQ=; b=Oy3LiJsApoLw2FGeYJWPuj/T41mXAjgop0dgXfDtuCL5m4e4Xdsbwg+Uf+rfjlQRKZ i3IHh7/WeebrD05sOAiqOEL3B/x4Hb1cZbgTLSs5Dy8RbLfrOPlrfF707nGDxO11V+GF WCe4Y625YeOyeEYnqBXihbUDnewHMqRo19+Gmfej15XDD944EpDuE+LZ2Tu0U3sGeg2K mWbrwf8XB9/iD8EAdYNRFRUQ9dr3FnQZkUCQkhM8nZEXBNpfF4gvJCUDQwoTh+2grl6C i9KPCVXfT0v+X5CacQnwP8Yijez2Ctx/bW4YCXrDeAj0ULFJiXKrB/ISGds3CSuMt4Ao U1nw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id 132si3724wmb.2.2019.10.28.10.01.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Oct 2019 10:01:35 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x9SH1Z5N008031 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 28 Oct 2019 18:01:35 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.244]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9SH1YPK025390; Mon, 28 Oct 2019 18:01:35 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 14/17] base-apt: move class "base-apt-helper" into only user Date: Mon, 28 Oct 2019 18:01:29 +0100 Message-Id: <20191028170132.28072-15-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191028170132.28072-1-henning.schild@siemens.com> References: <20191028170132.28072-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: S5V2O3tqkc8m 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 fb4f0c8..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, m5sums could be compared to ensure, that 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 - ingore 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..9dd7430 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, m5sums could be compared to ensure, that 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 - ingore 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.23.0