From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003123014041600 X-Received: by 2002:a05:651c:321:: with SMTP id b1mr13820917ljp.62.1580226167588; Tue, 28 Jan 2020 07:42:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:b530:: with SMTP id z16ls1645889ljm.2.gmail; Tue, 28 Jan 2020 07:42:46 -0800 (PST) X-Google-Smtp-Source: APXvYqygiNwGg4E89G5Aghc1lL9a1mzkL08MmIi3BBR2N7pAWI3CTChxcBjTGUrCE0OYC0njUk6o X-Received: by 2002:a2e:8651:: with SMTP id i17mr14110765ljj.121.1580226166720; Tue, 28 Jan 2020 07:42:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580226166; cv=none; d=google.com; s=arc-20160816; b=kbnC0HjBlawEGhVwyQpns7q4VyGVYmS0yiEU+UyFa+1cWcxR02BzMtes6ninlCvnTQ ymSXvAZxzQRx+J9ffFevJ64x7IeMFArDp1VfhMhXL0+hD2GCAsS8jyyTtg4yBWXnbtob HZLGy6TfjiQgg1bM7ty/nRHMgi3IKeykxLdTk9v/+z7PDy4KTsXSrT6qWPvn7loF3DDQ F4eJYdM0hkgxrxdSq/grkjJsL3kzubKBq0s1hHQS3XRdd2t2skPlEbME4fUREcSfg9Ob jXAXHWx4X6OiiuFGMqO1AJYAqUgsoXb9wUgLPrzER3dHPoWVStVdVZnGfqUC93nIHfPK Jsfw== 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=7DZEXWg0N8BS0M3zTZXj3yaS3chIKYuDkm8Rksl7G7w=; b=iNLBrGkIcw2gbT/hYEBlnug+V6H8oZoNI2feW2gxQlaFDxMzBvMvoTrSkQgtiUnVGK msBF8l98z8wGRGMqqWRhcMJhIgb2xGBj9BzsrFz0QqPRFWRlUq6X9IfhAROoOLz+DQAm RfoT8ShtcxD9V71fhk+8OVjXDtGrxqwoJqeYqRreZGX4Pd0KqX3iy+pQa5+70qIF2fMf QJBJFVRuZEArYxsAjAz80lYUsd1wWEZD00tT875RVFNMscf4L1MflyJe/Gw5jEDC9Yd5 l/F9jL/clsUyRuJ77I21x3d3H6u5cBmCKhjLRR4nby6pFcFWraSt11eVU314vpNr4inh LgNQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="EX1t/sZA"; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::432 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-x432.google.com (mail-wr1-x432.google.com. [2a00:1450:4864:20::432]) by gmr-mx.google.com with ESMTPS id u5si906959lfm.0.2020.01.28.07.42.46 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Jan 2020 07:42:46 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::432 as permitted sender) client-ip=2a00:1450:4864:20::432; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="EX1t/sZA"; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::432 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-x432.google.com with SMTP id y17so16555706wrh.5 for ; Tue, 28 Jan 2020 07:42:46 -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=7DZEXWg0N8BS0M3zTZXj3yaS3chIKYuDkm8Rksl7G7w=; b=EX1t/sZASz53eQgUW374rOj8JiS8pElqjcL8UA6DDQVTmL8+vTjmeZSKFe2n2VfLlp BnpiK4QzBW9DwLqdw5UKq7twN6O1M/wzPM8VAXqXsRQYFOY/rEPxrwztftajuoDQrNNi ZF79/496d23qJbOfyEPXaZG8A+CB2/JaSZCLYcMeEcBe+3kHp3JFRz0Uyjw/4oNMwMwW 9V8yHKwRRMggbl8QzK0pUWAARnaDJpzTwZfYmnywcxBWfdvwHkkjGqqDodj1OTnu6irL Ma/A71czLzSFnriyJX649KxecSv+ofywr5A1HnGcuJ2gL0Y/UMTXoDhrQLYeKKhEOqNI akcg== 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=7DZEXWg0N8BS0M3zTZXj3yaS3chIKYuDkm8Rksl7G7w=; b=FKE6UGUBiqITHVXf4rqaOiRjJ0YvC7A4Q/Zavf3zdFCNUqi1ziYjG8uZXjMEHhwe4+ AP6X2xydE3KaEENznIzXNX+CBuEJOIEOWbCyjNBIA/J2Wb1i+pzo6va4vkloreLXDa2E Bg6YIWhZceNz/nQCOWq1iIbFMkQrmUnYypoVuWlDuCsQKlbbZqxIlUUfGrtPierCJib0 2zMrRnBw/fUGRWKpsc18YEM7B5/gUUHBqgHTd2ADgtrgOsjviHJSy+iqwMB5t7l8GioH JjJGjfXDcu29THJ4W7e077CTrUvNeoydtZQL6vKE4q5nj+z7GetOMMgm+0/50mXgwjY+ QGbQ== X-Gm-Message-State: APjAAAW4UDOEfrArU5rx4WCby7Ba03stAm0mhrml5pl7kuXWytF4H68z mz2lx2FN8joOa//3cq4CvUEp7sayqJ8= X-Received: by 2002:adf:93c1:: with SMTP id 59mr1943884wrp.399.1580226166001; Tue, 28 Jan 2020 07:42:46 -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.42.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 07:42:45 -0800 (PST) From: Vijai Kumar K To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v3 01/26] repository: new class to deal with repos Date: Tue, 28 Jan 2020 21:11:48 +0530 Message-Id: <20200128154213.22353-2-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: GgVdwaK1DU/p From: Henning Schild Factor out all the "reprepro" code into a common class. There are slight functional changes since the two copies of the code got out of sync. Signed-off-by: Henning Schild --- meta/classes/base-apt-helper.bbclass | 28 ++++---- meta/classes/dpkg-base.bbclass | 24 ++----- meta/classes/repository.bbclass | 69 +++++++++++++++++++ meta/recipes-devtools/base-apt/base-apt.bb | 37 +++------- .../base-apt/files/distributions.in | 3 - .../isar-apt/files/distributions.in | 3 - meta/recipes-devtools/isar-apt/isar-apt.bb | 26 ++----- 7 files changed, 102 insertions(+), 88 deletions(-) create mode 100644 meta/classes/repository.bbclass delete mode 100644 meta/recipes-devtools/base-apt/files/distributions.in delete mode 100644 meta/recipes-devtools/isar-apt/files/distributions.in diff --git a/meta/classes/base-apt-helper.bbclass b/meta/classes/base-apt-helper.bbclass index 90b2cfc..1f08c70 100644 --- a/meta/classes/base-apt-helper.bbclass +++ b/meta/classes/base-apt-helper.bbclass @@ -1,5 +1,10 @@ # 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 @@ -14,10 +19,6 @@ compare_pkg_md5sums() { populate_base_apt() { search_dir=$1 - if [ -n "${GNUPGHOME}" ]; then - export GNUPGHOME="${GNUPGHOME}" - fi - find $search_dir -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 @@ -40,18 +41,15 @@ populate_base_apt() { compare_pkg_md5sums "$package" "$base_apt_p" && continue # md5sum differs, so remove the package from base-apt - name=$(echo $base_name | cut -d '_' -f 1) - reprepro -b ${REPO_BASE_DIR}/${BASE_DISTRO} \ - --dbdir ${REPO_BASE_DB_DIR}/${BASE_DISTRO} \ - -C main -A ${DISTRO_ARCH} \ - remove ${BASE_DISTRO_CODENAME} \ - $name + repo_del_package "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ + "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ + "${BASE_DISTRO_CODENAME}" \ + "${base_apt_p}" fi - reprepro -b ${REPO_BASE_DIR}/${BASE_DISTRO} \ - --dbdir ${REPO_BASE_DB_DIR}/${BASE_DISTRO} \ - -C main \ - includedeb ${BASE_DISTRO_CODENAME} \ - $package + repo_add_packages "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ + "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ + "${BASE_DISTRO_CODENAME}" \ + "${package}" done } diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index af9c984..f38168c 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -7,6 +7,7 @@ inherit buildchroot inherit debianize inherit terminal +inherit repository DEPENDS ?= "" @@ -140,31 +141,16 @@ repo_clean() { DEBS=$( find ${S}/.. -maxdepth 1 -name "*.deb" || [ ! -d ${S} ] ) if [ -n "${DEBS}" ]; then for d in ${DEBS}; do - p=$( dpkg-deb --show --showformat '${Package}' ${d} ) - a=$( dpkg-deb --show --showformat '${Architecture}' ${d} ) - # removing "all" means no arch - aarg="-A ${a}" - [ "${a}" = "all" ] && aarg="" - reprepro -b ${REPO_ISAR_DIR}/${DISTRO} \ - --dbdir ${REPO_ISAR_DB_DIR}/${DISTRO} \ - -C main ${aarg} \ - remove ${DEBDISTRONAME} \ - ${p} + repo_del_package "${REPO_ISAR_DIR}"/"${DISTRO}" \ + "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${d}" done fi } -# Install package to Isar-apt do_deploy_deb() { - if [ -n "${GNUPGHOME}" ]; then - export GNUPGHOME="${GNUPGHOME}" - fi repo_clean - reprepro -b ${REPO_ISAR_DIR}/${DISTRO} \ - --dbdir ${REPO_ISAR_DB_DIR}/${DISTRO} \ - -C main \ - includedeb ${DEBDISTRONAME} \ - ${S}/../*.deb + repo_add_packages "${REPO_ISAR_DIR}"/"${DISTRO}" \ + "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" ${S}/../*.deb } addtask deploy_deb after do_dpkg_build before do_build diff --git a/meta/classes/repository.bbclass b/meta/classes/repository.bbclass new file mode 100644 index 0000000..880ddef --- /dev/null +++ b/meta/classes/repository.bbclass @@ -0,0 +1,69 @@ +# This software is a part of ISAR. +# Copyright (C) 2017-2019 Siemens AG +# Copyright (C) 2019 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +repo_create() { + local dir="$1" + local dbdir="$2" + local codename="$3" + local keyfiles="$4" + + if [ -n "${GNUPGHOME}" ]; then + export GNUPGHOME="${GNUPGHOME}" + fi + + if [ ! -f "${dir}"/conf/distributions ]; then + mkdir -p "${dir}"/conf/ + cat < "${dir}"/conf/distributions +Codename: ${codename} +Architectures: i386 armhf arm64 amd64 mipsel source +Components: main +EOF + if [ -n "${keyfiles}" ] ; then + local option="" + for key in ${keyfiles}; do + keyid=$(gpg --keyid-format 0xlong --with-colons ${key} 2>/dev/null | grep "^pub:" | awk -F':' '{print $5;}') + option="${option}${keyid} " + done + echo "SignWith: ${option}" >> "${dir}"/conf/distributions + fi + fi + if [ ! -d "${dbdir}" ]; then + reprepro -b "${dir}" --dbdir "${dbdir}" export "${codename}" + fi +} + +repo_add_packages() { + local dir="$1" + local dbdir="$2" + local codename="$3" + shift; shift; shift + + if [ -n "${GNUPGHOME}" ]; then + export GNUPGHOME="${GNUPGHOME}" + fi + reprepro -b "${dir}" --dbdir "${dbdir}" -C main \ + includedeb "${codename}" \ + "$@" +} + +repo_del_package() { + local dir="$1" + local dbdir="$2" + local codename="$3" + local file="$4" + + if [ -n "${GNUPGHOME}" ]; then + export GNUPGHOME="${GNUPGHOME}" + fi + local p=$( dpkg-deb --show --showformat '${Package}' "${file}" ) + local a=$( dpkg-deb --show --showformat '${Architecture}' "${file}" ) + # removing "all" means no arch + local aarg="-A ${a}" + [ "${a}" = "all" ] && aarg="" + reprepro -b "${dir}" --dbdir "${dbdir}" -C main ${aarg} \ + remove "${codename}" \ + "${p}" +} diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index 9a0f7c8..c9a7dad 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -1,45 +1,24 @@ # This software is a part of ISAR. # Copyright (C) 2018 ilbers GmbH +# Copyright (C) 2019 Siemens AG +# +# SPDX-License-Identifier: MIT -SRC_URI = "file://distributions.in" +inherit repository BASE_REPO_KEY ?= "" KEYFILES ?= "" -CACHE_CONF_DIR = "${REPO_BASE_DIR}/${BASE_DISTRO}/conf" -do_cache_config[dirs] = "${CACHE_CONF_DIR}" do_cache_config[stamp-extra-info] = "${DISTRO}" do_cache_config[lockfiles] = "${REPO_BASE_DIR}/isar.lock" # Generate reprepro config for current distro if it doesn't exist. Once it's # generated, this task should do nothing. repo_config() { - if [ -n "${GNUPGHOME}" ]; then - export GNUPGHOME="${GNUPGHOME}" - fi - - if [ ! -e "${CACHE_CONF_DIR}/distributions" ]; then - sed -e "s#{CODENAME}#"${BASE_DISTRO_CODENAME}"#g" \ - ${WORKDIR}/distributions.in > ${CACHE_CONF_DIR}/distributions - if [ -n "${KEYFILES}" ]; then - option="" - for key in ${KEYFILES}; do - keyid=$(gpg --keyid-format 0xlong --with-colons ${key} 2>/dev/null | grep "^pub:" | awk -F':' '{print $5;}') - option="${option}${keyid} " - done - # To generate Release.gpg - echo "SignWith: ${option}" >> ${CACHE_CONF_DIR}/distributions - fi - fi - - path_cache="${REPO_BASE_DIR}/${BASE_DISTRO}" - path_databases="${REPO_BASE_DB_DIR}/${BASE_DISTRO}" - - if [ ! -d "${path_databases}" ]; then - reprepro -b ${path_cache} \ - --dbdir ${path_databases} \ - export ${BASE_DISTRO_CODENAME} - fi + repo_create "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ + "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ + "${BASE_DISTRO_CODENAME}" \ + "${KEYFILES}" } python do_cache_config() { diff --git a/meta/recipes-devtools/base-apt/files/distributions.in b/meta/recipes-devtools/base-apt/files/distributions.in deleted file mode 100644 index fd7de0b..0000000 --- a/meta/recipes-devtools/base-apt/files/distributions.in +++ /dev/null @@ -1,3 +0,0 @@ -Codename: {CODENAME} -Architectures: i386 armhf arm64 amd64 mipsel source -Components: main diff --git a/meta/recipes-devtools/isar-apt/files/distributions.in b/meta/recipes-devtools/isar-apt/files/distributions.in deleted file mode 100644 index a24a700..0000000 --- a/meta/recipes-devtools/isar-apt/files/distributions.in +++ /dev/null @@ -1,3 +0,0 @@ -Codename: {DISTRO_NAME} -Architectures: i386 armhf arm64 amd64 mipsel source -Components: main diff --git a/meta/recipes-devtools/isar-apt/isar-apt.bb b/meta/recipes-devtools/isar-apt/isar-apt.bb index e6f1753..0227c1b 100644 --- a/meta/recipes-devtools/isar-apt/isar-apt.bb +++ b/meta/recipes-devtools/isar-apt/isar-apt.bb @@ -1,32 +1,20 @@ # This software is a part of ISAR. # Copyright (C) 2015-2017 ilbers GmbH +# Copyright (C) 2019 Siemens AG +# +# SPDX-License-Identifier: MIT -SRC_URI = "file://distributions.in" +inherit repository -CACHE_CONF_DIR = "${REPO_ISAR_DIR}/${DISTRO}/conf" -do_cache_config[dirs] = "${CACHE_CONF_DIR}" do_cache_config[stamp-extra-info] = "${DISTRO}" do_cache_config[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" # Generate reprepro config for current distro if it doesn't exist. Once it's # generated, this task should do nothing. do_cache_config() { - if [ ! -e "${CACHE_CONF_DIR}/distributions" ]; then - sed -e "s#{DISTRO_NAME}#"${DEBDISTRONAME}"#g" \ - ${WORKDIR}/distributions.in > ${CACHE_CONF_DIR}/distributions - fi - - path_cache="${REPO_ISAR_DIR}/${DISTRO}" - path_databases="${REPO_ISAR_DB_DIR}/${DISTRO}" - - if [ ! -d "${path_databases}" ]; then - if [ -n "${GNUPGHOME}" ]; then - export GNUPGHOME="${GNUPGHOME}" - fi - reprepro -b ${path_cache} \ - --dbdir ${path_databases} \ - export ${DEBDISTRONAME} - fi + repo_create "${REPO_ISAR_DIR}"/"${DISTRO}" \ + "${REPO_ISAR_DB_DIR}"/"${DISTRO}" \ + "${DEBDISTRONAME}" } addtask cache_config after do_unpack before do_build -- 2.17.1