Изменения для сборки системы с офисами Р7 и МойОфис

bld/distcfg.mk

@@ -21,7 +21,7 @@ PACKAGES_REQUIRED_INITROOT = basesystem branding-$(BRANDING)-release
 export GLOBAL_ARCH = $(ARCH)
 # distro/.init
 META_PREPARER ?= mkimage-profiles
-META_APP_ID ?= alt-p10-kde5
+META_APP_ID ?= kometa-p10-kde5
 META_PUBLISHER ?= Artem Proskurnev
 # boot/iso
 BOOTLOADER ?= isolinux
@@ -110,12 +110,12 @@ STAGE1_PACKAGES += syslinux
 BOOTVGA ?= normal
 SYSLINUX_FILES += /usr/lib/syslinux/pxelinux.0
 META_SYSTEM_ID ?= SYSLINUX
-#RELNAME = ALT (alt-p10-kde5) # overridden by use/grub
+#RELNAME = ALT (kometa-p10-kde5) # overridden by use/grub
 export GLOBAL_SYSLINUX_DEFAULT = $(SYSLINUX_DEFAULT)
 # use/grub
 FEATURES += grub
 BOOTVGA ?= normal
-RELNAME = ALT (alt-p10-kde5)
+RELNAME = ALT (kometa-p10-kde5)
 export GLOBAL_GRUB_DEFAULT = $(GRUB_DEFAULT)
 # use/memtest
 FEATURES += memtest
@@ -506,8 +506,8 @@ THE_PACKAGES += make-initrd-plymouth
 BASE_BOOTARGS += splash
 # use/build-distro
 FEATURES += build-distro
-# config/name/alt-p10-kde5
-IMAGE_NAME = alt-p10-kde5
+# config/name/kometa-p10-kde5
+IMAGE_NAME = kometa-p10-kde5
 # use/pack
 FEATURES += pack
 # use/pack/iso

bld/files/.disk/commit

@@ -1 +1 @@
-e1b6e10bac7b540f29a965935d4ada6b82740763
+8e945bfd1e598e74d0a2cffbb51259ede6766f35

bld/files/.disk/date

@@ -1 +1 @@
-20220209
+20220211

bld/files/.disk/info

@@ -1 +1 @@
-KOMETA p10 kde5/x86_64 build 2022-02-09
+KOMETA p10 kde5/x86_64 build 2022-02-11

bld/pkg/lists/.base

@@ -378,7 +378,7 @@ kde5-edu
 kde5-printing
 kde5-scanning
 kde5-dolphin-plugins
-#plasma5-discover-maxi
+plasma5-discover-maxi
 
 
 xorg-conf-synaptics
@@ -407,18 +407,19 @@ 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
+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
@@ -433,6 +434,9 @@ fonts-ttf-unifont
 fonts-ttf-google-crosextra-carlito
 fonts-ttf-PTAstra
 
+####Lang
+hunspell-ru-lebedev
+
 ####soft
 gimp
 gimp-help-ru
@@ -442,6 +446,7 @@ xsane-gimp2
 simple-scan
 vlc-maxi
 simplescreenrecorder
+peek
 git
 xsensors
 chromium
@@ -449,21 +454,25 @@ firefox
 LibreOffice
 LibreOffice-langpack-ru
 LibreOffice-kde5
+LibreOffice-integrated
+LibreOffice-extensions
+LibreOffice-extension-CyrillicTools
 kde5-menu-new-odf-files
 cheese
 kamoso
 guvcview
-kdenlive
+#kdenlive
 shotcut
-openshot
+#openshot
 avidemux-qt
 lmms
-synfigstudio
+scribus
+#synfigstudio
 #pdfmod
 tesseract-langpack-ru
 gimagereader-qt5
 eepm
-darktable
+#darktable
 ksnip
 v4l-utils
 
@@ -477,8 +486,8 @@ audacity-manual
 blender
 scratch-full
 scratch-help-en
-wxMaxima
-bluefish
+#wxMaxima
+#bluefish
 lazarus
 qt-creator
 klatexformula
@@ -499,7 +508,7 @@ python3-tools-pep8
 sympy
 python3-module-sympy
 python3-module-sympy-examples
-ipython3
+#ipython3
 alterator-update-kernel
 ###touchegg
 hplip-hpcups-PPDs

bld/pkg/lists/tagged/base+kde5

@@ -75,7 +75,7 @@ kde5-edu
 kde5-printing
 kde5-scanning
 kde5-dolphin-plugins
-#plasma5-discover-maxi
+plasma5-discover-maxi
 
 
 xorg-conf-synaptics

bld/pkg/lists/tagged/base+kometa

@@ -26,7 +26,7 @@ eepm-add-r7-office
 #r7-office
 
 ####МойОфис
-myoffice-standard-documents
+#myoffice-standard-documents
 
 ####Fonts
 fonts-ttf-ms
@@ -38,6 +38,9 @@ fonts-ttf-unifont
 fonts-ttf-google-crosextra-carlito
 fonts-ttf-PTAstra
 
+####Lang
+hunspell-ru-lebedev
+
 ####soft
 gimp
 gimp-help-ru
@@ -47,6 +50,7 @@ xsane-gimp2
 simple-scan
 vlc-maxi
 simplescreenrecorder
+peek
 git
 xsensors
 chromium
@@ -54,16 +58,20 @@ firefox
 LibreOffice
 LibreOffice-langpack-ru
 LibreOffice-kde5
+LibreOffice-integrated
+LibreOffice-extensions
+LibreOffice-extension-CyrillicTools
 kde5-menu-new-odf-files
 cheese
 kamoso
 guvcview
 kdenlive
 shotcut
-openshot
+#openshot
 avidemux-qt
 lmms
-synfigstudio
+scribus
+#synfigstudio
 #pdfmod
 tesseract-langpack-ru
 gimagereader-qt5
@@ -82,8 +90,8 @@ audacity-manual
 blender
 scratch-full
 scratch-help-en
-wxMaxima
-bluefish
+#wxMaxima
+#bluefish
 lazarus
 qt-creator
 klatexformula

bld/stage1/files/boot/grub/.in/00defaults.cfg

@@ -12,13 +12,13 @@ insmod minicmd
 insmod normal
 insmod test
 set timeout=60
-if [ "$grub_platform" = "efi" ]; then set EFI_BOOTARGS=' lang=ru_RU'; fi
+if [ "$grub_platform" = "efi" ]; then set EFI_BOOTARGS=''; fi
 if [ "$grub_platform" = "efi" -a "$grub_cpu" = "x86_64" ]; then
 	set linux_suffix='efi'
 fi
 if [ "$grub_platform" = "pc" ]; then set linux_suffix='16'; fi
 lang=ru_RU
-if [ ! "$lang" ]; then lang=ru_RU; fi
+if [ ! "$lang" ]; then lang=en_US; fi
 if [ -s $pfxfat/grubenv ]; then
   load_env --file $pfxfat/grubenv
   set default="${saved_entry}"

bld/stage1/files/boot/grub/.in/30live.cfg

@@ -1,7 +1,7 @@
 menuentry $"LiveCD (no hard disk needed)" --id 'live' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  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
+  linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot live changedisk automatic=method:cdrom,fuid:2022-02-09-01-05-29-00 stagename=live ramdisk_size=@live_size@ showopts lowmem vga=normal usbcore.autosuspend=-1 quiet splash $EFI_BOOTARGS lang=$lang
   echo $"Loading initial ramdisk ..."
   initrd$linux_suffix /boot/full$KFLAVOUR.cz
 }

bld/stage1/files/boot/grub/.in/32live_rw.cfg

@@ -1,7 +1,7 @@
 menuentry $"LiveCD with sessions support" --id 'session' {
   savedefault
   echo $"Loading Linux vmlinuz$KFLAVOUR ..."
-  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
+  linux$linux_suffix /boot/vmlinuz$KFLAVOUR fastboot live changedisk automatic=method:cdrom,fuid:2022-02-09-01-05-29-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 ..."
   initrd$linux_suffix /boot/full$KFLAVOUR.cz
 }

bld/stage1/files/syslinux/.in/01gfxboot.cfg

@@ -1,4 +1,4 @@
 ui gfxboot bootlogo message
-menu title ALT (alt-p10-kde5)
+menu title ALT (kometa-p10-kde5)
 prompt 0
 

bld/stage1/files/syslinux/.in/30live.cfg

@@ -1,4 +1,4 @@
 label live
   kernel /boot/vmlinuz
-  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
+  append initrd=/boot/full.cz fastboot live changedisk automatic=method:cdrom,fuid:2022-02-09-01-05-29-00 stagename=live ramdisk_size=@live_size@ showopts lowmem vga=normal usbcore.autosuspend=-1 quiet splash
 

bld/stage1/files/syslinux/.in/32live_rw.cfg

@@ -1,4 +1,4 @@
 label session
   kernel /boot/vmlinuz
-  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
+  append initrd=/boot/full.cz fastboot live changedisk automatic=method:cdrom,fuid:2022-02-09-01-05-29-00 stagename=live ramdisk_size=@live_size@ showopts live_rw vga=normal usbcore.autosuspend=-1 quiet splash
 

main.mk

@@ -20,13 +20,16 @@ IMAGE_FILE    := $(lastword  $(subst /, ,$(IMAGE_TARGET)))# generic.tar.gz
 ifneq (,$(BRANCH))
 IMAGE_FILE    := $(subst regular,alt-$(BRANCH),$(IMAGE_FILE))
 endif
-IMAGE_NAME    := $(firstword $(subst ., ,$(IMAGE_FILE)))#   generic
-IMAGE_TYPE    := $(subst $(IMAGE_NAME).,,$(IMAGE_FILE))#    tar.gz
-ifeq ($(IMAGE_NAME),$(IMAGE_TYPE)$(IMAGE_GUESS))
-ifneq (help,$(IMAGE_CLASS))
-$(warning no image type/extension specified, run make help?)
-endif
-endif
+#IMAGE_NAME    := $(firstword $(subst ., ,$(IMAGE_FILE)))#   generic
+#IMAGE_TYPE    := $(subst $(IMAGE_NAME).,,$(IMAGE_FILE))#    tar.gz
+#ifeq ($(IMAGE_NAME),$(IMAGE_TYPE)$(IMAGE_GUESS))
+#ifneq (help,$(IMAGE_CLASS))
+#$(warning no image type/extension specified, run make help?)
+#endif
+#endif
+IMAGE_NAME := kometa-p10-kde5
+IMAGE_TYPE := iso
+
 
 # readjustable
 ifeq (1,$(NUM_TARGETS))