Skip to content

M
mkimage-profiles
Commit 781e70af authored by Mikhail Efremov's avatar Mikhail Efremov Committed by Anton Midyukov
Browse files
Options

slinux: Remove live system from full image

The image is too large, so remove live from it. Separate live image will be enough.
parent a64d6493
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 10 deletions
conf.d/slinux.mk
View file @ 781e70af
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
distro/slinux-live: distro/.livecd-install use/slinux/base use/live/repo distro/slinux-live: distro/.livecd-install use/slinux/base use/slinux/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 use/live/repo distro/slinux: distro/.installer use/slinux/full use/rescue/base
@$(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/multimedia-full-sound-juicer slinux/multimedia-full-obs-studio 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/multimedia-full-sound-juicer slinux/multimedia-full-obs-studio slinux/net-base)
ifneq (,$(filter-out e2k%,$(ARCH))) ifneq (,$(filter-out e2k%,$(ARCH)))
......
features.in/slinux/config.mk
View file @ 781e70af
...@@ -72,10 +72,6 @@ use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \ ...@@ -72,10 +72,6 @@ use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \
use/xdg-user-dirs/deep use/slinux/services use/xdg-user-dirs/deep use/slinux/services
@$(call set,DOCS,simply-linux) @$(call set,DOCS,simply-linux)
@$(call add,THE_LISTS,gnome-p2p) @$(call add,THE_LISTS,gnome-p2p)
@$(call add,LIVE_LISTS,slinux/games-base)
@$(call add,LIVE_LISTS,slinux/graphics-base)
@$(call add,LIVE_LISTS,slinux/multimedia-base)
@$(call add,LIVE_LISTS,slinux/net-base)
@$(call add,THE_LISTS,slinux/misc-base) @$(call add,THE_LISTS,slinux/misc-base)
@$(call add,THE_LISTS,slinux/xfce-base) @$(call add,THE_LISTS,slinux/xfce-base)
@$(call add,THE_LISTS,$(call tags,base l10n)) @$(call add,THE_LISTS,$(call tags,base l10n))
...@@ -97,13 +93,22 @@ ifeq (,$(filter-out armh aarch64 i586 x86_64,$(ARCH))) ...@@ -97,13 +93,22 @@ ifeq (,$(filter-out armh aarch64 i586 x86_64,$(ARCH)))
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
endif endif
use/slinux/live: use/live/x11 use/live/rw \
use/live/repo \
use/cleanup/live-no-cleanupdb
@$(call add,LIVE_LISTS,slinux/live)
@$(call add,LIVE_LISTS,slinux/games-base)
@$(call add,LIVE_LISTS,slinux/graphics-base)
@$(call add,LIVE_LISTS,slinux/multimedia-base)
@$(call add,LIVE_LISTS,slinux/net-base)
use/slinux/base: use/isohybrid use/luks \ use/slinux/base: use/isohybrid use/luks \
+plymouth use/memtest +vmguest \ +plymouth use/memtest +vmguest \
+efi \ +efi \
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/live/x11 use/live/rw use/install2/fonts \ use/install2/fonts \
use/install2/fat \ use/install2/fat \
use/efi/memtest86 use/efi/shell \ use/efi/memtest86 use/efi/shell \
use/bootloader/grub \ use/bootloader/grub \
...@@ -111,9 +116,7 @@ use/slinux/base: use/isohybrid use/luks \ ...@@ -111,9 +116,7 @@ use/slinux/base: use/isohybrid use/luks \
mixin/desktop-installer \ mixin/desktop-installer \
use/vmguest/kvm/x11 use/stage2/kms \ use/vmguest/kvm/x11 use/stage2/kms \
use/e2k/multiseat/full use/e2k/x11/101 use/e2k/sound/401 \ use/e2k/multiseat/full use/e2k/x11/101 use/e2k/sound/401 \
use/slinux/mixin-base \ use/slinux/mixin-base
use/cleanup/live-no-cleanupdb
@$(call add,LIVE_LISTS,slinux/live)
@$(call add,BASE_PACKAGES,installer-distro-simply-linux-stage3) @$(call add,BASE_PACKAGES,installer-distro-simply-linux-stage3)
@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad) @$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
......
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