regular.mk: initial rescue-netbootxyz flavour

This one has been split from regular rescue following discussion with Will Glynn; some hefty bits like UEFI support or an extra squashfs to check the image integrity aren't needed, so let's just build a slimmer ISO instead. Suggested-by: Will Glynn <will@willglynn.com> See-also: https://bugzilla.altlinux.org/33374

regular.mk: initial rescue-netbootxyz flavour
645f95f0 · Michael Shigorin · 4321fefc · 645f95f0
Commit 645f95f0 authored Apr 14, 2017 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 6 deletions

regular.mk conf.d/regular.mk +13 -6

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -234,17 +234,24 @@ distro/regular-kde5: distro/.regular-desktop \
 #     which will change propagator's behaviour to probe additional
 #     filesystems (ro but no loop) thus potentially writing to
 #     an unrecovered filesystem's journal
-distro/regular-rescue: distro/.regular-base use/rescue/rw use/luks \
-	use/branding use/efi/refind use/efi/shell use/efi/memtest86 \
-	use/hdt use/syslinux/ui/menu use/syslinux/timeout/600 \
-	use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \
-	use/firmware/qlogic use/mediacheck test/rescue/no-x11 \
-	+wireless +sysvinit
+mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
+	use/syslinux/ui/menu use/syslinux/timeout/600 \
+	use/firmware/qlogic test/rescue/no-x11 +sysvinit; @:
+
+distro/regular-rescue: distro/.regular-base mixin/regular-rescue  \
+	use/rescue/rw use/efi/refind use/efi/shell use/efi/memtest86 \
+	use/hdt use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \
+	use/mediacheck +wireless
 	@$(call set,KFLAVOURS,un-def)
 	@$(call add,RESCUE_PACKAGES,gpm livecd-net-eth)
 	@$(call add,RESCUE_LISTS,$(call tags,base && (smartcard || bench)))
 	@$(call add,RESCUE_LISTS,$(call tags,network security))

+distro/regular-rescue-netbootxyz: distro/.regular-bare mixin/regular-rescue
+	@$(call set,RELNAME,en.altlinux.org/rescue (netboot.xyz edition))
+	@$(call set,META_VOL_ID,ALT Rescue)
+	@$(call set,META_APP_ID,$(ARCH))
+
 distro/regular-sysv-tde: distro/.regular-install-x11-full mixin/regular-tde
 	@$(call add,THE_LISTS,$(call tags,base desktop))
 	@$(call add,THE_LISTS,$(call tags,regular tde))