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

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

Browse Source
master
Artem Proskurnev 3 years ago
parent d7dffd7a5f
commit c75d1334f5
17 changed files with 68 additions and 17080 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. 17032
      bld/build.log
  2. 10
      bld/distcfg.mk
  3. 2
      bld/files/.disk/commit
  4. 2
      bld/files/.disk/date
  5. 2
      bld/files/.disk/info
  6. BIN
      bld/files/.disk/profile.tgz
  7. BIN
      bld/files/Metadata/pkg-groups.tar
  8. 49
      bld/pkg/lists/.base
  9. 2
      bld/pkg/lists/tagged/base+kde5
  10. 18
      bld/pkg/lists/tagged/base+kometa
  11. 4
      bld/stage1/files/boot/grub/.in/00defaults.cfg
  12. 2
      bld/stage1/files/boot/grub/.in/30live.cfg
  13. 2
      bld/stage1/files/boot/grub/.in/32live_rw.cfg
  14. 2
      bld/stage1/files/syslinux/.in/01gfxboot.cfg
  15. 2
      bld/stage1/files/syslinux/.in/30live.cfg
  16. 2
      bld/stage1/files/syslinux/.in/32live_rw.cfg
  17. 17
      main.mk

17032
bld/build.log
View File

File diff suppressed because it is too large Load Diff

10
bld/distcfg.mk
Unescape View File

@ -21,7 +21,7 @@ PACKAGES_REQUIRED_INITROOT = basesystem 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 ?= alt-p10-kde5 META_APP_ID ?= kometa-p10-kde5
META_PUBLISHER ?= Artem Proskurnev META_PUBLISHER ?= Artem Proskurnev
# boot/iso # boot/iso
BOOTLOADER ?= isolinux BOOTLOADER ?= isolinux
@ -110,12 +110,12 @@ STAGE1_PACKAGES += syslinux
BOOTVGA ?= normal BOOTVGA ?= normal
SYSLINUX_FILES += /usr/lib/syslinux/pxelinux.0 SYSLINUX_FILES += /usr/lib/syslinux/pxelinux.0
META_SYSTEM_ID ?= SYSLINUX 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) export GLOBAL_SYSLINUX_DEFAULT = $(SYSLINUX_DEFAULT)
# use/grub # use/grub
FEATURES += grub FEATURES += grub
BOOTVGA ?= normal BOOTVGA ?= normal
RELNAME = ALT (alt-p10-kde5) RELNAME = ALT (kometa-p10-kde5)
export GLOBAL_GRUB_DEFAULT = $(GRUB_DEFAULT) export GLOBAL_GRUB_DEFAULT = $(GRUB_DEFAULT)
# use/memtest # use/memtest
FEATURES += memtest FEATURES += memtest
@ -506,8 +506,8 @@ THE_PACKAGES += make-initrd-plymouth
BASE_BOOTARGS += splash BASE_BOOTARGS += splash
# use/build-distro # use/build-distro
FEATURES += build-distro FEATURES += build-distro
# config/name/alt-p10-kde5 # config/name/kometa-p10-kde5
IMAGE_NAME = alt-p10-kde5 IMAGE_NAME = kometa-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 @@
e1b6e10bac7b540f29a965935d4ada6b82740763 8e945bfd1e598e74d0a2cffbb51259ede6766f35

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

@ -1 +1 @@
20220209 20220211

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

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

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

Binary file not shown.

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

Binary file not shown.

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

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

2
bld/pkg/lists/tagged/base+kde5
Unescape View File

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

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

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

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

@ -12,13 +12,13 @@ insmod minicmd
insmod normal insmod normal
insmod test insmod test
set timeout=60 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 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 lang=ru_RU
if [ ! "$lang" ]; then lang=ru_RU; fi if [ ! "$lang" ]; then lang=en_US; fi
if [ -s $pfxfat/grubenv ]; then if [ -s $pfxfat/grubenv ]; then
load_env --file $pfxfat/grubenv load_env --file $pfxfat/grubenv
set default="${saved_entry}" set default="${saved_entry}"

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: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 ..." 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: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 ..." echo $"Loading initial ramdisk ..."
initrd$linux_suffix /boot/full$KFLAVOUR.cz initrd$linux_suffix /boot/full$KFLAVOUR.cz
} }

2
bld/stage1/files/syslinux/.in/01gfxboot.cfg
Unescape View File

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

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: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

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: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

17
main.mk
Unescape View File

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

Write Preview
Loading…
Cancel
Save