From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6739560601010307072 X-Received: by 2002:ac2:5633:: with SMTP id b19mr14467397lff.103.1569176238328; Sun, 22 Sep 2019 11:17:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9786:: with SMTP id y6ls911620lji.3.gmail; Sun, 22 Sep 2019 11:17:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqzIXr+4KFBW8kWbI35v09lG1egRyxkn1DeW8ENMNboca1+QEsq8tmknyMhPlgt03xuDY4VO X-Received: by 2002:a2e:8052:: with SMTP id p18mr14888667ljg.198.1569176237862; Sun, 22 Sep 2019 11:17:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569176237; cv=none; d=google.com; s=arc-20160816; b=IjDVT3NQQeGrgbXdGptvHTY+VwS9HFvG45c/GRTblS8w086hLbGazo5lJmq/qV11Ur xlbrScAJlSuNE/tlerFtqG5Xem0F82XYH2XTBw7JNkJg/bOWk/jG9BGFbWz5VNTr2d// +hSOl3tKEvL+UV+FxNiGL6jWgLGjSyZGNVLIyiXAJ9vPVtfrGVh8LOwYn2RACxCNXZX4 it0qjzff3Wl2aOHRhsbtNEW/25wlQtftm59ZTm1w8aFpko1ptjhRW6o/1yVPgf8KPCo+ 12e8+nV35WPqsxf78ZhezvSm4xzEJ3dJjjdsmUFD+sywamGo1LpOeQCQtI4JdxB07+Qc tC/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=QA0PpxwqpjOVb29vkSBrz5ktgTq6vPg/KNlqHo/9Jis=; b=zW0JtwcW7RE4LK1fqMFQoRFD9SjTx8BZHcOQ4H1Wgo1F0p5FPAoyE4lbC2lnUpDAjt XNGq0hnQ4lhlMKwcKGZY9MzuKFQC5DItWwReZiyb+teobRTwownw1yz+7j3JtiVJBDQn 6oMhTLdnkrP42xV8g1OtIydb5+olG7SyddP20VovR6plkxPBDqKrwx3S3DD1reaZZ/Rl TPzwK6p36gI8nXTMdliU68hQhkHDhc400VBLXxWfouYW2fnOA1mKRI17mIwQ3owGu+dD ORC4TZgQfm4ajqqhXfN4BObxqL4qlEmE40MCmGAQ8I1tLUB03to81UipoE1W9zAuSofW qKyA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id h6si574814lfc.3.2019.09.22.11.17.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Sep 2019 11:17:17 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x8MIHGwl020179 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 22 Sep 2019 20:17:17 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.37.1]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x8MIHB9B005761 for ; Sun, 22 Sep 2019 20:17:16 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v5 23/27] Add git-buildpackage support Date: Sun, 22 Sep 2019 20:17:07 +0200 Message-Id: <73924c8c07e83edda7db9283c8f58f86247b5d3a.1569176231.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: yoJvOOT7nk10 From: Jan Kiszka This allows to build packages from gbp-compatible repositories like found on salsa. This is particularly useful for building unreleased or older packages, and also patching them. The feature comes with a test case that builds cowsay from its salsa repo, adding this also to CI. Signed-off-by: Jan Kiszka --- meta-isar/recipes-app/cowsay/cowsay_git.bb | 9 +++++++++ meta/classes/dpkg-gbp.bbclass | 24 ++++++++++++++++++++++++ meta/recipes-devtools/buildchroot/files/build.sh | 2 +- scripts/ci_build.sh | 2 ++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta-isar/recipes-app/cowsay/cowsay_git.bb create mode 100644 meta/classes/dpkg-gbp.bbclass diff --git a/meta-isar/recipes-app/cowsay/cowsay_git.bb b/meta-isar/recipes-app/cowsay/cowsay_git.bb new file mode 100644 index 0000000..7aca1b4 --- /dev/null +++ b/meta-isar/recipes-app/cowsay/cowsay_git.bb @@ -0,0 +1,9 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2019 +# +# SPDX-License-Identifier: MIT + +inherit dpkg-gbp + +SRC_URI = "git://salsa.debian.org/debian/cowsay.git;protocol=https" +SRCREV = "756f0c41fbf582093c0c1dff9ff77734716cb26f" diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass new file mode 100644 index 0000000..8a8e0f4 --- /dev/null +++ b/meta/classes/dpkg-gbp.bbclass @@ -0,0 +1,24 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2019 +# +# SPDX-License-Identifier: MIT + +inherit dpkg + +S = "${WORKDIR}/git" + +GBP_DEPENDS ?= "git-buildpackage pristine-tar" +GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" + +do_install_builddeps_append() { + dpkg_do_mounts + E="${@ bb.utils.export_proxies(d)}" + sudo -E chroot ${BUILDCHROOT_DIR} \ + apt-get install -y -o Debug::pkgProblemResolver=yes \ + --no-install-recommends ${GBP_DEPENDS} + dpkg_undo_mounts +} + +dpkg_runbuild_prepend() { + export GBP_PREFIX="gbp buildpackage --git-ignore-new ${GBP_EXTRA_OPTIONS} --git-builder=" +} diff --git a/meta/recipes-devtools/buildchroot/files/build.sh b/meta/recipes-devtools/buildchroot/files/build.sh index 1ba394c..101581d 100644 --- a/meta/recipes-devtools/buildchroot/files/build.sh +++ b/meta/recipes-devtools/buildchroot/files/build.sh @@ -14,4 +14,4 @@ for i in configure aclocal.m4 Makefile.am Makefile.in; do fi done -dpkg-buildpackage -a$target_arch -d --source-option=-I +${GBP_PREFIX}dpkg-buildpackage -a$target_arch -d --source-option=-I diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index a69cc51..d02326a 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -155,6 +155,8 @@ fi sed -i -e 's/#IMAGE_INSTALL += "isar-disable-apt-cache"/IMAGE_INSTALL += "isar-disable-apt-cache"/g' conf/local.conf +echo 'IMAGE_INSTALL += "cowsay"' >> conf/local.conf + # Start cross build for the defined set of configurations sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf bitbake $BB_ARGS $CROSS_TARGETS_SET -- 2.16.4