[PATCH] Dockerfile: Move unzip package to kas-base

17 views
Skip to first unread message

Hannah Kiekens

unread,
Jan 23, 2023, 12:06:47 PM1/23/23
to kas-...@googlegroups.com, Hannah Kiekens
Required so kas-isar recipes can have zip files in SRC_URI

Signed-off-by: Hannah Kiekens <hannah....@mind.be>
---
Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 488539d..ad03d07 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
apt-get install --no-install-recommends -y \
python3-pip python3-setuptools python3-wheel python3-yaml python3-distro python3-jsonschema python3-newt \
- gosu lsb-release file vim less procps tree tar bzip2 zstd pigz lz4 tmux libncurses-dev \
+ gosu lsb-release file vim less procps tree tar bzip2 zstd pigz lz4 unzip tmux libncurses-dev \
git-lfs mercurial iproute2 ssh-client telnet curl rsync gnupg awscli sudo \
socat bash-completion && \
apt-get clean && \
@@ -60,7 +60,7 @@ FROM kas-base as kas
# This will not change any image sizes on all the layers in use.
RUN apt-get update && \
apt-get install --no-install-recommends -y \
- gawk wget git diffstat unzip texinfo \
+ gawk wget git diffstat texinfo \
gcc build-essential chrpath socat cpio python3 python3-pip python3-pexpect \
xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev \
pylint3 xterm python3-subunit mesa-common-dev zstd liblz4-tool && \
--
2.39.1

Henning Schild

unread,
Jan 23, 2023, 1:05:07 PM1/23/23
to Hannah Kiekens, kas-...@googlegroups.com
Am Mon, 23 Jan 2023 18:06:40 +0100
schrieb Hannah Kiekens <hannah....@mind.be>:

> Required so kas-isar recipes can have zip files in SRC_URI

Uitmunted, bedankt!

Henning

Jan Kiszka

unread,
Jan 23, 2023, 2:13:28 PM1/23/23
to Hannah Kiekens, kas-...@googlegroups.com
On 23.01.23 18:06, Hannah Kiekens wrote:
> Required so kas-isar recipes can have zip files in SRC_URI
>

Should this become a patch for the Isar user_manual.md as well? Likely
also about other unzippers.

> Signed-off-by: Hannah Kiekens <hannah....@mind.be>
> ---
> Dockerfile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Dockerfile b/Dockerfile
> index 488539d..ad03d07 100644
> --- a/Dockerfile
> +++ b/Dockerfile
> @@ -10,7 +10,7 @@ RUN apt-get update && \
> localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
> apt-get install --no-install-recommends -y \
> python3-pip python3-setuptools python3-wheel python3-yaml python3-distro python3-jsonschema python3-newt \
> - gosu lsb-release file vim less procps tree tar bzip2 zstd pigz lz4 tmux libncurses-dev \
> + gosu lsb-release file vim less procps tree tar bzip2 zstd pigz lz4 unzip tmux libncurses-dev \

This is fine.

> git-lfs mercurial iproute2 ssh-client telnet curl rsync gnupg awscli sudo \
> socat bash-completion && \
> apt-get clean && \
> @@ -60,7 +60,7 @@ FROM kas-base as kas
> # This will not change any image sizes on all the layers in use.
> RUN apt-get update && \
> apt-get install --no-install-recommends -y \
> - gawk wget git diffstat unzip texinfo \
> + gawk wget git diffstat texinfo \

But if you read the comment above this block, you see that we
intentionally keep some duplicates here in order to be able to diff the
list against what Yocto documents as requirements.

> gcc build-essential chrpath socat cpio python3 python3-pip python3-pexpect \
> xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev \
> pylint3 xterm python3-subunit mesa-common-dev zstd liblz4-tool && \

Thanks,
Jan

--
Siemens AG, Technology
Competence Center Embedded Linux

Henning Schild

unread,
Jan 23, 2023, 3:23:17 PM1/23/23
to Jan Kiszka, Hannah Kiekens, kas-...@googlegroups.com
Am Mon, 23 Jan 2023 20:13:24 +0100
schrieb Jan Kiszka <jan.k...@siemens.com>:

> On 23.01.23 18:06, Hannah Kiekens wrote:
> > Required so kas-isar recipes can have zip files in SRC_URI
> >
>
> Should this become a patch for the Isar user_manual.md as well? Likely
> also about other unzippers.

Likely yes. But we should try to maintain that list without asking
contributors to add what Isar was missing from inheriting bitbake from
OE.

I would take this one if Hannah does not want to or does not know what
to do.

Would we have to wait for isar to merge it into the docs, or can we
proceed?
That is my bad. I requested to remove it from here because it would
have been a re-addition.

There was a github review on that https://github.com/siemens/kas/pull/89

Henning
Reply all
Reply to author
Forward
0 new messages