From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6473366578589073408 X-Received: by 10.28.65.86 with SMTP id o83mr894085wma.4.1507550671305; Mon, 09 Oct 2017 05:04:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.188.19 with SMTP id s19ls511434wrg.11.gmail; Mon, 09 Oct 2017 05:04:31 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDGV81DE9ET1ijI30qLFzIqoUlKeDNvNcnSoqd25G4xXW0NnT8HD5VY+S9geywKQ9+qTKD3 X-Received: by 10.223.176.122 with SMTP id g55mr727836wra.29.1507550670999; Mon, 09 Oct 2017 05:04:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507550670; cv=none; d=google.com; s=arc-20160816; b=TfrbuKELhg8miC6ncuXSStR9kcxssmQ+9W3Yx+5SxwSuMza2UEndRTGg+EvKRA+MWu dIkj6Pbn6aJu6AnWkKgexL3W0N6XPzOYTM2REPoVccU12O0n1eL78axW5gJo1yaXK7fU JFOPIEH8CeVmikSx/IF6WjFjLOe/cGHPVURBKGSvChr6tmw0lQKO3oVOaeVmABWsIKjZ tSlKKz4Yn5e2FkMFxpnD9h+xCVBWm41lECvWhLvb7byBEy5xlmcg4QRsqSWktnMlEtVs JbO4MyAuoFE5Hx7hP4aBaSQ95gCT1rjHmxK5rft9uLb48chsZkhWyIKeO1XXM2TozliR z7SQ== 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:subject:cc:to:from:date:arc-authentication-results; bh=aa44jgwCK9fdHWLNxOsCo5JPMb+Pv4RCJ5owmJjGMjQ=; b=tXIvDGPFMdCY6IvrXC/7DxkIrDz9pX30+fcltmic+r6EXLlnBn4cECc5nGrfawG7me NdjK2LKb6hRkW8K4TMO8ip+cMV3Mx0bGbkYeKyg9HWNN80IMZ0JzZ8U8ZNnJBFhgb2Ew 6ncSGD5DYzHF3mVgz9ihzY3a7pnMdosiGNHjsnuUzyaocCL1xINsGgyk4E3RyF1LxA6J ru6X+FNWFZthRS5zNjMEMyQvJ9106SC9G/JmcM9GpSz9JrxixQzsb5GsfjN97jLgAhmE 4G5kPDOhE6zHp3r7sSyjpkxdg2OVTFVzVq+P9Nv9GcUx3HXnZmuT7lS+BLWUUTjYLyIc t+RQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id d82si871869wmd.1.2017.10.09.05.04.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Oct 2017 05:04:30 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.14 is neither permitted nor denied by domain of henning.schild@siemens.com) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id v99C4UKC019259 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 9 Oct 2017 14:04:30 +0200 Received: from md1em3qc ([139.25.68.40]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id v99C4UkE010846; Mon, 9 Oct 2017 14:04:30 +0200 Date: Mon, 9 Oct 2017 14:04:29 +0200 From: Henning Schild To: Alexander Smirnov Cc: Subject: Re: [PATCH 2/4] apt: Generate Isar reprepro database Message-ID: <20171009140429.5e70014e@md1em3qc> In-Reply-To: <20171005100807.3369-3-asmirnov@ilbers.de> References: <20171005100807.3369-1-asmirnov@ilbers.de> <20171005100807.3369-3-asmirnov@ilbers.de> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: SsXndG2cpYR1 Am Thu, 5 Oct 2017 13:08:05 +0300 schrieb Alexander Smirnov : > Generate reprepro database for Isar apt repository. > > Signed-off-by: Alexander Smirnov > --- > meta-isar/conf/layer.conf | 3 +++ > meta-isar/conf/local.conf.sample | 4 ++++ > meta/classes/image.bbclass | 34 > ++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) > > diff --git a/meta-isar/conf/layer.conf b/meta-isar/conf/layer.conf > index 0950a34..cd42f06 100644 > --- a/meta-isar/conf/layer.conf > +++ b/meta-isar/conf/layer.conf > @@ -22,3 +22,6 @@ DEBDISTRONAME = "isar" > > # Path to the Isar apt repository > DEPLOY_DIR_APT ?= "${DEPLOY_DIR}/apt" > + > +# Path to the Isar databases used by `reprepro` > +DEPLOY_DIR_DB ?= "${DEPLOY_DIR}/db" > diff --git a/meta-isar/conf/local.conf.sample > b/meta-isar/conf/local.conf.sample index a456b1b..660958f 100644 > --- a/meta-isar/conf/local.conf.sample > +++ b/meta-isar/conf/local.conf.sample > @@ -158,3 +158,7 @@ IMAGE_INSTALL = "hello example-raw" > # > # Default parallel jobs for bitbake: > BB_NUMBER_THREADS = "4" > + > +# > +# Number of attempts to try to get reprepro lock for access to apt > cache +REPREPRO_LOCK_ATTEMPTS = "16" > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 57705a7..47f53a3 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -10,6 +10,31 @@ IMAGE_ROOTFS = "${WORKDIR}/rootfs" > > inherit ${IMAGE_TYPE} > > +call_reprepro() { > + for i in $(seq 1 ${REPREPRO_LOCK_ATTEMPTS}); do > + # According to `sh` manual page, shell exit statuses fall > between > + # 0-255. The EEXIST error code is (-17), so casting to > usigned 8-bit > + # integer results value (239). > + eexist=$(python -c 'import errno; print(256-errno.EEXIST)') Now that there are not magic numbers anymore we can skip the verbose comment. Henning > + retval="0" > + reprepro $* || retval="$?" > + > + # If reprepro has failed to get database lock, it returns > EEXIST code. > + # In this case we continue trying to get lock until max > amount of > + # attempts is reached. > + if [ $retval -eq $eexist ]; then > + bbwarn "Failed to get reprepro lock, trying again..." > + sleep 5 > + else > + break > + fi > + done > + > + if [ $retval -ne 0 ]; then > + bbfatal "reprepro failed" > + fi > +} > + > CACHE_CONF_DIR = "${DEPLOY_DIR_APT}/${DISTRO}/conf" > do_cache_config[dirs] = "${CACHE_CONF_DIR}" > do_cache_config[stamp-extra-info] = "${DISTRO}" > @@ -21,6 +46,15 @@ do_cache_config() { > sed -e "s#{DISTRO_NAME}#"${DEBDISTRONAME}"#g" \ > ${FILESDIR}/distributions.in > > ${CACHE_CONF_DIR}/distributions fi > + > + path_cache="${DEPLOY_DIR_APT}/${DISTRO}" > + path_databases="${DEPLOY_DIR_DB}/${DISTRO}" > + > + if [ ! -d "${path_databases}" ]; then > + call_reprepro -b ${path_cache} \ > + --dbdir ${path_databases} \ > + export ${DEBDISTRONAME} > + fi > } > > addtask cache_config before do_fetch