Re: [PATCH 1/2] remove conditional SDE paths

["MOESSBAUER, Felix" <felix.moessbauer@siemens.com>]

On Tue, 2024-04-23 at 22:49 +0300, Uladzimir Bely wrote:
> On Mon, 2024-04-22 at 20:58 +0200, 'Felix Moessbauer' via isar-users
> wrote:
> > 
> >  
> >  ROOTFS_POSTPROCESS_COMMAND += "image_postprocess_accounts"
> >  python image_postprocess_accounts() {
> > -    import os
> > -    if d.getVar("SOURCE_DATE_EPOCH") != None:
> > -        os.environ["SOURCE_DATE_EPOCH"] =
> > d.getVar("SOURCE_DATE_EPOCH")
> > - 
> 
> During testing in CI together with other patches from the mailist,
> faced a small merge/logical conflict with patch "[v3] image-account-
> extenstion: rebuild on varflag changes" that adds line
> +image_postprocess_accounts[vardeps] += "USERS GROUPS
> SOURCE_DATE_EPOCH"
> 
> I guess, it should become now:
> +image_postprocess_accounts[vardeps] += "USERS GROUPS"
> , is not it?

Yes, correct. Can you fix this while merging, or shall I resend a v2?

Felix

> 
> >      image_create_groups(d)
> >      image_create_users(d)
> >  }
> > diff --git a/meta/classes/image.bbclass
> > b/meta/classes/image.bbclass
> > index 98741da0..34faa6af 100644
> > --- a/meta/classes/image.bbclass
> > +++ b/meta/classes/image.bbclass
> > @@ -289,18 +289,6 @@ python() {
> >      d.appendVar('IMAGER_BUILD_DEPS', ' ' + '
> > '.join(sorted(imager_build_deps)))
> >  }
> >  
> > -
> > -# make generation of initramfs reproducible
> > -# note: this function is shared across multiple rootfs, but we
> > only
> > want to make the
> > -#       image rootfs reproducible. Otherwise changes of
> > SOURCE_DATE_EPOCH would
> > -#       invalidate the SSTATE entries for most packages, even if
> > they don't use the
> > -#       global SOURCE_DATE_EPOCH variable.
> > -rootfs_install_pkgs_install:prepend() {
> > -    if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then
> > -        export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}"
> > -    fi
> > -}
> > -
-- 
Siemens AG, Technology
Linux Expert Center