From eb19d39bd91efd1c2a8dbdd2209ca67ddb91e077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Fri, 16 Dec 2022 11:25:20 +0100 Subject: [PATCH] Nail down crypt settings so musl stages also work MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- releases/portage/stages-qemu/package.use/releng/musl | 9 +++++---- .../stages-qemu/profile/package.use.force/releng/musl | 2 ++ releases/portage/stages/package.use/releng/musl | 9 +++++---- .../portage/stages/profile/package.use.force/releng/musl | 2 ++ 4 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 releases/portage/stages-qemu/profile/package.use.force/releng/musl create mode 100644 releases/portage/stages/profile/package.use.force/releng/musl diff --git a/releases/portage/stages-qemu/package.use/releng/musl b/releases/portage/stages-qemu/package.use/releng/musl index cda8dbb3..9f20f926 100644 --- a/releases/portage/stages-qemu/package.use/releng/musl +++ b/releases/portage/stages-qemu/package.use/releng/musl @@ -1,4 +1,5 @@ -# we want crypt support within/provided by musl by default -# if we didn't have it we would need libxcrypt[system] already -# in stage1 -sys-libs/musl crypt +# we need this here to make sure musl stages build +# note: tried building musl only with built-in crypt, but +# that leads to a dependency mess when emerge refuses to +# downgrade the libcrypt virtual... +sys-libs/musl -crypt diff --git a/releases/portage/stages-qemu/profile/package.use.force/releng/musl b/releases/portage/stages-qemu/profile/package.use.force/releng/musl new file mode 100644 index 00000000..4456264d --- /dev/null +++ b/releases/portage/stages-qemu/profile/package.use.force/releng/musl @@ -0,0 +1,2 @@ +# we need this here to make sure musl stages build +sys-libs/libxcrypt system diff --git a/releases/portage/stages/package.use/releng/musl b/releases/portage/stages/package.use/releng/musl index cda8dbb3..9f20f926 100644 --- a/releases/portage/stages/package.use/releng/musl +++ b/releases/portage/stages/package.use/releng/musl @@ -1,4 +1,5 @@ -# we want crypt support within/provided by musl by default -# if we didn't have it we would need libxcrypt[system] already -# in stage1 -sys-libs/musl crypt +# we need this here to make sure musl stages build +# note: tried building musl only with built-in crypt, but +# that leads to a dependency mess when emerge refuses to +# downgrade the libcrypt virtual... +sys-libs/musl -crypt diff --git a/releases/portage/stages/profile/package.use.force/releng/musl b/releases/portage/stages/profile/package.use.force/releng/musl new file mode 100644 index 00000000..4456264d --- /dev/null +++ b/releases/portage/stages/profile/package.use.force/releng/musl @@ -0,0 +1,2 @@ +# we need this here to make sure musl stages build +sys-libs/libxcrypt system