From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003123014041600 X-Received: by 2002:adf:f80c:: with SMTP id s12mr29414369wrp.1.1580226198988; Tue, 28 Jan 2020 07:43:18 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fdc5:: with SMTP id i5ls9513173wrs.9.gmail; Tue, 28 Jan 2020 07:43:18 -0800 (PST) X-Google-Smtp-Source: APXvYqxWTyfGthz1o4ZCUspgGcHF6u95K0IhdUZi179zvj7XRx3OP0i/y/D5Zgj75d8jGDJpqQ19 X-Received: by 2002:a5d:678e:: with SMTP id v14mr1015895wru.101.1580226198282; Tue, 28 Jan 2020 07:43:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580226198; cv=none; d=google.com; s=arc-20160816; b=osmHVL/tGMIz+HUupXw7YbQyYC9s/BEmcNl/5ilsR7SbReOM6HtckHdfi1enCqo/Dz NSsH0JOhb0jsx8ytgL8TJ+yQGktBB5OVPINtIKb4A8f/bHKVqOKmdND6MxaIll+wo4cO /3bRRpQ0wLSA3hmluyWAxt1TtKd/oCENUxwRVTHQzQPjtLNgZHZCoITV0O5ZuUjcCld7 k5y7wzn/vl4mY0VpUO7m4vrzsxQ5iF7JbGJrjwkzLJOE6dm31bk+k1oUylqlzYqYtGoD Gva+IfQpq0CZBXKd0a8pnIydyfLOgOhmW5SJLlRUzYzPeacWYutdpNvDMq8PaxDOomoi tffQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bAE5Sld1NjfynIZ/ZXDO5OEgRpMZ75uDdwUs5QLrZgQ=; b=RVqPZbMoqleVka/YF5cAhRe62T7JEwFZI8KR8HHG3RJRQIwzOXN6xCF1vtSZ+KlTkn IVJaS16od0dSNBh7/8HelcC1U3czvUBIDbjHKR2m33c8/OtyRcvRNZmr3yM9TsnLIOFD 9ApMEiH3Jwwod7rvBeIlxHEeHByipMI3BUfmwqQKoeynEHq4fqyRnjgybNMAxwsvMsHw TEGrsfCMu/RIwr6UPmpS3TpHtfV3lcIZXwgz6XLjQUOycE8T1IRcBLqtVKrN79+PlIOt gE/ZAvoVdVngftxOPDtv4PdeVf6GFrP+5AZq2Nhml9AmfL9D4CTkchklGJ7p8YJztl4S Bqvw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=pmWQsqHV; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::442 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com. [2a00:1450:4864:20::442]) by gmr-mx.google.com with ESMTPS id u9si702806wri.3.2020.01.28.07.43.18 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Jan 2020 07:43:18 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::442 as permitted sender) client-ip=2a00:1450:4864:20::442; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=pmWQsqHV; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::442 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wr1-x442.google.com with SMTP id z3so16578137wru.3 for ; Tue, 28 Jan 2020 07:43:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bAE5Sld1NjfynIZ/ZXDO5OEgRpMZ75uDdwUs5QLrZgQ=; b=pmWQsqHVyXbpZZiWTD10vVhI/IVanE6QUoRcUoBieqLIhIvud2JQnkqBzL/VfKq1H0 TDaSMmjyRGeiAN3J4nkHmLGdUuNT59jjo3izM0c+7NfwrydXTvCro6h6w1FF0p8eiso2 muSV2GIF6WCSB/3Gt3NoRcL1PITVKJfiTRSvbJwwWkb7FyFBaFkD0Ct3Wu4hlCu+rkHW fE7v+6UPJMs4w7gZIqw0ZmmUedSdPWmn5zxs4L6uxACzbEcRR8+sS9D4uiADm7GA8NFl JPKA5xSfey/wke3vVGL0sk6dFecaXzjf40k6+IsgEJ54Y2WY+VxsQVtEBl4mET4mL9Rr J0nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bAE5Sld1NjfynIZ/ZXDO5OEgRpMZ75uDdwUs5QLrZgQ=; b=N22kHKXlSS3om76DYDnU7HFuLu79/2wXlnTV49iVMxRw+333+a1kIuHV3g9oAhQNeR lHk3/K4KF9ZP+CPPxgZGUZW4FFniEn2l3OXSsYSk5jOH3FSzfg51il66LG3U/eXFrfi0 jI+9isyyQBdOg9ifV2laqeNPwVOcsOjF6WI1LSWK6frT5/QdMcXfjTFGLgJcUz2VSYHf UNOooay/ODgsHMElJd//ivZvvzSVlUrk+YReH9UZ9sBsOG1bH5jteP++sK1Ghi+6E5de kq5m1OK/xuep4DKyqe/qA98pPM6oXpQ7mOYpdwpLsuKKhwNCWWZXwmyRCmfBvC2u1oqd T+WA== X-Gm-Message-State: APjAAAUoBJx9Qu5uFudVKccRiXKO0VIiyuy4tzYPLSkN1mkICPzJ9isK VC3Nr27apQ2hiOCQaTN2mh9bnTkQiEo= X-Received: by 2002:adf:f18b:: with SMTP id h11mr31387212wro.56.1580226197737; Tue, 28 Jan 2020 07:43:17 -0800 (PST) Return-Path: Received: from oxygen.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id u8sm3601200wmm.15.2020.01.28.07.43.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 07:43:17 -0800 (PST) From: Vijai Kumar K To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v3 16/26] base-apt: move class "base-apt-helper" into only user Date: Tue, 28 Jan 2020 21:12:03 +0530 Message-Id: <20200128154213.22353-17-vijaikumar.kanagarajan@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200128154213.22353-1-vijaikumar.kanagarajan@gmail.com> References: <20200128154312.337e61f6@md1za8fc.ad001.siemens.net> <20200128154213.22353-1-vijaikumar.kanagarajan@gmail.com> X-TUID: yrqjCLDOmt2j 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 18d43aa..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) 2019 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.17.1