| Message ID | 20240327171129.1636055-1-gerard.salvatella@siemens.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [meta-swupdate] initscripts-swupdate: remove `virtual/` build warnings | expand |
On 27.03.24 18:11, 'G. Salvatella' via swupdate wrote: > From: Gerard Salvatella <gerard.salvatella@siemens.com> > > Replace the `virtual/` syntax with the recommended `VIRUTAL-RUNTIME_` Type, VIRUTAL ==> VIRTUAL > variables to prevent build warnings since scarthgap. > > (See Poky rev: 9b5b62879979de3488c920f21ea358e72ff1e443) > > Signed-off-by: Gerard Salvatella <gerard.salvatella@siemens.com> > --- > recipes-core/initscripts-swupdate/initscripts-swupdate-usb.bb | 2 -- > recipes-extended/images/swupdate-image.inc | 4 +++- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/recipes-core/initscripts-swupdate/initscripts-swupdate-usb.bb b/recipes-core/initscripts-swupdate/initscripts-swupdate-usb.bb > index c57c340..7918dfa 100644 > --- a/recipes-core/initscripts-swupdate/initscripts-swupdate-usb.bb > +++ b/recipes-core/initscripts-swupdate/initscripts-swupdate-usb.bb > @@ -7,8 +7,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda > SRC_URI = "file://rcS.swupdate \ > " > > -RPROVIDES:${PN} += "virtual/initscripts-swupdate" > - > S = "${WORKDIR}" > > inherit allarch update-alternatives > diff --git a/recipes-extended/images/swupdate-image.inc b/recipes-extended/images/swupdate-image.inc > index 795b4a2..9138656 100644 > --- a/recipes-extended/images/swupdate-image.inc > +++ b/recipes-extended/images/swupdate-image.inc > @@ -4,6 +4,8 @@ USE_DEVFS = "1" > # This variable is triggered to check if sysvinit must be overwritten by a single rcS > export SYSVINIT = "no" > > +VIRTUAL-RUNTIME_initscripts-swupdate = 'initscripts-swupdate' > + > IMAGE_INSTALL = "base-files \ > base-passwd \ > busybox \ > @@ -12,7 +14,7 @@ IMAGE_INSTALL = "base-files \ > libconfig \ > swupdate \ > swupdate-www \ > - ${@bb.utils.contains('SWUPDATE_INIT', 'tiny', 'virtual/initscripts-swupdate', 'initscripts sysvinit', d)} \ > + ${@bb.utils.contains('SWUPDATE_INIT', 'tiny', '${VIRTUAL-RUNTIME_initscripts-swupdate}', 'initscripts sysvinit', d)} \ > util-linux-sfdisk \ > " >
diff --git a/recipes-core/initscripts-swupdate/initscripts-swupdate-usb.bb b/recipes-core/initscripts-swupdate/initscripts-swupdate-usb.bb index c57c340..7918dfa 100644 --- a/recipes-core/initscripts-swupdate/initscripts-swupdate-usb.bb +++ b/recipes-core/initscripts-swupdate/initscripts-swupdate-usb.bb @@ -7,8 +7,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = "file://rcS.swupdate \ " -RPROVIDES:${PN} += "virtual/initscripts-swupdate" - S = "${WORKDIR}" inherit allarch update-alternatives diff --git a/recipes-extended/images/swupdate-image.inc b/recipes-extended/images/swupdate-image.inc index 795b4a2..9138656 100644 --- a/recipes-extended/images/swupdate-image.inc +++ b/recipes-extended/images/swupdate-image.inc @@ -4,6 +4,8 @@ USE_DEVFS = "1" # This variable is triggered to check if sysvinit must be overwritten by a single rcS export SYSVINIT = "no" +VIRTUAL-RUNTIME_initscripts-swupdate = 'initscripts-swupdate' + IMAGE_INSTALL = "base-files \ base-passwd \ busybox \ @@ -12,7 +14,7 @@ IMAGE_INSTALL = "base-files \ libconfig \ swupdate \ swupdate-www \ - ${@bb.utils.contains('SWUPDATE_INIT', 'tiny', 'virtual/initscripts-swupdate', 'initscripts sysvinit', d)} \ + ${@bb.utils.contains('SWUPDATE_INIT', 'tiny', '${VIRTUAL-RUNTIME_initscripts-swupdate}', 'initscripts sysvinit', d)} \ util-linux-sfdisk \ "