Message ID | 20221107123733.912-2-egyszeregy@freemail.hu |
---|---|
State | New |
Headers | show |
Series | [master,v2,1/2] image_types: Add 7-Zip support in conversion types and commands | expand |
Hi Benjamin, On 11/7/22 13:37, Livius wrote: > From: Benjamin Szőke <egyszeregy@freemail.hu> > > Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu> > --- > meta/classes-recipe/image_types.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass > index f70c71b9d4..ae00728a74 100644 > --- a/meta/classes-recipe/image_types.bbclass > +++ b/meta/classes-recipe/image_types.bbclass > @@ -61,7 +61,7 @@ ZIP_COMPRESSION_LEVEL ?= "-9" > > 7ZIP_COMPRESSION_LEVEL ?= "9" > 7ZIP_COMPRESSION_METHOD ?= "BZip2" > -7ZIP_EXTENSION ?= "zip" > +7ZIP_EXTENSION ?= "7z" > We're almost there :) There's no need for a second commit since the issue is introduced in your first commit. Instead, you should squash them together so the issue does not exist in the first place. You can do so by doing: git reset --soft HEAD^ git commit --amend --no-edit This can also be done via git rebase: git rebase --interactive HEAD^^ then modify "pick" for "squash" for the last commit, save and exit. You'll be prompted for commit log modification while rebasing, save and exit after your changes have been made (if any necessary). You should only have one commit left, the first one, with the 7ZIP_EXTENSION fix applied. Don't forget to send as a v3. Cheers, Quentin
It is done: https://lists.openembedded.org/g/openembedded-core/message/172841
diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recip= e/image_types.bbclass index f70c71b9d4..ae00728a74 100644 --- a/meta/classes-recipe/image_types.bbclass +++ b/meta/classes-recipe/image_types.bbclass @@ -61,7 +61,7 @@ ZIP_COMPRESSION_LEVEL ?=3D "-9" =20 7ZIP_COMPRESSION_LEVEL ?=3D "9" 7ZIP_COMPRESSION_METHOD ?=3D "BZip2" -7ZIP_EXTENSION ?=3D "zip" +7ZIP_EXTENSION ?=3D "7z" =20 ZSTD_COMPRESSION_LEVEL ?=3D "-3" =20