From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:adf:9e8b:: with SMTP id a11mr28354802wrf.32.1583877408446; Tue, 10 Mar 2020 14:56:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:498c:: with SMTP id r12ls4992476wrq.10.gmail; Tue, 10 Mar 2020 14:56:48 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvIWLd6W+kTweXTTZy/GOBP29IVAicbWkPVXuEMBPslwSKMPBPMvKuGzuQezzr3MAGg/2AL X-Received: by 2002:a5d:62cb:: with SMTP id o11mr19913002wrv.403.1583877407973; Tue, 10 Mar 2020 14:56:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583877407; cv=none; d=google.com; s=arc-20160816; b=UZywyE/F3VhXJ5reIXNLpYe4AjSDvz8wtzSfgg42EKQUFcIhJkhJkiYqzn6eA4kr4d j5mXD+fLR/rgpAUgSicSUMRZIW3MxB+L0jg0BGN28GlXlhYpDG63h9G/DzWNoLPzi0J5 /Wxj05ujpwNnlRLkQ7x4WKT0XQLCECqNUBN22bCGMdbXVmRekavcZn+06BdxnTVkJsBD viQzxm6t1R9REH8+9pfjfujVueF1/szAWstYyuiWQeImdAtftn0qTTa/I7o8HGQDXX0r FXtl7VGSEL8yz66Og/yUjYUTS9GzGRp6k1mEvfx7UDTIE5QqKUsvatSryox+r2JuK5gM ht0g== 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=9Eo4xTlVu2skXGGalGFB+IG/GaXtGRTkM4YD6I7RIfM=; b=b6fAAWqUBp4uQHcHK3DMevV0gTYrvLIG9PvKhGoRxllrdQgN31qFeSz2vbrmThAKLU WqLMhjQM2B99h/yBxyZk/AjnV3XN/97Se7Dbna4cgqoFJUONqkfTM4at3F9f/ft1nbAJ AnRINyY7PRpgORro4JV7u46fZ2bjj6qzVg+RuiVw+LOSDjeLVKKTQkR5jF+M06EurOk7 gbuFAgsoUN3S2snreJ+uEsc9msUOs8eQseqoVqSWfpdbuFSbb9Hk/AZXMiDn7h5YHGM3 H6ja7K+y/n5Ss4ACiuHv3KJngLrrKapodAloI0A9gO9ykW54gqO8ByB3N7bB8+UCGG6r t7pw== 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 i19si1551wml.0.2020.03.10.14.56.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2020 14:56:47 -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 02ALulb4027930 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Mar 2020 22:56:47 +0100 Received: from localhost.localdomain ([139.22.36.172]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02ALub64026985; Tue, 10 Mar 2020 22:56:47 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv5 20/29] meta: repository: implement repo_contains_package and use it in base_apt Date: Tue, 10 Mar 2020 22:56:22 +0100 Message-Id: <20200310215631.24859-21-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200310215631.24859-1-henning.schild@siemens.com> References: <20200310215631.24859-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: v/YjsrJpeXPw 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 c3ee7b83..4123326e 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 591ee04a..18f020bd 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