From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6519381492065370112 X-Received: by 10.80.144.177 with SMTP id c46mr683989eda.8.1517911798679; Tue, 06 Feb 2018 02:09:58 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.185.67 with SMTP id m61ls5239294ede.4.gmail; Tue, 06 Feb 2018 02:09:58 -0800 (PST) X-Google-Smtp-Source: AH8x2241A0EVehh/SyDj21r8fh/b2UVD8FBwbPajbb8d3D8pj24OkZ4y8meN2AGf6mlCVyNUu/Rk X-Received: by 10.80.201.74 with SMTP id p10mr681074edh.7.1517911798171; Tue, 06 Feb 2018 02:09:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517911798; cv=none; d=google.com; s=arc-20160816; b=ZmTCoAldySw7PnQirWcxb00stJTGVoEg1/34w3xCJmky4CG1mU20fDk5NsR0jdkJ5j Zm5S1pj4v/AuskjNWJAtJR2QtXiOeGJABQ7W7X3MjXvdKTDyLoX11Ho+iHW1QRhKbo1B GVTBzmCCPoc9rRjma38busTahdlgsjWrx9FosChMl2TSxVkDphiH+gljZIHF1wKgVoSR QxBOl6UiCIanZwg0MBINiN8Rs1JQrZkVDkXT65S3O7p0n+gFvf2jZerwQU5wb4TUMSP/ t9/p9TTdONzAIYXcPfvDdye0iorx0xHBtg/cJuA8Xs11roKMDCuVq5NP7KfYqiWSjZuy gwyA== 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=gqPZCLOUIhhl+tZwT2i/9tCAKXZ9KYMWX53vZDPlNsM=; b=Fux9N/bT23xNBNBiz2okkytMTvm/20iWMJ6sPdLABgrVLYMwfNtSrrHqr7uvFkqPmc c2uYzASbI3GafeADquvQN5MJ8Ir1I138HaEA4yW78Bxqy5pOJWjQsqCV12k61q2U7QEO bq845yIPztrgRxv2ZCyZymDHM7jJ/oWBdf/KEylgzJDCLSSuhP6dVbMsXfdAVs3ZcBDv vyKScYKYnx2jIWifr7ERBC5LGXMb8aayhrrDiWVWbTHV5AAjlnkcjeZ+Y4+a3+ttTE5B ydqhnOWXxGqP7OOfiwuz67UP3rW9N157NdhY4kSKWZEe4nP0QvHKL2KBbd1Bden5OHrs wKUA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@googlemail.com header.s=20161025 header.b=ImTPexO7; spf=pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c0c::22d 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-x22d.google.com (mail-wr0-x22d.google.com. [2a00:1450:400c:c0c::22d]) by gmr-mx.google.com with ESMTPS id m19si885117edd.4.2018.02.06.02.09.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Feb 2018 02:09:58 -0800 (PST) Received-SPF: pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c0c::22d as permitted sender) client-ip=2a00:1450:400c:c0c::22d; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@googlemail.com header.s=20161025 header.b=ImTPexO7; spf=pass (google.com: domain of benbrenson89@googlemail.com designates 2a00:1450:400c:c0c::22d as permitted sender) smtp.mailfrom=benbrenson89@googlemail.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: by mail-wr0-x22d.google.com with SMTP id 41so1251016wrc.9 for ; Tue, 06 Feb 2018 02:09: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=gqPZCLOUIhhl+tZwT2i/9tCAKXZ9KYMWX53vZDPlNsM=; b=ImTPexO7XUv+tLaNqUPuRP0HhcQCTV7bCwoJZcOHJtkJwqL7qakrPRg7BuOnqOLt88 dj3nw9lcviM+kTCIcy+HB7DAiCOS7A06U64MjwHveQqLR8milmZkzlpYDaMB3KT1VAM1 Vm3E/z3e6Bwjn7aVqFJSkodDQ2E9swP8MvSyMXku8XocdpYUUiAcTAqVsQ6GfSyw8brz cEDP5mdEmqLkP6w1r+RZ++/XCS1T1iUqZRPjnEgLrVZAEZUoISOv4BB6oc+L3TDcb1Ny FlVtNfW5jfgXNt5h+QuZfr7LP+IRQvZ0spwp5D6x86k5EY7iAcP67XvGidnwS5f0na// MRfQ== 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=gqPZCLOUIhhl+tZwT2i/9tCAKXZ9KYMWX53vZDPlNsM=; b=U75iyUSxHPd84Vw4KHhiE/SAx1K7tj1SiFNulnsDcnpQTFG4LVtnFPb6TXRgQOB6/W FVZtX7Q56c4HdUtAm5ZggCXO928kjbme9TOjIhrhY24iiU3nTWLnTwYYhXJi9UmxPGgu ihe+u3yJoZFuml8LXctc7ceB2GdvmqIXm0qILpdLKCL4ugTKraMvLzKeqGD5SDcZWEbv O37HGoIReJAFU3kCFC+AE4zEdOW9UloN4IYqxoHoTAiF2xdOGVXMgXOpeU7jIPbATbzX WWA6Kbp6SAeHHZCx1psIt0coh5ot9hYvdvXY+wXpScy+zOAktyUMJuwe6pz5Sx6xW56g 2xxw== X-Gm-Message-State: APf1xPCONlHjeUsWQ/dSvgVQE7+AqR3vvKbe+PSZKhqQfccZQnQPAHDh GoLXws3VjwJWzeuvFpTNkGlW3Q== X-Received: by 10.223.160.100 with SMTP id l33mr1575670wrl.51.1517911797688; Tue, 06 Feb 2018 02:09:57 -0800 (PST) Return-Path: Received: from localhost.localdomain (ip-109-41-195-133.web.vodafone.de. [109.41.195.133]) by smtp.gmail.com with ESMTPSA id r5sm13466342wmg.30.2018.02.06.02.09.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Feb 2018 02:09:57 -0800 (PST) From: Benedikt Niedermayr X-Google-Original-From: Benedikt Niedermayr To: isar-users@googlegroups.com Cc: Benedikt Niedermayr Subject: [PATCH 6/6] Added support for installing isar packages to local isar repository. Date: Tue, 6 Feb 2018 11:09:39 +0100 Message-Id: <1517911779-30507-7-git-send-email-Benedikt.Niedermayr@mixed-mode.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517911779-30507-1-git-send-email-Benedikt.Niedermayr@mixed-mode.de> References: <1517911779-30507-1-git-send-email-Benedikt.Niedermayr@mixed-mode.de> X-TUID: Uo65J/Gf2Ngj 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 026028f..896d31d 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_build" @@ -20,10 +22,14 @@ dpkg_runbuild() { do_build() { mkdir -p ${BUILDROOT} sudo mount --bind ${WORKDIR} ${BUILDROOT} + sudo mount --bind ${TOPDIR}/apt-cache/${DISTRO} ${BUILDCHROOT_DIR}/apt-cache _do_build_cleanup() { ret=$? sudo umount ${BUILDROOT} 2>/dev/null || true sudo rmdir ${BUILDROOT} 2>/dev/null || true + + sudo umount ${BUILDCHROOT_DIR}/apt-cache 2>/dev/null || true + sudo rmdir ${BUILDCHROOT_DIR}/apt-cache 2>/dev/null || true (exit $ret) || bb_exit_handler } trap '_do_build_cleanup' EXIT @@ -31,13 +37,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