Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
mkimage-profiles
Commits
8c7d82cd
Commit
8c7d82cd
authored
Sep 29, 2023
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'next' into sisyphus
parents
8ebc7724
cefad179
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
52 additions
and
20 deletions
+52
-20
education.mk
conf.d/education.mk
+4
-3
live.mk
conf.d/live.mk
+1
-1
mixin.mk
conf.d/mixin.mk
+1
-0
50branding.mk
features.in/branding/install2/lib/50branding.mk
+1
-1
20-branding.mk
features.in/branding/lib/20-branding.mk
+1
-1
50branding.mk
features.in/branding/live/lib/50branding.mk
+1
-1
50branding.mk
features.in/branding/main/lib/50branding.mk
+1
-1
50branding.mk
features.in/branding/stage1/lib/50branding.mk
+1
-1
config.mk
features.in/grub/config.mk
+1
-1
config.mk
features.in/initrd-propagator/config.mk
+1
-0
50-pkgpriorities.mk
features.in/pkgpriorities/lib/50-pkgpriorities.mk
+0
-0
50-pkgpriorities-main.mk
features.in/pkgpriorities/main/lib/50-pkgpriorities-main.mk
+6
-6
50-pkgpriorities-stage2.mk
...es.in/pkgpriorities/stage2/lib/50-pkgpriorities-stage2.mk
+0
-0
config.mk
features.in/x11/config.mk
+4
-0
build.mk
lib/build.mk
+2
-2
00_libreoffice.directory
pkg.in/groups/education/00_libreoffice.directory
+7
-0
10_robotics.directory
pkg.in/groups/education/10_robotics.directory
+7
-0
base
pkg.in/lists/centaurus/base
+0
-1
kdesc
pkg.in/lists/education/kdesc
+0
-1
libreoffice
pkg.in/lists/education/libreoffice
+6
-0
misc
pkg.in/lists/education/misc
+3
-0
robotics
pkg.in/lists/education/robotics
+2
-0
base
pkg.in/lists/mobile/base
+2
-0
No files found.
conf.d/education.mk
View file @
8c7d82cd
...
...
@@ -12,7 +12,6 @@ mixin/education: \
use/x11/lightdm/gtk +pulse \
+nm use/x11/gtk/nm \
use/xdg-user-dirs/deep \
use/office/LibreOffice/full \
use/browser/chromium
@$(call set,BRANDING,alt-education)
@$(call add,THE_BRANDING,indexhtml)
...
...
@@ -102,7 +101,7 @@ mixin/education-base: \
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
@$(call set,INSTALLER,education)
@$(call set,META_VOL_ID,ALT Education 10.
1
$(ARCH))
@$(call set,META_VOL_ID,ALT Education 10.
2
$(ARCH))
@$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_APP_ID,$(DISTRO_VERSION) $(ARCH))
@$(call set,META_VOL_SET,ALT)
...
...
@@ -124,7 +123,7 @@ mixin/education-lite-base: \
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
@$(call set,INSTALLER,education)
@$(call set,META_VOL_ID,ALT Education 10.
1
$(ARCH))
@$(call set,META_VOL_ID,ALT Education 10.
2
$(ARCH))
@$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_APP_ID,$(DISTRO_VERSION) $(ARCH))
@$(call set,META_VOL_SET,ALT)
...
...
@@ -143,6 +142,7 @@ mixin/education-installer: \
@$(call add,INSTALL2_PACKAGES,disable-usb-autosuspend)
@$(call add,INSTALL2_PACKAGES,btrfs-progs)
@$(call add,MAIN_GROUPS,education/00_base)
@$(call add,MAIN_GROUPS,education/00_libreoffice)
@$(call add,MAIN_GROUPS,education/01_preschool)
@$(call add,MAIN_GROUPS,education/02_gradeschool)
@$(call add,MAIN_GROUPS,education/03_highschool)
...
...
@@ -150,6 +150,7 @@ mixin/education-installer: \
@$(call add,MAIN_GROUPS,education/05_university)
@$(call add,MAIN_GROUPS,education/07_teacher)
@$(call add,MAIN_GROUPS,education/08_server-apps-edu)
@$(call add,MAIN_GROUPS,education/10_robotics)
@$(call add,BASE_PACKAGES,os-prober)
@$(call add,BASE_PACKAGES,guest-account)
@$(call add,MAIN_PACKAGES,iperf3)
...
...
conf.d/live.mk
View file @
8c7d82cd
...
...
@@ -25,7 +25,7 @@ endif
distro/grub-net-install: distro/.base +efi \
use/firmware use/grub/sdab_bios.cfg use/l10n \
use/stage2/net-install use/stage2/hid use/stage2/usb \
use/stage2/ata use/stage2/sbc
use/stage2/ata use/stage2/sbc
use/stage2/kms
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call set,BOOTLOADER,grubpcboot)
endif
...
...
conf.d/mixin.mk
View file @
8c7d82cd
...
...
@@ -93,6 +93,7 @@ mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm \
mixin/regular-deepin: use/x11/deepin use/browser/chromium +nm; @:
mixin/regular-gnome: use/x11/gnome use/fonts/ttf/redhat +nm
@$(call add,THE_PACKAGES,power-profiles-daemon)
@$(call add,THE_PACKAGES,gnome-terminal)
@$(call add,PINNED_PACKAGES,gnome-terminal:Required)
@$(call add,THE_PACKAGES,templates)
...
...
features.in/branding/install2/lib/50branding.mk
View file @
8c7d82cd
IMAGE_PACKAGES_REGEXP += $(call branding, \
IMAGE_PACKAGES_REGEXP += $(call branding,
release
\
$(STAGE2_BRANDING) $(INSTALL2_BRANDING))
features.in/branding/lib/20-branding.mk
View file @
8c7d82cd
# step 4: build the distribution image
DOT_BASE += $(call branding,$(THE_BRANDING))
DOT_BASE += $(call branding,
release
$(THE_BRANDING))
features.in/branding/live/lib/50branding.mk
View file @
8c7d82cd
IMAGE_PACKAGES_REGEXP += $(call branding, \
IMAGE_PACKAGES_REGEXP += $(call branding,
release
\
$(THE_BRANDING) $(STAGE2_BRANDING))
features.in/branding/main/lib/50branding.mk
View file @
8c7d82cd
IMAGE_PACKAGES_REGEXP += $(call branding,$(THE_BRANDING))
IMAGE_PACKAGES_REGEXP += $(call branding,
release
$(THE_BRANDING))
features.in/branding/stage1/lib/50branding.mk
View file @
8c7d82cd
CHROOT_PACKAGES_REGEXP += $(call branding,$(STAGE1_BRANDING))
CHROOT_PACKAGES_REGEXP += $(call branding,
release
$(STAGE1_BRANDING))
features.in/grub/config.mk
View file @
8c7d82cd
...
...
@@ -13,7 +13,7 @@ endif
# UI is overwritten
use/grub/ui/%: use/grub
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64 aarch64
loongarch64
,$(ARCH)))
@$(call set,GRUB_UI,$*)
@if [ "$*" == gfxboot ]; then \
$(call add,STAGE1_BRANDING,bootloader); \
...
...
features.in/initrd-propagator/config.mk
View file @
8c7d82cd
...
...
@@ -5,3 +5,4 @@ use/initrd-propagator:
@$(call set,STAGE1_INITRD_TYPEARGS,$(shell echo "changedisk automatic"))
@$(call set,STAGE1_INITRD_BOOTMETHOD,$(shell echo "method:cdrom,fuid:$(UUID_ISO)"))
@$(call set,STAGE1_INITRD_STAGE2_OPTION,stagename)
@$(call add,STAGE2_BOOTARGS,udev.log_level=err)
features.in/pkgpriorities/
rootfs/
lib/50-pkgpriorities.mk
→
features.in/pkgpriorities/lib/50-pkgpriorities.mk
View file @
8c7d82cd
File moved
features.in/pkgpriorities/main/lib/50-pkgpriorities.mk
→
features.in/pkgpriorities/main/lib/50-pkgpriorities
-main
.mk
View file @
8c7d82cd
_
IMAGE_APTBOX_ = $(WORKDIR)
/aptbox
_
MAIN_APTBOX_ = $(WORKDIR)/pkgbox
/aptbox
# Add prerequisite to the copy-packages target of
# $(MKIMAGE_PREFIX)/targets.mk.
copy-packages: $(_
IMAGE
_APTBOX_)/etc/apt/pkgpriorities
copy-packages: $(_
MAIN
_APTBOX_)/etc/apt/pkgpriorities
_PINNED_PACKAGES_ = $(foreach pp,$(PINNED_PACKAGES),$(if $(findstring :,$(pp)),$(pp),$(pp):$(PIN_PRIORITY)))
_PIN_PRIORITIES_ = $(sort $(foreach pp,$(_PINNED_PACKAGES_),$(lastword $(subst :, ,$(pp)))))
_PKGPRIORITIES_ = $(subst \n ,\n,$(foreach pri,$(_PIN_PRIORITIES_),$(pri):$(patsubst %:$(pri),\n %,$(filter %:$(pri),$(_PINNED_PACKAGES_)))\n))
$(_
IMAGE
_APTBOX_)/etc/apt/pkgpriorities: prepare-workdir
$(_
MAIN
_APTBOX_)/etc/apt/pkgpriorities: prepare-workdir
@echo -e '$(_PKGPRIORITIES_)' | sed -e 's,[[:space:]]\+$$,,' >$@
@if [ -s $@ ]; then \
if grep -q '^\(APT::\)\?Dir::Etc::pkgpriorities[[:space:]]' \
$(_
IMAGE
_APTBOX_)/etc/apt/apt.conf; \
$(_
MAIN
_APTBOX_)/etc/apt/apt.conf; \
then \
sed -i -e 's,\(Dir::Etc::pkgpriorities\)[[:space:]].*$$,\1 "$@";,g' \
$(_
IMAGE
_APTBOX_)/etc/apt/apt.conf; \
$(_
MAIN
_APTBOX_)/etc/apt/apt.conf; \
else \
echo 'Dir::Etc::pkgpriorities "$@";' \
>>$(_
IMAGE
_APTBOX_)/etc/apt/apt.conf; \
>>$(_
MAIN
_APTBOX_)/etc/apt/apt.conf; \
fi; \
echo "--- Package priorities ---" >&2; \
cat $@ >&2; \
...
...
features.in/pkgpriorities/stage2/lib/50-pkgpriorities.mk
→
features.in/pkgpriorities/stage2/lib/50-pkgpriorities
-stage2
.mk
View file @
8c7d82cd
File moved
features.in/x11/config.mk
View file @
8c7d82cd
...
...
@@ -25,6 +25,10 @@ ifeq (,$(filter-out riscv64,$(ARCH)))
use/x11/xorg:: use/x11/amdgpu; @:
endif
ifeq (,$(filter-out loongarch64,$(ARCH)))
use/x11/xorg:: use/x11/radeon use/x11/amdgpu; @:
endif
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
use/x11/intel: use/x11 use/drm
@$(call add,THE_PACKAGES,xorg-drv-intel)
...
...
lib/build.mk
View file @
8c7d82cd
...
...
@@ -95,7 +95,7 @@ build-image: profile/populate
tail -n $(MAX_LINES) "$(BUILDLOG)" $(SHORTEN) \
| if [ -z "$(QUIET)" ]; then \
echo "$(TIME) done $$DURATION"; \
GREP_COLOR
="
$(ANSI_OK)" \
GREP_COLOR
S="mt=0
$(ANSI_OK)" \
grep --color=auto '^\*\* image: .*$$' ||:; \
else \
echo -n "$(TIME) $$DURATION "; \
...
...
@@ -114,7 +114,7 @@ build-image: profile/populate
echo "$(TIME) (you might want to rerun with DEBUG=1)"; \
fi; \
tail -n $(MAX_LINES) "$(BUILDLOG)" \
| GREP_COLOR
="
$(ANSI_FAIL)" \
| GREP_COLOR
S="mt=0
$(ANSI_FAIL)" \
grep -E --color=auto -m "$(MAX_ERRORS)" "$(GOTCHA)"; \
df -P $(BUILDDIR) | awk 'END { if ($$4 < $(LOWSPACE)) \
{ print "NB: low space on "$$6" ("$$5" used)"}}'; \
...
...
pkg.in/groups/education/00_libreoffice.directory
0 → 100644
View file @
8c7d82cd
[Desktop Entry]
Encoding=UTF-8
Type=Directory
Name=LibreOffice Office Suite
X-Alterator-PackageList=education/libreoffice
Name[ru_RU]=Офисный пакет LibreOffice
X-Alterator-Required=yes
pkg.in/groups/education/10_robotics.directory
0 → 100644
View file @
8c7d82cd
[Desktop Entry]
Encoding=UTF-8
Type=Directory
Name=Robotics
X-Alterator-PackageList=education/robotics
X-Alterator-Required=no
Name[ru_RU]=Робототехника
pkg.in/lists/centaurus/base
View file @
8c7d82cd
installer-feature-online-repo@!E2K
installer-feature-repo-add@!E2K
make-initrd-multipath
lsof
man-pages
...
...
pkg.in/lists/education/kdesc
View file @
8c7d82cd
...
...
@@ -33,6 +33,5 @@ kde5-edu
kde5-printing
kde5-scanning
kde5-connect
LibreOffice-still-kde5@!E2K
nextcloud-client-kde5@!E2K
branding-alt-education-kde-settings
pkg.in/lists/education/libreoffice
0 → 100644
View file @
8c7d82cd
LibreOffice-still@META
LibreOffice-still-gtk3
LibreOffice-still-langpack-be
LibreOffice-still-langpack-kk
LibreOffice-still-langpack-ru
LibreOffice-still-langpack-uk
pkg.in/lists/education/misc
View file @
8c7d82cd
...
...
@@ -92,6 +92,7 @@ adp
settime-rfc867
x11spice@x86_64
x11spice@aarch64
freerdp-server
pam_pkcs11
gvfs-shares
shared-desktop-icons
...
...
@@ -160,6 +161,7 @@ system-config-printer-udev
xkill
eiciel
polkit-rule-udisks2-mount
userpasswd
# Package managenment
synaptic
...
...
@@ -167,6 +169,7 @@ synaptic-usermode
gnome-software
gnome-software-disable-updates
packagekit
polkit-rule-packagekit-allow-remove
rpminstall
appinstall
...
...
pkg.in/lists/education/robotics
0 → 100644
View file @
8c7d82cd
gz-sim
arduino
pkg.in/lists/mobile/base
View file @
8c7d82cd
...
...
@@ -66,3 +66,5 @@ polkit
udev-rules-rfkill-uaccess
xdg-user-dirs
android-tools
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment