diff mbox series

[master,v2,2/2] image_types: Set .7z extension for 7-Zip conversion command

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

Commit Message

Livius Nov. 7, 2022, 12:37 p.m. UTC 
s=20181004; d=freemail.hu;

	h=From:To:Cc:Subject:Date:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding;

	l=666; bh=okipRjAsLt/gRy2A6q/lcxg6ztIVro0gzrU1Q3UX7lM=;

	b=OdOcPP+8x0PqdYPB0jCiuEiAdOyGkAraGNaGHbERYjGY38mUGQPcqIC8TmBv4yt6

	LW30dqJZZQgC0aVBO9EGpGv1cGwTK+G9TyvCKDqOI0mpAzch1+tIzEWtcb/LnnG11Rd

	LwXLHtgxm2sO+sRoy6StBGR8sEb+NxUsgzuBG0PHVXfgtdZ7IbQe5OM53nuHMnWEltd

	lrkZ5MoQfaHF1vx3L1QdbuNSWdo0xFzMvjlNxk4ONBmMLgLMg2sqIrtmNHSQhHhP3Lh

	Qh9+W4mSb9ai2ZIiK1pYdKU8tBOWyVKcT9Oe2whspZdqNPLAyWD2Jk1EHO/jhpulG4a

	MyHaAzuaew==
Content-Transfer-Encoding: quoted-printable

From: Benjamin Sz=C5=91ke <egyszeregy@freemail.hu>

Signed-off-by: Benjamin Sz=C5=91ke <egyszeregy@freemail.hu>
---
 meta/classes-recipe/image_types.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--=20
2.38.1.windows.1

Comments

Quentin Schulz Nov. 7, 2022, 12:53 p.m. UTC | #1 
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
Livius Nov. 7, 2022, 7:19 p.m. UTC | #2 
It is done: https://lists.openembedded.org/g/openembedded-core/message/172841
diff mbox series

Patch

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