[PATCH 1/3] kas-container: do not process locale aliases

[Felix Moessbauer]

When generating the locales we previously also provided a locale alias
file, as this was needed in debian jessi (added in 808443714). From
bullseye on using locale aliases is deprecated and support is finally
removed in debian forky. For details, see debian bug #231095101.

We now also stop using locale aliases unconditionally.

Signed-off-by: Felix Moessbauer <felix.mo...@siemens.com>
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e798472c8..f5e1a8119 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,7 +48,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=${CACHE_SHARING} \
fi && \
apt-get update && \
apt-get install -y locales && \
- localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
+ localedef -i en_US -c -f UTF-8 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 python3-colorlog python3-kconfiglib python3-websockets \
--
2.51.0

[Felix Moessbauer]

To be able to build the kas-container for debian forky, the packages of
the isar target need to be adjusted. The sbuild-adduser binary is now
part of the new sbuild-schroot package.

Signed-off-by: Felix Moessbauer <felix.mo...@siemens.com>
---

Dockerfile | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index f5e1a8119..3e5315bdd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -114,6 +114,10 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=${CACHE_SHARING} \
python3-botocore \
bubblewrap \
debootstrap && \
+ if grep -q 'VERSION_CODENAME=forky' /etc/os-release; then \
+ apt-get install -y -f --no-install-recommends \
+ sbuild-schroot; \
+ fi && \
rm -f /etc/apt/apt.conf.d/use-snapshot.conf /etc/apt/apt.conf.d/keep-packages.conf && \
if [ -f "/etc/apt/sources.list.d/debian.sources~" ]; then \
mv -f /etc/apt/sources.list.d/debian.sources~ /etc/apt/sources.list.d/debian.sources; \
--
2.51.0

[Felix Moessbauer]

To spot potential tooling bugs early, we start building and testing the
container of the next debian release as well.

Signed-off-by: Felix Moessbauer <felix.mo...@siemens.com>
---

.github/workflows/master.yml | 2 +-
.github/workflows/next.yml | 2 +-
.github/workflows/release.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index eabc559b6..331c1ac52 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
image-name: ["kas", "kas-isar"]
- distro-release: ["debian-bookworm", "debian-trixie"]
+ distro-release: ["debian-bookworm", "debian-trixie", "debian-forky"]
steps:
- name: Check out repo
uses: actions/checkout@v4
diff --git a/.github/workflows/next.yml b/.github/workflows/next.yml
index 3ff9f46e6..97f3980e6 100644
--- a/.github/workflows/next.yml
+++ b/.github/workflows/next.yml
@@ -60,7 +60,7 @@ jobs:
strategy:
matrix:
image-name: ["kas", "kas-isar"]
- distro-release: ["debian-bookworm", "debian-trixie"]
+ distro-release: ["debian-bookworm", "debian-trixie", "debian-forky"]
steps:
- name: Check out repo
uses: actions/checkout@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4583e2f55..21ccd48ce 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
image-name: ["kas", "kas-isar"]
- distro-release: ["debian-bookworm", "debian-trixie"]
+ distro-release: ["debian-bookworm", "debian-trixie", "debian-forky"]
steps:
- name: Check out repo
uses: actions/checkout@v4
--
2.51.0

[Jan Kiszka]

On 23.02.26 15:34, Felix Moessbauer wrote:
> When generating the locales we previously also provided a locale alias
> file, as this was needed in debian jessi (added in 808443714). From
> bullseye on using locale aliases is deprecated and support is finally
> removed in debian forky. For details, see debian bug #231095101.
>

This bug number seems invalid. You seem to have referenced
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1095101

> We now also stop using locale aliases unconditionally.
>

So, is this a bugfix for bookworm and trixie or just cleanup?

Jan

> Signed-off-by: Felix Moessbauer <felix.mo...@siemens.com>
> ---
> Dockerfile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Dockerfile b/Dockerfile
> index e798472c8..f5e1a8119 100644
> --- a/Dockerfile
> +++ b/Dockerfile
> @@ -48,7 +48,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=${CACHE_SHARING} \
> fi && \
> apt-get update && \
> apt-get install -y locales && \
> - localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
> + localedef -i en_US -c -f UTF-8 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 python3-colorlog python3-kconfiglib python3-websockets \


--

Siemens AG, Foundational Technologies
Linux Expert Center