From patchwork Fri Feb 19 09:57:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 337 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c583:0:0:0:0:0 with SMTP id x3csp8991770oop; Fri, 19 Feb 2021 11:57:52 -0800 (PST) X-Received: by 2002:adf:e988:: with SMTP id h8mr11057404wrm.2.1613764672284; Fri, 19 Feb 2021 11:57:52 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1613764672; cv=pass; d=google.com; s=arc-20160816; b=XSCRt39w9aWYpykbYzXApOvGZ0OB73jpUY1H/oKV3RdpOp883DOV1uf0ggKTfY/988 +v1rwFnKaHwwvH0xcVJQzGFK7OitJnMZCHwNrPKu7vewj+l2bcHMfduCzfAVRSVL6iCK aNqxlnCF3savZe9pPoqUG8kgWukjcKUTqdldDfHvq99WWoQPgt6UUVBWViMiVL9QdB9g DtxB2wEE31nESoOROsDTv5uUiVpOlkjwH4wRdBfis6GsNHAZTNVjPZ20EOIzSC+1d/HR pzGU6yIsuaLN4rObRiw13CAwQJ4bY+Gzeum7k/hDmdn6AaS8fjQ9+WLOuVswscOwacMV QV8Q== ARC-Message-Signature: i=3; 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:ironport-sdr:sender :dkim-signature; bh=oTcmnjbP7/tYmbsme2E+5AG1qt3St1DMLvehdU9kDyw=; b=TlOl6CHjTxxIuj6O7+ow9NN3s/W4XM361jCD5zqUnqXzFaFz86QhpsLbqa+jhQ3cpE XBDh9uGScJaga4UnYs1M+8EqUwTYY5IcPYNMRHe6/5LAYo3N4R0Qc5IN0Xw0o6CbQyn4 b623F1Rc9P7VghgUSNL9U0FUiszDMUe4Z56xWlb8wROkm7KfVqapTBtCVsRwGb/AfbKX rCW52qFl3A8SetumoHYM+rsk7YztUoZP3aRvzXMOcOBqD1K7llshXy+dXBkg/Q5+Lv+r X3SPxOCANbpPFsgXleXUARUk4z4mpeeI20bqZeIgMh7jXKCL8KYuw73D1730Ff6mIPQ/ mfZg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="VGzj/9Q1"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbp5qycaqmgqec5yvtti@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBP5QYCAQMGQEC5YVTTI@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id 89sor5112372wrs.28.2021.02.19.11.57.52 (Google Transport Security); Fri, 19 Feb 2021 11:57:52 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbp5qycaqmgqec5yvtti@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="VGzj/9Q1"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbp5qycaqmgqec5yvtti@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBP5QYCAQMGQEC5YVTTI@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1613764672; cv=pass; d=google.com; s=arc-20160816; b=vVWjTymTpbf+9Sj1EcQU9/blOTECNCW8MURQOFbw0K+pXTXGky/nxJIkwnLdkR17Nb +EIkK9ZvYSBemCQKbItSuvAdbrUkMtNvCp1sgHSqVur/mLrmYR1y/YLhoRoBONw06qYQ 0dtpFpVizpg3kZiCVJgeHH7+flzNGqi7nAYKzIfbZ3i+v7oFABZA86MtJ48k8rLAsaqV RtE6PI6X6khFx3VYAnjx6kRYvYcJW7Np2fYVcZaarCY+BgqVUonAvj9FoBtmj6rPxy86 FQCu+90+xTj8KK6Qikvrgh/wxXqONbsf+UKdvReLzJ0Js8RbJBBD7Vb1qsUHGgpGFwHu f58A== 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:ironport-sdr:sender :dkim-signature; bh=oTcmnjbP7/tYmbsme2E+5AG1qt3St1DMLvehdU9kDyw=; b=z3jV+cgwk8oqZnuPlOrvA0JUjaY1L1r304CaswIR4yh6GvVt0LZS90nPpZcdzX08+h SE2GqGrRYfkJPe9zVCk+0fZTu1xfuaPfzDmBpdVh5meA04r/MtiinvkTDg7aLoam6ijU uyxcDf05C2jCAXOZJpBhVXlDhWY7mwgCR9CR3Ozy3q72FGDN6xetoUy5THLk+UbEQE4S HvBQY5xgcH5KFeKgqsRYtv/PPW/o0aWKFfZIDquHyWRjLBRwTp/Z7Y6QP+To6UP+YpiK OeO15aSSY8rBl5k8FjHiyHydZNv/efq29dQKbSajnVIytLMG90Br64p+inrpCMe54wWW hi/g== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:ironport-sdr:ironport-sdr:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=oTcmnjbP7/tYmbsme2E+5AG1qt3St1DMLvehdU9kDyw=; b=VGzj/9Q1bzyd8rkngAJ3tanXNJ8khsP/7qSg/IwOAmeliWIAtlCnauHrTYptsvcfdJ N2klgO/g+X6NZmUvOl8pPlOiEk5AGOVs4fhYP8+I7YGqJAOUuc1zCKqNi/U5ESkcFPuE Wzps49vVnz/RggfftG59e0uuep9hmiRdtcRSu5EwU2Wz+4y0X2PGiC2kfjEZN8Ah+j5n dy0iNM6TVmstZDEAZN7t7Ggm8y91Xr8vYib1X6EJZvPiRpXx7zw3Y8DrpI/RJH6y9EE4 iU0UJgfYXgmXSGPPuCodZmiLIsho4f+J3U3xQZGqDx7wDbmuWPayj/XVAnPE2aHTI3ti 5R7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=oTcmnjbP7/tYmbsme2E+5AG1qt3St1DMLvehdU9kDyw=; b=Rs8f/9k/++PtebN1ivdTZEkGAuWhfiR5VEFOUdnsmel6LHfWj0FXpBg54T05OB6EEK SjbK0STOBbPmWfQr+54fS5MyzaLzcYq6NvRvLqCart5C/8dyGWJ3+htNvIHKtLDsNpU/ kiWDbI4DXEtydTBeAUoHbBQHdNzo+OKwxA3QJ4m6lKf6BMS+Rg5ufE+kmXfP+W+Bifvq iV9kzOqCdC0zhYKOquLOuMsrm9UV19JFJOC/4QIvKmW1v+gVc7TkvobX9jAIyate7FOW 6RuO2fjcjl2XFwx17VqFRMhdSm3l0UeF9BU/LsXKZRGi1CvuFnZ/steN9s/YO/+2Vmkh qRxg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531gRW3S3QP+p41M35tc3NXUj9q+RLZhRMk9FMMWCtX+7VO/trmo hypbuBCeTzmzDtrWNfyGj64= X-Google-Smtp-Source: ABdhPJwM3XeosAA5rErnxsQsD9KFAExDRP4hFn8VLADlkv5vvacHQ9gYJHVxftkyZytWhLIZHuId7w== X-Received: by 2002:a5d:4e10:: with SMTP id p16mr10678004wrt.360.1613764672031; Fri, 19 Feb 2021 11:57:52 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:2ecd:: with SMTP id u196ls4453685wmu.1.gmail; Fri, 19 Feb 2021 11:57:51 -0800 (PST) X-Received: by 2002:a1c:9a06:: with SMTP id c6mr9487370wme.140.1613764671140; Fri, 19 Feb 2021 11:57:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613764671; cv=none; d=google.com; s=arc-20160816; b=KP9Bweoi8OINYUrTFaPiV2v2r/i1mLbjJ3gX2MiJ1RZPVaIE5Bk9zKp79qLPVihxnr VVhBpGvZw532n/KvmAdEsdC7qMDgLbcJlBkC7q3QIh3GV/DIiLv8CMPLWQDdsbyzZQHi 8xpN4RUVK55pY7yTBmF05MxbaIr548nB1CkqwqQ7l34Yse2y9dNM/DTIrJS1DAHvf/W6 pkEUzACpvKM5/qpywZkPIVEe+9G7SRPMes/62d0XxhF4F+jhg+HUJduoLvtws0WzPaTI G4DfGxjDhSFoTdNlxb3DIpBxV5eQIdGYNuk3+JWWN9hncJpfTWnrZHYLI7VLbS96tIwe 8Y7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=TwXjE2r4KgypucL/FcR2W2L19n+Lldz2wbKmzvxx0O4=; b=dR/lntgvl9VE2HsdyjLt7XP8htCD/DzMLE/XVB8VobXCyCwBJ38Luu3u3mOEVzB6Qq mj++vPpQlHIAjHZ7788JNEENR45oGOd7rCgB5lXOGzAyQXHVUiaXWHFWftAanPCQMuci ZqdVEex8cuS0UxpHKxqg8UOtabamdYdlZGHeB6T7yQk1iE/XYJsGwmT7J2/2yi+UkIe1 fXovjlz0Ib1uk9CaFr1gUtKOn7Z7DweceIth3Y+v4FR6zQbA2eZbmtg6v9eUmGs9Ythk qRaYoRJrDncVXW5FE029Yuv4hdWlmkGxoWi20CRdYvYeyyvQL51+7g8xJFA/zkVhR9i9 ExYg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com. [68.232.137.180]) by gmr-mx.google.com with ESMTPS id f6si199833wmq.2.2021.02.19.11.57.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Feb 2021 11:57:51 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) client-ip=68.232.137.180; IronPort-SDR: 8Y55wpmni0X+jrhErpMoFJwbEH9ubJuVeUXFkKOEto88IirbfUjlJy9ByoLJAyCeYqi7CNkRVX gGTy2tiGI9SPl6LTQ8YaKDOWJ0L8It0Sc54d1Y/uWcthEKjX91FRt8fqc8r6nrztZ0dNoYzm+o ktF+/r5XDGIEyotc46IW9PtrtmIR0dB6x7+mqVVRoWP9q40u6jzB9JXbNvKu8VlMo2VfgocWhv m3AkxXpxs5FhuZDjWPnQX4/V9Mt2uX2ucTnkreYG3REa2VoxB0OQBgQ5a6F9LMYph1WvjQUHwR ODo= X-IronPort-AV: E=Sophos;i="5.81,189,1610438400"; d="scan'208";a="58305040" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 19 Feb 2021 11:57:50 -0800 IronPort-SDR: KZgBKawCTPvtJCmkLj4tXU9/RIGYM+0i35kVrxYfI7KidO39oTVy8x5Vp1sKb9L4KS3P4NsVB9 KUo00rewshKlZWA1PeZ0oDdLuL/IzqwgOgLm/EoFITBtUWNcgyeFDNCgTVVzX1xCygpR8T2nrG TGwlvepj5U+Ug+5UTeCnSVB53sK/6HsGAnl7eRZBm/L4YYvZeiOoSBe6WBlLJdoMTDO2aSCAi2 jovl+vaiX8NHD0WozkEsoMj1tp0AFQbZJcMYEPcbAInUVMvubspY0z1IjTVfWLiLQKJ064frI9 CU0= From: Vijai Kumar K To: , , CC: Vijai Kumar K Subject: [RFC PATCH 2/2] recipes-core: Add recipe for base-files Date: Sat, 20 Feb 2021 01:27:19 +0530 Message-ID: <20210219195719.29037-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210219195719.29037-1-Vijaikumar_Kanagarajan@mentor.com> References: <20210219195719.29037-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-09.mgc.mentorg.com (147.34.90.209) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1692154904854522137?= X-GMAIL-MSGID: =?utf-8?q?1692154904854522137?= /etc/os-release is a symlink to /usr/lib/os-release and belongs to the base-files package. ISAR has been modifying the /etc/os-release during postprocessing to inject custom data onto it. Since this file belongs to base-files, an update/reinstall of the package would overwrite the file with the one provided by base-files. Instead of modifying the contents of /etc/os-release during post-processing, provide a modified base-files recipe in ISAR which provides the similar changes in os-release. Signed-off-by: Vijai Kumar K --- .../recipes-core/images/isar-image-base.bb | 2 + meta/classes/image-postproc-extension.bbclass | 40 -------------- meta/classes/image.bbclass | 20 ------- meta/recipes-core/base-files/base-files.bb | 6 ++ meta/recipes-core/base-files/base-files.inc | 55 +++++++++++++++++++ 5 files changed, 63 insertions(+), 60 deletions(-) create mode 100644 meta/recipes-core/base-files/base-files.bb create mode 100644 meta/recipes-core/base-files/base-files.inc diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index b381d85..4aa7e66 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -11,3 +11,5 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 PV = "1.0" inherit image + +IMAGE_INSTALL += "base-files" diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes/image-postproc-extension.bbclass index 3f00c21..22c6a95 100644 --- a/meta/classes/image-postproc-extension.bbclass +++ b/meta/classes/image-postproc-extension.bbclass @@ -1,38 +1,6 @@ # This software is a part of ISAR. # Copyright (C) Siemens AG, 2019 -update_etc_os_release() { - OS_RELEASE_BUILD_ID="" - OS_RELEASE_VARIANT="" - OS_RELEASE_VARIANT_VERSION="" - while true; do - case "$1" in - --build-id) OS_RELEASE_BUILD_ID=$2; shift ;; - --variant) OS_RELEASE_VARIANT=$2; shift ;; - --version) OS_RELEASE_VARIANT_VERSION=$2; shift ;; - -*) bbfatal "$0: invalid option specified: $1" ;; - *) break ;; - esac - shift - done - - if [ -n "${OS_RELEASE_BUILD_ID}" ]; then - sudo sed -i '/^BUILD_ID=.*/d' '${IMAGE_ROOTFS}/etc/os-release' - echo "BUILD_ID=\"${OS_RELEASE_BUILD_ID}\"" | \ - sudo tee -a '${IMAGE_ROOTFS}/etc/os-release' - fi - if [ -n "${OS_RELEASE_VARIANT}" ]; then - sudo sed -i '/^VARIANT=.*/d' '${IMAGE_ROOTFS}/etc/os-release' - echo "VARIANT=\"${OS_RELEASE_VARIANT}\"" | \ - sudo tee -a '${IMAGE_ROOTFS}/etc/os-release' - fi - if [ -n "${OS_RELEASE_VARIANT_VERSION}" ]; then - sudo sed -i '/^ISAR_IMAGE_VERSION=.*/d' '${IMAGE_ROOTFS}/etc/os-release' - echo "VARIANT_VERSION=\"${PV}\"" | \ - sudo tee -a '${IMAGE_ROOTFS}/etc/os-release' - fi -} - ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_configure" image_postprocess_configure() { # Configure root filesystem @@ -45,14 +13,6 @@ image_postprocess_configure() { fi } -ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_mark" - -image_postprocess_mark() { - BUILD_ID=$(get_build_id) - update_etc_os_release \ - --build-id "${BUILD_ID}" --variant "${DESCRIPTION}" --version "${PV}" -} - ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_machine_id" image_postprocess_machine_id() { # systemd(1) takes care of recreating the machine-id on first boot diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index eddc444..d849175 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -49,9 +49,6 @@ SRC_URI += "${@ cfg_script(d) }" DEPENDS += "${IMAGE_INSTALL}" -ISAR_RELEASE_CMD_DEFAULT = "git -C ${LAYERDIR_core} describe --tags --dirty --match 'v[0-9].[0-9]*'" -ISAR_RELEASE_CMD ?= "${ISAR_RELEASE_CMD_DEFAULT}" - image_do_mounts() { sudo flock ${MOUNT_LOCKFILE} -c ' \ mkdir -p "${BUILDROOT_DEPLOY}" "${BUILDROOT_ROOTFS}" "${BUILDROOT_WORK}" @@ -91,23 +88,6 @@ def get_rootfs_size(d): return base_size + rootfs_extra * 1024 -# here we call a command that should describe your whole build system, -# this could be "git describe" or something similar. -# set ISAR_RELEASE_CMD to customize, or override do_mark_rootfs to do something -# completely different -get_build_id() { - if [ $(echo ${BBLAYERS} | wc -w) -ne 2 ] && - [ "${ISAR_RELEASE_CMD}" = "${ISAR_RELEASE_CMD_DEFAULT}" ]; then - bbwarn "You are using external layers that will not be" \ - "considered in the build_id. Consider changing" \ - "ISAR_RELEASE_CMD." - fi - if ! ( ${ISAR_RELEASE_CMD} ) 2>/dev/null; then - bbwarn "\"${ISAR_RELEASE_CMD}\" failed, returning empty build_id." - echo "" - fi -} - python set_image_size () { rootfs_size = get_rootfs_size(d) d.setVar('ROOTFS_SIZE', str(rootfs_size)) diff --git a/meta/recipes-core/base-files/base-files.bb b/meta/recipes-core/base-files/base-files.bb new file mode 100644 index 0000000..d250fc5 --- /dev/null +++ b/meta/recipes-core/base-files/base-files.bb @@ -0,0 +1,6 @@ +# This software is a part of ISAR. +# Copyright (c) Mentor, A Siemens Business, 2021 +# +# SPDX-License-Identifier: MIT + +require base-files.inc diff --git a/meta/recipes-core/base-files/base-files.inc b/meta/recipes-core/base-files/base-files.inc new file mode 100644 index 0000000..68d0e3a --- /dev/null +++ b/meta/recipes-core/base-files/base-files.inc @@ -0,0 +1,55 @@ +# This software is a part of ISAR. +# Copyright (c) Mentor, A Siemens Business, 2021 +# +# SPDX-License-Identifier: MIT + +inherit dpkg + +SRC_URI = "apt://${PN}" + +S="${WORKDIR}/${PN}" + +MAINTAINER = "isar-users " +CHANGELOG_V = "+isar" + +ISAR_RELEASE_CMD_DEFAULT = "git -C ${LAYERDIR_core} describe --tags --dirty --match 'v[0-9].[0-9]*'" +ISAR_RELEASE_CMD ?= "${ISAR_RELEASE_CMD_DEFAULT}" +OS_RELEASE_VARIANT = "Isar target filesystem" +OS_RELEASE_VARIANT_VERSION = "1.0" + +# here we call a command that should describe your whole build system, +# this could be "git describe" or something similar. +# set ISAR_RELEASE_CMD to customize, or override do_mark_rootfs to do something +# completely different +get_build_id() { + if [ $(echo ${BBLAYERS} | wc -w) -ne 2 ] && + [ "${ISAR_RELEASE_CMD}" = "${ISAR_RELEASE_CMD_DEFAULT}" ]; then + bbwarn "You are using external layers that will not be" \ + "considered in the build_id. Consider changing" \ + "ISAR_RELEASE_CMD." + fi + if ! ( ${ISAR_RELEASE_CMD} ) 2>/dev/null; then + bbwarn "\"${ISAR_RELEASE_CMD}\" failed, returning empty build_id." + echo "" + fi +} + +do_prepare_build() { + deb_add_changelog + OS_RELEASE_BUILD_ID=$(get_build_id) + if [ -n "${OS_RELEASE_BUILD_ID}" ]; then + sed -i '/^BUILD_ID=.*/d' '${S}/etc/os-release' + echo "BUILD_ID=\"${OS_RELEASE_BUILD_ID}\"" | \ + tee -a '${S}/etc/os-release' + fi + if [ -n "${OS_RELEASE_VARIANT}" ]; then + sed -i '/^VARIANT=.*/d' '${S}/etc/os-release' + echo "VARIANT=\"${OS_RELEASE_VARIANT}\"" | \ + tee -a '${S}/etc/os-release' + fi + if [ -n "${OS_RELEASE_VARIANT_VERSION}" ]; then + sed -i '/^VARIANT_VERSION=.*/d' '${S}/etc/os-release' + echo "VARIANT_VERSION=\"${OS_RELEASE_VARIANT_VERSION}\"" | \ + tee -a '${S}/etc/os-release' + fi +}