From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6931066459248394240 X-Received: by 2002:a62:61c6:0:b029:1ec:de87:c8a with SMTP id v189-20020a6261c60000b02901ecde870c8amr1322312pfb.74.1614225471839; Wed, 24 Feb 2021 19:57:51 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:e84f:: with SMTP id t15ls2403476plg.2.gmail; Wed, 24 Feb 2021 19:57:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJwvG3nEvl+V4d7bpxJK48q4oessU2UwavBFJgRa4bv4mOoBKg6/6BNOla4m8+9lthz6EXI6 X-Received: by 2002:a17:902:bd85:b029:e3:11d0:367f with SMTP id q5-20020a170902bd85b02900e311d0367fmr1322183pls.12.1614225470946; Wed, 24 Feb 2021 19:57:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614225470; cv=none; d=google.com; s=arc-20160816; b=AffK11vGJ/0Hld3ass8ExFcPaqDVm6f1krLOhYvPGzuyI7EOInjKTbJBMEshi83GRw Tk6RPK9d5RTdJXBSG98OfD8TOEvQF3XMjX0sDoU3yJvW1kvgLzTAgcEmiqdJytdAwMyL S7Zz+pgvE3mbGKxNHE/n1onL2oB8FZw6/VfJ1QL9tK0M/H0V3YfrXvYk+A/Kyf9y5v5I aukzbEW2gBaMPCj9j3SZ8YohRLzzXHG3GuZFk41k+MMKXK/ikFmGU7e3NqsK6pNFuKPZ e8BRBYptS//wFTzcZm3W+9aMG8Y6LDAIM6FccqcrlKO+/KNe4wK+mvxRrYbAAtd2J98V +W2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature; bh=bIPWQKTaHxYS4ucJOgc1jeb8mltZXnyGPW9e07g9n0w=; b=aWWX/cbX4jqCJg+ajX67J0+yqf3j/37tMwSxln52NHk07ZeqBe/y5SQqk6c101a4RH NSYeoQ7z1qxuvu8bYiM2TqKB6k36vIoF68CnTRKVc7+JwOxkCcs0q1hJsXbRM7fo4M3i 3OBaF0VfUQDxfGcvRZlOBQ1LbKU4VBp5NNtm4P0pc9eLzYj7EBrhfSTt0+UWHm8xwCu0 akDChLuV0+qfXF4ch3LOoGPy3j6gH9TIuJfeR50dHog4/D7mDGHvnphGzRZCOEnQIUwM M3cU6Qpe111z4o03PaVgWre3rZCMQsR6SzGXdGzqlgVnG5yz+CMBkO1/7BcrTEz8tKjH lC5g== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=qxxriqRR; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::72d as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com. [2607:f8b0:4864:20::72d]) by gmr-mx.google.com with ESMTPS id x3si106187pjo.1.2021.02.24.19.57.50 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 Feb 2021 19:57:50 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::72d as permitted sender) client-ip=2607:f8b0:4864:20::72d; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=qxxriqRR; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::72d as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-qk1-x72d.google.com with SMTP id d20so3516019qkc.2 for ; Wed, 24 Feb 2021 19:57:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=bIPWQKTaHxYS4ucJOgc1jeb8mltZXnyGPW9e07g9n0w=; b=qxxriqRRp2v6Lp/Yv4FCb+jdm1Z3r35GsJpRAsEzDxFazQW0lQhYfabmhnquXkgmTg QvQAbKEdIsnOGDxIz0HCJ0/hE6MFnXVK5oKeZJMV1ykZGUCYltIyHnGX+35SXc75p6kf yNTX1ZPCmTNH1DaDH8tOonvOuoMBLULpwSx3snHZb8GoQ3c9s6hxkWwfIEfvwQJhVVv5 O1YCbOpVrXJnjqNx8kYKa0fHY4dk3VaXZ4m5MoHTioktdNdO10UB2V+ws9O/TAkLMTvz bOFjMuWQ3TLfN29Dw4JNim29+3KfCJi1jZpekGY+bnBSRGGd9KgJe2deBjCwoFK3aamk dhAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=bIPWQKTaHxYS4ucJOgc1jeb8mltZXnyGPW9e07g9n0w=; b=jbPp8qbFliwamaeo1/qv+q8yKVdqkOHLYb4u1eq5oNLYDtXVckyMeBhAkEbcP4RuZL B+VMgv9qAvbEUIFDHFk8hAxVl/dXhBa5yCqgfNGWFIIpQjs7ZiHVtHkhp7yoS/qJMWR+ r2n9yOoX5tSuAzr1DrAOcfAxpq3IEiRJQgTh0JY6P2qzE0ZapoU7zwph1HwKpyEThkBP oH/8YGdG4Y6FZPkjI0XGdNGikhzlef5kA5ntLciHgtqIBul3KE10luXLA0KxsN5/kXsI DPm6O/If8y94F86aZfK0TGDCConBbD5jZr8Lny1MhOYL4/r1GJavgc04FjwWNGPWx3Gu N/JA== X-Gm-Message-State: AOAM5325Qtkac/kN9aDuGnvkfdvUJQ55auu76jeonCnuHVlyiAwkkMZc 85hfGG+xbl885ytUFT+oD34LjN0BBh9e5YP3lLM= X-Received: by 2002:a05:620a:141:: with SMTP id e1mr1110946qkn.413.1614225469939; Wed, 24 Feb 2021 19:57:49 -0800 (PST) MIME-Version: 1.0 References: <20210219195719.29037-1-Vijaikumar_Kanagarajan@mentor.com> <20210219195719.29037-3-Vijaikumar_Kanagarajan@mentor.com> <20210220092859.382eeb3a@md1za8fc.ad001.siemens.net> <20210224131256.14311847@md1za8fc.ad001.siemens.net> In-Reply-To: <20210224131256.14311847@md1za8fc.ad001.siemens.net> From: vijai kumar Date: Thu, 25 Feb 2021 09:27:38 +0530 Message-ID: Subject: Re: [RFC PATCH 2/2] recipes-core: Add recipe for base-files To: Henning Schild Cc: Vijai Kumar K , isar-users , Baurzhan Ismagulov , Silvano Cirujano Cuesta Content-Type: text/plain; charset="UTF-8" X-TUID: kjqDe4QwFlUJ On Wed, Feb 24, 2021 at 5:43 PM Henning Schild wrote: > > Am Tue, 23 Feb 2021 14:08:29 +0530 > schrieb vijai kumar : > > > On Sat, Feb 20, 2021 at 1:59 PM Henning Schild > > wrote: > > > > > > Am Sat, 20 Feb 2021 01:27:19 +0530 > > > schrieb Vijai Kumar K : > > > > > > > /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. > > > > > > To some degree such an update would be right to do so. The BUILD_ID > > > will for sure be invalidated, other custom fields might still be > > > valid though. > > > > > > > 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. > > > > > > I am beginning to wonder if we have to write certain bits to other > > > files. Bits that need to go into /etc/os-release could be appended > > > with a hook > > > See isar-disable-apt-cache, or we use the divert that Silvano > > > proposed. > > > > I have not used hooks before, but looks like it might help in our > > case. > > > > > > > > > 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 > > > > -} > > > > > > This is in the image for a good reason, it can not be part of a > > > package, otherwise it would already be and we might not have that > > > evil postprocess feature. > > > > > > Try a run, append a package to IMAGE_PREINSTALL, build again > > > > > > I kind of bet that BUILD_ID will be wrong and not show your new > > > commit or "dirty" > > > > Yes, It is wrong. > > > > Since we definitely know that we are bringing in a variable > > that changes everytime when there is a change to the source code, we > > could very well do do_prepare_build[nostamp]="1". > > > > That with some changes should solve this problem. > > It will mean that every change will trigger a full reinstall of the > image, many changes do that, but it sounds bad. > > And the false-sharing between images and multiconfigs still remains. > > Try two images in one layer with differing DESCRIPTIONS and see what > happens. That would be the simple case without even thinking mc So basically os-release varies based on the image built. With a single package like this, it is no longer possible. At anypoint we could have only one version of the package. Then, again, it makes me wonder if os-release is an apt place for such information. We lose updatability with the other approach. We definitely leave one file (/etc/os-release or /usr/lib/os-release) outdated on a dist upgrade. Thanks, Vijai Kumar K > > Henning > > > Thanks, > > Vijai Kumar K > > > > > > > > > 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" > > > > > > Just one such package. We will need for for every single image we > > > build in the tree. There can be multiple, especially when > > > multiconfig comes into play, but even without. > > > > > > Think of the internal layer you just helped with for a release, it > > > builds the product and the debug variant, which differ in their > > > DESCRIPTION and must not share that package. > > > > > > I am afraid a package will not work. We would need a package per > > > image. And that package would need to rebuild every time the > > > BUILD_ID changes. > > > > > > But now you still have the problem that someone could install a more > > > recent "base-files" ... Might as well use preferences to pin it > > > forever, instead of forking it and giving it a number that will > > > hopefully never be smaller than the one from debian > > > > > > Henning > > > > > > > +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 > > > > +} > > > > > > -- > > > You received this message because you are subscribed to the Google > > > Groups "isar-users" group. To unsubscribe from this group and stop > > > receiving emails from it, send an email to > > > isar-users+unsubscribe@googlegroups.com. To view this discussion on > > > the web visit > > > https://groups.google.com/d/msgid/isar-users/20210220092859.382eeb3a%40md1za8fc.ad001.siemens.net. > > > >