KOMETA
/
mkimage-profiles-kometa
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Рабочая версия

Browse Source
master
Artem Proskurnev 3 years ago
parent 22f7f75d8d
commit d7dffd7a5f
151 changed files with 17989 additions and 603 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      bin/archdep-filter
  2. 5
      bin/tar2fs
  3. 17004
      bld/build.log
  4. 80
      bld/distcfg.mk
  5. 2
      bld/files/.disk/commit
  6. 2
      bld/files/.disk/date
  7. 2
      bld/files/.disk/info
  8. BIN
      bld/files/.disk/profile.tgz
  9. 0
      bld/files/.empty
  10. BIN
      bld/files/Metadata/pkg-groups.tar
  11. 0
      bld/image-scripts.d/.empty
  12. 2
      bld/image-scripts.d/01-rootdir
  13. 0
      bld/lib/.empty
  14. 0
      bld/live/files/.empty
  15. 2
      bld/live/image-scripts.d/01-rootdir
  16. 2
      bld/live/image-scripts.d/50-net-nm
  17. 18
      bld/live/image-scripts.d/50-serial
  18. 34
      bld/live/image-scripts.d/60-apt
  19. 0
      bld/live/lib/.empty
  20. 3
      bld/live/scripts.d/01-clean-.empty-stage2
  21. 208
      bld/pkg/lists/.base
  22. 3
      bld/pkg/lists/grub
  23. 29
      bld/pkg/lists/tagged/base+kometa
  24. 3
      bld/pkg/lists/tagged/base+regular
  25. 10
      bld/pkg/lists/tagged/desktop+xorg
  26. 2
      bld/rootfs/image-scripts.d/50-net-nm
  27. 18
      bld/rootfs/image-scripts.d/50-serial
  28. 0
      bld/scripts.d/.empty
  29. 2
      bld/scripts.d/00-cleanup
  30. 0
      bld/stage1/files/.empty
  31. 8
      bld/stage1/files/boot/grub/.in/00defaults.cfg
  32. 6
      bld/stage1/files/boot/grub/.in/01gfxterm.cfg
  33. 2
      bld/stage1/files/boot/grub/.in/30live.cfg
  34. 2
      bld/stage1/files/boot/grub/.in/32live_rw.cfg
  35. 8
      bld/stage1/files/index.html
  36. 2
      bld/stage1/files/syslinux/.in/30live.cfg
  37. 2
      bld/stage1/files/syslinux/.in/32live_rw.cfg
  38. 0
      bld/stage1/modules.d/.empty
  39. 4
      bld/stage1/modules.d/50-stage2-usb
  40. 10
      bld/stage1/modules.d/50-vmguest
  41. 3
      bld/stage1/scripts.d/01-clean-.empty-stage1
  42. 4
      bld/stage1/scripts.d/01-grub
  43. 11
      bld/stage1/scripts.d/01-syslinux
  44. 2
      conf.d/alt-server.mk
  45. 3
      conf.d/basealt.mk
  46. 4
      conf.d/desktop.mk
  47. 49
      conf.d/education.mk
  48. 13
      conf.d/live.mk
  49. 7
      conf.d/mixin-alt-server.mk
  50. 4
      conf.d/mixin-basealt.mk
  51. 8
      conf.d/mixin.mk
  52. 39
      conf.d/regular-vm.mk
  53. 31
      conf.d/regular.mk
  54. 2
      conf.d/server-v.mk
  55. 24
      conf.d/slinux.mk
  56. 6
      doc/archdep.txt
  57. 6
      doc/params.txt
  58. 2
      features.in/Makefile
  59. 2
      features.in/apt-conf/config.mk
  60. 1
      features.in/arm-rpi4/config.mk
  61. 46
      features.in/arm-rpi4/image-scripts.d/98-bootstrap-boot-by-firmware
  62. 6
      features.in/browser/config.mk
  63. 2
      features.in/build-distro/scripts.d/00-cleanup
  64. 14
      features.in/build-vm/image-scripts.d/20-grub-terminal
  65. 1
      features.in/cleanup/config.mk
  66. 11
      features.in/dev/config.mk
  67. 107
      features.in/dev/live/image-scripts.d/51-hasher
  68. 8
      features.in/e2k/scripts.d/20-e2k-boot
  69. 3
      features.in/firmware/config.mk
  70. 13
      features.in/gitlab-runner/README
  71. 13
      features.in/gitlab-runner/config.mk
  72. 61
      features.in/gitlab-runner/rootfs/image-scripts.d/60-gitlab-install
  73. 11
      features.in/grub/README
  74. 9
      features.in/grub/cfg.in/00defaults.cfg
  75. 6
      features.in/grub/cfg.in/01gfxterm.cfg
  76. 4
      features.in/grub/stage1/scripts.d/01-grub
  77. 2
      features.in/homeros/live/image-scripts.d/20-altlinux-user
  78. 3
      features.in/init/config.mk
  79. 2
      features.in/initrd-bootchain/config.mk
  80. 7
      features.in/install2/config.mk
  81. 6
      features.in/kernel/config.mk
  82. 3
      features.in/live/config.mk
  83. 2
      features.in/live/generate.mk
  84. 34
      features.in/live/live/image-scripts.d/60-apt
  85. 3
      features.in/net-eth/config.mk
  86. 19
      features.in/net-eth/rootfs/image-scripts.d/50-net-eth
  87. 2
      features.in/net/rootfs/image-scripts.d/50-net-nm
  88. 21
      features.in/oem/config.mk
  89. 8
      features.in/repo/README
  90. 6
      features.in/repo/config.mk
  91. 37
      features.in/repo/image-scripts.d/90-enable-repo
  92. 17
      features.in/repo/install2/image-scripts.d/90-repo-mirror
  93. 2
      features.in/repo/rootfs/image-scripts.d/01-genbasedir-rootfs
  94. 2
      features.in/repo/rootfs/image-scripts.d/80-repo-rootfs-main
  95. 2
      features.in/server/config.mk
  96. 26
      features.in/slinux/config.mk
  97. 4
      features.in/stage2/stage1/modules.d/50-stage2-usb
  98. 11
      features.in/syslinux/stage1/scripts.d/01-syslinux
  99. 2
      features.in/tty/config.mk
  100. 5
      features.in/uboot/config.mk
  101. Some files were not shown because too many files have changed in this diff Show More

20
bin/archdep-filter
Unescape View File

@ -2,7 +2,7 @@
# filter stdin or file for words related to # filter stdin or file for words related to
# the specified target architecture # the specified target architecture
# #
# args: -a arch [-i file] # args: [-a arch] [-i file]
if [ "$1" = "-a" -a -n "$2" ]; then if [ "$1" = "-a" -a -n "$2" ]; then
a="$2" a="$2"
@ -34,16 +34,22 @@ esac
# NB: pipe runs in parallel => faster than -e -e # NB: pipe runs in parallel => faster than -e -e
cat ${f:+"$f"} | cat ${f:+"$f"} |
sed -rn "s/\<([^@ ]*)\>|\<([^@ ]*)@$A\>/\1\2/pg" | sed -r ':loop; s/^((([^@]+@!)[^,]+)+),([a-zA-Z0-9_]+)/\1@!\4/; t loop' |
sed -rn "s/\<([^@ ]*)\>|\<[^@ ]*@\!$A\> */\1/pg" | sed -r ':loop; s/^((([^@]+@)[^,]+)+),([a-zA-Z0-9_]+)/\1\n\3\4/; t loop' |
sed -rn "s/\<([^@ ]*)\>|\<([^@ ]*)@$A\>[^ ]*\>/\1\2/pg" |
sed -rn "s/\<([^@ ]*)\>|\<[^ ]*@\!$A\>[^ ]*\> */\1/pg" |
sed -r "s/\<([^@ ]*)@IA32\>/\1@i586 i586-\1@x86_64/g" | sed -r "s/\<([^@ ]*)@IA32\>/\1@i586 i586-\1@x86_64/g" |
sed -rn "s/\<([^@ ]*)\>|\<([^@ ]*)@$a\>/\1\2/pg" | sed -rn "s/\<([^@ ]*)\>|\<([^@ ]*)@$a\>[^ ]*\>/\1\2/pg" |
sed -rn "s/\<([^@ ]*)\>|\<[^@ ]*@\!$a\> */\1/pg" | sed -rn "s/\<([^@ ]*)\>|\<[^ ]*@\!$a\>[^ ]*\> */\1/pg" |
sed -r "s/\<([^@ ]*)@\![^@ ]+\>/\1/g" | sed -r "s/\<([^@ ]*)@\![^ ]+\>/\1/g" |
sed -r "s/\<([^@ ]*)@[^@ ]+\> *//g" | sed -r "s/\<([^@ ]*)@[^@ ]+\> *//g" |
sed -r "s/^ +//;s/ +$//" | sed -r "s/^ +//;s/ +$//;/^$/d" |
if [ -n "$f" ]; then if [ -n "$f" ]; then
cat > "$t" && mv "$t" "$f" cat > "$t" && mv "$t" "$f"
else else
cat cat
fi fi
# stick this for debugging sed pipeline and run the script
# with >/dev/null to see what flows in a particular place:
# tee /dev/stderr |

5
bin/tar2fs
Unescape View File

@ -62,6 +62,11 @@ arm*|aarch64)
BLOCKDEV="/dev/sda" BLOCKDEV="/dev/sda"
CUR_BOUNDARY=15 # offset 16 MiB for singleboard's CUR_BOUNDARY=15 # offset 16 MiB for singleboard's
;; ;;
riscv64)
ROOTPART="1"
BLOCKDEV="/dev/sda"
CUR_BOUNDARY=33 # offset 34 MiB for singleboard's
;;
*) *)
ROOTPART="1" ROOTPART="1"
BLOCKDEV="/dev/sda" BLOCKDEV="/dev/sda"

17004
bld/build.log
View File

File diff suppressed because it is too large Load Diff

80
bld/distcfg.mk
Unescape View File

@ -8,7 +8,7 @@ PIN_PRIORITY = Important
MKIMAGE_PREFIX ?= /usr/share/mkimage MKIMAGE_PREFIX ?= /usr/share/mkimage
IMAGEDIR ?= /home/tema/out IMAGEDIR ?= /home/tema/out
LOGDIR ?= /home/tema/out LOGDIR ?= /home/tema/out
BRANDING = kometa-school BRANDING ?= kometa-school
PINNED_PACKAGES += branding-$(BRANDING)-alterator:Essential PINNED_PACKAGES += branding-$(BRANDING)-alterator:Essential
PINNED_PACKAGES += branding-$(BRANDING)-bootsplash:Essential PINNED_PACKAGES += branding-$(BRANDING)-bootsplash:Essential
PINNED_PACKAGES += branding-$(BRANDING)-bootloader:Essential PINNED_PACKAGES += branding-$(BRANDING)-bootloader:Essential
@ -17,26 +17,26 @@ PINNED_PACKAGES += branding-$(BRANDING)-indexhtml:Essential
PINNED_PACKAGES += branding-$(BRANDING)-notes:Essential PINNED_PACKAGES += branding-$(BRANDING)-notes:Essential
PINNED_PACKAGES += branding-$(BRANDING)-release:Essential PINNED_PACKAGES += branding-$(BRANDING)-release:Essential
PINNED_PACKAGES += branding-$(BRANDING)-slideshow:Essential PINNED_PACKAGES += branding-$(BRANDING)-slideshow:Essential
WORK_INIT_LIST = +branding-$(BRANDING)-release PACKAGES_REQUIRED_INITROOT = basesystem branding-$(BRANDING)-release
IMAGE_INIT_LIST = +branding-$(BRANDING)-release
export GLOBAL_ARCH = $(ARCH) export GLOBAL_ARCH = $(ARCH)
# distro/.init # distro/.init
META_PREPARER ?= mkimage-profiles META_PREPARER ?= mkimage-profiles
META_APP_ID = kometa-school-p10 META_APP_ID ?= alt-p10-kde5
META_PUBLISHER = Proskurnev Artem META_PUBLISHER ?= Artem Proskurnev
# boot/iso # boot/iso
BOOTLOADER ?= isolinux BOOTLOADER ?= isolinux
IMAGE_PACKTYPE ?= boot IMAGE_PACKTYPE ?= boot
# distro/.boot # distro/.boot
META_VOL_ID = KOMETA kometa-school-p10/x86_64 IMAGE_FLAVOUR ?= kde5
META_VOL_SET = ALT META_VOL_ID ?= KOMETA p10 $(IMAGE_FLAVOUR)/x86_64
GLOBAL_BOOT_LANG = ru_RU META_VOL_try ?= KOMETA
GLOBAL_BOOT_LANG ?= ru_RU
# use/kernel # use/kernel
FEATURES += kernel FEATURES += kernel
KFLAVOURS ?= std-def KFLAVOURS ?= std-def
export GLOBAL_KFLAVOURS = $(KFLAVOURS) export GLOBAL_KFLAVOURS = $(KFLAVOURS)
# distro/.base # distro/.base
META_SYSTEM_ID = LINUX META_SYSTEM_ID ?= LINUX
# use/kernel/net # use/kernel/net
THE_KMODULES += e1000e THE_KMODULES += e1000e
THE_KMODULES += r8125 THE_KMODULES += r8125
@ -57,20 +57,19 @@ STAGE1_PACKAGES += make-initrd file iproute2
STAGE1_MODLISTS += $(FEATURES) STAGE1_MODLISTS += $(FEATURES)
export GLOBAL_STAGE1_PACKAGES = $(STAGE1_PACKAGES) export GLOBAL_STAGE1_PACKAGES = $(STAGE1_PACKAGES)
export GLOBAL_STAGE1_KCONFIG = $(STAGE1_KCONFIG) export GLOBAL_STAGE1_KCONFIG = $(STAGE1_KCONFIG)
HSH_PROC = 1
GLOBAL_HSH_PROC = 1 GLOBAL_HSH_PROC = 1
# use/uuid-iso # use/uuid-iso
FEATURES += uuid-iso FEATURES += uuid-iso
#MKI_VER_OPTIMAL = 0.2.41 # overridden by use/efi #MKI_VER_OPTIMAL = 0.2.41 # overridden by use/efi
UUID_ISO_SHRT = 2021120815104900 UUID_ISO_SHRT = 2022020819504500
UUID_ISO = 2021-12-08-15-10-49-00 UUID_ISO = 2022-02-08-19-50-45-00
export GLOBAL_UUID_ISO = $(UUID_ISO) export GLOBAL_UUID_ISO = $(UUID_ISO)
# use/initrd-propagator # use/initrd-propagator
FEATURES += initrd-propagator FEATURES += initrd-propagator
STAGE1_PACKAGES += make-initrd-propagator propagator STAGE1_PACKAGES += make-initrd-propagator propagator
STAGE1_INITRD = initrd-propagator STAGE1_INITRD = initrd-propagator
STAGE1_INITRD_TYPEARGS = changedisk automatic STAGE1_INITRD_TYPEARGS = changedisk automatic
STAGE1_INITRD_BOOTMETHOD = method:cdrom,fuid:2021-12-08-15-10-49-00 STAGE1_INITRD_BOOTMETHOD = method:cdrom,fuid:2022-02-08-19-50-45-00
STAGE1_INITRD_STAGE2_OPTION = stagename STAGE1_INITRD_STAGE2_OPTION = stagename
# use/stage2/fs # use/stage2/fs
STAGE1_MODLISTS += stage2-fs STAGE1_MODLISTS += stage2-fs
@ -94,6 +93,13 @@ STAGE1_MODLISTS += stage2-rtc
STAGE1_MODLISTS += stage2-scsi STAGE1_MODLISTS += stage2-scsi
# use/stage2/usb # use/stage2/usb
STAGE1_MODLISTS += stage2-usb STAGE1_MODLISTS += stage2-usb
# use/tty
FEATURES += tty
export GLOBAL_TTY_DEV = $(TTY_DEV)
export GLOBAL_TTY_RATE = $(TTY_RATE)
export GLOBAL_BASE_BOOTARGS = $(BASE_BOOTARGS)
INSTALL2_PACKAGES += installer-feature-serial-stage2
THE_PACKAGES += installer-feature-serial-stage3
# distro/.regular-bare # distro/.regular-bare
SAVE_PROFILE ?= yes SAVE_PROFILE ?= yes
# use/vmguest # use/vmguest
@ -109,7 +115,7 @@ export GLOBAL_SYSLINUX_DEFAULT = $(SYSLINUX_DEFAULT)
# use/grub # use/grub
FEATURES += grub FEATURES += grub
BOOTVGA ?= normal BOOTVGA ?= normal
RELNAME = KOMETA (kometa-school-p10) RELNAME = ALT (alt-p10-kde5)
export GLOBAL_GRUB_DEFAULT = $(GRUB_DEFAULT) export GLOBAL_GRUB_DEFAULT = $(GRUB_DEFAULT)
# use/memtest # use/memtest
FEATURES += memtest FEATURES += memtest
@ -180,7 +186,7 @@ DEFAULT_SERVICES_DISABLE += lvm2-lvmetad
DEFAULT_SERVICES_DISABLE += lvm2-lvmpolld DEFAULT_SERVICES_DISABLE += lvm2-lvmpolld
DEFAULT_SERVICES_DISABLE += lvm2-monitor DEFAULT_SERVICES_DISABLE += lvm2-monitor
# mixin/regular-x11 # mixin/regular-x11
THE_LISTS += tagged/desktop+regular tagged/base+regular THE_LISTS += tagged/base+regular tagged/desktop+regular
THE_PACKAGES += disable-usb-autosuspend THE_PACKAGES += disable-usb-autosuspend
THE_PACKAGES += btrfs-progs THE_PACKAGES += btrfs-progs
THE_PACKAGES += gpm THE_PACKAGES += gpm
@ -294,19 +300,15 @@ STAGE1_BRANDING += bootloader
STAGE1_PACKAGES += grub-common STAGE1_PACKAGES += grub-common
# distro/.regular-x11 # distro/.regular-x11
THE_BRANDING += bootloader THE_BRANDING += bootloader
THE_LISTS += tagged/base+regular+extra tagged/desktop+regular tagged/base+regular THE_LISTS += tagged/base+regular tagged/desktop+regular tagged/base+regular+extra
LIVE_LISTS += tagged/base+rescue LIVE_LISTS += tagged/base+rescue
LIVE_PACKAGES += gpm LIVE_PACKAGES += gpm
DEFAULT_SERVICES_DISABLE += gpm powertop DEFAULT_SERVICES_DISABLE += gpm powertop
# distro/.kometa
THE_LISTS += tagged/base+kde5
THE_LISTS += tagged/base+kometa
# use/sound/alsa # use/sound/alsa
#THE_SOUND = sound/alsa # overridden by use/sound/pulse #THE_SOUND = sound/alsa # overridden by use/sound/pulse
# use/power
FEATURES += power
# use/power/acpi
COMMON_PACKAGES += acpid acpi
DEFAULT_SERVICES_ENABLE += acpid
# use/power/acpi/button
COMMON_PACKAGES += acpid-events-power
# use/net/nm/native # use/net/nm/native
NM_Native = yes NM_Native = yes
# use/drm # use/drm
@ -316,6 +318,8 @@ THE_KMODULES += $(DRM_KMODULES)
# use/x11/intel # use/x11/intel
THE_PACKAGES += xorg-drv-intel THE_PACKAGES += xorg-drv-intel
THE_PACKAGES += xorg-dri-intel THE_PACKAGES += xorg-dri-intel
# use/x11/xorg
THE_LISTS += tagged/desktop+xorg
# use/drm/nouveau # use/drm/nouveau
NVIDIA_KMODULES ?= drm-nouveau NVIDIA_KMODULES ?= drm-nouveau
DRM_KMODULES += $(NVIDIA_KMODULES) DRM_KMODULES += $(NVIDIA_KMODULES)
@ -325,12 +329,9 @@ THE_PACKAGES += $(NVIDIA_PACKAGES)
# use/drm/radeon # use/drm/radeon
DRM_KMODULES += drm-radeon DRM_KMODULES += drm-radeon
# use/x11/radeon # use/x11/radeon
RADEON_PACKAGES ?= xorg-drv-ati xorg-drv-radeon THE_PACKAGES += xorg-drv-ati xorg-drv-radeon
THE_PACKAGES += $(RADEON_PACKAGES)
# use/drm/ancient # use/drm/ancient
DRM_KMODULES += drm-ancient DRM_KMODULES += drm-ancient
# use/x11/xorg
THE_LISTS += tagged/desktop+xorg
# use/control # use/control
FEATURES += control FEATURES += control
THE_PACKAGES += control THE_PACKAGES += control
@ -346,12 +347,6 @@ THE_LISTS += tagged/base+l10n
LOCALES += en_US LOCALES += en_US
XKB_KEYMAPS += us XKB_KEYMAPS += us
LOCALE ?= en_US LOCALE ?= en_US
# use/l10n/ru_RU
LOCALES += ru_RU
LOCALE = ru_RU
XKB_KEYMAPS += ru
KEYTABLE = ruwin_ct_sh-UTF-8
export GLOBAL_LOCALE = $(LOCALE) export GLOBAL_LOCALE = $(LOCALE)
export GLOBAL_LOCALES = $(LOCALES) export GLOBAL_LOCALES = $(LOCALES)
export GLOBAL_XKB_KEYMAPS = $(XKB_KEYMAPS) export GLOBAL_XKB_KEYMAPS = $(XKB_KEYMAPS)
@ -366,8 +361,10 @@ THE_PACKAGES += $(THE_IMAGEWRITER)
THE_IMAGEWRITER = altmediawriter THE_IMAGEWRITER = altmediawriter
THE_PACKAGES += upower udev-rules-rfkill-uaccess THE_PACKAGES += upower udev-rules-rfkill-uaccess
DEFAULT_SERVICES_DISABLE += gssd idmapd krb5kdc rpcbind DEFAULT_SERVICES_DISABLE += gssd idmapd krb5kdc rpcbind
DEFAULT_SERVICES_ENABLE += cups sshd DEFAULT_SERVICES_ENABLE += sshd
DEFAULT_SERVICES_ENABLE += cups
DEFAULT_SERVICES_ENABLE += alteratord DEFAULT_SERVICES_ENABLE += alteratord
CONTROL += fusermount:public
# use/vmguest/kvm # use/vmguest/kvm
THE_PACKAGES += qemu-guest-agent THE_PACKAGES += qemu-guest-agent
# use/vmguest/vmware # use/vmguest/vmware
@ -378,11 +375,11 @@ THE_PACKAGES += open-vm-tools
THE_KMODULES += drm THE_KMODULES += drm
THE_PACKAGES += virtualbox-guest-additions THE_PACKAGES += virtualbox-guest-additions
# use/vmguest/vmware/x11 # use/vmguest/vmware/x11
THE_PACKAGES += xorg-drv-vmware xorg-drv-vmmouse THE_PACKAGES += xorg-dri-vmwgfx xorg-drv-vmware xorg-drv-vmmouse
THE_PACKAGES += open-vm-tools-desktop THE_PACKAGES += open-vm-tools-desktop
# use/vmguest/kvm/x11 # use/vmguest/kvm/x11
THE_PACKAGES += spice-vdagent xorg-drv-qxl xorg-drv-spiceqxl THE_PACKAGES += spice-vdagent xorg-drv-qxl xorg-drv-spiceqxl
#THE_PACKAGES += xorg-dri-virtio THE_PACKAGES += xorg-dri-virtio
# use/syslinux/live_rw.cfg # use/syslinux/live_rw.cfg
SYSLINUX_CFG += live_rw SYSLINUX_CFG += live_rw
# use/grub/live_rw.cfg # use/grub/live_rw.cfg
@ -410,6 +407,7 @@ BASE_BOOTLOADER = grub
LIVE_PACKAGES += livecd-install LIVE_PACKAGES += livecd-install
LIVE_PACKAGES += livecd-kometa-hack LIVE_PACKAGES += livecd-kometa-hack
LIVE_PACKAGES += livecd-installer-features LIVE_PACKAGES += livecd-installer-features
PINNED_PACKAGES += livecd-installer-features
# distro/.regular-wm # distro/.regular-wm
LIVE_PACKAGES += livecd-install-apt-cache LIVE_PACKAGES += livecd-install-apt-cache
# use/branding/full # use/branding/full
@ -420,7 +418,6 @@ THE_BRANDING += bootsplash
# use/firmware/cpu # use/firmware/cpu
THE_PACKAGES += firmware-intel-ucode iucode_tool THE_PACKAGES += firmware-intel-ucode iucode_tool
# use/firmware/laptop # use/firmware/laptop
THE_KMODULES += acpi_call
THE_PACKAGES += firmware-alsa-sof THE_PACKAGES += firmware-alsa-sof
# use/init # use/init
FEATURES += init FEATURES += init
@ -441,8 +438,6 @@ DEFAULT_SERVICES_ENABLE += bluetoothd
# use/net/nm # use/net/nm
THE_NET_SUBSYS = NetworkManager THE_NET_SUBSYS = NetworkManager
THE_LISTS += tagged/base+nm THE_LISTS += tagged/base+nm
THE_LISTS += tagged/base+kde5
THE_LISTS += tagged/base+kometa
LIVE_PACKAGES += livecd-save-nfs LIVE_PACKAGES += livecd-save-nfs
DEFAULT_SERVICES_ENABLE += network DEFAULT_SERVICES_ENABLE += network
DEFAULT_SERVICES_ENABLE += NetworkManager ModemManager DEFAULT_SERVICES_ENABLE += NetworkManager ModemManager
@ -451,7 +446,7 @@ export GLOBAL_NM_native = $(NM_native)
# use/x11/kde/synaptic # use/x11/kde/synaptic
THE_PACKAGES += synaptic-kde synaptic-usermode- THE_PACKAGES += synaptic-kde synaptic-usermode-
# use/x11/kde5 # use/x11/kde5
#THE_PACKAGES += kde5-big # THE_PACKAGES += kde5-big
# use/browser/falkon # use/browser/falkon
THE_BROWSER = chromium THE_BROWSER = chromium
# use/x11/dm # use/x11/dm
@ -459,9 +454,8 @@ THE_BROWSER = chromium
THE_PACKAGES += $(THE_DISPLAY_MANAGER) THE_PACKAGES += $(THE_DISPLAY_MANAGER)
PINNED_PACKAGES += $(THE_DISPLAY_MANAGER) PINNED_PACKAGES += $(THE_DISPLAY_MANAGER)
DEFAULT_SERVICES_ENABLE += $(THE_DM_SERVICE) DEFAULT_SERVICES_ENABLE += $(THE_DM_SERVICE)
# use/x11/sddm
THE_DISPLAY_MANAGER = sddm
# use/x11/kde5-display-manager-lightdm # use/x11/kde5-display-manager-lightdm
THE_DISPLAY_MANAGER = sddm
#THE_DISPLAY_MANAGER = kde5-display-manager-lightdm #THE_DISPLAY_MANAGER = kde5-display-manager-lightdm
#THE_DM_SERVICE = lightdm #THE_DM_SERVICE = lightdm
#PINNED_PACKAGES += kde5-display-manager-sddm:Extra #PINNED_PACKAGES += kde5-display-manager-sddm:Extra
@ -513,7 +507,7 @@ BASE_BOOTARGS += splash
# use/build-distro # use/build-distro
FEATURES += build-distro FEATURES += build-distro
# config/name/alt-p10-kde5 # config/name/alt-p10-kde5
IMAGE_NAME = kometa-school-p10 IMAGE_NAME = alt-p10-kde5
# use/pack # use/pack
FEATURES += pack FEATURES += pack
# use/pack/iso # use/pack/iso

2
bld/files/.disk/commit
Unescape View File

@ -1 +1 @@
e8f8a56263ae690a4325e4fbdef5cabb111406e0 e1b6e10bac7b540f29a965935d4ada6b82740763

2
bld/files/.disk/date
Unescape View File

@ -1 +1 @@
20211227 20220209

2
bld/files/.disk/info
Unescape View File

@ -1 +1 @@
KOMETA kometa-school-p10/x86_64 build 2021-12-27 KOMETA p10 kde5/x86_64 build 2022-02-09

BIN
bld/files/.disk/profile.tgz
View File

Binary file not shown.

0
bld/files/.empty
Unescape View File

BIN
bld/files/Metadata/pkg-groups.tar
View File

Binary file not shown.

0
bld/image-scripts.d/.empty
Unescape View File

2
bld/image-scripts.d/01-rootdir
Unescape View File

@ -3,4 +3,4 @@
chmod 755 / chmod 755 /
rm -f /.gitignore rm -f /.empty

0
bld/lib/.empty
Unescape View File

0
bld/live/files/.empty
Unescape View File

2
bld/live/image-scripts.d/01-rootdir
Unescape View File

@ -2,5 +2,3 @@
# fixup chroot's toplevel directory permissions (use to become 1775) # fixup chroot's toplevel directory permissions (use to become 1775)
chmod 755 / chmod 755 /
rm -f /.gitignore

2
bld/live/image-scripts.d/50-net-nm
Unescape View File

@ -4,7 +4,7 @@
defcfg=/etc/net/ifaces/default/options-eth defcfg=/etc/net/ifaces/default/options-eth
[ -f defcfg ] || exit 0 [ -f "$defcfg" ] || exit 0
if [ -x /usr/sbin/NetworkManager -o -x /usr/sbin/connmand ]; then if [ -x /usr/sbin/NetworkManager -o -x /usr/sbin/connmand ]; then
shell_config_set "$defcfg" NM_CONTROLLED yes shell_config_set "$defcfg" NM_CONTROLLED yes

18
bld/live/image-scripts.d/50-serial
Unescape View File

@ -0,0 +1,18 @@
#!/bin/sh
# setup serial console access
BIN=/sbin/agetty
CFG=/etc/inittab
SEC=/etc/securetty
[ -n "$GLOBAL_TTY_DEV" -a -n "$GLOBAL_TTY_RATE" ] || exit 0
[ -s "$CFG" -a -x "$BIN" ] || exit 0
if ! grep -q "$BIN" "$CFG"; then
n=0
for t in $GLOBAL_TTY_DEV; do
grep -q "$t" "$SEC" || echo "$t" >>"$SEC"
echo "T$n:2345:respawn:$BIN -L $t $GLOBAL_TTY_RATE vt100" >>$CFG
n=$(($n+1))
done
fi

34
bld/live/image-scripts.d/60-apt
Unescape View File

@ -3,8 +3,38 @@
[ -n "$GLOBAL_LIVE_REPO" ] || exit 0 [ -n "$GLOBAL_LIVE_REPO" ] || exit 0
# no public repos for e2k for now, unfortunately
[ `arch` != "e2k" ] || exit 0
PROTO="${GLOBAL_LIVE_REPO%/*}" # http, ftp, rsync PROTO="${GLOBAL_LIVE_REPO%/*}" # http, ftp, rsync
case "$PROTO" in
http|ftp|rsync)
;;
*)
echo "Error: protocol $PROTO not supported" >&2
exit 1
;;
esac
MIRROR="${GLOBAL_LIVE_REPO#*/}" # alt, heanet, kiev, yandex, ... MIRROR="${GLOBAL_LIVE_REPO#*/}" # alt, heanet, kiev, yandex, ...
sed -i "s,^#\(rpm \[.*\] ${PROTO:-http}.*\),\1," \ if [ -z "$MIRROR" ]; then
"/etc/apt/sources.list.d/${MIRROR:-yandex}.list" ||: echo "Error: variable MIRROR is not set!!!" >&2
echo "Set REPO variable in the format: PROTO/MIRROR" >&2
echo "Example: http/yandex" >&2
exit 1
fi
repo_source="/etc/apt/sources.list.d/$MIRROR.list"
if [ ! -s "$repo_source" ]; then
echo "Error: $repo_source is not exist" >&2
exit 1
fi
# regexps from alterator-pkg (via installer-feature-online-repo)
prefix_re="[[:space:]]*rpm[[:space:]]\+\([^[:space:]]\+[[:space:]]\+\)\?"
host_re="${PROTO:-http}:\/\/\([^[:space:]]\+\)[[:space:]]\+"
updates_re="${prefix_re}${host_re}\([^[:space:]]\+\/\)\?"
sed -i "s/^#\($updates_re\)/\1/" "$repo_source"

0
bld/live/lib/.empty
Unescape View File

3
bld/live/scripts.d/01-clean-.empty-stage2
Unescape View File

@ -0,0 +1,3 @@
#!/bin/sh
rm -f /.image/.empty

208
bld/pkg/lists/.base
Unescape View File

@ -9,11 +9,9 @@ firmware-linux
shim-signed shim-signed
mokutil mokutil
pesign pesign
acpid
acpi
acpid-events-power
## THE_PACKAGES ## THE_PACKAGES
installer-feature-serial-stage3
alterator-luks alterator-luks
chromium chromium
chrony chrony
@ -54,12 +52,14 @@ udev-rules-rfkill-uaccess
qemu-guest-agent qemu-guest-agent
open-vm-tools open-vm-tools
virtualbox-guest-additions virtualbox-guest-additions
xorg-dri-vmwgfx
xorg-drv-vmware xorg-drv-vmware
xorg-drv-vmmouse xorg-drv-vmmouse
open-vm-tools-desktop open-vm-tools-desktop
spice-vdagent spice-vdagent
xorg-drv-qxl xorg-drv-qxl
xorg-drv-spiceqxl xorg-drv-spiceqxl
xorg-dri-virtio
firmware-intel-ucode firmware-intel-ucode
iucode_tool iucode_tool
firmware-alsa-sof firmware-alsa-sof
@ -70,7 +70,7 @@ systemd-settings-enable-showstatus
bluez bluez
synaptic-kde synaptic-kde
synaptic-usermode- synaptic-usermode-
kde5-display-manager-lightdm sddm
dhcpcd dhcpcd
make-initrd-plymouth make-initrd-plymouth
@ -91,9 +91,43 @@ efibootmgr
## THE_LISTS ## THE_LISTS
# tagged/security+luks tagged/desktop+regular tagged/base+regular tagged/base+xorg tools/wireless sound/base sound/pulseaudio tagged/base+regular+extra tagged/desktop+regular tagged/base+regular tagged/desktop+xorg tagged/base+l10n systemd tagged/base+nm tagged/base+kde5 tagged/base+kometa domain-client # tagged/security+luks tagged/base+regular tagged/desktop+regular tagged/base+xorg tools/wireless sound/base sound/pulseaudio tagged/base+regular tagged/desktop+regular tagged/base+regular+extra tagged/base+kde5 tagged/base+kometa tagged/desktop+xorg tagged/base+l10n systemd tagged/base+nm domain-client
make-initrd-luks make-initrd-luks
cryptsetup cryptsetup
glibc-locales
xfsprogs
jfsprogs
ntfs-3g
dosfstools
fatresize
make-initrd-ucode
shadow-change
openssh
openssh-blacklist
net-tools
nfs-utils
smartmontools
system-report
ps_mem
strace
powertop
pciutils
usbutils
acpi
dmidecode
apt-repo
apt-rsync
apt-scripts
#aptitude # See ALT bug 41622
update-kernel
eepm
bash-completion
cpufreq-simple
eject
bc
ncdu
tree
zsh
synaptic synaptic
synaptic-usermode synaptic-usermode
userpasswd userpasswd
@ -150,6 +184,29 @@ htop
# firmware update utils # firmware update utils
#fwupd #fwupd
blacklist-pcspkr blacklist-pcspkr
xorg-server
xorg-drv-evdev
xorg-drv-synaptics
xorg-drv-libinput
xorg-drv-vesa
xorg-drv-fbdev
xauth
xorg-utils
x-cursor-theme-jimmac
menu-icons-default
wireless-tools
ath_info
rfkill
crda
iw
amixer
alsa-utils
aplay
test-audio
alsa-set-initial-options
pulseaudio-daemon
pulseaudio-utils
alsa-plugins-pulse
glibc-locales glibc-locales
xfsprogs xfsprogs
jfsprogs jfsprogs
@ -171,11 +228,10 @@ pciutils
usbutils usbutils
acpi acpi
dmidecode dmidecode
apt-repo apt-repo
apt-rsync apt-rsync
apt-scripts apt-scripts
aptitude #aptitude # See ALT bug 41622
update-kernel update-kernel
eepm eepm
bash-completion bash-completion
@ -185,33 +241,6 @@ bc
ncdu ncdu
tree tree
zsh zsh
xorg-server
xorg-drv-evdev
xorg-drv-synaptics
xorg-drv-libinput
xorg-drv-vesa
xorg-drv-fbdev
xauth
xorg-utils
x-cursor-theme-jimmac
menu-icons-default
wireless-tools
ath_info
rfkill
crda
iw
amixer
alsa-utils
aplay
test-audio
alsa-set-initial-options
pulseaudio-daemon
pulseaudio-utils
alsa-plugins-pulse
lvm2
make-initrd-lvm
mdadm
make-initrd-mdadm
synaptic synaptic
synaptic-usermode synaptic-usermode
userpasswd userpasswd
@ -268,66 +297,10 @@ htop
# firmware update utils # firmware update utils
#fwupd #fwupd
blacklist-pcspkr blacklist-pcspkr
glibc-locales lvm2
xfsprogs make-initrd-lvm
jfsprogs mdadm
ntfs-3g make-initrd-mdadm
dosfstools
fatresize
make-initrd-ucode
shadow-change
openssh
openssh-blacklist
net-tools
nfs-utils
smartmontools
system-report
ps_mem
strace
powertop
pciutils
usbutils
acpi
dmidecode
apt-repo
apt-rsync
apt-scripts
aptitude
update-kernel
eepm
bash-completion
cpufreq-simple
eject
bc
ncdu
tree
zsh
xorg-drv-ati
xorg-drv-cirrus
#xorg-drv-mga
xorg-drv-modesetting
#xorg-drv-nv
xorg-drv-qxl
#xorg-drv-s3
#xorg-drv-s3virge
#xorg-drv-savage
#xorg-drv-sis
glibc-locales
glibc-gconv-modules
systemd
systemd-units
systemd-services
systemd-sysvinit
systemd-analyze
chkconfig
NetworkManager
NetworkManager-vpnc
NetworkManager-openvpn
NetworkManager-pptp
NetworkManager-l2tp
NetworkManager-openconnect
usb-modeswitch
systemd-sysvinit systemd-sysvinit
###systemd-presets-kdesktop ###systemd-presets-kdesktop
@ -420,6 +393,7 @@ kernel-modules-virtualbox-std-def
icon-theme-oxygen icon-theme-oxygen
vconsole-setup-kludge vconsole-setup-kludge
pam-limits-desktop pam-limits-desktop
installer-feature-desktop-other-fs-stage2
installer-feature-kometa-kde5 installer-feature-kometa-kde5
installer-feature-kometa-school-kde5 installer-feature-kometa-school-kde5
kometa-os-release kometa-os-release
@ -429,6 +403,25 @@ kometa-xdg-plasma5-classic
kometa-xdg-pam-env kometa-xdg-pam-env
kometa-icons-core-classic kometa-icons-core-classic
kometa-icons-theme-classic kometa-icons-theme-classic
polkit-rule-gparted-as-root
eepm-add-r7-office
####R7
#fonts-ttf-dejavu
#fonts-ttf-google-crosextra-carlito
#fonts-ttf-liberation
#glibc gst-libav
#gst-plugins-ugly1.0
#libX11
#libXScrnSaver
#libcairo
#libgcc1
#libgtk+2
#libgtkglext
#r7-office
####МойОфис
myoffice-standard-documents
####Fonts ####Fonts
fonts-ttf-ms fonts-ttf-ms
@ -516,8 +509,28 @@ hplip-ps-PPDs
hplip-recommends hplip-recommends
#Для ноутбуков HP у которых не работает микрофон #Для ноутбуков HP у которых не работает микрофон
#firmware-alsa-sof firmware-alsa-sof
appinstall appinstall
xorg-drv-cirrus
xorg-drv-mga
xorg-drv-qxl
xorg-drv-spiceqxl
glibc-locales
glibc-gconv-modules
systemd
systemd-units
systemd-services
systemd-sysvinit
systemd-analyze
chkconfig
NetworkManager
NetworkManager-vpnc
NetworkManager-openvpn
NetworkManager-pptp
NetworkManager-l2tp
NetworkManager-openconnect
usb-modeswitch
pam-config pam-config
pam_mount pam_mount
pam_ccreds pam_ccreds
@ -540,13 +553,10 @@ alterator-net-shares
# grub # grub
grub-pc grub-pc
grub-efi grub-efi
# should be R: in grub-ieee1275 # should be R: in grub-ieee1275
## DOT_BASE ## DOT_BASE
^kernel-(image|modules-(acpi_call|bcmwl|drm|drm-ancient|drm-nouveau|drm-radeon|e1000e|r8125|rtl8188fu|rtl8192eu|rtl8723bu|rtl8723de|rtl8812au|rtl8821ce|rtl8821cu|rtl88x2bu|rtw89|scsi|staging|vmware))-(std-def)$ ^kernel-(image|modules-(bcmwl|drm|drm-ancient|drm-nouveau|drm-radeon|e1000e|r8125|rtl8188fu|rtl8192eu|rtl8723bu|rtl8723de|rtl8812au|rtl8821ce|rtl8821cu|rtl88x2bu|rtw89|scsi|staging|vmware))-(std-def)$
^branding-kometa-school-(notes|bootloader|alterator|graphics|indexhtml|notes|alterator|graphics|indexhtml|slideshow|bootloader|bootsplash|bootsplash)$ ^branding-kometa-school-(notes|bootloader|alterator|graphics|indexhtml|notes|alterator|graphics|indexhtml|slideshow|bootloader|bootsplash|bootsplash)$
make-initrd-plymouth make-initrd-plymouth
cpio cpio

3
bld/pkg/lists/grub
Unescape View File

@ -1,6 +1,3 @@
grub-pc grub-pc
grub-efi grub-efi
# should be R: in grub-ieee1275 # should be R: in grub-ieee1275

29
bld/pkg/lists/tagged/base+kometa
Unescape View File

@ -1,6 +1,6 @@
installer-feature-desktop-other-fs-stage2
installer-feature-kometa-kde5 installer-feature-kometa-kde5
installer-feature-kometa-school-kde5 installer-feature-kometa-school-kde5
installer-feature-desktop-other-fs-stage2
kometa-os-release kometa-os-release
kometa-std-desktop kometa-std-desktop
kometa-xdg-core kometa-xdg-core
@ -12,20 +12,20 @@ polkit-rule-gparted-as-root
eepm-add-r7-office eepm-add-r7-office
####R7 ####R7
fonts-ttf-dejavu #fonts-ttf-dejavu
fonts-ttf-google-crosextra-carlito #fonts-ttf-google-crosextra-carlito
fonts-ttf-liberation #fonts-ttf-liberation
glibc gst-libav #glibc gst-libav
gst-plugins-ugly1.0 #gst-plugins-ugly1.0
libX11 #libX11
libXScrnSaver #libXScrnSaver
libcairo #libcairo
libgcc1 #libgcc1
libgtk+2 #libgtk+2
libgtkglext #libgtkglext
r7-office #r7-office
####Myoffice ####МойОфис
myoffice-standard-documents myoffice-standard-documents
####Fonts ####Fonts
@ -115,4 +115,5 @@ hplip-recommends
#Для ноутбуков HP у которых не работает микрофон #Для ноутбуков HP у которых не работает микрофон
firmware-alsa-sof firmware-alsa-sof
appinstall appinstall

3
bld/pkg/lists/tagged/base+regular
Unescape View File

@ -19,11 +19,10 @@ pciutils
usbutils usbutils
acpi acpi
dmidecode dmidecode
apt-repo apt-repo
apt-rsync apt-rsync
apt-scripts apt-scripts
aptitude #aptitude # See ALT bug 41622
update-kernel update-kernel
eepm eepm
bash-completion bash-completion

10
bld/pkg/lists/tagged/desktop+xorg
Unescape View File

@ -1,10 +1,4 @@
xorg-drv-ati
xorg-drv-cirrus xorg-drv-cirrus
#xorg-drv-mga xorg-drv-mga
xorg-drv-modesetting
#xorg-drv-nv
xorg-drv-qxl xorg-drv-qxl
#xorg-drv-s3 xorg-drv-spiceqxl
#xorg-drv-s3virge
#xorg-drv-savage
#xorg-drv-sis

2
bld/rootfs/image-scripts.d/50-net-nm
Unescape View File

@ -4,7 +4,7 @@
defcfg=/etc/net/ifaces/default/options-eth defcfg=/etc/net/ifaces/default/options-eth
[ -f defcfg ] || exit 0 [ -f "$defcfg" ] || exit 0
if [ -x /usr/sbin/NetworkManager -o -x /usr/sbin/connmand ]; then if [ -x /usr/sbin/NetworkManager -o -x /usr/sbin/connmand ]; then
shell_config_set "$defcfg" NM_CONTROLLED yes shell_config_set "$defcfg" NM_CONTROLLED yes

18
bld/rootfs/image-scripts.d/50-serial
Unescape View File

@ -0,0 +1,18 @@
#!/bin/sh
# setup serial console access
BIN=/sbin/agetty
CFG=/etc/inittab
SEC=/etc/securetty
[ -n "$GLOBAL_TTY_DEV" -a -n "$GLOBAL_TTY_RATE" ] || exit 0
[ -s "$CFG" -a -x "$BIN" ] || exit 0
if ! grep -q "$BIN" "$CFG"; then
n=0
for t in $GLOBAL_TTY_DEV; do
grep -q "$t" "$SEC" || echo "$t" >>"$SEC"
echo "T$n:2345:respawn:$BIN -L $t $GLOBAL_TTY_RATE vt100" >>$CFG
n=$(($n+1))
done
fi

0
bld/scripts.d/.empty
Unescape View File

2
bld/scripts.d/00-cleanup
Unescape View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
# TODO: invent some way to remove this inter-subprofile thing # TODO: invent some way to remove this inter-subprofile thing
rm -vf $WORKDIR/{squashcfg.mk,initfs,.gitignore} rm -vf $WORKDIR/{squashcfg.mk,initfs,.gitignore,.empty}

0
bld/stage1/files/.empty
Unescape View File

8
bld/stage1/files/boot/grub/.in/00defaults.cfg
Unescape View File

@ -1,3 +1,11 @@
export GRUB_TERMINAL
export GRUB_SERIAL_COMMAND
if [ -n "$GRUB_TERMINAL" ]; then
$GRUB_SERIAL_COMMAND
terminal_output "$GRUB_TERMINAL"
terminal_input "$GRUB_TERMINAL"
fi
insmod echo insmod echo
insmod gzio insmod gzio
insmod minicmd insmod minicmd

6
bld/stage1/files/boot/grub/.in/01gfxterm.cfg
Unescape View File

@ -12,8 +12,9 @@ function load_video {
fi fi
} }
font=${prefix}/fonts/unicode.pf2 if [ -z "$GRUB_TERMINAL" ]; then
if loadfont "$font" ; then font=${prefix}/fonts/unicode.pf2
if loadfont "$font"; then
set gfxmode=auto set gfxmode=auto
load_video load_video
insmod gfxterm insmod gfxterm
@ -34,4 +35,5 @@ if loadfont "$font" ; then
set menu_color_highlight=black/white set menu_color_highlight=black/white
set color_normal=white/black set color_normal=white/black
set color_highlight=black/white set color_highlight=black/white
fi
fi fi

2
bld/stage1/files/boot/grub/.in/30live.cfg
Unescape View File

@ -1,7 +1,7 @@
menuentry $"LiveCD (no hard disk needed)" --id 'live' { menuentry $"LiveCD (no hard disk needed)" --id 'live' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot live changedisk automatic=method:cdrom,fuid:2021-12-09-16-40-50-00 stagename=live ramdisk_size=@live_size@ showopts lowmem vga=normal usbcore.autosuspend=-1 quiet splash $EFI_BOOTARGS lang=$lang linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot live changedisk automatic=method:cdrom,fuid:2022-02-08-19-50-45-00 stagename=live ramdisk_size=@live_size@ showopts lowmem vga=normal usbcore.autosuspend=-1 quiet splash $EFI_BOOTARGS lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/full$KFLAVOUR.cz initrd$linux_suffix /boot/full$KFLAVOUR.cz
} }

2
bld/stage1/files/boot/grub/.in/32live_rw.cfg
Unescape View File

@ -1,7 +1,7 @@
menuentry $"LiveCD with sessions support" --id 'session' { menuentry $"LiveCD with sessions support" --id 'session' {
savedefault savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..." echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot live changedisk automatic=method:cdrom,fuid:2021-12-09-16-40-50-00 stagename=live ramdisk_size=@live_size@ showopts live_rw vga=normal usbcore.autosuspend=-1 quiet splash $EFI_BOOTARGS lang=$lang linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot live changedisk automatic=method:cdrom,fuid:2022-02-08-19-50-45-00 stagename=live ramdisk_size=@live_size@ showopts live_rw vga=normal usbcore.autosuspend=-1 quiet splash $EFI_BOOTARGS lang=$lang
echo $"Loading initial ramdisk ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/full$KFLAVOUR.cz initrd$linux_suffix /boot/full$KFLAVOUR.cz
} }

8
bld/stage1/files/index.html
Unescape View File

@ -1,10 +1,10 @@
<html> <html>
<head> <head>
<meta http-equiv="refresh" content="3;url=http://altlinux.org/"> <meta http-equiv="refresh" content="3;url=http://oskometa.ru/">
<title>Welcome to ALT!</title> <title>Welcome to KOMETA!</title>
</head> </head>
<body> <body>
<h1>Welcome to ALT!</h1> <h1>Welcome to KOMETA!</h1>
<p>You will be redirected to <a href="http://altlinux.org/">the home page</a> shortly.</p> <p>You will be redirected to <a href="http://oskometa.ru/">the home page</a> shortly.</p>
</body> </body>
</html> </html>

2
bld/stage1/files/syslinux/.in/30live.cfg
Unescape View File

@ -1,4 +1,4 @@
label live label live
kernel /boot/vmlinuz kernel /boot/vmlinuz
append initrd=/boot/full.cz fastboot live changedisk automatic=method:cdrom,fuid:2021-12-09-16-40-50-00 stagename=live ramdisk_size=@live_size@ showopts lowmem vga=normal usbcore.autosuspend=-1 quiet splash append initrd=/boot/full.cz fastboot live changedisk automatic=method:cdrom,fuid:2022-02-08-19-50-45-00 stagename=live ramdisk_size=@live_size@ showopts lowmem vga=normal usbcore.autosuspend=-1 quiet splash

2
bld/stage1/files/syslinux/.in/32live_rw.cfg
Unescape View File

@ -1,4 +1,4 @@
label session label session
kernel /boot/vmlinuz kernel /boot/vmlinuz
append initrd=/boot/full.cz fastboot live changedisk automatic=method:cdrom,fuid:2021-12-09-16-40-50-00 stagename=live ramdisk_size=@live_size@ showopts live_rw vga=normal usbcore.autosuspend=-1 quiet splash append initrd=/boot/full.cz fastboot live changedisk automatic=method:cdrom,fuid:2022-02-08-19-50-45-00 stagename=live ramdisk_size=@live_size@ showopts live_rw vga=normal usbcore.autosuspend=-1 quiet splash

0
bld/stage1/modules.d/.empty
Unescape View File

4
bld/stage1/modules.d/50-stage2-usb
Unescape View File

@ -14,3 +14,7 @@ xhci-hcd.ko
xhci-pci.ko xhci-pci.ko
xhci-pci-renesas.ko xhci-pci-renesas.ko
xhci-plat-hcd.ko xhci-plat-hcd.ko
dwc3-pci.ko
dwc3-baikal.ko
udc-core.ko
xhci-hcdi.ko

10
bld/stage1/modules.d/50-vmguest
Unescape View File

@ -1,6 +1,12 @@
# vmguest # vmguest
kernel/drivers/virtio kernel/drivers/virtio
vmxnet3.ko vmxnet3.ko
hv_netvsc.ko
virtio_net.ko virtio_net.ko
#
# hyper-v
hv_balloon.ko
hv_netvsc.ko
hv_sock.ko
hv_storvsc.ko
hv_vmbus.ko
uio_hv_generic.ko

3
bld/stage1/scripts.d/01-clean-.empty-stage1
Unescape View File

@ -0,0 +1,3 @@
#!/bin/sh
rm -f /.image/.empty

4
bld/stage1/scripts.d/01-grub
Unescape View File

@ -62,7 +62,9 @@ fi
# copy grub theme # copy grub theme
mkdir -p themes mkdir -p themes
GRUBTHEME="$(grep -m1 '/theme.txt;' "$CFG" |rev | cut -f2 -d '/' |rev)" GRUBTHEME="$(grep -m1 '/theme.txt;' "$CFG" |tail -n 1)"
GRUBTHEME="${GRUBTHEME%/*}"
GRUBTHEME="${GRUBTHEME##*/}"
if [ -n "$GRUBTHEME" ]; then if [ -n "$GRUBTHEME" ]; then
if [ -d "/boot/grub/themes/$GRUBTHEME" ]; then if [ -d "/boot/grub/themes/$GRUBTHEME" ]; then
cp -r /boot/grub/themes/$GRUBTHEME themes/ cp -r /boot/grub/themes/$GRUBTHEME themes/

11
bld/stage1/scripts.d/01-syslinux
Unescape View File

@ -2,6 +2,12 @@
# gather syslinux configuration from snippets; # gather syslinux configuration from snippets;
# copy modules; see also this feature's generate.mk # copy modules; see also this feature's generate.mk
# snippets are not going into the actual image
final_exit () {
if [ "$DEBUG" != 2 ]; then rm -r .in/; fi
exit 0
}
MODDIR="/usr/lib/syslinux" MODDIR="/usr/lib/syslinux"
case "$GLOBAL_BOOTLOADER" in case "$GLOBAL_BOOTLOADER" in
@ -38,7 +44,7 @@ fi
# validate just in case (see also stage1 Makefile) # validate just in case (see also stage1 Makefile)
case "$GLOBAL_BOOTLOADER" in case "$GLOBAL_BOOTLOADER" in
isolinux|syslinux) ;; isolinux|syslinux) ;;
*) exit 0;; *) final_exit;;
esac esac
# copy extra files, if any # copy extra files, if any
@ -56,8 +62,7 @@ if [ -n "$SYSLINUX_MODULES" ]; then
done done
fi fi
# snippets are not going into the actual image final_exit
if [ "$DEBUG" != 2 ]; then rm -r .in/; fi
# NB: there will be final macro expansion based on actual image sizes # NB: there will be final macro expansion based on actual image sizes
# done by features.in/syslinux/scripts.d/20-propagator-ramdisk # done by features.in/syslinux/scripts.d/20-propagator-ramdisk

2
conf.d/alt-server.mk
Unescape View File

@ -60,7 +60,7 @@ distro/alt-server:: use/memtest; @:
endif endif
ifeq (,$(filter-out x86_64 aarch64,$(ARCH))) ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
distro/alt-server:: use/efi/refind +efi; @: distro/alt-server:: +efi; @:
endif endif
ifeq (,$(filter-out ppc64le aarch64 e2k%,$(ARCH))) ifeq (,$(filter-out ppc64le aarch64 e2k%,$(ARCH)))

3
conf.d/basealt.mk
Unescape View File

@ -63,7 +63,7 @@ else
@$(call add,THE_LISTS,workstation/libreoffice) @$(call add,THE_LISTS,workstation/libreoffice)
endif endif
vm/alt-workstation:: vm/.alt-workstation vm/alt-workstation:: vm/.alt-workstation +vmguest
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,THE_LISTS,workstation/vlc) @$(call add,THE_LISTS,workstation/vlc)
endif endif
@ -81,6 +81,7 @@ endif
ifeq (,$(filter-out aarch64 armh,$(ARCH))) ifeq (,$(filter-out aarch64 armh,$(ARCH)))
vm/alt-workstation-rpi: vm/.alt-workstation use/arm-rpi4/full vm/alt-workstation-rpi: vm/.alt-workstation use/arm-rpi4/full
@$(call add,THE_LISTS,workstation/celluloid) @$(call add,THE_LISTS,workstation/celluloid)
@$(call set,THE_BROWSER,chromium)
endif endif
ifeq (,$(filter-out aarch64,$(ARCH))) ifeq (,$(filter-out aarch64,$(ARCH)))

4
conf.d/desktop.mk
Unescape View File

@ -8,7 +8,7 @@ distro/.desktop-mini: distro/.desktop-base use/x11/xdm; @:
distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @: distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:
distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @: #distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
distro/ltsp-icewm: distro/icewm +ltsp; @: #distro/ltsp-icewm: distro/icewm +ltsp; @:
endif endif

49
conf.d/education.mk
Unescape View File

@ -17,13 +17,20 @@ mixin/education: \
@$(call add,THE_BRANDING,menu xfce-settings system-settings) @$(call add,THE_BRANDING,menu xfce-settings system-settings)
@$(call add,THE_LISTS,slinux/xfce-base) @$(call add,THE_LISTS,slinux/xfce-base)
@$(call add,THE_LISTS,education/misc) @$(call add,THE_LISTS,education/misc)
ifeq (,$(filter-out e2k%,$(ARCH)))
@$(call add,THE_PACKAGES,jre)
else
@$(call add,THE_PACKAGES,java-11-openjdk) @$(call add,THE_PACKAGES,java-11-openjdk)
endif
@$(call add,THE_PACKAGES,mousepad)
@$(call add,THE_PACKAGES,thunderbird) @$(call add,THE_PACKAGES,thunderbird)
@$(call add,THE_PACKAGES,installer-feature-lightdm-stage3)
@$(call add,THE_PACKAGES,installer-feature-quota-stage2)
@$(call add,THE_LISTS,$(call tags,base l10n)) @$(call add,THE_LISTS,$(call tags,base l10n))
@$(call add,BASE_LISTS,workstation/3rdparty) @$(call add,BASE_LISTS,workstation/3rdparty)
@$(call add,THE_PACKAGES,settings-alsa-sof-force)
@$(call add,THE_LISTS,$(call tags,base regular)) @$(call add,THE_LISTS,$(call tags,base regular))
@$(call add,THE_LISTS,$(call tags,base extra)) @$(call add,THE_LISTS,$(call tags,base extra))
@$(call add,SERVICES_DISABLE,host2cat)
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
@ -38,7 +45,12 @@ ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
endif endif
@$(call add,LIVE_PACKAGES,mc-full) @$(call add,LIVE_PACKAGES,mc-full)
@$(call add,LIVE_PACKAGES,remmina remmina-plugins) @$(call add,LIVE_PACKAGES,remmina remmina-plugins)
@$(call add,LIVE_PACKAGES,mousepad)
ifeq (,$(filter-out e2k%,$(ARCH)))
@$(call add,LIVE_PACKAGES,jre)
else
@$(call add,LIVE_PACKAGES,java-11-openjdk) @$(call add,LIVE_PACKAGES,java-11-openjdk)
endif
@$(call add,LIVE_PACKAGES,xorg-conf-libinput-touchpad) @$(call add,LIVE_PACKAGES,xorg-conf-libinput-touchpad)
@$(call add,LIVE_LISTS,$(call tags,base rescue)) @$(call add,LIVE_LISTS,$(call tags,base rescue))
@$(call add,LIVE_LISTS,$(call tags,base extra)) @$(call add,LIVE_LISTS,$(call tags,base extra))
@ -59,7 +71,7 @@ mixin/education-installer: \
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/fat use/install2/fat
@$(call set,INSTALLER,education) @$(call set,INSTALLER,education)
@$(call set,META_VOL_ID,ALT Education 10.0beta $(ARCH)) @$(call set,META_VOL_ID,ALT Education 10.0 $(ARCH))
@$(call set,META_PUBLISHER,BaseALT Ltd) @$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_APP_ID,$(DISTRO_VERSION) $(ARCH)) @$(call set,META_APP_ID,$(DISTRO_VERSION) $(ARCH))
@$(call set,META_VOL_SET,ALT) @$(call set,META_VOL_SET,ALT)
@ -82,6 +94,7 @@ mixin/education-installer: \
@$(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,MAIN_PACKAGES,xorg-conf-libinput-touchpad) @$(call add,MAIN_PACKAGES,xorg-conf-libinput-touchpad)
@$(call add,MAIN_PACKAGES,settings-alsa-sof-force)
@$(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,STAGE1_MODLISTS,stage2-mmc)
@ -109,11 +122,11 @@ else
@$(call add,MAIN_GROUPS,education/09_video-conferencing) @$(call add,MAIN_GROUPS,education/09_video-conferencing)
endif # e2k% endif # e2k%
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH))) ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,std-def)
@$(call add,MAIN_PACKAGES,kernel-headers-un-def) @$(call add,MAIN_PACKAGES,kernel-headers-std-def)
@$(call add,MAIN_PACKAGES,kernel-headers-modules-un-def) @$(call add,MAIN_PACKAGES,kernel-headers-modules-std-def)
@$(call add,MAIN_PACKAGES,kernel-headers-un-def) @$(call add,MAIN_PACKAGES,kernel-headers-std-def)
@$(call add,MAIN_PACKAGES,kernel-headers-modules-un-def) @$(call add,MAIN_PACKAGES,kernel-headers-modules-std-def)
@$(call add,THE_KMODULES,virtualbox) @$(call add,THE_KMODULES,virtualbox)
@$(call add,THE_KMODULES,lsadrv bbswitch) @$(call add,THE_KMODULES,lsadrv bbswitch)
@$(call add,THE_KMODULES,staging) @$(call add,THE_KMODULES,staging)
@ -127,6 +140,7 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,MAIN_PACKAGES,owamp-server) @$(call add,MAIN_PACKAGES,owamp-server)
endif endif
@$(call add,CONTROL,sudo:public) @$(call add,CONTROL,sudo:public)
@$(call add,CONTROL,fusermount:wheelonly)
endif # distro endif # distro
@ -135,33 +149,20 @@ ifeq (vm,$(IMAGE_CLASS))
vm/.alt-education: vm/systemd use/repo use/oem/distro mixin/education vm/.alt-education: vm/systemd use/repo use/oem/distro mixin/education
@$(call add,DEFAULT_SERVICES_DISABLE,multipathd) @$(call add,DEFAULT_SERVICES_DISABLE,multipathd)
vm/alt-education:: vm/.alt-education vm/alt-education:: vm/.alt-education +vmguest; @:
ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH))) ifeq (,$(filter-out aarch64 riscv64,$(ARCH)))
vm/alt-education:: use/uboot vm/alt-education:: use/uboot
@$(call add,BASE_LISTS,uboot) @$(call add,BASE_LISTS,uboot)
endif endif
ifeq (,$(filter-out aarch64 armh,$(ARCH))) ifeq (,$(filter-out aarch64,$(ARCH)))
vm/alt-education:: use/no-sleep use/arm-rpi4; @: vm/alt-education:: use/no-sleep use/arm-rpi4; @:
endif endif
ifeq (,$(filter-out aarch64 armh,$(ARCH))) ifeq (,$(filter-out aarch64,$(ARCH)))
vm/alt-education-rpi: vm/.alt-education use/arm-rpi4/full vm/alt-education-rpi: vm/.alt-education use/arm-rpi4/full
@$(call add,THE_PACKAGES,task-edu-lite) @$(call add,THE_PACKAGES,task-edu-lite)
endif endif
ifeq (,$(filter-out aarch64,$(ARCH)))
vm/alt-education-tegra: vm/.alt-education use/aarch64-tegra; @:
endif
ifeq (,$(filter-out armh,$(ARCH)))
vm/alt-education-mcom02: vm/.alt-education use/armh-mcom02/x11; @:
endif
ifeq (,$(filter-out mipsel,$(ARCH)))
vm/alt-education-tavolga: vm/.alt-education use/mipsel-mitx/x11; @:
vm/alt-education-bfk3: vm/.alt-education use/mipsel-bfk3/x11; @:
endif
endif endif

13
conf.d/live.mk
Unescape View File

@ -58,7 +58,7 @@ distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
distro/live-builder-mini: distro/.live-base use/dev/builder/base \ distro/live-builder-mini: distro/.live-base use/dev/builder/base \
use/syslinux/timeout/30 use/isohybrid \ use/syslinux/timeout/30 use/isohybrid \
use/stage2/net-eth use/net-eth/dhcp; @: use/stage2/net-eth use/net-eth/dhcp +sysvinit; @:
distro/live-builder: distro/live-builder-mini \ distro/live-builder: distro/live-builder-mini \
use/dev/builder/full use/live/rw +efi; @: use/dev/builder/full use/live/rw +efi; @:
@ -66,8 +66,10 @@ distro/live-builder: distro/live-builder-mini \
distro/live-install: distro/.live-base use/live/textinstall; @: distro/live-install: distro/.live-base use/live/textinstall; @:
distro/.livecd-install: distro/.live-base use/live/install; @: distro/.livecd-install: distro/.live-base use/live/install; @:
distro/live-icewm: distro/.live-desktop use/x11/lightdm/gtk +icewm; @: distro/live-icewm: distro/.live-desktop use/x11/gdm2.20 use/ntp +icewm \
distro/live-fvwm: distro/.live-desktop-ru use/x11/lightdm/gtk use/x11/fvwm; @: +sysvinit; @:
distro/live-fvwm: distro/.live-desktop-ru use/x11/gdm2.20 use/ntp use/x11/fvwm \
+sysvinit; @:
distro/live-rescue: distro/live-icewm +efi distro/live-rescue: distro/live-icewm +efi
@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11))) @$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
@ -129,11 +131,10 @@ distro/live-0ad: distro/.live-games
distro/live-gimp: distro/live-icewm use/live/ru distro/live-gimp: distro/live-icewm use/live/ru
@$(call add,LIVE_LISTS,$(call tags,desktop sane)) @$(call add,LIVE_LISTS,$(call tags,desktop sane))
@$(call add,LIVE_PACKAGES,gimp tintii immix fim) @$(call add,LIVE_PACKAGES,gimp immix)
@$(call add,LIVE_PACKAGES,darktable geeqie rawstudio ufraw) @$(call add,LIVE_PACKAGES,darktable geeqie rawstudio ufraw)
@$(call add,LIVE_PACKAGES,macrofusion python-module-pygtk-libglade) @$(call add,LIVE_PACKAGES,macrofusion)
@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync usbutils) @$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync usbutils)
@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)
# NB: use/browser won't do as it provides a *single* browser ATM # NB: use/browser won't do as it provides a *single* browser ATM
distro/live-privacy: distro/.base +efi +systemd +vmguest \ distro/live-privacy: distro/.base +efi +systemd +vmguest \

7
conf.d/mixin-alt-server.mk
Unescape View File

@ -17,7 +17,8 @@ mixin/alt-server: +installer +systemd \
@$(call add,THE_BRANDING,alterator) @$(call add,THE_BRANDING,alterator)
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH))) ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
@$(call add,THE_BRANDING,bootloader bootsplash) @$(call add,THE_BRANDING,bootloader bootsplash)
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,std-def)
@$(call add,MAIN_GROUPS,centaurus/pve-backup-server)
endif endif
@$(call add,BASE_LISTS,centaurus/base) @$(call add,BASE_LISTS,centaurus/base)
@$(call add,BASE_LISTS,centaurus/base-server) @$(call add,BASE_LISTS,centaurus/base-server)
@ -50,7 +51,7 @@ endif
@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics) @$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
@$(call add,COMMON_PACKAGES,vim-console) @$(call add,COMMON_PACKAGES,vim-console)
@$(call add,DEFAULT_SERVICES_ENABLE,rpcbind sshd bind) @$(call add,DEFAULT_SERVICES_ENABLE,rpcbind sshd bind)
@$(call set,META_VOL_ID,ALT Server 9.1 $(ARCH)) @$(call set,META_VOL_ID,ALT Server 10.0 $(ARCH))
@$(call set,META_PUBLISHER,BaseALT Ltd) @$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_VOL_SET,ALT) @$(call set,META_VOL_SET,ALT)
@$(call set,META_APP_ID,ALT Server 9.1.0 $(ARCH) $(shell date +%F)) @$(call set,META_APP_ID,ALT Server 10.0 $(ARCH) $(shell date +%F))

4
conf.d/mixin-basealt.mk
Unescape View File

@ -31,7 +31,7 @@ mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm +power \
@$(call add,LIVE_LISTS,workstation/live.pkgs) @$(call add,LIVE_LISTS,workstation/live.pkgs)
@$(call add,LIVE_LISTS,$(call tags,desktop sane)) @$(call add,LIVE_LISTS,$(call tags,desktop sane))
ifneq (,$(filter-out armh,$(ARCH))) ifneq (,$(filter-out armh,$(ARCH)))
@$(call add,LIVE_LISTS,$(call tags,desktop office)) @$(call add,LIVE_LISTS,workstation/libreoffice)
endif endif
@$(call add,THE_LISTS,workstation/mate) @$(call add,THE_LISTS,workstation/mate)
@$(call add,THE_LISTS,workstation/the.pkgs) @$(call add,THE_LISTS,workstation/the.pkgs)
@ -48,6 +48,8 @@ endif
@$(call add,SERVICES_ENABLE,crond) @$(call add,SERVICES_ENABLE,crond)
@$(call add,SERVICES_ENABLE,fstrim.timer) @$(call add,SERVICES_ENABLE,fstrim.timer)
@$(call add,SERVICES_DISABLE,powertop bridge gpm) @$(call add,SERVICES_DISABLE,powertop bridge gpm)
@$(call add,SYSTEMD_SERVICES_DISABLE,systemd-userdbd.service)
@$(call add,SYSTEMD_SERVICES_DISABLE,systemd-userdbd.socket)
@$(call set,META_PUBLISHER,BaseALT Ltd) @$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_VOL_SET,ALT) @$(call set,META_VOL_SET,ALT)
@$(call set,META_VOL_ID,ALT Workstation $(DISTRO_VERSION) $(ARCH)) @$(call set,META_VOL_ID,ALT Workstation $(DISTRO_VERSION) $(ARCH))

8
conf.d/mixin.mk
Unescape View File

@ -51,7 +51,7 @@ ifneq (,$(BRANCH))
endif endif
# common WM live/installer bits # common WM live/installer bits
mixin/regular-desktop: +alsa +power +nm-native \ mixin/regular-desktop: +alsa +nm-native \
use/x11/xorg use/xdg-user-dirs use/l10n \ use/x11/xorg use/xdg-user-dirs use/l10n \
use/fonts/otf/adobe use/fonts/otf/mozilla use/branding/notes use/fonts/otf/adobe use/fonts/otf/mozilla use/branding/notes
@$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit dvd+rw-tools) @$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit dvd+rw-tools)
@ -65,6 +65,7 @@ endif
@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind) @$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
@$(call add,DEFAULT_SERVICES_ENABLE,cups) @$(call add,DEFAULT_SERVICES_ENABLE,cups)
@$(call add,DEFAULT_SERVICES_ENABLE,alteratord) @$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
@$(call add,CONTROL,fusermount:public)
mixin/desktop-extra: mixin/desktop-extra:
@$(call add,BASE_LISTS,$(call tags,(archive || base) && extra)) @$(call add,BASE_LISTS,$(call tags,(archive || base) && extra))
@ -123,8 +124,10 @@ mixin/regular-lxqt: use/x11/lxqt +nm-gtk; @:
mixin/mate-base: use/x11/mate use/fonts/ttf/google +nm-gtk mixin/mate-base: use/x11/mate use/fonts/ttf/google +nm-gtk
@$(call add,THE_LISTS,$(call tags,mobile mate)) @$(call add,THE_LISTS,$(call tags,mobile mate))
mixin/regular-mate: mixin/mate-base use/domain-client mixin/regular-mate: mixin/mate-base use/domain-client; @:
ifneq (,$(filter-out riscv64,$(ARCH)))
@$(call add,THE_LISTS,$(call tags,base smartcard)) @$(call add,THE_LISTS,$(call tags,base smartcard))
endif
mixin/office: use/fonts/ttf/google use/fonts/ttf/xo mixin/office: use/fonts/ttf/google use/fonts/ttf/xo
@$(call add,THE_LISTS,$(call tags,desktop && (cups || office))) @$(call add,THE_LISTS,$(call tags,desktop && (cups || office)))
@ -144,7 +147,6 @@ mixin/regular-builder: use/dev/builder/base use/net/dhcp use/ntp/chrony
@$(call add,THE_PACKAGES,bash-completion elinks gpm lftp openssh) @$(call add,THE_PACKAGES,bash-completion elinks gpm lftp openssh)
@$(call add,THE_PACKAGES,rpm-utils screen tmux wget zsh) @$(call add,THE_PACKAGES,rpm-utils screen tmux wget zsh)
@$(call add,THE_PACKAGES,apt-repo aptitude eepm) @$(call add,THE_PACKAGES,apt-repo aptitude eepm)
@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
### vm.mk ### vm.mk
mixin/cloud-init: mixin/cloud-init:

39
conf.d/regular-vm.mk
Unescape View File

@ -1,6 +1,17 @@
ifeq (vm,$(IMAGE_CLASS)) ifeq (vm,$(IMAGE_CLASS))
mixin/vm-archdep:: ; @: #ifeq (,$(filter-out qcow2 qcow2c,$(IMAGE_TYPE)))
vm/regular-systemd: vm/systemd-net use/vmguest/kvm use/tty/S0 \
use/deflogin/root use/net/networkd/resolved
@$(call add,BASE_PACKAGES,apt-repo)
@$(call add,BASE_PACKAGES,hasher nfs-clients git rpm-build)
@$(call add,BASE_PACKAGES,kernel-build-tools gear)
@$(call add,BASE_PACKAGES,systemd-settings-disable-kill-user-processes)
@$(call add,DEFAULT_SERVICES_ENABLE,nfs-client.target)
@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
#endif
mixin/vm-archdep:: use/auto-resize; @:
ifeq (,$(filter-out i586 x86_64 armh aarch64,$(ARCH))) ifeq (,$(filter-out i586 x86_64 armh aarch64,$(ARCH)))
mixin/vm-archdep:: mixin/vm-archdep::
@ -21,6 +32,8 @@ mixin/vm-archdep:: use/bootloader/uboot
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
endif endif
mixin/vm-archdep-x11: mixin/vm-archdep +vmguest; @:
mixin/regular-vm-base: use/firmware use/ntp/chrony use/repo \ mixin/regular-vm-base: use/firmware use/ntp/chrony use/repo \
use/services/lvm2-disable use/services/lvm2-disable
ifneq (,$(filter-out i586 x86_64,$(ARCH))) ifneq (,$(filter-out i586 x86_64,$(ARCH)))
@ -29,10 +42,12 @@ endif
@$(call add,THE_PACKAGES,bash-completion mc update-kernel) @$(call add,THE_PACKAGES,bash-completion mc update-kernel)
@$(call add,THE_PACKAGES,vim-console) @$(call add,THE_PACKAGES,vim-console)
@$(call add,KMODULES,staging) @$(call add,KMODULES,staging)
@$(call set,REPO,http/yandex)
mixin/regular-vm-jeos: mixin/regular-vm-base use/deflogin/root \ mixin/regular-vm-jeos: mixin/regular-vm-base use/deflogin/root \
use/net/etcnet use/net/dhcp use/net/etcnet use/net/dhcp
@$(call add,THE_PACKAGES,livecd-net-eth) @$(call add,THE_PACKAGES,livecd-net-eth)
@$(call add,THE_LISTS, $(call tags,base network))
@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 livecd-net-eth) @$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 livecd-net-eth)
mixin/regular-vm-x11:: mixin/regular-vm-base mixin/regular-x11 \ mixin/regular-vm-x11:: mixin/regular-vm-base mixin/regular-x11 \
@ -65,34 +80,36 @@ vm/.regular-qt: vm/.regular-desktop use/x11/sddm; @:
vm/regular-jeos-systemd: vm/systemd \ vm/regular-jeos-systemd: vm/systemd \
mixin/regular-vm-jeos mixin/vm-archdep mixin/regular-vm-jeos mixin/vm-archdep
@$(call add,THE_PACKAGES,glibc-locales) @$(call add,THE_PACKAGES,glibc-locales)
@$(call add,THE_PACKAGES,systemd-settings-disable-kill-user-processes)
@$(call try,VM_SIZE,3221225472) @$(call try,VM_SIZE,3221225472)
vm/regular-jeos-sysv: vm/bare mixin/regular-vm-jeos mixin/vm-archdep +power; @: vm/regular-jeos-sysv: vm/bare mixin/regular-vm-jeos mixin/vm-archdep +power; @:
vm/regular-builder: vm/regular-jeos-systemd mixin/regular-builder; @: vm/regular-builder: vm/regular-jeos-systemd mixin/regular-builder +nm
@$(call add,THE_PACKAGES,NetworkManager-tui)
vm/regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \ vm/regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \
mixin/vm-archdep; @: mixin/vm-archdep-x11; @:
vm/regular-cinnamon: vm/.regular-gtk mixin/regular-cinnamon mixin/vm-archdep; @: vm/regular-cinnamon: vm/.regular-gtk mixin/regular-cinnamon mixin/vm-archdep-x11; @:
vm/regular-deepin: vm/.regular-gtk mixin/regular-deepin mixin/vm-archdep; @: vm/regular-deepin: vm/.regular-gtk mixin/regular-deepin mixin/vm-archdep-x11; @:
vm/regular-gnome3: vm/.regular-gtk mixin/regular-gnome3 mixin/vm-archdep vm/regular-gnome3: vm/.regular-gtk mixin/regular-gnome3 mixin/vm-archdep-x11
@$(call set,VM_SIZE,8589934592) @$(call set,VM_SIZE,8589934592)
vm/regular-lxde: vm/.regular-gtk mixin/regular-lxde mixin/vm-archdep; @: vm/regular-lxde: vm/.regular-gtk mixin/regular-lxde mixin/vm-archdep-x11; @:
vm/regular-mate: vm/.regular-gtk mixin/mate-base mixin/vm-archdep vm/regular-mate: vm/.regular-gtk mixin/mate-base mixin/vm-archdep-x11
@$(call add,THE_PACKAGES,mate-reduced-resource) @$(call add,THE_PACKAGES,mate-reduced-resource)
vm/regular-xfce: vm/.regular-gtk mixin/regular-xfce mixin/vm-archdep vm/regular-xfce: vm/.regular-gtk mixin/regular-xfce mixin/vm-archdep-x11
@$(call add,THE_PACKAGES,xfce-reduced-resource) @$(call add,THE_PACKAGES,xfce-reduced-resource)
vm/regular-kde5: vm/.regular-gtk mixin/regular-kde5 mixin/vm-archdep vm/regular-kde5: vm/.regular-gtk mixin/regular-kde5 mixin/vm-archdep-x11
@$(call set,VM_SIZE,7516192768) @$(call set,VM_SIZE,7516192768)
vm/regular-lxqt: vm/.regular-gtk mixin/regular-lxqt mixin/vm-archdep; @: vm/regular-lxqt: vm/.regular-gtk mixin/regular-lxqt mixin/vm-archdep-x11; @:
ifeq (,$(filter-out aarch64 armh,$(ARCH))) ifeq (,$(filter-out aarch64 armh,$(ARCH)))
# Raspberry Pi 4 # Raspberry Pi 4

31
conf.d/regular.mk
Unescape View File

@ -5,12 +5,15 @@ ifeq (distro,$(IMAGE_CLASS))
distro/.regular-bare: distro/.base use/kernel/net use/docs/license \ distro/.regular-bare: distro/.base use/kernel/net use/docs/license \
use/stage2/fs use/stage2/hid use/stage2/md \ 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/tty
@$(call try,SAVE_PROFILE,yes) @$(call try,SAVE_PROFILE,yes)
ifeq (,$(BRANCH)) ifeq (,$(BRANCH))
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 set,LIVE_REPO,http/yandex)
@$(call set,REPO,http/yandex)
endif endif
# base target (for most images) # base target (for most images)
@ -56,7 +59,7 @@ distro/.regular-desktop: distro/.regular-wm use/branding/full \
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @: distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
distro/.regular-desktop-sysv: distro/.regular-wm use/init/sysv/polkit; @: distro/.regular-desktop-sysv: distro/.regular-wm use/init/sysv/polkit +power; @:
distro/.regular-gtk-sysv: distro/.regular-desktop-sysv \ distro/.regular-gtk-sysv: distro/.regular-desktop-sysv \
use/syslinux/ui/gfxboot use/x11/gdm2.20; @: use/syslinux/ui/gfxboot use/x11/gdm2.20; @:
@ -69,12 +72,13 @@ distro/.regular-install: distro/.regular-base +installer \
@$(call add,THE_LISTS,$(call tags,base regular)) @$(call add,THE_LISTS,$(call tags,base regular))
@$(call add,INSTALL2_BRANDING,alterator notes) @$(call add,INSTALL2_BRANDING,alterator notes)
@$(call add,THE_BRANDING,alterator) @$(call add,THE_BRANDING,alterator)
@$(call add,EFI_BOOTARGS,lang=ru_RU)
# common base for the very bare distros # common base for the very bare distros
distro/.regular-jeos-base: distro/.regular-bare \ distro/.regular-jeos-base: distro/.regular-bare \
use/isohybrid use/branding \ use/isohybrid use/branding \
use/install2/repo use/install2/packages \ use/install2/repo use/install2/packages \
use/net/etcnet use/power/acpi/button use/net/etcnet
@$(call set,BOOTVGA,) @$(call set,BOOTVGA,)
@$(call set,INSTALLER,altlinux-generic) @$(call set,INSTALLER,altlinux-generic)
@$(call add,INSTALL2_BRANDING,alterator notes) @$(call add,INSTALL2_BRANDING,alterator notes)
@ -106,7 +110,7 @@ endif
# NB: # NB:
# - stock cleanup is not enough (or installer-common-stage3 deps soaring) # - stock cleanup is not enough (or installer-common-stage3 deps soaring)
distro/regular-jeos-sysv: distro/.regular-jeos-full use/cleanup/jeos/full \ distro/regular-jeos-sysv: distro/.regular-jeos-full use/cleanup/jeos/full \
+sysvinit +sysvinit +power
@$(call add,BASE_PACKAGES,apt-conf-ignore-systemd) @$(call add,BASE_PACKAGES,apt-conf-ignore-systemd)
distro/regular-jeos-systemd: distro/.regular-jeos-full \ distro/regular-jeos-systemd: distro/.regular-jeos-full \
@ -167,7 +171,7 @@ distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde; @:
distro/regular-mate: distro/.regular-gtk mixin/regular-mate; @: distro/regular-mate: distro/.regular-gtk mixin/regular-mate; @:
distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment +power; @: distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment; @:
distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @: distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
@ -231,7 +235,7 @@ distro/.regular-server-full: distro/.regular-server-managed \
distro/regular-server-systemd: distro/.regular-server-full \ distro/regular-server-systemd: distro/.regular-server-full \
+systemd +systemd-optimal; @: +systemd +systemd-optimal; @:
distro/regular-server-sysv: distro/.regular-server-full +sysvinit; @: distro/regular-server-sysv: distro/.regular-server-full +sysvinit +power; @:
distro/.regular-server-ovz: distro/.regular-server \ distro/.regular-server-ovz: distro/.regular-server \
use/server/ovz use/server/groups/tools use/cleanup/x11-alterator use/server/ovz use/server/groups/tools use/cleanup/x11-alterator
@ -256,12 +260,21 @@ distro/regular-server-pve: distro/.regular-server-base +systemd \
pve-firewall pve-ha-crm pve-manager pveproxy pvedaemon \ pve-firewall pve-ha-crm pve-manager pveproxy pvedaemon \
pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy) pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy)
distro/regular-builder: distro/.regular-bare mixin/regular-builder \ distro/.regular-builder: distro/.regular-bare mixin/regular-builder \
use/dev/builder/full use/stage2/kms +sysvinit +efi +power \ use/stage2/kms +efi +power \
use/live/base use/live/rw use/live/repo/online use/live/textinstall \ use/live/base use/live/rw use/live/repo use/live/textinstall \
use/isohybrid use/syslinux/timeout/300 use/grub/timeout/30 use/isohybrid use/syslinux/timeout/300 use/grub/timeout/30
@$(call add,THE_PACKAGES,ccache cifs-utils wodim) @$(call add,THE_PACKAGES,ccache cifs-utils wodim)
distro/regular-builder: distro/.regular-builder +systemd +nm \
use/dev/builder/live/systemd
@$(call add,THE_PACKAGES,NetworkManager-tui)
# old regular-builder
distro/regular-builder-sysv: distro/.regular-builder +sysvinit \
use/dev/builder/live/sysv
@$(call add,THE_PACKAGES,livecd-net-eth) @$(call add,THE_PACKAGES,livecd-net-eth)
@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
distro/regular-server-samba4: distro/.regular-server-managed +systemd distro/regular-server-samba4: distro/.regular-server-managed +systemd
@$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator))) @$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator)))

2
conf.d/server-v.mk
Unescape View File

@ -129,7 +129,7 @@ endif
@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 getty@ttyS0) @$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 getty@ttyS0)
@$(call add,DEFAULT_SERVICES_ENABLE,fstrim.timer) @$(call add,DEFAULT_SERVICES_ENABLE,fstrim.timer)
@$(call add,DEFAULT_SERVICES_ENABLE,libvirtd) @$(call add,DEFAULT_SERVICES_ENABLE,libvirtd)
@$(call add,DEFAULT_SERVICES_ENABLE,docker lxd kubelet kube-proxy) @$(call add,DEFAULT_SERVICES_ENABLE,docker lxd crio kubelet kube-proxy)
@$(call add,DEFAULT_SERVICES_ENABLE,bind mysqld openvswitch) @$(call add,DEFAULT_SERVICES_ENABLE,bind mysqld openvswitch)
@$(call add,DEFAULT_SERVICES_ENABLE,rsyslogd systemd-journal-gatewayd) @$(call add,DEFAULT_SERVICES_ENABLE,rsyslogd systemd-journal-gatewayd)
@$(call add,DEFAULT_SERVICES_DISABLE,powertop bridge gpm) @$(call add,DEFAULT_SERVICES_DISABLE,powertop bridge gpm)

24
conf.d/slinux.mk
Unescape View File

@ -21,17 +21,11 @@ endif
endif endif
ifeq (vm,$(IMAGE_CLASS)) ifeq (vm,$(IMAGE_CLASS))
vm/slinux:: use/slinux/vm-base use/auto-resize vm/slinux:: use/slinux/vm-base use/auto-resize +vmguest; @:
ifeq (,$(filter-out armh aarch64 mipsel e2k%,$(ARCH)))
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
else
@$(call add,THE_LISTS,slinux/multimedia-player-vlc)
endif
ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH))) ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH)))
vm/slinux:: use/uboot vm/slinux:: use/uboot
@$(call add,BASE_LISTS,uboot) @$(call add,BASE_LISTS,uboot)
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
endif endif
ifeq (,$(filter-out aarch64 armh,$(ARCH))) ifeq (,$(filter-out aarch64 armh,$(ARCH)))
@ -39,30 +33,24 @@ vm/slinux:: use/no-sleep use/arm-rpi4; @:
endif endif
ifeq (,$(filter-out aarch64 armh,$(ARCH))) ifeq (,$(filter-out aarch64 armh,$(ARCH)))
vm/slinux-rpi: use/slinux/vm-base use/arm-rpi4/full vm/slinux-rpi: use/slinux/vm-base use/arm-rpi4/full; @:
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
endif endif
ifeq (,$(filter-out aarch64,$(ARCH))) ifeq (,$(filter-out aarch64,$(ARCH)))
vm/slinux-tegra: use/slinux/vm-base use/aarch64-tegra vm/slinux-tegra: use/slinux/vm-base use/aarch64-tegra; @:
@$(call add,THE_LISTS,slinux/multimedia-player-vlc)
endif endif
ifeq (,$(filter-out armh,$(ARCH))) ifeq (,$(filter-out armh,$(ARCH)))
vm/slinux-mcom02: use/slinux/vm-base use/armh-mcom02/x11 vm/slinux-mcom02: use/slinux/vm-base use/armh-mcom02/x11; @:
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
endif endif
ifeq (,$(filter-out mipsel,$(ARCH))) ifeq (,$(filter-out mipsel,$(ARCH)))
vm/slinux:: vm/slinux::
@$(call add,THE_PACKAGES,installer-feature-bell-off-stage3) @$(call add,THE_PACKAGES,installer-feature-bell-off-stage3)
@$(call add,THE_PACKAGES,xfce-reduced-resource) @$(call add,THE_PACKAGES,xfce-reduced-resource)
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
vm/slinux-tavolga: vm/slinux use/mipsel-mitx/x11 vm/slinux-tavolga: vm/slinux use/mipsel-mitx/x11; @:
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid) vm/slinux-bfk3: vm/slinux use/mipsel-bfk3/x11; @:
vm/slinux-bfk3: vm/slinux use/mipsel-bfk3/x11
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
endif endif
endif endif

6
doc/archdep.txt
Unescape View File

@ -48,6 +48,12 @@
ARM (armh или aarch64), а также выборка "для любой архитектуры, кроме" ARM (armh или aarch64), а также выборка "для любой архитектуры, кроме"
(например, @!E2K, или "@!ARM). (например, @!E2K, или "@!ARM).
С версии 1.4.21 поддерживается перечисление архитектур через запятую
после "@" или "@!":
LibreOffice-still@X86,aarch64,ppc64le,mipsel
java-11-openjdk@!E2K,mipsel
Для преобразования можно воспользоваться следующей командой: Для преобразования можно воспользоваться следующей командой:
sed -r -e 's/@I586_ONLY@([^\t ]+)/\1@i586/g' \ sed -r -e 's/@I586_ONLY@([^\t ]+)/\1@i586/g' \

6
doc/params.txt
Unescape View File

@ -153,6 +153,12 @@ $HOME/.mkimage/profiles.mk.
*** пусто (по умолчанию) либо строка (например, "alpha", "beta") *** пусто (по умолчанию) либо строка (например, "alpha", "beta")
** см. image.in/Makefile ** см. image.in/Makefile
* USE_QEMU
** использовать qemu, если архитектура не совпадает
** значение:
*** 1 (по умолчанию), для отключения используйте любое другое значение
** см. lib/build.mk
* VM_SAVE_TARBALL * VM_SAVE_TARBALL
** указывает, что нужно сохранить промежуточный тарбол, из которого ** указывает, что нужно сохранить промежуточный тарбол, из которого
** создаётся образ виртуальной машины, в заданном формате ** создаётся образ виртуальной машины, в заданном формате

2
features.in/Makefile
Unescape View File

@ -68,7 +68,7 @@ prep:
# - "rootfs@/": copy feature's rootfs parts into BUILDDIR toplevel # - "rootfs@/": copy feature's rootfs parts into BUILDDIR toplevel
$(FEATURES): $(FEATURES):
@feat=$@; \ @feat=$@; \
args="-qab --exclude .gitignore --exclude README --exclude config.mk"; \ args="-qab --exclude README --exclude config.mk"; \
args="$$args --exclude generate.mk --exclude generate.sh"; \ args="$$args --exclude generate.mk --exclude generate.sh"; \
if [ -n "$(GLOBAL_DEBUG)" ]; then \ if [ -n "$(GLOBAL_DEBUG)" ]; then \
echo "** adding $$feat feature"; \ echo "** adding $$feat feature"; \

2
features.in/apt-conf/config.mk
Unescape View File

@ -1,7 +1,7 @@
use/apt-conf: use/apt-conf:
@$(call add_feature) @$(call add_feature)
@$(call add,THE_PACKAGES,apt-conf-$$(THE_APT_CONF)) @$(call add,THE_PACKAGES,apt-conf-$$(THE_APT_CONF))
@$(call add,IMAGE_INIT_LIST,apt-conf-$$(THE_APT_CONF)) @$(call add,PINNED_PACKAGES,apt-conf-$$(THE_APT_CONF))
@$(call try,THE_APT_CONF,sisyphus) @$(call try,THE_APT_CONF,sisyphus)
use/apt-conf/branch: use/apt-conf use/apt-conf/branch: use/apt-conf

1
features.in/arm-rpi4/config.mk
Unescape View File

@ -11,6 +11,7 @@ endif
@$(call add,THE_LISTS,uboot) @$(call add,THE_LISTS,uboot)
@$(call add,THE_PACKAGES,u-boot-tools) @$(call add,THE_PACKAGES,u-boot-tools)
@$(call add,THE_PACKAGES,firmware-bcm4345) @$(call add,THE_PACKAGES,firmware-bcm4345)
@$(call add,DEFAULT_SERVICES_DISABLE,smartd)
use/arm-rpi4/x11: use/arm-rpi4 use/arm-rpi4/x11: use/arm-rpi4
@$(call add,THE_PACKAGES,pi-bluetooth) @$(call add,THE_PACKAGES,pi-bluetooth)

46
features.in/arm-rpi4/image-scripts.d/98-bootstrap-boot-by-firmware
Unescape View File

@ -5,17 +5,43 @@ kflavour="${GLOBAL_KFLAVOURS%% *}"
mkdir -p /boot/efi mkdir -p /boot/efi
uboots="rpi_3 rpi_3_32b rpi_4 rpi_4_32b" cp /usr/share/raspberrypi-firmware/*.{bin,dat,elf} /boot/efi/
for uboot in $uboots; do
[ -d /usr/share/u-boot/$uboot ] && [ -f /usr/share/u-boot/rpi_3/kernel8.img ] &&
cp -f /usr/share/u-boot/$uboot/* /boot/efi/ cp /usr/share/u-boot/rpi_3/kernel8.img \
[ -f /boot/efi/kernel8.img ] && /boot/efi/uboot-rpi_3.bin
mv /boot/efi/{kernel8.img,uboot-$uboot.bin} [ -f /usr/share/u-boot/rpi_3_32b/kernel7.img ] &&
[ -f /boot/efi/kernel7.img ] && cp /usr/share/u-boot/rpi_3_32b/kernel7.img \
mv /boot/efi/{kernel7.img,uboot-$uboot.bin} /boot/efi/uboot-rpi_3_32b.bin
done [ -f /usr/share/u-boot/rpi_4/kernel8.img ] &&
cp /usr/share/u-boot/rpi_4/kernel8.img \
/boot/efi/uboot-rpi_4.bin
[ -f /usr/share/u-boot/rpi_4_32b/kernel7.img ] &&
cp /usr/share/u-boot/rpi_4_32b/kernel7.img \
/boot/efi/uboot-rpi_4_32b.bin
rm -f /boot/efi/config.txt # copy actualy dtb's for default kernel
cp /boot/dtb/bcm27*-rpi-*.dtb /boot/efi/ || :
[ -f /boot/efi/bcm2710-rpi-3-b.dtb ] ||
cp /boot/dtb/bcm2837-rpi-3-b.dtb \
/boot/efi/bcm2710-rpi-3-b.dtb || :
[ -f /boot/efi/bcm2710-rpi-3-b-plus.dtb ] ||
cp /boot/dtb/bcm2837-rpi-3-b-plus.dtb \
/boot/efi/bcm2710-rpi-3-b-plus.dtb || :
[ -f /boot/efi/bcm2710-rpi-cm3.dtb ] ||
cp /boot/dtb/bcm2837-rpi-cm3-io3.dtb \
/boot/efi/bcm2710-rpi-cm3.dtb || :
[ -f /boot/efi/bcm2711-rpi-cm4.dtb ] ||
cp /boot/dtb/bcm2711-rpi-cm4-io.dtb \
/boot/efi/bcm2711-rpi-cm4.dtb || :
[ -d /boot/dtb/overlays ] &&
cp -r /boot/dtb/overlays /boot/efi/ || :
# copy missing dtb's from raspberrypi-firmware
for dtb in /usr/share/raspberrypi-firmware/*.dtb; do
[ -f "/boot/efi/$(basename $dtb)" ] ||
cp "$dtb" /boot/efi/
done
[ "$GLOBAL_ARCH" = aarch64 ] && \ [ "$GLOBAL_ARCH" = aarch64 ] && \
echo "arm_64bit=1" > /boot/efi/config.txt echo "arm_64bit=1" > /boot/efi/config.txt

6
features.in/browser/config.mk
Unescape View File

@ -12,7 +12,7 @@ BROWSERS_aarch64 = chromium netsurf epiphany falkon otter-browser elinks links2
BROWSERS_armh = netsurf epiphany falkon otter-browser elinks links2 BROWSERS_armh = netsurf epiphany falkon otter-browser elinks links2
BROWSERS_mipsel = chromium seamonkey netsurf epiphany falkon otter-browser \ BROWSERS_mipsel = chromium seamonkey netsurf epiphany falkon otter-browser \
elinks links2 elinks links2
BROWSERS_riscv64 = midori netsurf elinks BROWSERS_riscv64 = epiphany midori netsurf elinks
BROWSERS_e2k = netsurf elinks links2 BROWSERS_e2k = netsurf elinks links2
BROWSERS_e2kv4 := $(BROWSERS_e2k) BROWSERS_e2kv4 := $(BROWSERS_e2k)
BROWSERS := $(BROWSERS_$(ARCH)) BROWSERS := $(BROWSERS_$(ARCH))
@ -40,5 +40,9 @@ endif
use/browser/firefox/esr: use/browser/firefox/esr:
@$(call set,FX_FLAVOUR,-esr) @$(call set,FX_FLAVOUR,-esr)
ifneq (,$(filter-out riscv64,$(ARCH)))
use/browser/firefox/live: use/browser/firefox use/browser/firefox/live: use/browser/firefox
@$(call add,THE_BROWSER,livecd-firefox) @$(call add,THE_BROWSER,livecd-firefox)
else
use/browser/firefox/live: ; @:
endif

2
features.in/build-distro/scripts.d/00-cleanup
Unescape View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
# TODO: invent some way to remove this inter-subprofile thing # TODO: invent some way to remove this inter-subprofile thing
rm -vf $WORKDIR/{squashcfg.mk,initfs,.gitignore} rm -vf $WORKDIR/{squashcfg.mk,initfs,.gitignore,.empty}

14
features.in/build-vm/image-scripts.d/20-grub-terminal
Unescape View File

@ -0,0 +1,14 @@
#!/bin/sh -efu
GRUB_CFG=/etc/sysconfig/grub2
[ -s "$GRUB_CFG" ] || exit 0
GRUBTHEME="$(cat "$GRUB_CFG" |grep '^GRUB_THEME=.*' |tail -n 1)"
GRUBTHEME="${GRUBTHEME%/*}"
GRUBTHEME="${GRUBTHEME##*/}"
[ -z "$GRUBTHEME" ] || exit 0
sed '/^GRUB_TERMINAL_OUTPUT=.*/d' -i "$GRUB_CFG"
echo 'GRUB_TERMINAL_OUTPUT="console"' >> "$GRUB_CFG"

1
features.in/cleanup/config.mk
Unescape View File

@ -47,7 +47,6 @@ use/cleanup/jeos: use/cleanup/x11-alterator
use/cleanup/jeos/full: use/cleanup/jeos use/cleanup/jeos/full: use/cleanup/jeos
@$(call add,CLEANUP_PACKAGES,interactivesystem 'groff*' man stmpclean) @$(call add,CLEANUP_PACKAGES,interactivesystem 'groff*' man stmpclean)
@$(call add,CLEANUP_PACKAGES,console-scripts console-vt-tools 'kbd*') @$(call add,CLEANUP_PACKAGES,console-scripts console-vt-tools 'kbd*')
@$(call add,CLEANUP_PACKAGES,libsystemd-journal libsystemd-login)
@$(call add,CLEANUP_PACKAGES,dbus libdbus) @$(call add,CLEANUP_PACKAGES,dbus libdbus)
else else

11
features.in/dev/config.mk
Unescape View File

@ -16,8 +16,19 @@ use/dev/builder/base: use/dev/mkimage
use/dev/builder/live: use/dev/builder/base use/dev/builder/live: use/dev/builder/base
@$(call add,LIVE_LISTS,$(call tags,live builder)) @$(call add,LIVE_LISTS,$(call tags,live builder))
ifeq (,$(filter-out x86_64 ,$(ARCH)))
use/dev/builder/live/sysv: use/dev/builder/live
@$(call add,LIVE_PACKAGES,livecd-qemu-arch qemu-user-binfmt_misc) @$(call add,LIVE_PACKAGES,livecd-qemu-arch qemu-user-binfmt_misc)
use/dev/builder/live/systemd: use/dev/builder/live
@$(call add,LIVE_PACKAGES,qemu-user-static-binfmt)
@$(call add,DEFAULT_SERVICES_ENABLE,systemd-binfmt)
else
use/dev/builder/live/sysv use/dev/builder/live/systemd: \
use/dev/builder/live; @:
endif
use/dev/builder/full: use/dev use/dev/builder/live use/dev/repo use/dev/builder/full: use/dev use/dev/builder/live use/dev/repo
ifdef BIGRAM ifdef BIGRAM
@$(call set,KFLAVOURS,$(BIGRAM)) @$(call set,KFLAVOURS,$(BIGRAM))

107
features.in/dev/live/image-scripts.d/51-hasher
Unescape View File

@ -55,7 +55,7 @@ if [ -x "$ZSHELL" ]; then
install -m644 -o "$USER" -g "$USER" /dev/null "$HOME/.zshrc" install -m644 -o "$USER" -g "$USER" /dev/null "$HOME/.zshrc"
cat >> "$HOME/.zsh_history" <<-EOF cat >> "$HOME/.zsh_history" <<-EOF
git clone git://git.altlinux.org/gears/m/mkimage-profiles.git && cd mkimage-profiles && make help/distro git clone git://git.altlinux.org/gears/m/mkimage-profiles.git && cd mkimage-profiles && make help/distro
make -C /usr/share/mkimage-profiles syslinux.iso make -C /usr/share/mkimage-profiles grub.iso
git clone git://git.altlinux.org/gears/h/hello.git && cd hello && gear-hsh git clone git://git.altlinux.org/gears/h/hello.git && cd hello && gear-hsh
EOF EOF
fi fi
@ -81,7 +81,7 @@ Here are some ALT package/image build tools prepared for you:
Examples (use right/middle mouse button to paste; see ~/hasher/repo/): Examples (use right/middle mouse button to paste; see ~/hasher/repo/):
* ${white}git clone git://git.altlinux.org/gears/h/hello.git && cd hello && gear-hsh${gray} * ${white}git clone git://git.altlinux.org/gears/h/hello.git && cd hello && gear-hsh${gray}
* ${white}make -C /usr/share/mkimage-profiles syslinux.iso${gray} * ${white}make -C /usr/share/mkimage-profiles grub.iso${gray}
EOH EOH
EOF EOF
@ -98,8 +98,6 @@ EOF
# hasher # hasher
WORKDIR="$TMP/hasher" WORKDIR="$TMP/hasher"
ln -s "$WORKDIR" "$HOME/hasher" ln -s "$WORKDIR" "$HOME/hasher"
echo "rpm-dir file://$HOME/hasher/repo $ARCH hasher" \
>> /etc/apt/sources.list.d/hasher.list
mkdir "$HOME/.hasher" mkdir "$HOME/.hasher"
cat >> "$HOME/.hasher/config" << EOF cat >> "$HOME/.hasher/config" << EOF
@ -109,6 +107,107 @@ export GCC_USE_CCACHE=1
mkdir -p "$WORKDIR" mkdir -p "$WORKDIR"
EOF EOF
# create apt.conf for supported ARCHES and BRANCHES
# use format: $BRANCH-$ARCH
create_apt_conf () {
local PORTS=
local SIGN=
local BRANCH=$(echo "$1" | cut -f1 -d '-')
local ARCH=$(echo "$1" | cut -f2 -d '-')
local EXT_BRANCH=$(echo "$1" | cut -f3 -d '-')
[ -n "$ARCH" ] || [ -n "$BRANCH" ] || exit 1
[ -z "$EXT_BRANCH" ] || [ "$EXT_BRANCH" = port ] || exit 1
[ "$EXT_BRANCH" = port ] && PORTS=1
if [ "$BRANCH" = sisyphus ]; then
BRANCH_PATH=Sisyphus
SIGN='[alt]'
else
BRANCH_PATH=$BRANCH/branch
SIGN="[$BRANCH]"
fi
if [ -n "$PORTS" ]; then
BRANCH_PATH=ports/$ARCH/$BRANCH
SIGN="[$BRANCH-$ARCH]"
fi
mkdir -p "$HOME/apt/lists/partial" \
"$HOME/apt/cache/$BRANCH/$ARCH/archives/partial" \
"$HOME/apt/cache/$BRANCH/noarch/archives/partial"
cat > "$HOME/apt/apt.conf.$BRANCH.$ARCH" << EOF
Dir::Etc::main "/dev/null";
Dir::Etc::SourceParts "/var/empty";
Dir::Etc::SourceList "$HOME/apt/sources.list.$BRANCH.$ARCH";
Dir::State::lists "$HOME/apt/lists/";
Dir::Cache "$HOME/apt/cache/$BRANCH/$ARCH";
;Debug::pkgMarkInstall "true";
;Debug::pkgProblemResolver "true";
EOF
cat > "$HOME/apt/sources.list.$BRANCH.$ARCH" << EOF
rpm-dir file://$HOME/hasher/repo $ARCH hasher
# Official repo (slow)
#rpm $SIGN http://ftp.altlinux.org/pub/distributions/ALTLinux/$BRANCH_PATH $ARCH classic
#rpm $SIGN http://ftp.altlinux.org/pub/distributions/ALTLinux/$BRANCH_PATH noarch classic
# Yandex mirror (fast)
rpm $SIGN http://mirror.yandex.ru/altlinux/$BRANCH_PATH $ARCH classic
rpm $SIGN http://mirror.yandex.ru/altlinux/$BRANCH_PATH noarch classic
EOF
}
target_apt_confs="
sisyphus-x86_64
sisyphus-i586
sisyphus-aarch64
sisyphus-armh
sisyphus-ppc64le
sisyphus-mipsel-port
sisyphus-riscv64-port
p10-x86_64
p10-i586
p10-aarch64
p10-armh
p10-ppc64le
p9-x86_64
p9-i586
p9-aarch64
p9-armh
p9-ppc64le
p9-mipsel-port
"
for target_apt_conf in $target_apt_confs; do
create_apt_conf "$target_apt_conf"
done
# setup mkimage-profiles settings
# add mkimage-profiles settings
mkdir -p $HOME/.mkimage
cat > $HOME/.mkimage/profiles.mk << EOF
ifneq (,\$(BRANCH))
APTCONF = ~/apt/apt.conf.\$(BRANCH).\$(ARCH)
IMAGEDIR = ~/out/\$(BRANCH)/\$(shell date +%Y%m%d)
else
APTCONF = ~/apt/apt.conf.sisyphus.\$(ARCH)
IMAGEDIR = ~/out/sisyphus/\$(shell date +%Y%m%d)
endif
CLEAN = 1
DEBUG = 1
REPORT = 1
NO_SYMLINK = 1
#NICE = 1
#QUIET = 1
EOF
# fix owner:group
chown $USER:$USER -R "$HOME"
# online repo needs network not isolation # online repo needs network not isolation
echo "export share_network=1" >> /etc/profile.d/hasher.sh echo "export share_network=1" >> /etc/profile.d/hasher.sh
chmod +x /etc/profile.d/hasher.sh chmod +x /etc/profile.d/hasher.sh

8
features.in/e2k/scripts.d/20-e2k-boot
Unescape View File

@ -29,17 +29,21 @@ for i in live altinst rescue; do
stage2="stagename=$i" stage2="stagename=$i"
fi fi
# Rename kernel image, unable to boot kernel from CD/DVD
# if its name does not contain "." (mcst#6856).
mv boot/image{,.0}
cat >> boot.conf << EOF cat >> boot.conf << EOF
label=$label label=$label
partition=0 partition=0
image=/boot/image image=/boot/image.0
cmdline=console=ttyS0,115200 console=tty0 hardreset fastboot live automatic=method:cdrom ${stage2:+$stage2 }${GLOBAL_STAGE2_BOOTARGS:+$GLOBAL_STAGE2_BOOTARGS }${GLOBAL_BOOT_LANG:+lang=$GLOBAL_BOOT_LANG} cmdline=console=ttyS0,115200 console=tty0 hardreset fastboot live automatic=method:cdrom ${stage2:+$stage2 }${GLOBAL_STAGE2_BOOTARGS:+$GLOBAL_STAGE2_BOOTARGS }${GLOBAL_BOOT_LANG:+lang=$GLOBAL_BOOT_LANG}
initrd=/boot/full.cz initrd=/boot/full.cz
label=${label}_flash label=${label}_flash
partition=0 partition=0
image=/boot/image image=/boot/image.0
cmdline=console=ttyS0,115200 console=tty0 hardreset fastboot live lowmem automatic=method:disk,label:altinst,directory:/ ${stage2:+$stage2 }${GLOBAL_STAGE2_BOOTARGS:+$GLOBAL_STAGE2_BOOTARGS }${GLOBAL_BOOT_LANG:+lang=$GLOBAL_BOOT_LANG} cmdline=console=ttyS0,115200 console=tty0 hardreset fastboot live lowmem automatic=method:disk,label:altinst,directory:/ ${stage2:+$stage2 }${GLOBAL_STAGE2_BOOTARGS:+$GLOBAL_STAGE2_BOOTARGS }${GLOBAL_BOOT_LANG:+lang=$GLOBAL_BOOT_LANG}
initrd=/boot/full.cz initrd=/boot/full.cz
EOF EOF

3
features.in/firmware/config.mk
Unescape View File

@ -33,8 +33,7 @@ use/firmware/wireless: use/firmware
@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*) @$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-rt.*) @$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)
use/firmware/laptop: use/firmware/cpu use/firmware/laptop: use/firmware/cpu; @:
@$(call add,THE_KMODULES,acpi_call)
ifeq (,$(filter-out x86_64,$(ARCH))) ifeq (,$(filter-out x86_64,$(ARCH)))
@$(call add,THE_PACKAGES,firmware-alsa-sof) @$(call add,THE_PACKAGES,firmware-alsa-sof)
endif endif

13
features.in/gitlab-runner/README
Unescape View File

@ -0,0 +1,13 @@
This feature installs gitlab-runner according official guide [1]
The following envs can be altered:
GL_USER - define default gitlab-runner username ('gitlab-runner' by default)
GL_SSH_KEY - ssh pubkey added to authorized_keys of GL_USER
NOTE: this feature depends on network enablement in hasher (see [2] for details)
and mkimage [3]
1. https://docs.gitlab.com/runner/install/linux-manually.html
2. https://bugzilla.altlinux.org/34596
3. https://git.altlinux.org/people/legion/packages/mkimage.git?p=mkimage.git;a=commitdiff;h=6e90f032f15f89de1c2c523a725e369ab6cad1a0

13
features.in/gitlab-runner/config.mk
Unescape View File

@ -0,0 +1,13 @@
# WARNING: the variable values are stored in build config/log!
use/gitlab-runner:
@$(call add_feature)
@$(call add,THE_PACKAGES,shadow-utils passwd curl)
@$(call xport,GL_USER)
@$(call xport,GL_SSH_KEY)
# some presets
# USERS variable chunk format is "login:passwd:admin:sudo"
# GROUPS are just stashed there to include USERS logins created
# GL_SSH_KEY should be changed accordingly
use/gitlab-runner/defuser: use/gitlab-runner
@$(call add,GL_USER,gitlab-runner)

61
features.in/gitlab-runner/rootfs/image-scripts.d/60-gitlab-install
Unescape View File

@ -0,0 +1,61 @@
#!/bin/sh -efu
gl_url="https://gitlab-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-runner-linux-"
add_user() {
useradd -c 'Gitlab Runner' -m "$1"
[ -z "$GLOBAL_GL_SSH_KEY" ] || echo "$GLOBAL_GL_SSH_KEY" >> /home/"$1"/.ssh/authorized_keys
usermod -L "$1" ||
echo "*** failed to add user '$1'"
}
case "$GLOBAL_ARCH" in
x86_64)
gl_url="${gl_url}amd64"
;;
i586)
gl_url="${gl_url}386"
;;
armh)
gl_url="${gl_url}arm"
;;
aarch64)
gl_url="${gl_url}arm64"
;;
ppc64le)
gl_url="${gl_url}ppc64le"
;;
*)
echo "arch $GLOBAL_ARCH not supported!"
exit 1
;;
esac
if [ -n "$GLOBAL_GL_USER" ]; then
add_user "$GLOBAL_GL_USER"
echo 'nameserver 8.8.8.8' >> /etc/resolv.conf
curl -L --output /usr/local/bin/gitlab-runner "$gl_url"
chmod +x /usr/local/bin/gitlab-runner
cat > /lib/systemd/system/gitlab-runner.service << EOF
[Unit]
Description=GitLab Runner
ConditionFileIsExecutable=/usr/local/bin/gitlab-runner
After=syslog.target network.target
[Service]
StartLimitInterval=5
StartLimitBurst=10
ExecStart=/usr/bin/gitlab-runner "run" "--working-directory" "/home/$GLOBAL_GL_USER" "--config" "/etc/gitlab-runner/config.toml" "--service" "gitlab-runner" "--user" "$GLOBAL_GL_USER"
Restart=always
RestartSec=120
EnvironmentFile=-/etc/sysconfig/gitlab-runner
[Install]
WantedBy=multi-user.target
EOF
systemctl enable gitlab-runner
fi

11
features.in/grub/README
Unescape View File

@ -33,3 +33,14 @@
@$(call set,GRUB_DEFAULT,live) @$(call set,GRUB_DEFAULT,live)
Именем дефолтного пункта является --id. Именем дефолтного пункта является --id.
Запуск iso образа с неправильно работающей в grub графике (только EFI):
На ESP-разделе образа можно отредактировать конфиг EFI/BOOT/grub.cfg,
добавив в его начало:
GRUB_TERMINAL='console'
Если нужно включить последовательную консоль, пропишите в нём:
GRUB_TERMINAL='console serial'
GRUB_SERIAL_COMMAND='serial --unit=0 --speed=115200'

9
features.in/grub/cfg.in/00defaults.cfg
Unescape View File

@ -1,3 +1,11 @@
export GRUB_TERMINAL
export GRUB_SERIAL_COMMAND
if [ -n "$GRUB_TERMINAL" ]; then
$GRUB_SERIAL_COMMAND
terminal_output "$GRUB_TERMINAL"
terminal_input "$GRUB_TERMINAL"
fi
insmod echo insmod echo
insmod gzio insmod gzio
insmod minicmd insmod minicmd
@ -9,6 +17,7 @@ if [ "$grub_platform" = "efi" -a "$grub_cpu" = "x86_64" ]; then
set linux_suffix='efi' set linux_suffix='efi'
fi fi
if [ "$grub_platform" = "pc" ]; then set linux_suffix='16'; fi if [ "$grub_platform" = "pc" ]; then set linux_suffix='16'; fi
lang=ru_RU
if [ ! "$lang" ]; then lang=@LOCALE@; fi if [ ! "$lang" ]; then lang=@LOCALE@; fi
if [ -s $pfxfat/grubenv ]; then if [ -s $pfxfat/grubenv ]; then
load_env --file $pfxfat/grubenv load_env --file $pfxfat/grubenv

6
features.in/grub/cfg.in/01gfxterm.cfg
Unescape View File

@ -12,8 +12,9 @@ function load_video {
fi fi
} }
font=${prefix}/fonts/unicode.pf2 if [ -z "$GRUB_TERMINAL" ]; then
if loadfont "$font" ; then font=${prefix}/fonts/unicode.pf2
if loadfont "$font"; then
set gfxmode=auto set gfxmode=auto
load_video load_video
insmod gfxterm insmod gfxterm
@ -34,4 +35,5 @@ if loadfont "$font" ; then
set menu_color_highlight=black/white set menu_color_highlight=black/white
set color_normal=white/black set color_normal=white/black
set color_highlight=black/white set color_highlight=black/white
fi
fi fi

4
features.in/grub/stage1/scripts.d/01-grub
Unescape View File

@ -62,7 +62,9 @@ fi
# copy grub theme # copy grub theme
mkdir -p themes mkdir -p themes
GRUBTHEME="$(grep -m1 '/theme.txt;' "$CFG" |rev | cut -f2 -d '/' |rev)" GRUBTHEME="$(grep -m1 '/theme.txt;' "$CFG" |tail -n 1)"
GRUBTHEME="${GRUBTHEME%/*}"
GRUBTHEME="${GRUBTHEME##*/}"
if [ -n "$GRUBTHEME" ]; then if [ -n "$GRUBTHEME" ]; then
if [ -d "/boot/grub/themes/$GRUBTHEME" ]; then if [ -d "/boot/grub/themes/$GRUBTHEME" ]; then
cp -r /boot/grub/themes/$GRUBTHEME themes/ cp -r /boot/grub/themes/$GRUBTHEME themes/

2
features.in/homeros/live/image-scripts.d/20-altlinux-user
Unescape View File

@ -1,5 +1,5 @@
#!/bin/sh -e #!/bin/sh -e
useradd kometa useradd kometa
echo 'kometa ALL=NOPASSWD:ALL' > /etc/sudo.d/kometa echo 'altlinux ALL=NOPASSWD:ALL' > /etc/sudo.d/kometa
chmod 400 /etc/sudo.d/kometa chmod 400 /etc/sudo.d/kometa

3
features.in/init/config.mk
Unescape View File

@ -14,8 +14,11 @@ use/init/sysv: use/init
@$(call set,INIT_TYPE,sysvinit) @$(call set,INIT_TYPE,sysvinit)
@$(call add,THE_PACKAGES,rsyslog-classic startup) @$(call add,THE_PACKAGES,rsyslog-classic startup)
@$(call add,THE_PACKAGES,udev-rule-generator) @$(call add,THE_PACKAGES,udev-rule-generator)
@$(call add,THE_PACKAGES,apt-conf-ignore-systemd)
@$(call add,DEFAULT_SERVICES_ENABLE,udevd-final) @$(call add,DEFAULT_SERVICES_ENABLE,udevd-final)
@$(call add,PINNED_PACKAGES,rsyslog-classic) @$(call add,PINNED_PACKAGES,rsyslog-classic)
@$(call add,PINNED_PACKAGES,systemd-utils-standalone:Essential)
@$(call add,PINNED_PACKAGES,apt-conf-ignore-systemd:Essential)
ifeq (,$(filter-out x86_64 aarch64,$(ARCH))) ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
@$(call add,THE_PACKAGES,mount-efivars) @$(call add,THE_PACKAGES,mount-efivars)
endif endif

2
features.in/initrd-bootchain/config.mk
Unescape View File

@ -19,5 +19,5 @@ use/initrd-bootchain: use/uuid-iso
@$(call try,BOOTCHAIN_OEM_SRV_NETINST,) @$(call try,BOOTCHAIN_OEM_SRV_NETINST,)
@$(call try,BOOTCHAIN_OEM_NFS_NETINST,/srv/public/netinst) @$(call try,BOOTCHAIN_OEM_NFS_NETINST,/srv/public/netinst)
@$(call try,BOOTCHAIN_OEM_CIFS_NETINST,/netinst) @$(call try,BOOTCHAIN_OEM_CIFS_NETINST,/netinst)
@$(call try,BOOTCHAIN_LOGFILE,/var/log/bootchained.log) @$(call try,BOOTCHAIN_LOGFILE,/var/log/chaind.log)
@$(call try,BOOTCHAIN_LOG_VT,3) @$(call try,BOOTCHAIN_LOG_VT,3)

7
features.in/install2/config.mk
Unescape View File

@ -5,6 +5,8 @@
use/install2: use/stage2 sub/stage2@install2 use/metadata \ use/install2: use/stage2 sub/stage2@install2 use/metadata \
use/cleanup/installer use/install2/autoinstall use/grub/install2.cfg use/cleanup/installer use/install2/autoinstall use/grub/install2.cfg
@$(call add_feature) @$(call add_feature)
@$(call add,INSTALL2_PACKAGES,installer-common-stage2)
@$(call add,PINNED_PACKAGES,installer-common-stage2)
@$(call try,INSTALLER,altlinux-generic) # might be replaced later @$(call try,INSTALLER,altlinux-generic) # might be replaced later
@$(call add,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2) @$(call add,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator) @$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
@ -50,7 +52,7 @@ use/install2/vbox:
use/install2/vmware: use/install2/vmware:
@$(call add,STAGE1_KMODULES,vmware) @$(call add,STAGE1_KMODULES,vmware)
@$(call add,STAGE1_KMODULES,scsi) # mptspi in led-ws @$(call add,STAGE1_KMODULES,scsi) # mptspi in led-ws
@$(call add,INSTALL2_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse) @$(call add,INSTALL2_PACKAGES,xorg-dri-vmwgfx xorg-drv-vmware xorg-drv-vmmouse)
use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @: use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @:
@ -142,10 +144,7 @@ use/install2/cleanup/x11-hwdrivers:
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-glamor) @$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-glamor)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-mach64 xorg-drv-mga) @$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-mach64 xorg-drv-mga)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-nouveau) @$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-nouveau)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-openchrome)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-r128 xorg-drv-radeon) @$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-r128 xorg-drv-radeon)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-s3virge xorg-drv-savage)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-sis)
# massive purge of anything not critical to installer boot (l10n included!) # massive purge of anything not critical to installer boot (l10n included!)
use/install2/cleanup/everything: use/install2/cleanup/x11-hwdrivers \ use/install2/cleanup/everything: use/install2/cleanup/x11-hwdrivers \

6
features.in/kernel/config.mk
Unescape View File

@ -23,7 +23,6 @@ endif
# r8168 is a kludge, never install it by default # r8168 is a kludge, never install it by default
use/kernel/net: use/kernel/net:
@$(call add,THE_KMODULES,e1000e)
@$(call add,THE_KMODULES,r8125) @$(call add,THE_KMODULES,r8125)
@$(call add,MAIN_KMODULES,r8168 rtl8168) @$(call add,MAIN_KMODULES,r8168 rtl8168)
@ -62,6 +61,7 @@ use/kernel/initrd-setup: use/kernel
@$(call add,VM_INITRDMODULES,drm/virtio) @$(call add,VM_INITRDMODULES,drm/virtio)
@$(call add,VM_INITRDMODULES,virtio_scsi.ko virtio_blk.ko virtio-rng virtio_net.ko virtio-gpu.ko) @$(call add,VM_INITRDMODULES,virtio_scsi.ko virtio_blk.ko virtio-rng virtio_net.ko virtio-gpu.ko)
@$(call add,VM_INITRDMODULES,virtio-mmio.ko virtio_pci.ko virtio_console.ko virtio_input.ko) @$(call add,VM_INITRDMODULES,virtio-mmio.ko virtio_pci.ko virtio_console.ko virtio_input.ko)
@$(call add,VM_INITRDMODULES,drivers/video/fbdev)
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,VM_INITRDMODULES,ata_piix.ko) @$(call add,VM_INITRDMODULES,ata_piix.ko)
endif endif
@ -84,6 +84,10 @@ ifeq (,$(filter-out aarch64 armh,$(ARCH)))
@$(call add,VM_INITRDMODULES,drivers/i2c) @$(call add,VM_INITRDMODULES,drivers/i2c)
@$(call add,VM_INITRDMODULES,drivers/mfd) @$(call add,VM_INITRDMODULES,drivers/mfd)
@$(call add,VM_INITRDMODULES,drivers/clk) @$(call add,VM_INITRDMODULES,drivers/clk)
@$(call add,VM_INITRDMODULES,drivers/gpu/drm/bridge)
@$(call add,VM_INITRDMODULES,drivers/gpu/drm/rockchip)
@$(call add,VM_INITRDMODULES,drivers/gpu/drm/sun4i)
@$(call add,VM_INITRDMODULES,tegra-drm.ko)
endif endif
@$(call xport,VM_INITRDMODULES) @$(call xport,VM_INITRDMODULES)
@$(call xport,VM_INITRDFEATURES) @$(call xport,VM_INITRDFEATURES)

3
features.in/live/config.mk
Unescape View File

@ -48,7 +48,7 @@ use/live/desktop: use/live/x11 use/x11/xorg use/x11/wacom \
# preconfigure apt for both live and installed-from-live systems # preconfigure apt for both live and installed-from-live systems
use/live/repo: use/live use/live/repo: use/live
@$(call try,LIVE_REPO,http/yandex) @$(call try,LIVE_REPO,http/alt)
@$(call xport,LIVE_REPO) @$(call xport,LIVE_REPO)
# preconfigure apt in runtime (less reliable) # preconfigure apt in runtime (less reliable)
@ -61,6 +61,7 @@ use/live/install: use/metadata use/xdg-user-dirs \
use/bootloader/live use/bootloader/grub use/bootloader/live use/bootloader/grub
@$(call add,LIVE_PACKAGES,livecd-install) @$(call add,LIVE_PACKAGES,livecd-install)
@$(call add,LIVE_PACKAGES,livecd-installer-features) @$(call add,LIVE_PACKAGES,livecd-installer-features)
@$(call add,PINNED_PACKAGES,livecd-installer-features)
# text-based installation script # text-based installation script
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))

2
features.in/live/generate.mk
Unescape View File

@ -9,7 +9,7 @@ HOMEPAGE = http://oskometa.ru/
endif endif
ifndef HOMENAME ifndef HOMENAME
HOMENAME = ALT HOMENAME = KOMETA
endif endif
ifndef HOMEWAIT ifndef HOMEWAIT

34
features.in/live/live/image-scripts.d/60-apt
Unescape View File

@ -3,8 +3,38 @@
[ -n "$GLOBAL_LIVE_REPO" ] || exit 0 [ -n "$GLOBAL_LIVE_REPO" ] || exit 0
# no public repos for e2k for now, unfortunately
[ `arch` != "e2k" ] || exit 0
PROTO="${GLOBAL_LIVE_REPO%/*}" # http, ftp, rsync PROTO="${GLOBAL_LIVE_REPO%/*}" # http, ftp, rsync
case "$PROTO" in
http|ftp|rsync)
;;
*)
echo "Error: protocol $PROTO not supported" >&2
exit 1
;;
esac
MIRROR="${GLOBAL_LIVE_REPO#*/}" # alt, heanet, kiev, yandex, ... MIRROR="${GLOBAL_LIVE_REPO#*/}" # alt, heanet, kiev, yandex, ...
sed -i "s,^#\(rpm \[.*\] ${PROTO:-http}.*\),\1," \ if [ -z "$MIRROR" ]; then
"/etc/apt/sources.list.d/${MIRROR:-yandex}.list" ||: echo "Error: variable MIRROR is not set!!!" >&2
echo "Set REPO variable in the format: PROTO/MIRROR" >&2
echo "Example: http/yandex" >&2
exit 1
fi
repo_source="/etc/apt/sources.list.d/$MIRROR.list"
if [ ! -s "$repo_source" ]; then
echo "Error: $repo_source is not exist" >&2
exit 1
fi
# regexps from alterator-pkg (via installer-feature-online-repo)
prefix_re="[[:space:]]*rpm[[:space:]]\+\([^[:space:]]\+[[:space:]]\+\)\?"
host_re="${PROTO:-http}:\/\/\([^[:space:]]\+\)[[:space:]]\+"
updates_re="${prefix_re}${host_re}\([^[:space:]]\+\/\)\?"
sed -i "s/^#\($updates_re\)/\1/" "$repo_source"

3
features.in/net-eth/config.mk
Unescape View File

@ -25,4 +25,7 @@ use/net-eth/dhcp/timeout/%: use/net-eth/dhcp
use/net-eth/networkd-dhcp: use/net-eth/networkd use/net-eth/networkd-dhcp: use/net-eth/networkd
@$(call add,NET_ETH,eth0:dhcp) @$(call add,NET_ETH,eth0:dhcp)
use/net-eth/networkd-dhcp4: use/net-eth/networkd
@$(call add,NET_ETH,eth0:dhcp4)
# use e.g. eth0:static:10.0.0.2/24:10.0.0.1 for predefined static configuration # use e.g. eth0:static:10.0.0.2/24:10.0.0.1 for predefined static configuration

19
features.in/net-eth/rootfs/image-scripts.d/50-net-eth
Unescape View File

@ -22,7 +22,7 @@ SYSTEMD_IFDIR="/etc/systemd/network"
write_iface() { write_iface() {
case "$proto" in case "$proto" in
dhcp) dhcp*)
;; ;;
static) static)
[ -n "$ipv4addr" ] || fatal "ipv4addr missing" [ -n "$ipv4addr" ] || fatal "ipv4addr missing"
@ -41,7 +41,7 @@ write_etcnet_iface() {
mkdir -p "$dir" mkdir -p "$dir"
append= append=
case "$proto" in case "$proto" in
dhcp) dhcp*)
append="DHCP_TIMEOUT=$GLOBAL_NET_ETH_TIMEOUT" append="DHCP_TIMEOUT=$GLOBAL_NET_ETH_TIMEOUT"
;; ;;
static) static)
@ -62,6 +62,21 @@ write_etcnet_iface() {
write_systemd_iface() { write_systemd_iface() {
case "$proto" in case "$proto" in
dhcp4)
echo "[Match]"
echo "Name=$iface"
echo
echo "[Network]"
echo "DHCP=ipv4"
echo "IPv6AcceptRA=no"
echo "LinkLocalAddressing=ipv4"
echo
echo "[DHCP]"
echo "UseMTU=yes"
echo "UseDomains=yes"
echo "UseNTP=yes"
echo
;;
dhcp) dhcp)
echo "[Match]" echo "[Match]"
echo "Name=$iface" echo "Name=$iface"

2
features.in/net/rootfs/image-scripts.d/50-net-nm
Unescape View File

@ -4,7 +4,7 @@
defcfg=/etc/net/ifaces/default/options-eth defcfg=/etc/net/ifaces/default/options-eth
[ -f defcfg ] || exit 0 [ -f "$defcfg" ] || exit 0
if [ -x /usr/sbin/NetworkManager -o -x /usr/sbin/connmand ]; then if [ -x /usr/sbin/NetworkManager -o -x /usr/sbin/connmand ]; then
shell_config_set "$defcfg" NM_CONTROLLED yes shell_config_set "$defcfg" NM_CONTROLLED yes

21
features.in/oem/config.mk
Unescape View File

@ -1,8 +1,9 @@
use/oem: use/services use/branding use/deflogin/root use/oem: use/services use/branding use/deflogin/root
@$(call add_feature) @$(call add_feature)
@$(call add,DEFAULT_SERVICES_ENABLE,messagebus alteratord) @$(call add,DEFAULT_SERVICES_ENABLE,messagebus alteratord)
@$(call add,THE_PACKAGES,alterator-setup alterator-notes) @$(call add,BASE_PACKAGES,alterator-setup alterator-notes)
@$(call add,THE_PACKAGES,rootfs-installer-features) @$(call add,BASE_PACKAGES,rootfs-installer-features)
@$(call add,PINNED_PACKAGES,rootfs-installer-features)
@$(call add,THE_BRANDING,alterator notes) @$(call add,THE_BRANDING,alterator notes)
@$(call try,OEM_TARGET,setup) @$(call try,OEM_TARGET,setup)
@$(call add,DEFAULT_SERVICES_ENABLE,$$(OEM_TARGET)) @$(call add,DEFAULT_SERVICES_ENABLE,$$(OEM_TARGET))
@ -11,11 +12,9 @@ use/oem: use/services use/branding use/deflogin/root
@$(call xport,OEM_STEPS) @$(call xport,OEM_STEPS)
@$(call xport,OEM_INSTALL) @$(call xport,OEM_INSTALL)
use/oem/vnc: use/oem use/x11-vnc use/net-eth/dhcp use/oem/vnc: use/oem
@$(call add,THE_PACKAGES,alterator-setup-x11vnc) @$(call add,BASE_PACKAGES,alterator-vnc)
@$(call set,OEM_TARGET,setup-vnc) @$(call add,BASE_PACKAGES,x11vnc x11vnc-service xorg-drv-dummy)
@$(call set,NMCTL,no)
@$(call xport,NMCTL)
use/oem/no-cleanup: use/oem use/oem/no-cleanup: use/oem
@$(call set,OEM_NO_CLEANUP,yes) @$(call set,OEM_NO_CLEANUP,yes)
@ -23,12 +22,12 @@ use/oem/no-cleanup: use/oem
use/oem/distro: use/oem use/oem/distro: use/oem
@$(call try,OEM_STEPS,sysconfig notes-license datetime \ @$(call try,OEM_STEPS,sysconfig notes-license datetime \
preinstall net-eth root users setup-finish) preinstall net-eth root users setup-finish)
@$(call add,THE_PACKAGES,alterator-net-eth) @$(call add,BASE_PACKAGES,alterator-net-eth)
@$(call add,THE_PACKAGES,installer-common-stage3) @$(call add,BASE_PACKAGES,installer-common-stage3)
use/oem/install: use/oem use/repo/main use/oem/install: use/oem use/repo/main
@$(call set,OEM_INSTALL,yes) @$(call set,OEM_INSTALL,yes)
@$(call try,OEM_STEPS,sysconfig notes-license datetime pkg \ @$(call try,OEM_STEPS,sysconfig notes-license datetime pkg \
preinstall net-eth root users setup-finish) preinstall net-eth root users setup-finish)
@$(call add,THE_PACKAGES,alterator-pkg alterator-net-eth) @$(call add,BASE_PACKAGES,alterator-pkg alterator-net-eth)
@$(call add,THE_PACKAGES,installer-common-stage3) @$(call add,BASE_PACKAGES,installer-common-stage3)

8
features.in/repo/README
Unescape View File

@ -6,3 +6,11 @@
addons, updates или иных по мере необходимости. addons, updates или иных по мере необходимости.
Результат -- каталог ALTLinux/base/ для копирования в образ. Результат -- каталог ALTLinux/base/ для копирования в образ.
Дополнительно обрабатываемые переменные:
* REPO
** позволяет выбрать и включить зеркало репозитория
** не влияет ни на что, если вызывается цель use/repo/main
** значение: http/alt (по умолчанию) либо протокол/зеркало
** см. тж. /etc/apt/sources.list.d/, проверьте наличие нужного!

6
features.in/repo/config.mk
Unescape View File

@ -1,13 +1,15 @@
use/repo: use/repo:
@$(call add_feature) @$(call add_feature)
@$(call add,STAGE1_PACKAGES,gnupg) @$(call add,STAGE1_PACKAGES,gnupg)
@$(call xport,ROOTFS_MAIN) @$(call try,REPO,http/alt)
@$(call xport,REPO_MAIN)
@$(call xport,REPO)
use/repo/main:: sub/main use/repo; @: use/repo/main:: sub/main use/repo; @:
ifeq (vm,$(IMAGE_CLASS)) ifeq (vm,$(IMAGE_CLASS))
use/repo/main:: use/repo/main::
@$(call set,ROOTFS_MAIN,1) @$(call set,REPO_MAIN,1)
@$(call add,THE_PACKAGES,apt-repo-tools) @$(call add,THE_PACKAGES,apt-repo-tools)
endif endif

37
features.in/repo/image-scripts.d/90-enable-repo
Unescape View File

@ -1,15 +1,42 @@
#!/bin/sh #!/bin/sh
# enable online repos if possible, just quit if list is absent # enable online repos if not use/repo/main
repo_source='/etc/apt/sources.list.d/yandex.list' [ -z "$GLOBAL_REPO_MAIN" ] || exit 0
[ -z "$GLOBAL_ROOTFS_MAIN" ] || exit 0 # no public repos for e2k for now, unfortunately
[ `arch` != "e2k" ] || exit 0
[ -s "$repo_source" ] || exit 0 [ -n "$GLOBAL_REPO" ] || exit 0
PROTO="${GLOBAL_REPO%/*}" # http, ftp, rsync
case "$PROTO" in
http|ftp|rsync)
;;
*)
echo "Error: protocol $PROTO not supported" >&2
exit 1
;;
esac
MIRROR="${GLOBAL_REPO#*/}" # alt, heanet, kiev, yandex, ...
if [ -z "$MIRROR" ]; then
echo "Error: variable MIRROR is not set!!!" >&2
echo "Set REPO variable in the format: PROTO/MIRROR" >&2
echo "Example: http/yandex" >&2
exit 1
fi
repo_source="/etc/apt/sources.list.d/$MIRROR.list"
if [ ! -s "$repo_source" ]; then
echo "Error: $repo_source is not exist" >&2
exit 1
fi
# regexps from alterator-pkg (via installer-feature-online-repo) # regexps from alterator-pkg (via installer-feature-online-repo)
prefix_re="[[:space:]]*rpm[[:space:]]\+\([^[:space:]]\+[[:space:]]\+\)\?" prefix_re="[[:space:]]*rpm[[:space:]]\+\([^[:space:]]\+[[:space:]]\+\)\?"
host_re="http:\/\/\([^[:space:]]\+\)[[:space:]]\+" host_re="${PROTO:-http}:\/\/\([^[:space:]]\+\)[[:space:]]\+"
updates_re="${prefix_re}${host_re}\([^[:space:]]\+\/\)\?" updates_re="${prefix_re}${host_re}\([^[:space:]]\+\/\)\?"
sed -i "s/^#\($updates_re\)/\1/" "$repo_source" sed -i "s/^#\($updates_re\)/\1/" "$repo_source"

17
features.in/repo/install2/image-scripts.d/90-repo-mirror
Unescape View File

@ -0,0 +1,17 @@
#!/bin/sh
repo_script=/usr/share/install2/postinstall.d/99-online-repo.sh
[ -f "$repo_script" ] || exit 0
[ -n "$GLOBAL_REPO" ] || exit 0
MIRROR="${GLOBAL_REPO#*/}" # alt, heanet, kiev, yandex, ...
repo_source="/etc/apt/sources.list.d/$MIRROR.list"
if [ ! -s "$repo_source" ]; then
echo "Error: $repo_source is not exist" >&2
exit 1
fi
sed -i "s;repo_source=.*;repo_source=$repo_source;" "$repo_script"

2
features.in/repo/rootfs/image-scripts.d/01-genbasedir-rootfs
Unescape View File

@ -1,6 +1,6 @@
#!/bin/sh -eu #!/bin/sh -eu
[ -n "$GLOBAL_ROOTFS_MAIN" ] || exit 0 [ -n "$GLOBAL_REPO_MAIN" ] || exit 0
mv /ALTLinux /srv/ALT mv /ALTLinux /srv/ALT

2
features.in/repo/rootfs/image-scripts.d/80-repo-rootfs-main
Unescape View File

@ -2,7 +2,7 @@
# configure package repository of the image (provided by sub/main); # configure package repository of the image (provided by sub/main);
# this script will be run iff both live and repo features are used # this script will be run iff both live and repo features are used
[ -n "$GLOBAL_ROOTFS_MAIN" ] || exit 0 [ -n "$GLOBAL_REPO_MAIN" ] || exit 0
DIR=/etc/apt/sources.list.d DIR=/etc/apt/sources.list.d

2
features.in/server/config.mk
Unescape View File

@ -5,8 +5,6 @@ use/server/base: use/server use/firmware/server \
use/net-ssh use/syslinux/timeout/600 use/grub/timeout/60 use/net-ssh use/syslinux/timeout/600 use/grub/timeout/60
@$(call set,BOOTVGA,) @$(call set,BOOTVGA,)
@$(call add,THE_LISTS,server-base) @$(call add,THE_LISTS,server-base)
@$(call add,THE_KMODULES,e1000e igb)
@$(call add,STAGE1_KMODULES,e1000e)
@$(call add,INSTALL2_PACKAGES,installer-feature-server-raid-fixup-stage2) @$(call add,INSTALL2_PACKAGES,installer-feature-server-raid-fixup-stage2)
use/server/mini: use/server/base use/services/lvm2-disable use/server/mini: use/server/base use/services/lvm2-disable

26
features.in/slinux/config.mk
Unescape View File

@ -43,22 +43,26 @@ use/slinux/services-disabled:
use/slinux/services: use/slinux/services-enabled use/slinux/services-disabled use/slinux/services: use/slinux/services-enabled use/slinux/services-disabled
ifeq (,$(filter-out riscv64,$(ARCH)))
use/slinux/vm-base:: use/oem/vnc
@$(call set,KFLAVOURS,un-def)
endif
use/slinux/vm-base:: vm/systemd \ use/slinux/vm-base:: vm/systemd \
use/oem/distro use/slinux/mixin-base use/oem/distro use/slinux/mixin-base
@$(call add,THE_LISTS,slinux/games-base) @$(call add,THE_LISTS,slinux/games-base)
@$(call add,THE_LISTS,slinux/graphics-base) @$(call add,THE_LISTS,slinux/graphics-base)
@$(call add,THE_LISTS,slinux/multimedia-base) @$(call add,THE_LISTS,slinux/multimedia-base)
@$(call add,THE_LISTS,slinux/net-base) @$(call add,THE_LISTS,slinux/net-base)
ifeq (,$(filter-out riscv64,$(ARCH)))
@$(call add,THE_LISTS,slinux/claws-mail)
endif
@$(call add,THE_PACKAGES,installer-feature-lightdm-stage3) @$(call add,THE_PACKAGES,installer-feature-lightdm-stage3)
@$(call add,THE_PACKAGES,installer-feature-online-repo) @$(call add,THE_PACKAGES,installer-feature-online-repo)
@$(call add,THE_PACKAGES,installer-feature-samba-usershares-stage2) @$(call add,THE_PACKAGES,installer-feature-samba-usershares-stage2)
@$(call add,THE_PACKAGES,installer-feature-sudo-enable-by-default-stage3) @$(call add,THE_PACKAGES,installer-feature-sudo-enable-by-default-stage3)
ifeq (,$(filter-out riscv64,$(ARCH)))
use/slinux/vm-base:: use/oem/vnc use/browser/epiphany
@$(call add,THE_PACKAGES,xfce-reduced-resource)
@$(call set,KFLAVOURS,un-def)
endif
use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \ use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \
+nm use/x11/gtk/nm +systemd +systemd-optimal +wireless \ +nm use/x11/gtk/nm +systemd +systemd-optimal +wireless \
use/l10n/default/ru_RU \ use/l10n/default/ru_RU \
@ -76,10 +80,15 @@ use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \
@$(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))
@$(call add,THE_KMODULES,staging) @$(call add,THE_KMODULES,staging)
ifeq (,$(filter-out armh aarch64 mipsel e2k%,$(ARCH))) ifeq (,$(filter-out armh mipsel e2k%,$(ARCH)))
@$(call add,THE_LISTS,slinux/browser-firefox) @$(call add,THE_LISTS,slinux/browser-firefox)
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
else else
@$(call add,THE_LISTS,slinux/browser-chromium) @$(call add,THE_LISTS,slinux/browser-chromium)
@$(call add,THE_LISTS,slinux/multimedia-player-vlc)
endif
ifeq (,$(filter-out riscv64,$(ARCH)))
@$(call add,THE_PACKAGES,abiword gnumeric)
endif endif
ifeq (,$(filter-out armh aarch64 i586 x86_64,$(ARCH))) ifeq (,$(filter-out armh aarch64 i586 x86_64,$(ARCH)))
@$(call set,KFLAVOURS,std-def) @$(call set,KFLAVOURS,std-def)
@ -104,11 +113,6 @@ use/slinux/base: use/isohybrid use/luks \
@$(call add,LIVE_LISTS,slinux/live) @$(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)
ifeq (,$(filter-out armh aarch64 mipsel e2k%,$(ARCH)))
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
else
@$(call add,THE_LISTS,slinux/multimedia-player-vlc)
endif
use/slinux/full: use/slinux/base use/slinux/full: use/slinux/base
@$(call add,MAIN_LISTS,slinux/not-install-full) @$(call add,MAIN_LISTS,slinux/not-install-full)

4
features.in/stage2/stage1/modules.d/50-stage2-usb
Unescape View File

@ -14,3 +14,7 @@ xhci-hcd.ko
xhci-pci.ko xhci-pci.ko
xhci-pci-renesas.ko xhci-pci-renesas.ko
xhci-plat-hcd.ko xhci-plat-hcd.ko
dwc3-pci.ko
dwc3-baikal.ko
udc-core.ko
xhci-hcdi.ko

11
features.in/syslinux/stage1/scripts.d/01-syslinux
Unescape View File

@ -2,6 +2,12 @@
# gather syslinux configuration from snippets; # gather syslinux configuration from snippets;
# copy modules; see also this feature's generate.mk # copy modules; see also this feature's generate.mk
# snippets are not going into the actual image
final_exit () {
if [ "$DEBUG" != 2 ]; then rm -r .in/; fi
exit 0
}
MODDIR="/usr/lib/syslinux" MODDIR="/usr/lib/syslinux"
case "$GLOBAL_BOOTLOADER" in case "$GLOBAL_BOOTLOADER" in
@ -38,7 +44,7 @@ fi
# validate just in case (see also stage1 Makefile) # validate just in case (see also stage1 Makefile)
case "$GLOBAL_BOOTLOADER" in case "$GLOBAL_BOOTLOADER" in
isolinux|syslinux) ;; isolinux|syslinux) ;;
*) exit 0;; *) final_exit;;
esac esac
# copy extra files, if any # copy extra files, if any
@ -56,8 +62,7 @@ if [ -n "$SYSLINUX_MODULES" ]; then
done done
fi fi
# snippets are not going into the actual image final_exit
if [ "$DEBUG" != 2 ]; then rm -r .in/; fi
# NB: there will be final macro expansion based on actual image sizes # NB: there will be final macro expansion based on actual image sizes
# done by features.in/syslinux/scripts.d/20-propagator-ramdisk # done by features.in/syslinux/scripts.d/20-propagator-ramdisk

2
features.in/tty/config.mk
Unescape View File

@ -5,7 +5,7 @@ use/tty:
@$(call xport,BASE_BOOTARGS) @$(call xport,BASE_BOOTARGS)
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
@$(call add,INSTALL2_PACKAGES,installer-feature-serial-stage2) @$(call add,INSTALL2_PACKAGES,installer-feature-serial-stage2)
@$(call add,BASE_PACKAGES,installer-feature-serial-stage3) @$(call add,THE_PACKAGES,installer-feature-serial-stage3)
endif endif
comma := , comma := ,

5
features.in/uboot/config.mk
Unescape View File

@ -7,12 +7,7 @@ endif
endif endif
ifeq (,$(filter-out riscv64,$(ARCH))) ifeq (,$(filter-out riscv64,$(ARCH)))
ifeq (,$(filter-out qcow2 qcow2c,$(IMAGE_TYPE)))
UBOOT_TTY := use/tty/S0 UBOOT_TTY := use/tty/S0
UBOOT_NOFDTDIR := 1
else
UBOOT_TTY := use/tty/SIF0
endif
endif endif
ifneq (,$(filter-out i586 x86_64,$(ARCH))) ifneq (,$(filter-out i586 x86_64,$(ARCH)))

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save