From patchwork Fri Dec 15 11:45:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinuvasan Arjunan X-Patchwork-Id: 3235 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 15 Dec 2023 12:45:58 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f58.google.com (mail-pj1-f58.google.com [209.85.216.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 3BFBjuJK003909 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 15 Dec 2023 12:45:57 +0100 Received: by mail-pj1-f58.google.com with SMTP id 98e67ed59e1d1-28a30542c37sf186619a91.1 for ; Fri, 15 Dec 2023 03:45:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702640750; cv=pass; d=google.com; s=arc-20160816; b=D/H85wjrmcbHAxzGiy5Ki1VJcD7FxvIe4hpCVQkCv9mTQjajM5S/W7F8hxRCLwihxs 8zd94JKC7HFohKR/XRlioM2UCL56HhurwshOnkHL/4QZQftugQ+LbCC184la87XEObj2 bUPrFANrYu6MHGXtv2ayv6+XBhC1/czix/o90o7HkajO9RrTeOkuR+TEOGmKl9uaMokg 9uxCkrLQYg3LPUeA+voOn4v4cYQM05KVtSueAi5haPbVuKjL/ZxyuvIczbeJiOTEblG/ O04yj+QGKoeiXlEO+Qng1yzzEKGuQgDeKUNmbBYkmUuDysuBfOrA6/85jiM0rq2sjQe1 2B0A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:sender :dkim-signature; bh=LEfC/rupr5YseR/0oelxXk+WwK78Bq7B5jT5pMoq+04=; fh=Igj93TBK3i6c7Oy07qB7xeVIIK1PlortB1TNWYO0u9U=; b=eoUVj/c3l6ejxSTPgP3jFR2dN/A+6emaMRbW+oMCOzjgyExxYaBmEvc618elxoIx0R 4EDb/P1VZ4eTU8F+dZgPZpMpwUaOkSXC76bwG0C1kfIPocLs1Kq+K0M9zQ2oAqP1Q2zI 46UO2q1ddmytVBiU9j9w6j6iC67FCFNrVUsUDK3CdnxwZTZfllBMNxdHrAK7sdvRboxm ImNOsK94OdqMSZFt/Wm1F8P7UyLJmKgrPeJ1HCUGwMx7O8CoyHlQfcjppzYiTqR8LkTM NZfSBrHZAkQWzzPt1ZeY9iq+p78bS4B5tl1nGwMi6MAFgzeLEgPQZRRpz2y0kok2Q2LW bPwA== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1702640750; x=1703245550; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:ironport-sdr:sender:from:to:cc:subject:date :message-id:reply-to; bh=LEfC/rupr5YseR/0oelxXk+WwK78Bq7B5jT5pMoq+04=; b=rCHx6w5lKJjsedayjOOpFzb9vgGYAGd5Pq4jmFDetZH45CKTSMjoMfwV6uV7tgqr8h Vp6BJyK3jr8yCy1lv7Z24ShhH3XCKrFuq3hnolZ1pxUHQSralNPeXTp0CYjbCnuHsKa7 FUSfiw/86idQB8LqggpXvY9dSr/9iyXfBPV5ubnjPtdPLuv5RdCx3GxsxOUurE3eZwzX GEtlRGxi18991pC6DJ/hQDjaw2VfDXQf0c1xHt4yBZxs68Fj7DYjLnR4J6DI8zplqMYY EzAMgHX2fINiKXEDEJL9iED12XwzumVLNGieIi6/K5e8eJkrMAv3H7vqEOg7YrUaLaFF o6eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702640750; x=1703245550; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:x-beenthere:x-gm-message-state:sender:from:to:cc :subject:date:message-id:reply-to; bh=LEfC/rupr5YseR/0oelxXk+WwK78Bq7B5jT5pMoq+04=; b=OI3R8fkzbLa02t08Isw6g2Rt+JXjqm1BCdkvjr6WfmzvLsWgIDOTNr4sI70ZrnFy54 V6jE2FH9RVisjPQ2GoNR2lIJtOXD0WfteyX/pFTCRQlorQPNpvgc2dHNWsQx7wC1VAw0 qwhbTRv6rHit7CvCuyqfPNQViqt0q9mZsl3z/YgG88l+PkWQJWtV9J0xILmhX7QXRA4A fcaUx33F0fPHMhJOi6K4diEd9Sbviojp9S9kkRS8EpVtcDOiOyW20vC/RLjPp0yx9de1 KAPT+kaA4xHp4o3ouhl2lG0wGf8LR9Sn6zi6i5Ux7DIQODG0sOH/3f5vLZYOodZq/bYL ZehQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOJu0YyRySJaYwNcsGwykGRdyctxfVfjpzG0GhNV+WaADJx5O1bCYrB9 XXIO/1wBnBUxr0sm6dsALg4= X-Google-Smtp-Source: AGHT+IE2G9ugpnb/ykrhSaTKWKTOHxYTmh9mJKQl0ZWgqvc1TCkf/stBbAHcMZQcU4sXfo04HdZhow== X-Received: by 2002:a17:903:2303:b0:1d0:ab57:2483 with SMTP id d3-20020a170903230300b001d0ab572483mr6508206plh.98.1702640750503; 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-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 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; 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 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-Original-Sender: srinuvasan_a@mentor.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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 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 +}