From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6607733288662466560 X-Received: by 2002:a5d:5005:: with SMTP id e5-v6mr1565359wrt.24.1538482795258; Tue, 02 Oct 2018 05:19:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:a05:: with SMTP id 5-v6ls263444wmk.17.canary-gmail; Tue, 02 Oct 2018 05:19:54 -0700 (PDT) X-Google-Smtp-Source: ACcGV616b3s5I0036Lla4KBbGIxJ4aNr7CHUPM3Dcbvpxwemt9ATm2op43uJEtr6PYGZIXbwJ6Nt X-Received: by 2002:a1c:f60a:: with SMTP id w10-v6mr234448wmc.19.1538482794861; Tue, 02 Oct 2018 05:19:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538482794; cv=none; d=google.com; s=arc-20160816; b=fZrfwRFIImg4kUYhxFz6bS4pDExTXL6uh4z9NT74K6pHtjXYxG35u5ohZM0RFKvaFV pypqg6P1wgGlucWKQzEYboZ4kLmAy2rJJrEYc6/TSwppBgdNAAbh2j88wJoziYaY2ozk +yDLOR+vUs9ifT7S1Qp+rE/mtb+ncwrTGf4Gdsd0ELUJPuaJrHa0TvR820Zg6K4ovPO4 gOLrrnxcNj7ejI3TLr/YfOTKNE50oPX9tNbWAYosMB4KHJpTfP27y4ZP6iHRLiTnkHRp SHi381N4JOFS6znekgFGf2LUyROoF5RDd9RZbX66JHF/GEUjR6OrYQJQwQdEVtVFn+I4 eoOA== 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:to:from; bh=MFP+gVmbt6/LDGEM0tSJl9igUUReBXMAK/O4QI/7pew=; b=RiJt2CwNzY2HAy6uxQWeULwFMqJWCiwsFF1AJoXeqXbpJDqa0EJqVyt0d+MINh3cAy o1RAJfa/mFFLCtS3Vp+0kKVRIXlcmNtwlh5s8Gk4dX+BrlIGsghVnhHzpzPYRCMk7Hrz yt2pGpshuxY9SLBUx4IUK6y8CYCoHGlE6iQkmPb5C5TtETvwCHC/3rfxslj6ZrUEti3l Y1XuFiNo8qXvKd9LUqkgU6iFacZSeGphiHLcVcVTmDicewUW5nHmHfzmBEgMFztKnx/c LQ60A+YsMgJ13G+0QkOGBxoPn+ElWPy47bEAy0J3qiOuHfF67L15tRXBK0C/OezazJn2 hVlQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id 191-v6si40420wmv.0.2018.10.02.05.19.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Oct 2018 05:19:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w92CJ7LZ013178 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Tue, 2 Oct 2018 14:19:53 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 1/9] base-apt: Add helper class Date: Tue, 2 Oct 2018 14:18:59 +0200 Message-Id: <20181002121907.18476-2-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181002121907.18476-1-mosipov@ilbers.de> References: <20181002121907.18476-1-mosipov@ilbers.de> X-TUID: qwLFA4LbRena From: Alexander Smirnov base-apt intended to store original upstream debs to re-use them later offline. This class helps to populate base-apt with the packages used during build. Signed-off-by: Alexander Smirnov --- meta/classes/base-apt-helper.bbclass | 53 ++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 meta/classes/base-apt-helper.bbclass diff --git a/meta/classes/base-apt-helper.bbclass b/meta/classes/base-apt-helper.bbclass new file mode 100644 index 0000000..5e3fe36 --- /dev/null +++ b/meta/classes/base-apt-helper.bbclass @@ -0,0 +1,53 @@ +# This software is a part of ISAR. +# Copyright (C) 2018 ilbers GmbH + +DISTRO_NAME ?= "${@ d.getVar('DISTRO', True).split('-')[0]}" +DISTRO_SUITE ?= "${@ d.getVar('DISTRO', True).split('-')[1]}" + +populate_base_apt() { + search_dir=$1 + + for package in $(find $search_dir -name '*.deb'); 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, m5sums could be compared to ensure, that 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 - ingore it. + isar_package=$(find ${DEPLOY_DIR_APT}/${DISTRO} -name $package) + if [ -n "$isar_package" ]; then + # Check if MD5 sums are iendtical. This helps to avoid the case + # when packages is overriden from another repo. + md1=$(md5sum $package) + md2=$(md5sum $isar_package) + if [ "$md1" = "$md2" ]; then + continue + fi + fi + + # Check if this package is already in base-apt + isar_package=$(find ${BASE_APT_DIR}/${DISTRO_NAME} -name $package) + if [ -n "$isar_package" ]; then + md1=$(md5sum $package) + md2=$(md5sum $isar_package) + if [ "$md1" = "$md2" ]; then + continue + fi + + # md5sum differs, so remove the package from base-apt + name=$(basename $package | cut -d '_' -f 1) + reprepro -b ${BASE_APT_DIR}/${DISTRO_NAME} \ + --dbdir ${BASE_APT_DB}/${DISTRO_NAME} \ + -C main -A ${DISTRO_ARCH} \ + remove ${DISTRO_SUITE} \ + $name + fi + + reprepro -b ${BASE_APT_DIR}/${DISTRO_NAME} \ + --dbdir ${BASE_APT_DB}/${DISTRO_NAME} \ + -C main \ + includedeb ${DISTRO_SUITE} \ + $package + done +} -- 2.11.0