From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6520131612833742848 X-Received: by 10.28.50.4 with SMTP id y4mr74622wmy.1.1518086459503; Thu, 08 Feb 2018 02:40:59 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.197.7 with SMTP id q7ls1263234wrf.10.gmail; Thu, 08 Feb 2018 02:40:58 -0800 (PST) X-Google-Smtp-Source: AH8x226yS0EBMBTkLOCqUXQyJQCBEPQZHYAyXajH4jcSWl9RX9RkbgApSrABxNcsTL590hEBQUUj X-Received: by 10.223.190.141 with SMTP id i13mr25980wrh.15.1518086458759; Thu, 08 Feb 2018 02:40:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518086458; cv=none; d=google.com; s=arc-20160816; b=j9PylRIH6tpTVF2YeXIePKXd7iP2wY6JSketitg7T7ju0jUei6VXXDcQEoGCko5xcQ 6DLy1FwzkX9Mlldl5GHY9xjTrhVhiFEGADO6ngHLyFEoYxaI3dgPLDO7+PRmGWsObZ9E 9Be4K7TnabRCMM9/Qz1AllCuIhbAitCrgMdOzLfw6ObBx7/WrDbQin4+6gZOse/CwTcd qk+txtvYnvQXWapGqf4sW+qHYE8Hw76v0GGK3xBLCFXdmGJTFXZbJ9jub3/LQMSF4bvT +e77996HB00OBEtd+FO4J/1M3z77n9Xfr8iGAa8cBxC3l17LDRSrb65hnLFYwpC+s1g4 f78Q== 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:arc-authentication-results; bh=lRBdXx6ZTlr7nMudBfe1AB4/Z26sioxeG/GoJ4Dvs+g=; b=iog/xSXawJIdM9LRehzzTU345yYTIuw3P53wPI+2Le24lGgvgJpGX3DMcPW4PXlABl dkkKbRKe6qPKQi/R/NYkgk/ZYuDEgLQUSdI5POxj+ySa3kjuz1sRIYwVmb8ZBjm19e4E 6v6qRTg73aatKRFxDV6+J2MFiccHhyQ5mgZt1kfCsgamDtIpLZOLPs/VkYG/2Wp4RbR6 F1KVdQS9417O2cPvVv60kTJcGI8lq0dxZ8pL3YyvG6yVKe3z92LgdfQDtzhPFtLvolpu 7Ri00TelHCHM8jZU15S0JiGnA6DvTNKzISdhnrcVmXrGblyJd+h8YdJiBJCUUninzcXP wwVA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@googlemail.com header.s=20161025 header.b=qBXhSBtr; spf=pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c0c::22e as permitted sender) smtp.mailfrom=benbrenson89@googlemail.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from mail-wr0-x22e.google.com (mail-wr0-x22e.google.com. [2a00:1450:400c:c0c::22e]) by gmr-mx.google.com with ESMTPS id m23si252152wrb.4.2018.02.08.02.40.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 02:40:58 -0800 (PST) Received-SPF: pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c0c::22e as permitted sender) client-ip=2a00:1450:400c:c0c::22e; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@googlemail.com header.s=20161025 header.b=qBXhSBtr; spf=pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c0c::22e as permitted sender) smtp.mailfrom=benbrenson89@googlemail.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: by mail-wr0-x22e.google.com with SMTP id f6so4153139wra.6 for ; Thu, 08 Feb 2018 02:40:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lRBdXx6ZTlr7nMudBfe1AB4/Z26sioxeG/GoJ4Dvs+g=; b=qBXhSBtr4npPUW5BhGRjg7qjpL6++B5QOkcihDIVH8D6WVubj0QKn2UkWS8hQPpATg JQXFEKnQVM44iSJfY4tEcBzMMK5PC4kTJWQW2ZmjzizT+bYECbGuDMI7n9G7UUcBLuiD 2DvPGY3bhRIwBmI7LfZhBxLRwnZSyJLbNcwVz7BfMOP8988dWkXVJFcEDdpq4OUdPK5q tbuJ1Vsdtag6WcIPTP0ecUlTKnPbdl3ioOVJWojzBGkNBr45XxI0wojfgk+NqlPCyv4/ LoO0rWu3Vs+mpof9aWHgjA2Twz6AChNYSk0Ezm1MoHbu9ld4hBa7l6YEvq8Hnq6sdpZI 7k8Q== 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=lRBdXx6ZTlr7nMudBfe1AB4/Z26sioxeG/GoJ4Dvs+g=; b=I4aofMSJ86aXJpAJOwK2H0iLJBLw5YBiY/73IclMbwWDxuOxY1KHAvijYf0V4EFqn/ JJrQyi10SyxVUQARfeGJz+ee1bxfVy4aLj3F2z3UJXJPdFcugMu1kAZ9PIHpRAcnfLVG UhAtO0DZyb8iCHLCzT1Q8g6OHsAAPMBJZrkThuHokwBNMrN7PJ49rv8mwe3URzcP5q3O BNCd28d0rMtZ8U6OVFj5bd/urQ7fEUz6wFznPdtj7TIXRq2JjaFryWVYxA6EYOTKiFxj KJILsK6eOtpViornRnB9kCIgnzmgxk1Y0n7g07kWh+rl3ze9fTO5bAr7RBSHHmhH6vL1 2sYA== X-Gm-Message-State: APf1xPC00DDRnfu8vcTvrMYz4CXoLiX4uVpBSCy+vGQZzzyYvz5knKp0 ZvjofLUYKeA5m5JOXTLtCpJ/tw== X-Received: by 10.223.156.135 with SMTP id d7mr302346wre.184.1518086458276; Thu, 08 Feb 2018 02:40:58 -0800 (PST) Return-Path: Received: from localhost.localdomain (ip-109-41-193-215.web.vodafone.de. [109.41.193.215]) by smtp.gmail.com with ESMTPSA id k74sm764689wrc.2.2018.02.08.02.40.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Feb 2018 02:40:57 -0800 (PST) From: Benedikt Niedermayr X-Google-Original-From: Benedikt Niedermayr To: isar-users@googlegroups.com Cc: Benedikt Niedermayr Subject: [PATCH v2 6/7] Added support for installing isar packages to local isar repository. Date: Thu, 8 Feb 2018 11:40:11 +0100 Message-Id: <1518086412-12567-7-git-send-email-Benedikt.Niedermayr@mixed-mode.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518086412-12567-1-git-send-email-Benedikt.Niedermayr@mixed-mode.de> References: <1518086412-12567-1-git-send-email-Benedikt.Niedermayr@mixed-mode.de> X-TUID: 52NzgTxMIaLW Installs packages to the local Isar reposiory within the do_deploy_deb task. The cache_add_package function does the following: - Add the package to the repository database - Update the published repository Signed-off-by: Benedikt Niedermayr --- meta/classes/dpkg-base.bbclass | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index c5820fe..12daea5 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -1,6 +1,8 @@ # This software is a part of ISAR. # Copyright (C) 2017 Siemens AG +inherit apt-cache + # Add dependency from buildchroot creation do_build[depends] = "buildchroot:do_setup_mounts" @@ -24,10 +26,14 @@ dpkg_runbuild() { do_build() { mkdir -p ${BUILDROOT} sudo mount --bind ${WORKDIR} ${BUILDROOT} + sudo mount --bind ${TOPDIR}/apt-cache ${BUILDCHROOT_DIR}${CHROOT_CACHE_DIR} _do_build_cleanup() { ret=$? sudo umount ${BUILDROOT} 2>/dev/null || true sudo rmdir ${BUILDROOT} 2>/dev/null || true + + sudo umount ${BUILDCHROOT_DIR}${CHROOT_CACHE_DIR} 2>/dev/null || true + sudo rmdir ${BUILDCHROOT_DIR}${CHROOT_CACHE_DIR} 2>/dev/null || true (exit $ret) || bb_exit_handler } trap '_do_build_cleanup' EXIT @@ -35,13 +41,10 @@ do_build() { _do_build_cleanup } -# Install package to Isar-apt + +# Install package to isar repository do_deploy_deb() { - reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \ - --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \ - -C main \ - includedeb ${DEBDISTRONAME} \ - ${WORKDIR}/*.deb + cache_add_package ${ISAR_REPO} ${ISAR_REPO_PREFIX} ${WORKDIR}/*.deb } addtask deploy_deb after do_build -- 2.7.4