From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003121820762112 X-Received: by 2002:a5d:61cf:: with SMTP id q15mr30459237wrv.231.1576497016574; Mon, 16 Dec 2019 03:50:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:7409:: with SMTP id p9ls7956666wmc.4.gmail; Mon, 16 Dec 2019 03:50:16 -0800 (PST) X-Google-Smtp-Source: APXvYqyr12r3J4dmE5J4Wfv5aZZjQNBETop0sf31iRmJiTQ6PuFjXykmgwORrJWCyh7V6fIazXgS X-Received: by 2002:a1c:6404:: with SMTP id y4mr25799022wmb.143.1576497016130; Mon, 16 Dec 2019 03:50:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576497016; cv=none; d=google.com; s=arc-20160816; b=R3EeIPoU4DDhSnATt+hCqec1WNqhAxn0/l502f8WbgyBjgm+QCJFLnyEiV86CpGprr 1b/u1J0WEebLjbIxbMDq7JYQ0wkPqrpsyuQfudeTHtgMKeosYcw2hF7VlqxIQr7eCPp4 GH+cyJ1FhRTXG7/xZeSIWMlIE5sseZshIB9lBf04iK1Mo5ySoeNsKQwBBeyx94K25fpl L8cUcw1qRvcMP3wHo+jlmpfD5dP8zqJpH8eDjsW2J5gMNrAdSIVOKqEbBtGbULjH9KAn irJbni7/kGh0rJj9yUj6dp8nQYy2wFHzK6Lv1RjEcCDiY7iyuu9Z+HK90VVfP//jd1oC SJjA== 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=4/yyENB0EEDuKh70aFzdmB4QDz06s6YyGP9RX/jQD9s=; b=dAIIuwdIYj49+GpfoYhyIsGiFM6xCQIW4qqPJGIIQa1ks5SjVMTef4x0Mko8wU8TVj iUilVu9S4jdImMkKqiiqEHUximbKX+FUTA7Ze0eO7oY4cQjAp8mNaj9bbnmyKeSPu3kW qNbAexPEyWwgClK01oo78D5uumPsD9/twqjbUHi/RL6ntw1tvVjRBbPj3rYMsb8/vE6P VNEkMnuvSEVjySHDe+qlBBATEjiNmel0yZ+0rm54Qv0URvPG1UtBKIJeqyBqKM12KQXk 9CMlMDoTtOfZttZTrgTg/pvqh3ogjoc/T0te2YsFChfucznB8wI2NNCBewGT59Hwwsr0 Wgtg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id m2si722564wmi.3.2019.12.16.03.50.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 03:50:16 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id xBGBoF2m016962 (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 xBGBoDWf009084; Mon, 16 Dec 2019 12:50:15 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Baurzhan Ismagulov , chombourger@gmail.com, Henning Schild Subject: [PATCHv2 20/25] meta: repository: implement repo_contains_package and use it in base_apt Date: Mon, 16 Dec 2019 12:50:06 +0100 Message-Id: <20191216115011.17664-21-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: c9Tk4CeMf7a+ 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..4123326 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 dc4c1dc..e7acf59 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