keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

education.mk, mixin-basealt.mk, live, slinux: Use stage2 features instead STAGE1_MODLISTS

Browse Source
This commit is contained in:
Anton Midyukov 2020-02-08 00:49:30 +07:00
parent 6ef10f64b9
commit 1185a11821
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf.d/education.mk
View File

@ -35,7 +35,10 @@ distro/alt-education: distro/.installer mixin/education \
+efi use/efi/refind use/efi/shell \ +efi use/efi/refind use/efi/shell \
use/isohybrid use/luks \ use/isohybrid use/luks \
+plymouth +wireless \ +plymouth +wireless \
use/install2/fonts use/install2/fonts \
use/stage2/fs use/stage2/hid use/stage2/md \
use/stage2/mmc use/stage2/net use/stage2/net-nfs \
use/stage2/rtc use/stage2/scsi use/stage2/usb
@$(call set,INSTALLER,education) @$(call set,INSTALLER,education)
@$(call set,META_VOL_ID,ALT Education 9.0 $(ARCH)) @$(call set,META_VOL_ID,ALT Education 9.0 $(ARCH))
@$(call set,META_PUBLISHER,BaseALT Ltd) @$(call set,META_PUBLISHER,BaseALT Ltd)
@ -75,7 +78,6 @@ endif
@$(call add,MAIN_PACKAGES,stellarium) @$(call add,MAIN_PACKAGES,stellarium)
@$(call add,MAIN_PACKAGES,libreoffice-block-macros) @$(call add,MAIN_PACKAGES,libreoffice-block-macros)
@$(call add,MAIN_PACKAGES,lmms) @$(call add,MAIN_PACKAGES,lmms)
@$(call add,STAGE1_MODLISTS,stage2-mmc)
@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true) @$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
@$(call add,LIVE_PACKAGES,livecd-timezone) @$(call add,LIVE_PACKAGES,livecd-timezone)
@$(call add,LIVE_LISTS,slinux/net-base) @$(call add,LIVE_LISTS,slinux/net-base)

6
conf.d/mixin-basealt.mk
View File

@ -50,8 +50,10 @@ mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm \
@$(call set,DOCS,alt-workstation) @$(call set,DOCS,alt-workstation)
mixin/alt-workstation-install: +installer \ mixin/alt-workstation-install: +installer \
use/install2/fat use/install2/vnc use/install2/fat use/install2/vnc \
@$(call add,STAGE1_MODLISTS,stage2-mmc) use/stage2/fs use/stage2/hid use/stage2/md \
use/stage2/mmc use/stage2/net use/stage2/net-nfs \
use/stage2/rtc use/stage2/scsi use/stage2/usb
@$(call set,INSTALLER,altlinux-desktop) @$(call set,INSTALLER,altlinux-desktop)
@$(call add,INSTALL2_PACKAGES,installer-feature-slideshow) @$(call add,INSTALL2_PACKAGES,installer-feature-slideshow)
@$(call add,INSTALL2_PACKAGES,alterator-notes) @$(call add,INSTALL2_PACKAGES,alterator-notes)

6
features.in/live/config.mk
View File

@ -92,7 +92,9 @@ use/live/suspend: use/live
@$(call add,LIVE_PACKAGES,installer-feature-desktop-suspend-stage2) @$(call add,LIVE_PACKAGES,installer-feature-desktop-suspend-stage2)
# deny network/local drive access for security reasons # deny network/local drive access for security reasons
use/live/privacy: use/services use/memclean use/deflogin use/live/privacy: use/services use/memclean use/deflogin \
use/stage2/ata use/stage2/drm use/stage2/hid \
use/stage2/mmc use/stage2/net-nfs use/stage2/usb
@$(call add,DEFAULT_SERVICES_ENABLE,livecd-nodisks) @$(call add,DEFAULT_SERVICES_ENABLE,livecd-nodisks)
@$(call add,LIVE_PACKAGES,livecd-nodisks) @$(call add,LIVE_PACKAGES,livecd-nodisks)
@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/net/) @$(call add,LIVE_CLEANUP_KDRIVERS,kernel/net/)
@ -103,6 +105,4 @@ use/live/privacy: use/services use/memclean use/deflogin
@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/cdrom/) @$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/cdrom/)
@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/firewire/) @$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/firewire/)
@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/bluetooth/) @$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/bluetooth/)
@$(call set,STAGE1_MODLISTS,stage2-ata stage2-drm stage2-hid)
@$(call add,STAGE1_MODLISTS,stage2-mmc stage2-usb)
@$(call add,USERS,altlinux:::) @$(call add,USERS,altlinux:::)

4
features.in/slinux/config.mk
View File

@ -81,6 +81,9 @@ endif
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/fs use/stage2/hid use/stage2/md \
use/stage2/mmc use/stage2/net use/stage2/net-nfs \
use/stage2/rtc use/stage2/scsi use/stage2/usb \
use/live/x11 use/live/rw use/install2/fonts \ use/live/x11 use/live/rw use/install2/fonts \
use/efi/refind use/efi/memtest86 use/efi/shell \ use/efi/refind use/efi/memtest86 use/efi/shell \
use/bootloader/grub \ use/bootloader/grub \
@ -94,7 +97,6 @@ use/slinux/base: use/isohybrid use/luks \
@$(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)
@$(call add,STAGE2_PACKAGES,chrony) @$(call add,STAGE2_PACKAGES,chrony)
@$(call add,STAGE1_MODLISTS,stage2-mmc)
@$(call add,EFI_BOOTARGS,lang=ru_RU) @$(call add,EFI_BOOTARGS,lang=ru_RU)
use/slinux/full: use/slinux/base use/slinux/full: use/slinux/base