From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7312758318482587648 X-Received: by 2002:a92:cd8c:0:b0:35d:9890:92db with SMTP id r12-20020a92cd8c000000b0035d989092dbmr14701635ilb.10.1702634226430; Fri, 15 Dec 2023 01:57:06 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a92:1949:0:b0:35d:7c0c:b961 with SMTP id e9-20020a921949000000b0035d7c0cb961ls1173001ilm.1.-pod-prod-02-us; Fri, 15 Dec 2023 01:57:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IHF79QB///p/rMrkBYUwbOfLKDzzJppVfwwnWvLpeYDhEhzl4cgnRNhyWvbbDUZO1TmJBQo X-Received: by 2002:a05:6e02:1a88:b0:35d:5543:45dd with SMTP id k8-20020a056e021a8800b0035d554345ddmr15518591ilv.22.1702634225588; Fri, 15 Dec 2023 01:57:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702634225; cv=none; d=google.com; s=arc-20160816; b=rAhovC+uMyQOb/StFHQYuG5GGCJsRjitU1h1hgnuXCaQVuWDmk2SnVZxSC9fkoaYMV I/UiavVqZsJB8es69JtNfDK4M8PMmbGtyjSBK0JjTJkNoyfnfLVrpQ6mDI/JfVdP9WDD b+xP5rjo9NDWqdF64D8We4jkOvvZvYwMU413J9OTKqzl0vNg136PDrIBOipBbpi+Mikc weKkcIhkp32bTbEhOeCOoyoE9FM+X2fn3IBKuT2fxMqarVTM417eUWmWkWOjzyKDLp6o EHEwotYCpnLn9iHhlobnhNlo9Z51oDtKYIXdSzqcdvu0Zrk+x3P4RBW5oWl2HlS5uBon YzEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:ironport-sdr; bh=4a4qackidrmP5wnwq6IGkPik0iNfx001d4+dDraIz3o=; fh=Igj93TBK3i6c7Oy07qB7xeVIIK1PlortB1TNWYO0u9U=; b=c59mSdcCfLHf9bbekiX6ED4j/d+iHcpS4AtxFm+N/NPB1zUFrbimZgZnp6pAv6pz0H Q60pJE0NJxXN+KrgzqWo20KRe49BGWORQl6m0wsYcSBfOj/hzZj7c30i7MflvHkCLhSo Yz9YfkcN4bnHqgbWXFyN/retf45O98aMzNj0rrcMwPArxyiGCdA2+4KETheyzh+XQbEc mm/0H5SMMJOtrdX0MXYdFvBX6888IYK+Crc/o7Wf1h/buKSYMiorERrZHY7LYqbe/WAQ AdKqFgMuKWCRVcBM/KAhMfyapBzjO9gKRLb3ei7ox9EPBAsz3Y5n00erLibZoShmTX5n XdcA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of srinuvasan_a@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Srinuvasan_A@mentor.com Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id 82-20020a630055000000b005ca45e6a45bsi506204pga.5.2023.12.15.01.57.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Dec 2023 01:57:05 -0800 (PST) Received-SPF: pass (google.com: domain of srinuvasan_a@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of srinuvasan_a@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Srinuvasan_A@mentor.com X-CSE-ConnectionGUID: oHcpFNe4R0ilaic4howMRg== X-CSE-MsgGUID: e2c3Llg/QKy94yYHF6FTzA== X-IronPort-AV: E=Sophos;i="6.04,278,1695715200"; d="scan'208";a="28651628" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 15 Dec 2023 01:57:04 -0800 IronPort-SDR: g4OhP9PAxOa1UdzsWdzku8Ct6CkhdLz+9/Oja5sZ1ccvh6qcB+IQ7s+vLI0cUB0ZoHIiMOy9dx wBg6y04gyt6aPsmfMOLpwUkcf2SfMad5YOO/GwV6ruzg56a/cXWmAtX1mYXYG+UfFK6dvboJFG A66/zebMKmBbyG+rUkisqY7vKoozrnkiYcglchbKURjoxPgfjOiGKqpS8Ier0ixaV/D5HJjAoY BpDeSROsM3HRomGt4V2JcjJnLPKIYlDIzbavdXg/GKPoe3ibfaw6lfD04UoebtiV5sWo9qgRNM xzg= From: Srinuvasan Arjunan To: CC: , srinuvasan Subject: [PATCH] recipes-devtools/sbuild-chroot: install self-built packages in sbuild flavor Date: Fri, 15 Dec 2023 15:26:39 +0530 Message-ID: <20231215095639.566978-1-srinuvasan_a@mentor.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: srinuvasan_a@mentor.com X-ClientProxiedBy: svr-orw-mbx-11.mgc.mentorg.com (147.34.90.211) To svr-orw-mbx-13.mgc.mentorg.com (147.34.90.213) X-TUID: xQJ7j6uW1/lG From: srinuvasan 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 --- .../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