Skip to content

M
mkimage-profiles
You need to sign in or sign up before continuing.
Commit a5b0e945 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

slinux: use live as installer and rescue also

parent 7d2617e2
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
conf.d/slinux.mk
View file @ a5b0e945
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
distro/slinux-live: distro/.livecd-install use/slinux/base use/slinux/live distro/slinux-live: distro/.base use/slinux/base use/slinux/live +live
@$(call add,THE_LISTS,slinux/live-install) @$(call add,THE_LISTS,slinux/live-install)
@$(call set,META_VOL_ID,Simply Linux live $(DISTRO_VERSION) $(ARCH)) @$(call set,META_VOL_ID,Simply Linux live $(DISTRO_VERSION) $(ARCH))
@$(call set,META_APP_ID,Simply Linux live $(DISTRO_VERSION) $(ARCH) $(shell date +%F)) @$(call set,META_APP_ID,Simply Linux live $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
distro/slinux: distro/.installer use/slinux/full use/rescue/base distro/slinux: distro/.base use/slinux/full use/live/rescue use/live/repo \
+live +live-installer-pkg
@$(call set,INSTALLER,simply-linux) @$(call set,INSTALLER,simply-linux)
@$(call add,MAIN_GROUPS,slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics slinux/graphics-full-inkscape slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-shotcut slinux/net-base) @$(call add,MAIN_GROUPS,slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics slinux/graphics-full-inkscape slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-shotcut slinux/net-base)
ifneq (,$(filter-out riscv64,$(ARCH))) ifneq (,$(filter-out riscv64,$(ARCH)))
......
features.in/slinux/config.mk
View file @ a5b0e945
...@@ -116,12 +116,9 @@ use/slinux/base: use/isohybrid use/luks \ ...@@ -116,12 +116,9 @@ use/slinux/base: use/isohybrid use/luks \
use/stage2/ata use/stage2/fs use/stage2/hid use/stage2/md \ use/stage2/ata use/stage2/fs use/stage2/hid use/stage2/md \
use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \ use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \
use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \ use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \
use/install2/fonts \
use/install2/fat \
use/efi/memtest86 use/efi/shell \ use/efi/memtest86 use/efi/shell \
use/bootloader/grub \ use/bootloader/grub \
use/branding/complete \ use/branding/complete \
mixin/desktop-installer \
use/firmware/laptop \ use/firmware/laptop \
use/vmguest/kvm/x11 use/stage2/kms/nvidia \ use/vmguest/kvm/x11 use/stage2/kms/nvidia \
use/e2k/multiseat/full use/e2k/x11/101 use/e2k/sound/401 \ use/e2k/multiseat/full use/e2k/x11/101 use/e2k/sound/401 \
...@@ -129,11 +126,9 @@ use/slinux/base: use/isohybrid use/luks \ ...@@ -129,11 +126,9 @@ use/slinux/base: use/isohybrid use/luks \
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call set,BOOTLOADER,grubpcboot) @$(call set,BOOTLOADER,grubpcboot)
endif endif
@$(call add,INSTALL2_PACKAGES,xorg-conf-libinput-touchpad)
@$(call add,STAGE2_PACKAGES,btrfs-progs) @$(call add,STAGE2_PACKAGES,btrfs-progs)
use/slinux/full: use/slinux/base \ use/slinux/full: use/slinux/base
use/install2/repo
ifeq (,$(filter-out x86_64,$(ARCH))) ifeq (,$(filter-out x86_64,$(ARCH)))
@$(call set,KFLAVOURS,un-def std-def) @$(call set,KFLAVOURS,un-def std-def)
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment