From 0fa628484470b430e40ef49258d87f7405e05786 Mon Sep 17 00:00:00 2001 From: Ben Kohler Date: Fri, 11 Feb 2022 10:38:26 -0600 Subject: [PATCH] portage/livegui: new portage confdir for livegui builds Signed-off-by: Ben Kohler --- releases/portage/livegui/package.license/package.license | 3 +++ releases/portage/livegui/package.use/admincd-packages | 3 +++ releases/portage/livegui/package.use/brltty | 1 + releases/portage/livegui/package.use/cifs-utils | 4 ++++ releases/portage/livegui/package.use/genkernel | 1 + releases/portage/livegui/package.use/gentoo-sources | 1 + releases/portage/livegui/package.use/no-filecaps | 5 +++++ releases/specs/amd64/livegui/livegui-stage1.spec | 2 +- releases/specs/amd64/livegui/livegui-stage2.spec | 2 +- 9 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 releases/portage/livegui/package.license/package.license create mode 100644 releases/portage/livegui/package.use/admincd-packages create mode 100644 releases/portage/livegui/package.use/brltty create mode 100644 releases/portage/livegui/package.use/cifs-utils create mode 100644 releases/portage/livegui/package.use/genkernel create mode 100644 releases/portage/livegui/package.use/gentoo-sources create mode 100644 releases/portage/livegui/package.use/no-filecaps diff --git a/releases/portage/livegui/package.license/package.license b/releases/portage/livegui/package.license/package.license new file mode 100644 index 00000000..c5fd72de --- /dev/null +++ b/releases/portage/livegui/package.license/package.license @@ -0,0 +1,3 @@ +# Allow linux-firmware and other required packages in @BINARY-REDISTRIBUTABLE +# license group +*/* @BINARY-REDISTRIBUTABLE diff --git a/releases/portage/livegui/package.use/admincd-packages b/releases/portage/livegui/package.use/admincd-packages new file mode 100644 index 00000000..f995ff18 --- /dev/null +++ b/releases/portage/livegui/package.use/admincd-packages @@ -0,0 +1,3 @@ +dev-libs/libpcre2 jit +mail-mta/ssmtp mta +sys-apps/busybox -static diff --git a/releases/portage/livegui/package.use/brltty b/releases/portage/livegui/package.use/brltty new file mode 100644 index 00000000..4ee24b48 --- /dev/null +++ b/releases/portage/livegui/package.use/brltty @@ -0,0 +1 @@ +dev-libs/libpcre2 pcre32 diff --git a/releases/portage/livegui/package.use/cifs-utils b/releases/portage/livegui/package.use/cifs-utils new file mode 100644 index 00000000..b0de5d58 --- /dev/null +++ b/releases/portage/livegui/package.use/cifs-utils @@ -0,0 +1,4 @@ +net-fs/cifs-utils -acl -ads +sys-libs/ntdb python +sys-libs/tdb python +sys-libs/tevent python diff --git a/releases/portage/livegui/package.use/genkernel b/releases/portage/livegui/package.use/genkernel new file mode 100644 index 00000000..2c80720e --- /dev/null +++ b/releases/portage/livegui/package.use/genkernel @@ -0,0 +1 @@ +sys-apps/util-linux static-libs diff --git a/releases/portage/livegui/package.use/gentoo-sources b/releases/portage/livegui/package.use/gentoo-sources new file mode 100644 index 00000000..ef684cf7 --- /dev/null +++ b/releases/portage/livegui/package.use/gentoo-sources @@ -0,0 +1 @@ +sys-kernel/gentoo-sources symlink diff --git a/releases/portage/livegui/package.use/no-filecaps b/releases/portage/livegui/package.use/no-filecaps new file mode 100644 index 00000000..929ddbc1 --- /dev/null +++ b/releases/portage/livegui/package.use/no-filecaps @@ -0,0 +1,5 @@ +# There is a circular dependency between sys-libs/libcap[pam] and +# sys-libs/pam[filecaps]. Since the livecd is configured to automatically log +# in as root, caps are not useful, so just disable USE=filecaps. + +*/* -filecaps diff --git a/releases/specs/amd64/livegui/livegui-stage1.spec b/releases/specs/amd64/livegui/livegui-stage1.spec index 7c647c20..98b9cb2e 100644 --- a/releases/specs/amd64/livegui/livegui-stage1.spec +++ b/releases/specs/amd64/livegui/livegui-stage1.spec @@ -6,7 +6,7 @@ profile: default/linux/amd64/17.1/desktop/plasma snapshot: @TIMESTAMP@ source_subpath: default/stage3-amd64-openrc-@TIMESTAMP@.tar.xz compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/isos +portage_confdir: @REPO_DIR@/releases/portage/livegui livecd/use: -aac diff --git a/releases/specs/amd64/livegui/livegui-stage2.spec b/releases/specs/amd64/livegui/livegui-stage2.spec index edb4a973..dda70f01 100644 --- a/releases/specs/amd64/livegui/livegui-stage2.spec +++ b/releases/specs/amd64/livegui/livegui-stage2.spec @@ -5,7 +5,7 @@ rel_type: default profile: default/linux/amd64/17.1/desktop/plasma snapshot: @TIMESTAMP@ source_subpath: default/livecd-stage1-amd64-plasma-@TIMESTAMP@ -portage_confdir: @REPO_DIR@/releases/portage/isos +portage_confdir: @REPO_DIR@/releases/portage/livegui livecd/bootargs: dokeymap overlayfs livecd/fstype: squashfs