public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
* [PATCH] recipes-devtools/sbuild-chroot: install self-built packages in sbuild flavor
@ 2023-12-15  9:56 Srinuvasan Arjunan
  2023-12-15 10:34 ` Jan Kiszka
  0 siblings, 1 reply; 12+ messages in thread
From: Srinuvasan Arjunan @ 2023-12-15  9:56 UTC (permalink / raw)
  To: isar-users; +Cc: jan.kiszka, srinuvasan

From: srinuvasan <srinuvasan.a@siemens.com>

In some use-cases we need to install custom packages in sbuildchroot and
this can be referred later time during image generation part, hence we
need the persistent sbuildchroot rather than the temporary sessions.

Introduced persistent-sbuildchroot class to handle the above scenarios.

Introduced SBUILD_CHROOT_INSTALL_EXTRA variable, here you can define the
additional custom packages that you need to install in sbuild flavor.

Signed-off-by: srinuvasan <srinuvasan.a@siemens.com>
---
 .../recipes-app/hello-isar/hello-isar.bb      |  2 +-
 meta-isar/recipes-app/libhello/libhello.bb    |  2 +-
 .../recipes-core/images/isar-image-base.bb    |  3 +
 ...b => sbuild-chroot-host-extra-packages.bb} |  2 +-
 ...=> sbuild-chroot-target-extra-packages.bb} |  2 +-
 meta/classes/image.bbclass                    |  1 +
 meta/classes/persistent-sbuildchroot.bbclass  | 64 +++++++++++++++++++
 7 files changed, 72 insertions(+), 4 deletions(-)
 rename meta-isar/recipes-devtools/sbuild-chroot/{sbuild-chroot-host-db2m.bb => sbuild-chroot-host-extra-packages.bb} (91%)
 rename meta-isar/recipes-devtools/sbuild-chroot/{sbuild-chroot-target-db2m.bb => sbuild-chroot-target-extra-packages.bb} (91%)
 create mode 100644 meta/classes/persistent-sbuildchroot.bbclass

diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb b/meta-isar/recipes-app/hello-isar/hello-isar.bb
index 51dac2b7..484e5704 100644
--- a/meta-isar/recipes-app/hello-isar/hello-isar.bb
+++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb
@@ -23,4 +23,4 @@ SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d"
 inherit dpkg
 
 # Example of using alternative sbuild chroot
-SBUILD_FLAVOR="db2m"
+SBUILD_FLAVOR="extra-packages"
diff --git a/meta-isar/recipes-app/libhello/libhello.bb b/meta-isar/recipes-app/libhello/libhello.bb
index 71604bf5..4e6522fe 100644
--- a/meta-isar/recipes-app/libhello/libhello.bb
+++ b/meta-isar/recipes-app/libhello/libhello.bb
@@ -16,4 +16,4 @@ SRCREV = "98f2e41e7d05ab8d19b0c5d160b104b725c8fd93"
 inherit dpkg
 
 # Example of using alternative sbuild chroot
-SBUILD_FLAVOR="db2m"
+SBUILD_FLAVOR="extra-packages"
diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb
index b381d859..17840906 100644
--- a/meta-isar/recipes-core/images/isar-image-base.bb
+++ b/meta-isar/recipes-core/images/isar-image-base.bb
@@ -10,4 +10,7 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260
 
 PV = "1.0"
 
+SBUILD_FLAVOR = "extra-packages"
+SBUILD_CHROOT_INSTALL_EXTRA = "hello-isar"
+
 inherit image
diff --git a/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-db2m.bb b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-extra-packages.bb
similarity index 91%
rename from meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-db2m.bb
rename to meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-extra-packages.bb
index 1795c5a2..b035a926 100644
--- a/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-db2m.bb
+++ b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-extra-packages.bb
@@ -8,5 +8,5 @@ DESCRIPTION = "Isar sbuild/schroot filesystem for host (docbook-to-man)"
 
 require recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
 
-SBUILD_FLAVOR = "db2m"
+SBUILD_FLAVOR = "extra-packages"
 SBUILD_CHROOT_PREINSTALL_EXTRA ?= "docbook-to-man"
diff --git a/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-db2m.bb b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-extra-packages.bb
similarity index 91%
rename from meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-db2m.bb
rename to meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-extra-packages.bb
index e2e10433..80440df2 100644
--- a/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-db2m.bb
+++ b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-extra-packages.bb
@@ -8,5 +8,5 @@ DESCRIPTION = "Isar sbuild/schroot filesystem for target (docbook-to-man)"
 
 require recipes-devtools/sbuild-chroot/sbuild-chroot-target.bb
 
-SBUILD_FLAVOR = "db2m"
+SBUILD_FLAVOR = "extra-packages"
 SBUILD_CHROOT_PREINSTALL_EXTRA ?= "docbook-to-man"
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 73f1d52c..03a02583 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -85,6 +85,7 @@ inherit image-tools-extension
 inherit image-postproc-extension
 inherit image-locales-extension
 inherit image-account-extension
+inherit persistent-sbuildchroot
 
 # Extra space for rootfs in MB
 ROOTFS_EXTRA ?= "64"
diff --git a/meta/classes/persistent-sbuildchroot.bbclass b/meta/classes/persistent-sbuildchroot.bbclass
new file mode 100644
index 00000000..388d156a
--- /dev/null
+++ b/meta/classes/persistent-sbuildchroot.bbclass
@@ -0,0 +1,64 @@
+# This software is a part of ISAR.
+# Copyright (C) Siemens AG, 2023
+#
+# SPDX-License-Identifier: MIT
+#
+# This file extends the image.bbclass to supply tools for futher imager functions
+
+inherit sbuild
+
+SBUILD_FLAVOR = "extra-packages"
+SBUILD_CHROOT_INSTALL_EXTRA ??= ""
+
+SCHROOT_MOUNTS = "${WORKDIR}:${PP_WORK} ${IMAGE_ROOTFS}:${PP_ROOTFS} ${DEPLOY_DIR_IMAGE}:${PP_DEPLOY}"
+SCHROOT_MOUNTS += "${REPO_ISAR_DIR}/${DISTRO}:/isar-apt"
+
+ROOTFS_INSTALL_COMMAND:prepend = " sbuild_chroot_install_extra"
+
+sbuild_chroot_install_extra() {
+
+    schroot_create_configs
+    insert_mounts
+
+    if [ -n "${SBUILD_CHROOT_INSTALL_EXTRA}" ]; then
+        echo "Installing self built packages: ${SBUILD_CHROOT_INSTALL_EXTRA}"
+
+        distro="${BASE_DISTRO}-${BASE_DISTRO_CODENAME}"
+        if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then
+            distro="${HOST_BASE_DISTRO}-${BASE_DISTRO_CODENAME}"
+        fi
+
+        # prepare isar-apt
+        sudo -E chroot ${SCHROOT_DIR} sh -c " \
+            mkdir -p '/etc/apt/sources.list.d'
+            echo 'deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main' > \
+                '/etc/apt/sources.list.d/isar-apt.list'
+
+            mkdir -p '/etc/apt/preferences.d'
+            cat << EOF > '/etc/apt/preferences.d/isar-apt'
+Package: ${SBUILD_CHROOT_INSTALL_EXTRA}
+Pin: release n=${DEBDISTRONAME}
+Pin-Priority: 1000
+EOF"
+
+        E="${@ isar_export_proxies(d)}"
+        deb_dl_dir_import ${schroot_dir} ${distro}
+        sudo -E chroot ${SCHROOT_DIR} sh -c " \
+            apt-get update \
+                -o Dir::Etc::SourceList='sources.list.d/isar-apt.list' \
+                -o Dir::Etc::SourceParts='-' \
+                -o APT::Get::List-Cleanup='0'
+            apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \
+                --allow-unauthenticated --allow-downgrades --download-only install \
+                ${SBUILD_CHROOT_INSTALL_EXTRA}"
+
+        deb_dl_dir_export ${schroot_dir} ${distro}
+        sudo -E chroot ${SCHROOT_DIR} sh -c " \
+            apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \
+                --allow-unauthenticated --allow-downgrades install \
+                ${SBUILD_CHROOT_INSTALL_EXTRA}"
+    fi
+
+    remove_mounts
+    schroot_delete_configs
+}
-- 
2.39.2


^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-01-05 12:00 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-15  9:56 [PATCH] recipes-devtools/sbuild-chroot: install self-built packages in sbuild flavor Srinuvasan Arjunan
2023-12-15 10:34 ` Jan Kiszka
2023-12-15 11:01   ` Srinuvasan Arjunan
2023-12-15 11:45   ` [PATCH v1] " Srinuvasan Arjunan
2024-01-03  4:47     ` Srinuvasan Arjunan
2024-01-03  5:17       ` Jan Kiszka
2024-01-03  7:56         ` Srinuvasan Arjunan
2024-01-03 10:36           ` Jan Kiszka
2024-01-03 13:11             ` Srinuvasan Arjunan
2024-01-03 16:27               ` Jan Kiszka
2024-01-04  5:43                 ` Srinuvasan Arjunan
2024-01-05 12:00                   ` Srinuvasan Arjunan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox