From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a5d:5091:: with SMTP id a17mr12299683wrt.362.1580481004872; Fri, 31 Jan 2020 06:30:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fdc5:: with SMTP id i5ls4293489wrs.9.gmail; Fri, 31 Jan 2020 06:30:04 -0800 (PST) X-Google-Smtp-Source: APXvYqxRDUfqi19AxZbwU++fgVisTjs/T34fYu9RqlOuBNePDvdBsQ1x/uqg0ha2JV5nMgkBthmL X-Received: by 2002:adf:ec4c:: with SMTP id w12mr13157968wrn.124.1580481004299; Fri, 31 Jan 2020 06:30:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580481004; cv=none; d=google.com; s=arc-20160816; b=0F0aJMg5yJ85f0s5NA7JShr89XT2E4Pzh/nQ/ejsQHD5WJFxn4jsJ9Oiw4VHi+Oif9 9d6CHhMgCdGjK2KmUcX7d78BMTU5gxF526AYMxz3SvyS0v3i509KvqzhmR7ex1oRUkVa Btxy4kxVAZ/QNl3QB5w/z+iy+SKxEQaazYIWODv4dYaLFWqm5HksithrAb49VrhOIemK Uc4Td3bzh2yIQiS5cxaMNkj8lwCvYtgJjQtChAVpdv6vg8pNjdFiT7mOYMzMKAse2pq6 mhRUnlwCEGoS2OnPnZheOfzzjPZfAOHvn8SsIF5e4fDzte43dZNsCBtyZF0aBHgio7Fl ZBuA== 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=WnUhl3dkGM7j24S8EfTpkDieNNrKFrbrpvDBQ0cqJT0=; b=CbY6M/3h5GfOUKG/lRItiR8yk50F6arH3+uXkyBpDdwuMIyOy9Tiy/mLYC5C35FDEz h9hkBIi0XiDWaL8exLwZSKqKG49Jz7EqrUbeMUAX3QvFJJ2LpnbAY0HbAwp2zgNDnedy 1ZCVj+/uswKM7WXdWwNKJRQQ6sMBTslVz8TuLQLmyFtJpILfUsKg2GKgfLaPhisbFZp4 IE7NqDW6/VWQ8jE1R2jYPkaTFIWDByOFFDJbRI8AMZZ9ukqIiA0RJpwYnsNmF8ktDhDx qcXOm8kqs/NpGRTdTDqOq4YhCqrowO8340a3fP6aDbIun3XikMTAp2PsMwCK1P3PkBXA 4qZA== 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 m2si668925wmi.3.2020.01.31.06.30.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jan 2020 06:30:04 -0800 (PST) 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 mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 00VEU3rx026475 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jan 2020 15:30:03 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.68.229]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00VEU1RY030231; Fri, 31 Jan 2020 15:30:03 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Henning Schild Subject: [PATCHv4 20/26] meta: repository: implement repo_contains_package and use it in base_apt Date: Fri, 31 Jan 2020 15:29:54 +0100 Message-Id: <20200131143000.14873-21-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200131143000.14873-1-henning.schild@siemens.com> References: <20200131143000.14873-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 6I+xfcyta/pc 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 dc4c1dcd..e7acf591 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