From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a2e:978d:: with SMTP id y13mr5234322lji.293.1585230218015; Thu, 26 Mar 2020 06:43:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:550:: with SMTP id q16ls1598098ljp.1.gmail; Thu, 26 Mar 2020 06:43:37 -0700 (PDT) X-Google-Smtp-Source: ADFU+vurW81xo8w6UJBW+Fs6fIhQY66WA1fLC9GY6v2Mx+Yi8zL+OjwIKfidTSmIjKTGufoQuO4o X-Received: by 2002:a2e:2e13:: with SMTP id u19mr5332154lju.3.1585230217289; Thu, 26 Mar 2020 06:43:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585230217; cv=none; d=google.com; s=arc-20160816; b=RBpOHRevgwo1E3reZTeV224orZftRoNvGdN9b0zj0sdauBBwIEdX/g4Hcu0mnRDBwD unKmNLV3g5nYTuUosrdERVKmG5kwauiKXc62SLU9T6H3RiCY3URgGr8jTVSu1biP57Ie q8wluTnX0Wk566Q64EDucJLM0Bxi2kJKVswb8VI9X2kPP5+Bv8Udn6x6bH0bDRBO7ZyT 8oUL0jABqjdHgi7A2Evrg9rWMzNn6Njdy76xejVDviHgbGxuT0PXWboruGO9pOoeepTM rBL3GUlgxyGzjG9xXDAkj4b22aQQOk4PY/W3i+fD3V0FjYmodynwyC1+CzJAZ3RXGQ2c noMg== 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=f5xKDxEV0s+namAs5yw/lVk1qdTJ77H8fav+ts1lxN0=; b=PzjK9dK6t+irQI8kwZkmszIVkx6Y8HvkSDH1aFWjxq/Ku9RW95Ia6yKBn0fZPFm4QP CMxXyOuuQTI2SzUzreb7EBbsnA6tURjIR+0Lhe0uGtEdeNMUWiEx8/HSm0md0nt4EvlM Or8Ay9W0mkYqLvxMO+fHMQfWX2JAe9bNqYjmEzIaFl9ffC9LhhO85b73UAGN9rZloiHf Br2rVfihmeyp1NWk/sPJhlYmlbKy4wRMjo7bVd2CSbALQEj+9o7boXQpmpDpA3egZyBi imuKXlcSOFGXlrVZ/Zz0yRnjIJ6i099YUURtICvXB1cBvWjrypG1W6DVfMitoDd6ouvM oQgA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id d12si135445lfi.2.2020.03.26.06.43.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:43:37 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 02QDhaDj022544 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Mar 2020 14:43:36 +0100 Received: from localhost.localdomain ([167.87.11.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02QDhSBm031897; Thu, 26 Mar 2020 14:43:35 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv8 16/29] base-apt: move class "base-apt-helper" into only user Date: Thu, 26 Mar 2020 14:43:12 +0100 Message-Id: <20200326134325.8672-17-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200326134325.8672-1-henning.schild@siemens.com> References: <20200326134325.8672-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: nR6JY90PCpxC 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 7ed2859..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) 2020 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