From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7312758318482587648 X-Received: by 2002:a17:903:24c:b0:1d0:6638:b9de with SMTP id j12-20020a170903024c00b001d06638b9demr13023915plh.10.1702640750629; Fri, 15 Dec 2023 03:45:50 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:9698:b0:1cf:b6b6:a0de with SMTP id n24-20020a170902969800b001cfb6b6a0dels246826plp.2.-pod-prod-02-us; Fri, 15 Dec 2023 03:45:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IHLQ8NkEhShTG9vO5QnkI+L/l8T1dzrCG3/Gg8YWPbQoNRqDaeOyjA1Jb4v/brZMXqZFIUg X-Received: by 2002:a17:902:e741:b0:1d0:b095:9ab0 with SMTP id p1-20020a170902e74100b001d0b0959ab0mr6180360plf.105.1702640748978; Fri, 15 Dec 2023 03:45:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702640748; cv=none; d=google.com; s=arc-20160816; b=hzrxIoif1ludiy9CBg7vddYX6DedZQq3JMame4xIzY+BOweFJFghbJdR+Xlu0EiDnS jTISFc4ORnmGf9MpeBS0c8MFU2jLLTq4bgWQ2+aKqNwpP2s5oIiLYs9TnqGk9vvqwFz4 zMUpVjHmIGJUPlsOxzQC+wQy075EXCVps/FB0X2LMHNqe9vv5EyPDoPCPA1V1iODbCda SHQ81r6KaW+InbZjRxT1aTngQCtbQ7xCMb453PNqQqwGwoXunAeHXkd3dIeYuBUpTRsO iexh8qGUrm3lY1o/G7LYOB9i727n+qi4CY++ZRTfFQkvwDh03l+/oqVFYV+N5ldsZqEK HYZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr; bh=4Zq3jPqeBSxmsYmcKeUFMhqWk1/0JWSCjGtWauZGvAY=; fh=Igj93TBK3i6c7Oy07qB7xeVIIK1PlortB1TNWYO0u9U=; b=z0tgGHja/oxepVochQL8EgOc8u9S72N8GKoMfnQivcAsao7QSVP5mZH4frmSM+mGZ1 qxpylagGMaUnMk713upyBUBmeP+qhnmrCQmm52izKQRfAJSeWAzUZ9ahPKIfRsd5hHwg TWY8KrJHcSIbJWtOLQykDLwRGdaR7hlUT5fmXXcr5XdWTuaQUy2puHiSa8YYIMLjbBfY t8mDCuYIyIgfuYkdoRlKAyYg9rZzkcjWdzqL+SBdwpl/yhCYPvuqlTWwLKnG/SlxXgtJ mBkWQHP8L1aGKDFegTsbaR+LnLeoKKgv4fSBImQxDu+kAVNLwKuq5R8g0m/dzsl9diDj i0WQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of srinuvasan_a@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Srinuvasan_A@mentor.com Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com. [68.232.137.180]) by gmr-mx.google.com with ESMTPS id s11-20020a170903200b00b001d346fac8ddsi457898pla.0.2023.12.15.03.45.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Dec 2023 03:45:48 -0800 (PST) Received-SPF: pass (google.com: domain of srinuvasan_a@mentor.com designates 68.232.137.180 as permitted sender) client-ip=68.232.137.180; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of srinuvasan_a@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Srinuvasan_A@mentor.com X-CSE-ConnectionGUID: m3k5H6SeSNqmJOmCK1PkWg== X-CSE-MsgGUID: gErPp1daRLazQpogMY9bKw== X-IronPort-AV: E=Sophos;i="6.04,278,1695715200"; d="scan'208";a="25362197" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 15 Dec 2023 03:45:46 -0800 IronPort-SDR: QqWVwvIvV8lSxg/bWJk+3+lb2FcEXA7Ud8hXEBLaEI4zqOv5Xe1fxZ72pNjk+FJn1Qqri1y7UL D7h5RD9YPxBkp/0klSFr7iRGm6OJD+yX2xFAE8h/Dwfwv1T/gDZ0ncgJDyOqlU0TWjOMofOcOY T0U0DCMtAX7yEVwKlFCJSSv8jkQE1Vc5rH186dstU4QppVHG5o0HFO+9To9Wcwc1NuB/CAxyFI LPLWSTtk+GAxPewmf8FLV+3Sw2gnnUeod+TYDUacapkH1vE6Om5x7BgLPrTgPXH6VpRobUTiuu p9w= From: Srinuvasan Arjunan To: CC: , srinuvasan Subject: [PATCH v1] recipes-devtools/sbuild-chroot: install self-built packages in sbuild flavor Date: Fri, 15 Dec 2023 17:15:27 +0530 Message-ID: <20231215114527.567501-1-srinuvasan_a@mentor.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <8b19681f-8237-4cef-9235-b6128a37f457@siemens.com> References: <8b19681f-8237-4cef-9235-b6128a37f457@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: srinuvasan_a@mentor.com X-ClientProxiedBy: svr-orw-mbx-12.mgc.mentorg.com (147.34.90.212) To svr-orw-mbx-13.mgc.mentorg.com (147.34.90.213) X-TUID: Kn7nPEZevy/f 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 additionally added the provision to install the custom packages in sbuild flavor. Introduced SBUILD_CHROOT_INSTALL variable, here you can define the 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 + ...tall-custom-packages-sbuild-flavor.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/install-custom-packages-sbuild-flavor.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..d635a3aa 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 = "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..5fea18b0 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 install-custom-packages-sbuild-flavor # Extra space for rootfs in MB ROOTFS_EXTRA ?= "64" diff --git a/meta/classes/install-custom-packages-sbuild-flavor.bbclass b/meta/classes/install-custom-packages-sbuild-flavor.bbclass new file mode 100644 index 00000000..04650f51 --- /dev/null +++ b/meta/classes/install-custom-packages-sbuild-flavor.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 ??= "" + +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 = " install_custom_packages_sbuild_flavor" + +install_custom_packages_sbuild_flavor() { + + schroot_create_configs + insert_mounts + + if [ -n "${SBUILD_CHROOT_INSTALL}" ]; then + echo "Installing self built packages: ${SBUILD_CHROOT_INSTALL}" + + 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} +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}" + + 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}" + fi + + remove_mounts + schroot_delete_configs +} -- 2.39.2