From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH v5 23/27] Add git-buildpackage support
Date: Sun, 22 Sep 2019 20:17:07 +0200 [thread overview]
Message-ID: <73924c8c07e83edda7db9283c8f58f86247b5d3a.1569176231.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1569176231.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1569176231.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
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 <jan.kiszka@siemens.com>
---
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
next prev parent reply other threads:[~2019-09-22 18:17 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-22 18:16 [PATCH v5 00/27] Pending patches, fix for isar-bootstrap, devshell Jan Kiszka
2019-09-22 18:16 ` [PATCH v5 01/27] buildchroot: Properly deploy the build result Jan Kiszka
2019-09-22 18:16 ` [PATCH v5 02/27] sdk: Use clean-package-cache rather than open-coded cleanup Jan Kiszka
2019-09-22 18:16 ` [PATCH v5 03/27] sdk: Deploy earlier Jan Kiszka
2019-09-22 18:16 ` [PATCH v5 04/27] Remove unneeded PF tweakings Jan Kiszka
2019-09-22 18:16 ` [PATCH v5 05/27] image: Stop changing PF, tune WORKDIR and STAMP directly Jan Kiszka
2019-09-25 12:47 ` [PATCH v6 " Jan Kiszka
2019-09-22 18:16 ` [PATCH v5 06/27] image: Make WORKDIR and STAMPs IMAGE_TYPE-specific Jan Kiszka
2019-09-22 18:16 ` [PATCH v5 07/27] Adjust STAMP variables to use PN, rather than PF Jan Kiszka
2019-09-22 18:16 ` [PATCH v5 08/27] Align WORKDIR structure with OE Jan Kiszka
2019-09-22 18:16 ` [PATCH v5 09/27] isar-bootstrap: Unshare host bootstraps across different target distros Jan Kiszka
2019-09-22 18:16 ` [PATCH v5 10/27] isar-bootstrap: Clean up and fix rebuild Jan Kiszka
2019-09-22 18:16 ` [PATCH v5 11/27] gitlab-ci: Keep logs as artifacts on failure Jan Kiszka
2019-09-22 18:16 ` [PATCH v5 12/27] Detect false sharing of recipes Jan Kiszka
2019-09-24 18:02 ` [PATCH v6 " Jan Kiszka
2019-09-29 14:57 ` Baurzhan Ismagulov
2019-09-30 6:00 ` Jan Kiszka
2019-09-30 9:56 ` Baurzhan Ismagulov
2019-09-30 10:14 ` Jan Kiszka
2019-09-30 14:53 ` Baurzhan Ismagulov
2019-09-30 15:26 ` Jan Kiszka
2019-09-30 15:39 ` Baurzhan Ismagulov
2019-09-30 16:34 ` Jan Kiszka
2019-09-30 17:20 ` Baurzhan Ismagulov
2019-09-30 17:26 ` Jan Kiszka
2019-09-30 20:29 ` Baurzhan Ismagulov
2019-09-22 18:16 ` [PATCH v5 13/27] dpkg-base: Move do_deploy_deb before do_build Jan Kiszka
2019-10-02 7:09 ` Baurzhan Ismagulov
2019-09-22 18:16 ` [PATCH v5 14/27] base-apt: Move do_cache_config " Jan Kiszka
2019-09-22 18:16 ` [PATCH v5 15/27] wic-img: Use private tmp dir Jan Kiszka
2019-09-22 18:17 ` [PATCH v5 16/27] rootfs: Take isar-apt shared lock during repository operations Jan Kiszka
2019-09-22 18:17 ` [PATCH v5 17/27] Use deb.debian.org mirrors Jan Kiszka
2019-09-23 10:03 ` Baurzhan Ismagulov
2019-09-23 10:09 ` Jan Kiszka
2019-10-02 11:13 ` Baurzhan Ismagulov
2019-09-22 18:17 ` [PATCH v5 18/27] linux-custom: Control linux-libc-dev deployment manually Jan Kiszka
2019-09-22 18:17 ` [PATCH v5 19/27] dpkg-base: Wait for umount to succeed Jan Kiszka
2019-09-30 11:07 ` Baurzhan Ismagulov
2019-09-30 12:22 ` Jan Kiszka
2019-09-30 13:33 ` Baurzhan Ismagulov
2019-10-07 15:48 ` Baurzhan Ismagulov
2019-09-22 18:17 ` [PATCH v5 20/27] dpkg-base: Permit multiple clean runs Jan Kiszka
2019-09-22 18:17 ` [PATCH v5 21/27] buildchroot: Factor out common packages Jan Kiszka
2019-09-22 18:17 ` [PATCH v5 22/27] buildchroot: Do not build cross when there are no arch-specific outputs Jan Kiszka
2019-09-22 18:17 ` Jan Kiszka [this message]
2019-09-22 18:17 ` [PATCH v5 24/27] dbpg-raw: Only list top-level files in <pn>.install Jan Kiszka
2019-09-23 9:52 ` Baurzhan Ismagulov
2019-09-23 10:29 ` Jan Kiszka
2019-09-23 10:30 ` Baurzhan Ismagulov
2019-09-22 18:17 ` [PATCH v5 25/27] Add OE class and library elements for terminal support Jan Kiszka
2019-09-22 18:17 ` [PATCH v5 26/27] dpkg-base: Add devshell target Jan Kiszka
2019-09-22 18:17 ` [PATCH v5 27/27] linux-custom: Add libncurses-dev to KBUILD_DEPENDS Jan Kiszka
2019-09-23 6:33 ` [PATCH v5 00/27] Pending patches, fix for isar-bootstrap, devshell Baurzhan Ismagulov
2019-09-23 7:33 ` Jan Kiszka
2019-09-23 7:50 ` Baurzhan Ismagulov
2019-09-23 9:50 ` Baurzhan Ismagulov
2019-09-23 10:07 ` Jan Kiszka
2019-09-23 10:23 ` Baurzhan Ismagulov
2019-09-23 10:28 ` Jan Kiszka
2019-09-25 8:41 ` Baurzhan Ismagulov
2019-09-25 8:51 ` Jan Kiszka
2019-09-25 9:22 ` Baurzhan Ismagulov
2019-09-25 9:26 ` Jan Kiszka
2019-09-25 9:35 ` Baurzhan Ismagulov
2019-09-25 9:35 ` Jan Kiszka
2019-09-25 10:52 ` Baurzhan Ismagulov
2019-09-25 11:05 ` Jan Kiszka
2019-09-25 12:08 ` Baurzhan Ismagulov
2019-09-25 12:29 ` Jan Kiszka
2019-09-25 12:44 ` Baurzhan Ismagulov
2019-09-23 14:24 ` Henning Schild
2019-09-28 15:46 ` Baurzhan Ismagulov
2019-09-25 10:23 ` Henning Schild
2019-09-25 11:41 ` Jan Kiszka
2019-09-30 9:29 ` Baurzhan Ismagulov
2019-09-30 10:02 ` Jan Kiszka
2019-09-30 13:00 ` Baurzhan Ismagulov
2019-10-01 14:47 ` Baurzhan Ismagulov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=73924c8c07e83edda7db9283c8f58f86247b5d3a.1569176231.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox