Merge branch 'edge' into 'edge'

See merge request redcore/redcore-desktop!7

6 files changed, 52 insertions, 8 deletions

diff --git a/sys-kernel/linux-image-redcore-lts/files/bootloader.conf b/sys-kernel/linux-image-redcore-lts/files/bootloader.conf
new file mode 100644
index 00000000..6ca02b32
--- /dev/null
+++ b/sys-kernel/linux-image-redcore-lts/files/bootloader.conf
@@ -0,0 +1,14 @@
+---
+efiBootLoader: "grub"
+
+kernel: "/boot/vmlinuz-REDCORE_KERNEL_VERSION"
+img: "/boot/initrd-REDCORE_KERNEL_VERSION"
+timeout: "10"
+
+grubInstall: "grub2-install"
+grubMkconfig: "grub2-mkconfig"
+grubCfg: "/boot/grub/grub.cfg"
+grubProbe: "grub2-probe"
+efiBootMgr: "efibootmgr"
+
+installEFIFallback: true
diff --git a/sys-kernel/linux-image-redcore-lts/files/dracut.conf b/sys-kernel/linux-image-redcore-lts/files/dracut.conf
new file mode 100644
index 00000000..39cd5521
--- /dev/null
+++ b/sys-kernel/linux-image-redcore-lts/files/dracut.conf
@@ -0,0 +1,2 @@
+---
+initramfsName: /boot/initrd-REDCORE_KERNEL_VERSION
diff --git a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-5.15.178.ebuild b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-5.15.178-r1.ebuild
index 731d0be7..d615ed71 100644
--- a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-5.15.178.ebuild
+++ b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-5.15.178-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-EXTRAVERSION="redcore-lts"
+EXTRAVERSION="redcore-lts-${PR}"
 KV_FULL="${PV}-${EXTRAVERSION}"
 KV_MAJOR="5.15"
 
@@ -14,7 +14,7 @@ SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz"
 KEYWORDS="~amd64"
 LICENSE="GPL-2"
 SLOT="${KV_MAJOR}"
-IUSE="+cryptsetup +dmraid +dracut +dkms +mdadm"
+IUSE="+cryptsetup +dmraid +dracut +dkms live +mdadm"
 
 RESTRICT="binchecks strip mirror"
 DEPEND="
@@ -93,6 +93,13 @@ src_install() {
 	for KSYMS in build source ; do
 		dosym ../../../usr/src/linux-"${KV_FULL}" lib/modules/"${KV_FULL}"/"${KSYMS}"
 	done
+	if use live ; then
+		insinto /etc/calamares/modules
+		doins "${FILESDIR}"/bootloader.conf
+		doins "${FILESDIR}"/dracut.conf
+		sed -i 's|REDCORE_KERNEL_VERSION|'"${KV_FULL}"'|g' "${D}/etc/calamares/modules/bootloader.conf" || die
+		sed -i 's|REDCORE_KERNEL_VERSION|'"${KV_FULL}"'|g' "${D}/etc/calamares/modules/dracut.conf" || die	
+	fi
 }
 
 _grub2_update_grubcfg() {
diff --git a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.1.129.ebuild b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.1.129-r1.ebuild
index e13c20c2..2f8f0c05 100644
--- a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.1.129.ebuild
+++ b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.1.129-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-EXTRAVERSION="redcore-lts"
+EXTRAVERSION="redcore-lts-${PR}"
 KV_FULL="${PV}-${EXTRAVERSION}"
 KV_MAJOR="6.1"
 
@@ -14,7 +14,7 @@ SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${PV}.tar.xz"
 KEYWORDS="~amd64"
 LICENSE="GPL-2"
 SLOT="${KV_MAJOR}"
-IUSE="+cryptsetup +dmraid +dracut +dkms +mdadm"
+IUSE="+cryptsetup +dmraid +dracut +dkms live +mdadm"
 
 RESTRICT="binchecks strip mirror"
 DEPEND="
@@ -87,6 +87,13 @@ src_install() {
 	for KSYMS in build source ; do
 		dosym ../../../usr/src/linux-"${KV_FULL}" lib/modules/"${KV_FULL}"/"${KSYMS}"
 	done
+	if use live ; then
+		insinto /etc/calamares/modules
+		doins "${FILESDIR}"/bootloader.conf
+		doins "${FILESDIR}"/dracut.conf
+		sed -i 's|REDCORE_KERNEL_VERSION|'"${KV_FULL}"'|g' "${D}/etc/calamares/modules/bootloader.conf" || die
+		sed -i 's|REDCORE_KERNEL_VERSION|'"${KV_FULL}"'|g' "${D}/etc/calamares/modules/dracut.conf" || die	
+	fi
 }
 
 _grub2_update_grubcfg() {
diff --git a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.12.17.ebuild b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.12.17-r1.ebuild
index 66ccdc03..044398f7 100644
--- a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.12.17.ebuild
+++ b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.12.17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-EXTRAVERSION="redcore-lts"
+EXTRAVERSION="redcore-lts-${PR}"
 KV_FULL="${PV}-${EXTRAVERSION}"
 KV_MAJOR="6.12"
 
@@ -14,7 +14,7 @@ SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${PV}.tar.xz"
 KEYWORDS="~amd64"
 LICENSE="GPL-2"
 SLOT="${KV_MAJOR}"
-IUSE="+cryptsetup +dmraid +dracut +dkms +mdadm"
+IUSE="+cryptsetup +dmraid +dracut +dkms live +mdadm"
 
 RESTRICT="binchecks strip mirror"
 DEPEND="
@@ -86,6 +86,13 @@ src_install() {
 	for KSYMS in build source ; do
 		dosym ../../../usr/src/linux-"${KV_FULL}" lib/modules/"${KV_FULL}"/"${KSYMS}"
 	done
+	if use live ; then
+		insinto /etc/calamares/modules
+		doins "${FILESDIR}"/bootloader.conf
+		doins "${FILESDIR}"/dracut.conf
+		sed -i 's|REDCORE_KERNEL_VERSION|'"${KV_FULL}"'|g' "${D}/etc/calamares/modules/bootloader.conf" || die
+		sed -i 's|REDCORE_KERNEL_VERSION|'"${KV_FULL}"'|g' "${D}/etc/calamares/modules/dracut.conf" || die	
+	fi
 }
 
 _grub2_update_grubcfg() {
diff --git a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.6.80.ebuild b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.6.80-r1.ebuild
index 2d7aa20d..958dda08 100644
--- a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.6.80.ebuild
+++ b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-6.6.80-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-EXTRAVERSION="redcore-lts"
+EXTRAVERSION="redcore-lts-${PR}"
 KV_FULL="${PV}-${EXTRAVERSION}"
 KV_MAJOR="6.6"
 
@@ -14,7 +14,7 @@ SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${PV}.tar.xz"
 KEYWORDS="~amd64"
 LICENSE="GPL-2"
 SLOT="${KV_MAJOR}"
-IUSE="+cryptsetup +dmraid +dracut +dkms +mdadm"
+IUSE="+cryptsetup +dmraid +dracut +dkms live +mdadm"
 
 RESTRICT="binchecks strip mirror"
 DEPEND="
@@ -86,6 +86,13 @@ src_install() {
 	for KSYMS in build source ; do
 		dosym ../../../usr/src/linux-"${KV_FULL}" lib/modules/"${KV_FULL}"/"${KSYMS}"
 	done
+	if use live ; then
+		insinto /etc/calamares/modules
+		doins "${FILESDIR}"/bootloader.conf
+		doins "${FILESDIR}"/dracut.conf
+		sed -i 's|REDCORE_KERNEL_VERSION|'"${KV_FULL}"'|g' "${D}/etc/calamares/modules/bootloader.conf" || die
+		sed -i 's|REDCORE_KERNEL_VERSION|'"${KV_FULL}"'|g' "${D}/etc/calamares/modules/dracut.conf" || die	
+	fi
 }
 
 _grub2_update_grubcfg() {