Message ID | 20230615105447.29690-2-aplanas@suse.com |
---|---|
State | New |
Headers | show |
Series | [v2,1/2] rpm2cpio.sh: update to the last 4.x version | expand |
On Thu, 2023-06-15 at 12:54 +0200, Alberto Planas via lists.openembedded.org wrote: > From: Alberto Planas <aplanas@suse.com> > > rpm2cpio.sh can make calls to unzstd to uncompress the RPM payload that > conform the cpio file. > > zstd is already part of HOSTTOOLS, as a link to the system installed > zstd. > > This patch add unzstd in HOSTOOLS list as a non-optional binary, so is > available to rpm2cpio.sh when it is required. > > Signed-off-by: Alberto Planas <aplanas@suse.com> > --- > meta/conf/bitbake.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > index e28df7478f..702881144e 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -524,7 +524,7 @@ HOSTTOOLS += " \ > python3 pzstd ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh \ > sha1sum sha224sum sha256sum sha384sum sha512sum \ > sleep sort split stat strings strip tail tar tee test touch tr true uname \ > - uniq wc wget which xargs zstd \ > + uniq unzstd wc wget which xargs zstd \ > " > > # Tools needed to run testimage runtime image testing Couldn't we just use zstd -d in the script? They're always the same binary anyway as far as I understand it... Cheers, Richard
> From: Richard Purdie <richard.purdie@linuxfoundation.org> > Couldn't we just use zstd -d in the script? They're always the same > binary anyway as far as I understand it... Yes, this should work. I decided to include the second patch to avoid changing the rpm2cpio.sh code, that is a verbatim copy of the upstream script (minus the added comment from the old version, that reference where to find the script) If this is the preferred way I can do a v3 that drop this patch and changes rpm2cpio.sh.
On Thu, 2023-06-15 at 12:58 +0000, Alberto Planas Dominguez wrote: > > From: Richard Purdie <richard.purdie@linuxfoundation.org> > > > Couldn't we just use zstd -d in the script? They're always the same > > binary anyway as far as I understand it... > > Yes, this should work. I decided to include the second patch to avoid > changing the rpm2cpio.sh code, that is a verbatim copy of the > upstream script (minus the added comment from the old version, that > reference where to find the script) > > If this is the preferred way I can do a v3 that drop this patch and > changes rpm2cpio.sh. I guess we can stay in sync then, I was just hoping not to add more to HOSTTOOLS. Thanks for the context. Cheers, Richard
I am seeing some race condition see https://errors.yoctoproject.org/Errors/Details/708923/ On Thu, Jun 15, 2023 at 6:34 AM Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > > On Thu, 2023-06-15 at 12:58 +0000, Alberto Planas Dominguez wrote: > > > From: Richard Purdie <richard.purdie@linuxfoundation.org> > > > > > Couldn't we just use zstd -d in the script? They're always the same > > > binary anyway as far as I understand it... > > > > Yes, this should work. I decided to include the second patch to avoid > > changing the rpm2cpio.sh code, that is a verbatim copy of the > > upstream script (minus the added comment from the old version, that > > reference where to find the script) > > > > If this is the preferred way I can do a v3 that drop this patch and > > changes rpm2cpio.sh. > > I guess we can stay in sync then, I was just hoping not to add more to > HOSTTOOLS. Thanks for the context. > > Cheers, > > Richard > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#182861): https://lists.openembedded.org/g/openembedded-core/message/182861 > Mute This Topic: https://lists.openembedded.org/mt/99546093/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index e28df7478f..702881144e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -524,7 +524,7 @@ HOSTTOOLS += " \ python3 pzstd ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh \ sha1sum sha224sum sha256sum sha384sum sha512sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ - uniq wc wget which xargs zstd \ + uniq unzstd wc wget which xargs zstd \ " # Tools needed to run testimage runtime image testing