aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kohler <bkohler@gentoo.org>2024-05-13 10:39:03 -0500
committerBen Kohler <bkohler@gentoo.org>2024-05-13 10:40:26 -0500
commit2e52c01031793eeb363c029b3f9436e6f3ccdcc3 (patch)
treec389d74e5bb0065be9bac55e0c36ead61dc24fe4 /releases
parentportage/livegui: enable dracut on installkernel for dist-kernel (diff)
downloadreleng-master.tar.gz
releng-master.tar.bz2
releng-master.zip
specs/amd64/livegui: switch livecd-stage2 to dist-kernelHEADmaster
Old genkernel setup has been preserved in livecd-stage2-genkernel.spec Signed-off-by: Ben Kohler <bkohler@gentoo.org>
Diffstat (limited to 'releases')
-rw-r--r--releases/specs/amd64/livegui/livegui-stage2-genkernel.spec30
-rw-r--r--releases/specs/amd64/livegui/livegui-stage2.spec10
2 files changed, 34 insertions, 6 deletions
diff --git a/releases/specs/amd64/livegui/livegui-stage2-genkernel.spec b/releases/specs/amd64/livegui/livegui-stage2-genkernel.spec
new file mode 100644
index 00000000..231b7845
--- /dev/null
+++ b/releases/specs/amd64/livegui/livegui-stage2-genkernel.spec
@@ -0,0 +1,30 @@
+subarch: amd64
+version_stamp: plasma-@TIMESTAMP@
+target: livecd-stage2
+rel_type: 23.0-default
+profile: default/linux/amd64/23.0/desktop/plasma
+snapshot_treeish: @TREEISH@
+source_subpath: 23.0-default/livecd-stage1-amd64-plasma-@TIMESTAMP@
+portage_confdir: @REPO_DIR@/releases/portage/livegui
+
+livecd/bootargs: overlayfs nodhcp secureconsole
+livecd/depclean: no
+livecd/fstype: squashfs
+livecd/iso: livegui-amd64-@TIMESTAMP@.iso
+livecd/type: gentoo-release-livecd
+livecd/volid: Gentoo amd64 LiveGUI @TIMESTAMP@
+
+livecd/fsscript: @REPO_DIR@/releases/specs/amd64/livegui/files/fsscript-stage2.sh
+livecd/rcadd: udev|sysinit udev-mount|sysinit acpid|default dbus|default gpm|default NetworkManager|default elogind|boot
+livecd/unmerge: net-misc/netifrc
+
+livecd/empty:
+ /var/db/repos
+ /usr/src
+
+boot/kernel: gentoo
+
+boot/kernel/gentoo/sources: gentoo-sources
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/livegui-amd64-5.15.23.config
+
+boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod broadcom-sta
diff --git a/releases/specs/amd64/livegui/livegui-stage2.spec b/releases/specs/amd64/livegui/livegui-stage2.spec
index 231b7845..a2eff933 100644
--- a/releases/specs/amd64/livegui/livegui-stage2.spec
+++ b/releases/specs/amd64/livegui/livegui-stage2.spec
@@ -7,12 +7,12 @@ snapshot_treeish: @TREEISH@
source_subpath: 23.0-default/livecd-stage1-amd64-plasma-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/livegui
-livecd/bootargs: overlayfs nodhcp secureconsole
+livecd/bootargs: nodhcp secureconsole
livecd/depclean: no
livecd/fstype: squashfs
livecd/iso: livegui-amd64-@TIMESTAMP@.iso
livecd/type: gentoo-release-livecd
-livecd/volid: Gentoo amd64 LiveGUI @TIMESTAMP@
+livecd/volid: gentoo-amd64-livegui
livecd/fsscript: @REPO_DIR@/releases/specs/amd64/livegui/files/fsscript-stage2.sh
livecd/rcadd: udev|sysinit udev-mount|sysinit acpid|default dbus|default gpm|default NetworkManager|default elogind|boot
@@ -24,7 +24,5 @@ livecd/empty:
boot/kernel: gentoo
-boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/livegui-amd64-5.15.23.config
-
-boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod broadcom-sta
+boot/kernel/gentoo/distkernel: yes
+boot/kernel/gentoo/dracut_args: --xz --no-hostonly -a dmsquash-live -a mdraid -o btrfs -o crypt -o i18n -o usrmount -o lunmask -o qemu -o qemu-net -o nvdimm -o multipath -i /lib/keymaps /lib/keymaps -I busybox