| Message ID | 20231212141556.1616031-1-Quirin.Gylstorff@siemens.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [isar-cip-core] swupdate-certificates*.inc: Add missing FILESEXTRAPATHS | expand |
On Tue, 2023-12-12 at 15:12 +0100, Quirin Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > This allows to include the files in downstream layers. > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > .../swupdate-certificates/swupdate-certificates-key.inc | 2 > ++ > .../swupdate-certificates/swupdate-certificates.inc | 2 > ++ > 2 files changed, 4 insertions(+) > > diff --git a/recipes-devtools/swupdate-certificates/swupdate- > certificates-key.inc b/recipes-devtools/swupdate- > certificates/swupdate-certificates-key.inc > index d3d2e16..2c67e89 100644 > --- a/recipes-devtools/swupdate-certificates/swupdate-certificates- > key.inc > +++ b/recipes-devtools/swupdate-certificates/swupdate-certificates- > key.inc > @@ -11,6 +11,8 @@ > > inherit dpkg-raw > > +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" > + > PROVIDES += "swupdate-certificates-key" > > SWU_SIGN_KEY ??= "" > diff --git a/recipes-devtools/swupdate-certificates/swupdate- > certificates.inc b/recipes-devtools/swupdate-certificates/swupdate- > certificates.inc > index 6673383..564dda4 100644 > --- a/recipes-devtools/swupdate-certificates/swupdate- > certificates.inc > +++ b/recipes-devtools/swupdate-certificates/swupdate- > certificates.inc > @@ -11,6 +11,8 @@ > > inherit dpkg-raw > > +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" Hi, did you check if this is compatible with sstate caching? We must avoid adding absolute paths to the signatures, as otherwise this breaks caching on the gitlab-cloud-ci runners. You can check that with the isar-sstate lint script. Best regards, Felix > + > PROVIDES += "swupdate-certificates" > > SWU_SIGN_CERT ??= ""
On 12/13/23 04:27, Moessbauer Felix wrote: > On Tue, 2023-12-12 at 15:12 +0100, Quirin Gylstorff wrote: >> From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> >> This allows to include the files in downstream layers. >> >> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> --- >> .../swupdate-certificates/swupdate-certificates-key.inc | 2 >> ++ >> .../swupdate-certificates/swupdate-certificates.inc | 2 >> ++ >> 2 files changed, 4 insertions(+) >> >> diff --git a/recipes-devtools/swupdate-certificates/swupdate- >> certificates-key.inc b/recipes-devtools/swupdate- >> certificates/swupdate-certificates-key.inc >> index d3d2e16..2c67e89 100644 >> --- a/recipes-devtools/swupdate-certificates/swupdate-certificates- >> key.inc >> +++ b/recipes-devtools/swupdate-certificates/swupdate-certificates- >> key.inc >> @@ -11,6 +11,8 @@ >> >> inherit dpkg-raw >> >> +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" >> + >> PROVIDES += "swupdate-certificates-key" >> >> SWU_SIGN_KEY ??= "" >> diff --git a/recipes-devtools/swupdate-certificates/swupdate- >> certificates.inc b/recipes-devtools/swupdate-certificates/swupdate- >> certificates.inc >> index 6673383..564dda4 100644 >> --- a/recipes-devtools/swupdate-certificates/swupdate- >> certificates.inc >> +++ b/recipes-devtools/swupdate-certificates/swupdate- >> certificates.inc >> @@ -11,6 +11,8 @@ >> >> inherit dpkg-raw >> >> +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" > > Hi, did you check if this is compatible with sstate caching? We must > avoid adding absolute paths to the signatures, as otherwise this breaks > caching on the gitlab-cloud-ci runners. This should not be the case as it is added recipes-devtools/swupdate-certificates/files/swu-sign-cms scripts. I checked it with sstate-lint and it didn;t find any problems in isar-cip-core. Best regards, Quirin > > You can check that with the isar-sstate lint script. > > Best regards, > Felix > >> + >> PROVIDES += "swupdate-certificates" >> >> SWU_SIGN_CERT ??= "" >
On Wed, 2023-12-13 at 12:45 +0100, Gylstorff Quirin wrote: > > > On 12/13/23 04:27, Moessbauer Felix wrote: > > On Tue, 2023-12-12 at 15:12 +0100, Quirin Gylstorff wrote: > > > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > > > > > This allows to include the files in downstream layers. > > > > > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > > --- > > > .../swupdate-certificates/swupdate-certificates-key.inc > > > | 2 > > > ++ > > > .../swupdate-certificates/swupdate-certificates.inc > > > | 2 > > > ++ > > > 2 files changed, 4 insertions(+) > > > > > > diff --git a/recipes-devtools/swupdate-certificates/swupdate- > > > certificates-key.inc b/recipes-devtools/swupdate- > > > certificates/swupdate-certificates-key.inc > > > index d3d2e16..2c67e89 100644 > > > --- a/recipes-devtools/swupdate-certificates/swupdate- > > > certificates- > > > key.inc > > > +++ b/recipes-devtools/swupdate-certificates/swupdate- > > > certificates- > > > key.inc > > > @@ -11,6 +11,8 @@ > > > > > > inherit dpkg-raw > > > > > > +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" > > > + > > > PROVIDES += "swupdate-certificates-key" > > > > > > SWU_SIGN_KEY ??= "" > > > diff --git a/recipes-devtools/swupdate-certificates/swupdate- > > > certificates.inc b/recipes-devtools/swupdate- > > > certificates/swupdate- > > > certificates.inc > > > index 6673383..564dda4 100644 > > > --- a/recipes-devtools/swupdate-certificates/swupdate- > > > certificates.inc > > > +++ b/recipes-devtools/swupdate-certificates/swupdate- > > > certificates.inc > > > @@ -11,6 +11,8 @@ > > > > > > inherit dpkg-raw > > > > > > +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" > > > > Hi, did you check if this is compatible with sstate caching? We > > must > > avoid adding absolute paths to the signatures, as otherwise this > > breaks > > caching on the gitlab-cloud-ci runners. > > This should not be the case as it is added > recipes-devtools/swupdate-certificates/files/swu-sign-cms scripts. > > I checked it with sstate-lint and it didn;t find any problems in > isar-cip-core. Ok, thanks for the clarification. Felix > > Best regards, > Quirin > > > > > You can check that with the isar-sstate lint script. > > > > Best regards, > > Felix > > > > > + > > > PROVIDES += "swupdate-certificates" > > > > > > SWU_SIGN_CERT ??= "" > >
On 12.12.23 15:12, Quirin Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > This allows to include the files in downstream layers. > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > .../swupdate-certificates/swupdate-certificates-key.inc | 2 ++ > .../swupdate-certificates/swupdate-certificates.inc | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc b/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc > index d3d2e16..2c67e89 100644 > --- a/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc > +++ b/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc > @@ -11,6 +11,8 @@ > > inherit dpkg-raw > > +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" > + > PROVIDES += "swupdate-certificates-key" > > SWU_SIGN_KEY ??= "" > diff --git a/recipes-devtools/swupdate-certificates/swupdate-certificates.inc b/recipes-devtools/swupdate-certificates/swupdate-certificates.inc > index 6673383..564dda4 100644 > --- a/recipes-devtools/swupdate-certificates/swupdate-certificates.inc > +++ b/recipes-devtools/swupdate-certificates/swupdate-certificates.inc > @@ -11,6 +11,8 @@ > > inherit dpkg-raw > > +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" > + > PROVIDES += "swupdate-certificates" > > SWU_SIGN_CERT ??= "" Thanks, applied. Jan
diff --git a/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc b/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc index d3d2e16..2c67e89 100644 --- a/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc +++ b/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc @@ -11,6 +11,8 @@ inherit dpkg-raw +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" + PROVIDES += "swupdate-certificates-key" SWU_SIGN_KEY ??= "" diff --git a/recipes-devtools/swupdate-certificates/swupdate-certificates.inc b/recipes-devtools/swupdate-certificates/swupdate-certificates.inc index 6673383..564dda4 100644 --- a/recipes-devtools/swupdate-certificates/swupdate-certificates.inc +++ b/recipes-devtools/swupdate-certificates/swupdate-certificates.inc @@ -11,6 +11,8 @@ inherit dpkg-raw +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" + PROVIDES += "swupdate-certificates" SWU_SIGN_CERT ??= ""