regular.mk: refactor regular-jeos

Now these are live images instead of altinst, which have almost nothing cut out. It is possible to use the rw-mode of live, which can be useful for experiments and debugging the installer. Added firmware-linux both to live and to the installed system to expand the range of platforms on which the system can be installed. Added the drm module to the installed system so that it is possible most video cards support. Now the installer can be connected via vnc. A standard set of installer steps is used, as in other regular. Such jeos images can be used as a base for both a desktop and a server. This is exactly what users expect from jeos, but it was so cut that it could not be installed on real hardware. This has now been fixed.

regular.mk: refactor regular-jeos
8ab050f8 · Anton Midyukov · d359efb0 · 8ab050f8
Commit 8ab050f8 authored Jan 26, 2025 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 46 deletions

regular.mk conf.d/regular.mk +21 -46

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -84,53 +84,28 @@ endif
 	@$(call add,THE_BRANDING,alterator)
 # common base for the very bare distros
-distro/.regular-jeos-base: distro/.regular-bare \
+distro/.regular-jeos-base: distro/.regular-bare +efi \
-	use/isohybrid use/branding \
+	use/branding +live-installer-pkg use/live-install/repo
-	use/install2/repo use/install2/packages \
+	@$(call add,THE_BRANDING,alterator notes)
-	use/net/etcnet
+	@$(call add,BASE_PACKAGES,installer-common-stage3)
-	@$(call set,INSTALLER,jeos)
+	@$(call add,LIVE_PACKAGES,alterator-net-functions) # for run scripts from installer-common-stage3
-	@$(call add,BASE_PACKAGES,glibc-locales)
-	@$(call add,INSTALL2_BRANDING,alterator notes)
-	@$(call add,THE_BRANDING,alterator) # just to be cleaned up later on
 	@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console su agetty)
-	@$(call add,THE_LISTS,openssh)
+	@$(call add,THE_PACKAGES,glibc-locales)
+	@$(call add,BASE_PACKAGES,make-initrd-lvm make-initrd-mdadm cpio)
-# ...and for somewhat bare distros
+	@$(call add,BASE_LISTS,openssh)
-distro/.regular-jeos: distro/.regular-jeos-base \
+	@$(call add,THE_PACKAGES,fdisk)
-	use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
+	@$(call add,THE_PACKAGES,btrfs-progs)
-	use/syslinux/lateboot.cfg use/cleanup/jeos
-	@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
+distro/.regular-jeos: distro/.regular-jeos-base use/cleanup \
+	use/volumes/regular use/ntp/chrony use/net/etcnet \
-distro/.regular-jeos-full: distro/.regular-jeos \
+	use/firmware use/drm
-	use/volumes/regular use/ntp/chrony use/bootloader/grub \
+	@$(call set,INSTALLER,regular)
-	use/grub/localboot_bios.cfg +efi
+	@$(call add,CLEANUP_BASE_PACKAGES,alterator)
-	@$(call add,BASE_PACKAGES,nfs-utils gdisk)
+	@$(call add,BASE_PACKAGES,nfs-utils gdisk apt-repo)
-	@$(call add,INSTALL2_PACKAGES,fdisk)
-	@$(call add,INSTALL2_PACKAGES,btrfs-progs)
+distro/regular-jeos-sysv: distro/.regular-jeos +sysvinit +power; @:
-	@$(call add,BASE_PACKAGES,btrfs-progs)
-	@$(call add,BASE_PACKAGES,make-initrd-lvm)
+distro/regular-jeos-systemd: distro/.regular-jeos +systemd +systemd-optimal; @:
-ifeq (,$(filter-out e2k%,$(ARCH)))
-	@$(call add,CLEANUP_PACKAGES,acpid-events-power)
-else
-	@$(call add,MAIN_PACKAGES,firmware-linux)
-	@$(call add,CLEANUP_PACKAGES,libffi 'libltdl*')
-	@$(call add,CLEANUP_PACKAGES,bridge-utils)
-endif
-	@$(call add,DEFAULT_SERVICES_DISABLE,fbsetfont)
-ifeq (,$(filter-out i586 x86_64,$(ARCH)))
-	@$(call add,INSTALL2_PACKAGES,xorg-dri-vmwgfx)
-endif
-ifneq (,$(filter-out e2k%,$(ARCH)))
-	@$(call add,INSTALL2_PACKAGES,xorg-dri-virtio)
-endif
-# NB:
-# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
-distro/regular-jeos-sysv: distro/.regular-jeos-full use/cleanup/jeos/full \
-	+sysvinit +power; @:
-distro/regular-jeos-systemd: distro/.regular-jeos-full use/install2/vmguest \
-	+systemd +systemd-optimal; @:
 distro/regular-icewm: distro/.regular-desktop use/x11/lightdm/gtk \
 	mixin/regular-icewm