From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:adf:de90:: with SMTP id w16mr10105821wrl.292.1585230218985; Thu, 26 Mar 2020 06:43:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:104d:: with SMTP id 13ls195813wmx.1.gmail; Thu, 26 Mar 2020 06:43:38 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuz3BGWtz62CvYZqxmgk2zRp2OZQs49iRTz7uuNtsceR89YOdntFRp9X5Hr25Q9J1JiI1wB X-Received: by 2002:a1c:1d4d:: with SMTP id d74mr4837wmd.123.1585230218637; Thu, 26 Mar 2020 06:43:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585230218; cv=none; d=google.com; s=arc-20160816; b=uAs02UHQcF/c8KuwTFfaorsAir1u2jXV+1INM652/qG6PLn5zwvgDzV2IAtkNiEfP4 jJKsqweLikAbv/GliV6J/CWEQNM6oHK6Y43i4G6QYGCNkBk4B4VOUHS17Abcnkg7HUgf qOaCTon77Y7DRna+JjuV8w2Oq1189c3mEgcATdNpqJ8ILhxNoGaEcR2nTM6AzW6N6x2y T++cB9XPgTE+lW5WatVZaaZpgo5W7vJ3fUVUmkW6Fg2CUq5UqBZUHr4F+N9cBiLS+EnS v51mLVj5AVMOLFS3ZlIxnyxuzTVFSHiAYhUbcjHXh2Zq2x2NxkjArWmNf7wXT9vlaVGf 9y1Q== 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=YkzaGZTZYuzSvXy96fohE7pC7+UCwUnMmS2nD+89eFU=; b=KGRm5f3si874iGTLC7wg71CQHl6dUPYNwGNmJ43V4alWbfxkXco74WdMmPkXCj92Xa yInTWzj1lAQXvU/pYiMP1dw5OnGExul6IQT+teGNZU9eGONk12ueb4PvJAx72Gn2LldF 3aBiz05witA+K7UF3NuStCcCfQJ/Qozj8V9TwAqYd2/r5md+B0v/GbgOupHn+vHuF2w+ yfkKqqT20l4joQK6HzSOnjhUNmxjJ+0Ql6//NGoiz8R6AKzLYb+WJATIBUiW2MAGr/ti Tj0ZfUC9UDzl5FrGuW9TrjXaYIYKjE8BBM62yIxVcAK4DHQ7nfFRIwxSBL8FVCSKRdf5 69iA== 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 d16si98719wrv.4.2020.03.26.06.43.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:43:38 -0700 (PDT) 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 02QDhb8k006093 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Mar 2020 14:43:38 +0100 Received: from localhost.localdomain ([167.87.11.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02QDhSBq031897; Thu, 26 Mar 2020 14:43:37 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv8 20/29] meta: repository: implement repo_contains_package and use it in base_apt Date: Thu, 26 Mar 2020 14:43:16 +0100 Message-Id: <20200326134325.8672-21-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: GEB4FYfPS71P From: Henning Schild Make the lookup and the checksum comparison one function of a repository. That cleans things up and allows for easier reuse. Signed-off-by: Henning Schild --- meta/classes/image-cache-extension.bbclass | 31 ++++++---------------- meta/classes/repository.bbclass | 19 +++++++++++++ 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/meta/classes/image-cache-extension.bbclass b/meta/classes/image-cache-extension.bbclass index c3ee7b8..8df06f3 100644 --- a/meta/classes/image-cache-extension.bbclass +++ b/meta/classes/image-cache-extension.bbclass @@ -7,16 +7,6 @@ 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 @@ -25,21 +15,16 @@ populate_base_apt() { # 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 taken from Isar-apt, if so - ingore it. + repo_contains_package "${REPO_ISAR_DIR}/${DISTRO}" "${package}" && \ + continue # 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 + ret=0 + repo_contains_package "${REPO_BASE_DIR}/${BASE_DISTRO}" "${package}" || + ret=$? + [ "${ret}" = "0" ] && continue + if [ "${ret}" = "1" ]; then repo_del_package "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ "${BASE_DISTRO_CODENAME}" \ diff --git a/meta/classes/repository.bbclass b/meta/classes/repository.bbclass index 591ee04..18f020b 100644 --- a/meta/classes/repository.bbclass +++ b/meta/classes/repository.bbclass @@ -81,3 +81,22 @@ repo_del_package() { remove "${codename}" \ "${p}" } + +repo_contains_package() { + local dir="$1" + local file="$2" + local package + + package=$(find ${dir} -name ${file##*/}) + if [ -n "$package" ]; then + local md1=$(md5sum "$package" | cut -d ' ' -f 1) + local md2=$(sudo md5sum "$file" | cut -d ' ' -f 1) + + # yes + [ "${md1}" = "${md2}" ] && return 0 + # yes but not the exact same file + return 1 + fi + # no + return 2 +} -- 2.24.1