Commit 2c997f53 authored by Anton Midyukov's avatar Anton Midyukov

Merge tag 'v1.5.7' into sisyphus

v1.5.7
parents 36bb8173 e7df892b
......@@ -29,6 +29,11 @@ $ git config --global user.name "My Name"
$ mkdir -p ~/out ~/tmp
----
Примечание: можно обойтись установкой пакета builder-useradd и выполнением одной команды от root::
----
# builder-useradd USER
----
тестовая сборка (в каталоге mkimage-profiles)::
----
$ make grub.iso
......@@ -52,3 +57,4 @@ $ make ARCH=i586 APTCONF=~/apt/apt.conf.i586 REPORT=1 ve/generic.tar
- http://www.altlinux.org/m-p
- http://www.altlinux.org/m-p-howto ("как поправить под себя")
- http://www.altlinux.org/starterkits/builder (сборочный LiveCD)
- http://nightly.altlinux.org/docs/mkimage-profiles.html (Документация)
......@@ -80,6 +80,21 @@ if [ "$BOOTLOADER" == grub-efi -o "$BOOTTYPE" == EFI ]; then
ROOTPART="2"
fi
# tested to work: ext[234], jfs
# NB: xfs doesn't have a spare sector for the bootloader
ROOTFSTYPE="${4:-ext4}"
if [ -f "$ROOTFS/boot/extlinux/extlinux.conf" ] && [ "$ROOTFSTYPE" != ext4 ]; then
if [ -n "$EFIPART" ]; then
BOOTPART="2"
ROOTPART="3"
else
BOOTPART="1"
ROOTPART="2"
fi
BOOTFSTYPE="ext4"
fi
PARTTABLE="$7"
if [ -z "$PARTTABLE" ]; then
if [ "$BOOTLOADER" == grub-efi ]; then
......@@ -138,19 +153,20 @@ IMG="$2"
ROOTSIZE="$3"
[ -n "$ROOTSIZE" -a "$ROOTSIZE" != 0 ] || unset ROOTSIZE
BOOTSIZE="$9"
[ -n "$BOOTSIZE" -a "$BOOTSIZE" != 0 ] || unset BOOTSIZE
# image size in bytes
TARSIZE="$(stat -Lc %s "$TAR")"
# /boot size in that tarball
BOOTSIZE="$(boot_size "$TAR")"
DEFSIZE="$(($SIZE_FACTOR * ($TARSIZE - $BOOTSIZE)))" # (exact sizes)
BOOTDEFSIZE="$(boot_size "$TAR")"
DEFSIZE="$(($SIZE_FACTOR * ($TARSIZE - ${BOOTSIZE:-$BOOTDEFSIZE})))" # (exact sizes)
ROOTSIZE="$((${ROOTSIZE:-$DEFSIZE} + $MB - 1))" # for ceil rounding to MB
# image and /boot sizes in megabytes
ROOTSIZEM="$(($ROOTSIZE / $MB))"
BOOTSIZEM="$((($SIZE_FACTOR * $BOOT_SIZE_FACTOR * $BOOTSIZE + $MB - 1) / $MB))"
# tested to work: ext[234], jfs
# NB: xfs doesn't have a spare sector for the bootloader
ROOTFSTYPE="${4:-ext4}"
BOOTDEFSIZE="$(($SIZE_FACTOR * $BOOT_SIZE_FACTOR * $BOOTDEFSIZE))"
BOOTSIZE="$((${BOOTSIZE:-$BOOTDEFSIZE} + $MB - 1))" # for ceil rounding to MB
BOOTSIZEM="$(($BOOTSIZE / $MB))"
# single root partition hardwired so far,
# add another image for home/data/swap if needed
......@@ -369,11 +385,19 @@ popd
if [ -f "$ROOTFS/boot/extlinux/extlinux.conf" ]; then
sed -i "s/LABEL=ROOT/$ROOTDEV/g" "$ROOTFS/boot/extlinux/extlinux.conf"
if [ "$PARTTABLE" == gpt ]; then
if [ -n "$BOOTPART" ]; then
parting set "$BOOTPART" legacy_boot on
else
parting set "$ROOTPART" legacy_boot on
fi
fi
if [ "$PARTTABLE" == msdos ]; then
if [ -n "$BOOTPART" ]; then
parting set "$BOOTPART" boot on
else
parting set "$ROOTPART" boot on
fi
fi
fi
# Setup bootloader
......
......@@ -109,7 +109,7 @@ vm/alt-workstation-bfk3: vm/alt-workstation use/mipsel-bfk3/x11; @:
vm/alt-workstation-tavolga: vm/alt-workstation use/mipsel-mitx/x11; @:
endif
vm/alt-workstation-cloud: vm/systemd use/x11/lightdm/gtk \
vm/alt-workstation-cloud: vm/systemd use/x11/lightdm/gtk use/repo \
mixin/alt-workstation mixin/cloud-init use/vmguest/kvm use/tty/S0
@$(call add,THE_PACKAGES,cloud-init-config-network-manager)
@$(call add,THE_KMODULES,drm)
......
......@@ -91,11 +91,10 @@ mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm-gtk \
mixin/regular-deepin: use/x11/deepin use/browser/chromium +nm; @:
mixin/regular-gnome3: use/x11/gnome3 use/fonts/ttf/redhat +nm-gtk
@$(call add,THE_PACKAGES,xcalib templates)
mixin/regular-gnome: use/x11/gnome use/fonts/ttf/redhat +nm
@$(call add,THE_PACKAGES,templates)
@$(call add,THE_PACKAGES,chrome-gnome-shell)
@$(call add,THE_PACKAGES,qt5-wayland qt6-wayland)
@$(call add,THE_PACKAGES,packagekit)
mixin/regular-kde5: use/x11/kde5 use/browser/falkon \
use/x11/kde5-display-manager-lightdm \
......@@ -153,7 +152,7 @@ mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
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,rpm-utils screen tmux wget zsh)
@$(call add,THE_PACKAGES,apt-repo aptitude eepm)
@$(call add,THE_PACKAGES,apt-repo)
### vm.mk
mixin/cloud-init:
......
mixin/phosh: use/x11/gdm use/x11-autologin +pipewire +nm +nm-native
mixin/waydroid:
@$(call add,THE_PACKAGES,libgbinder1 waydroid)
@$(call add,THE_KMODULES,anbox)
@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,waydroid-container.service)
@$(call add,BASE_BOOTARGS,psi=1)
mixin/phone-base: use/ntp/chrony use/repo use/branding/notes \
use/deflogin/privileges use/deflogin/xgrp use/deflogin/hardware \
use/deflogin/root use/l10n/ru_RU
@$(call add,THE_LISTS,mobile/base)
@$(call add,USERS,altlinux:271828:1:1)
@$(call set,LOCALES,ru_RU en_US)
@$(call set,LOCALE,ru_RU)
@$(call add,CONTROL,fusermount:public)
@$(call add,CONTROL,libnss-role:disabled)
mixin/phosh: use/x11/gdm use/x11-autologin +pulse +nm +nm-native \
use/services
@$(call add,THE_PACKAGES,phosh mutter-gnome xorg-xwayland)
@$(call add,THE_PACKAGES,gnome-terminal gedit)
@$(call add,THE_PACKAGES,qt5-wayland qt6-wayland)
@$(call add,THE_PACKAGES,bluez)
@$(call add,THE_LISTS,mobile/apps)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
@$(call set,DEFAULT_SESSION,phosh)
ifeq (vm,$(IMAGE_CLASS))
vm/.phosh: vm/systemd use/efi/grub +systemd \
mixin/regular-vm-base mixin/regular-x11 \
mixin/regular-desktop mixin/phosh use/deflogin/root \
use/deflogin/privileges use/deflogin/xgrp use/deflogin/hardware \
use/l10n/ru_RU
@$(call add,USERS,altlinux:altlinux:500:500)
@$(call set,LOCALES,ru_RU en_US)
@$(call set,LOCALE,ru_RU)
@$(call set,KFLAVOURS,un-def)
vm/.phosh: vm/systemd mixin/phone-base mixin/phosh +systemd \
mixin/waydroid; @:
vm/qemu-phosh: vm/.phosh use/tty/S0 +vmguest; @:
vm/phosh: vm/.phosh use/tty/S0 use/efi/grub use/bootloader/uboot \
use/firmware +x11 +plymouth +vmguest; @:
endif
ifeq (aarch64,$(ARCH))
# TODO: devicetree ($root)/boot/dtb/rockchip/rk3399-pinephone-pro.dtb
mixin/pinephone: use/x11/armsoc use/firmware use/uboot use/tty/S2; @:
mixin/pinephone: use/x11/armsoc use/firmware use/bootloader/uboot use/tty/S2 \
use/phone
@$(call set,EFI_BOOTLOADER,)
@$(call set,UBOOT_TIMEOUT,5)
@$(call set,KFLAVOURS,pine)
@$(call add,THE_PACKAGES,eg25-manager)
@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,eg25-manager.service)
ifeq (vm,$(IMAGE_CLASS))
vm/pinephone-phosh: vm/.phosh mixin/pinephone; @:
......
......@@ -92,7 +92,7 @@ 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-x11; @:
vm/regular-gnome3: vm/.regular-gtk mixin/regular-gnome3 mixin/vm-archdep-x11
vm/regular-gnome: vm/.regular-gtk mixin/regular-gnome mixin/vm-archdep-x11
@$(call set,VM_SIZE,8589934592)
vm/regular-lxde: vm/.regular-gtk mixin/regular-lxde mixin/vm-archdep-x11; @:
......
......@@ -177,7 +177,7 @@ distro/regular-xfce-install: distro/.regular-install-x11-systemd \
distro/regular-xfce-sysv: distro/.regular-gtk-sysv mixin/regular-xfce-sysv; @:
distro/regular-gnome3-install: distro/.regular-install-x11-systemd mixin/regular-gnome3 \
distro/regular-gnome-install: distro/.regular-install-x11-systemd mixin/regular-gnome \
use/kernel/latest +plymouth; @:
distro/regular-xfce-sysv-install: distro/.regular-install-x11-full \
......@@ -192,10 +192,8 @@ distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment; @:
distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
# not .regular-gtk due to gdm vs lightdm
distro/regular-gnome3: distro/.regular-desktop mixin/regular-gnome3 \
use/kernel/latest +plymouth use/browser/epiphany
@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
@$(call add,LIVE_PACKAGES,screenpen)
distro/regular-gnome: distro/.regular-desktop mixin/regular-gnome \
use/kernel/latest +plymouth use/browser/epiphany; @:
distro/regular-lxqt: distro/.regular-gtk mixin/regular-lxqt +plymouth
@$(call add,THE_LISTS,$(call tags,lxqt desktop))
......@@ -233,7 +231,6 @@ distro/.regular-server: distro/.regular-server-base use/net/etcnet \
use/server/mini use/firmware/qlogic use/rescue/base \
use/ntp/chrony use/cleanup/libs use/bootloader/grub +efi
@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@$(call add,BASE_PACKAGES,aptitude)
@$(call add,CLEANUP_PACKAGES,qt4-common qt5-base-common)
@$(call add,DEFAULT_SERVICES_DISABLE,bridge)
@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1)
......
......@@ -6,7 +6,7 @@ distro/.server-base: distro/.installer use/syslinux/ui/menu use/memtest \
@$(call add,BASE_LISTS,server-base openssh)
distro/server-nano: distro/.server-base use/bootloader/lilo +power \
use/install2/cleanup/crypto use/install2/cleanup/vnc
use/install2/cleanup/vnc
@$(call add,BASE_LISTS,$(call tags,server network))
@$(call add,BASE_PACKAGES,dhcpcd cpio)
......
......@@ -58,7 +58,7 @@ tar2fs: $(SAVE_TARBALL) check-sudo prepare-tarball-qemu
if ! sudo $$TOPDIR/bin/tar2fs \
"$(VM_TARBALL)" "$(VM_RAWDISK)" "$(VM_SIZE)" "$(VM_FSTYPE)" \
"$(VM_BOOTLOADER)" "$(ARCH)" "$(VM_PARTTABLE)" \
"$(VM_BOOTTYPE)"; then \
"$(VM_BOOTTYPE)" "$(VM_BOOTSIZE)"; then \
echo "** error: sudo tar2fs failed, see build log" >&2; \
exit 1; \
fi
......
......@@ -9,6 +9,21 @@
CAUTION: применяйте разумно, т.к. крайне легко создать и оставить
дыру в безопасности!
Пользователи добавляются через переменную USERS через пробел в формате:
login:passwd:admin:sudo
Например:
@$(call add,USERS,fedya:123:1:1 masha:321::)
Будут созданы два пользователя: fedya с паролем 123', c правами администратора
и настроенным sudo, и пользователь masha c паролем '321', без прав администратора
и без sudo.
Также можно определить группы, в которые будут добавляться пользователи через
переменную GROUPS.
В версии mkimage-profiles 1.4.4 появилась возможность создать пользователя
с произвольными uid, gid, домашним каталогом, интерпретатором shell и т.д.
Используйте для этого следующую конструкцию:
......
......@@ -145,11 +145,6 @@ use/install2/cleanup/dri:
@$(call set,INSTALL2_CLEANUP_DRI,yes)
@$(call xport,INSTALL2_CLEANUP_DRI)
# conflicts with luks feature
use/install2/cleanup/crypto:
@$(call add,INSTALL2_CLEANUP_PACKAGES,gnupg)
@$(call add,INSTALL2_CLEANUP_PACKAGES,libgnutls*)
# leave only cirrus, fbdev, qxl, vesa in vm-targeted images
use/install2/cleanup/x11-hwdrivers:
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-ati xorg-drv-intel)
......@@ -160,7 +155,7 @@ use/install2/cleanup/x11-hwdrivers:
# massive purge of anything not critical to installer boot (l10n included!)
use/install2/cleanup/everything: use/install2/cleanup/x11-hwdrivers \
use/install2/cleanup/vnc use/install2/cleanup/crypto
use/install2/cleanup/vnc
@$(call add,INSTALL2_CLEANUP_PACKAGES,glibc-locales)
@$(call add,INSTALL2_CLEANUP_PACKAGES,libX11-locales alterator-l10n)
@$(call add,INSTALL2_CLEANUP_PACKAGES,kbd-data kbd console-scripts)
......
......@@ -57,6 +57,7 @@ use/kernel/initrd-setup: use/kernel
@$(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,drivers/video/fbdev)
@$(call add,VM_INITRDMODULES,crc32_generic.ko)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,VM_INITRDMODULES,ata_piix.ko)
endif
......
......@@ -7,19 +7,18 @@ locale="$GLOBAL_LOCALE"
systemd_locale=/etc/locale.conf
sysv_locale=/etc/sysconfig/i18n
[ -f "$langlist" ] || exit 0
[ -n "$locales" ] || exit 0
if [ -f "$langlist" ] && [ -n "$locales" ]; then
rm -f "$langlist_temp"
rm -f "$langlist_temp"
for lang in $locales; do
for lang in $locales; do
grep -q "$lang" "$langlist" && grep "$lang" "$langlist" >> "$langlist_temp"
done
mv "$langlist_temp" "$langlist"
done
[ -n "$locale" ] || exit 0
mv "$langlist_temp" "$langlist"
fi
echo LANG="$locale".UTF8 > "$systemd_locale"
echo LANG="$locale".UTF8 > "$sysv_locale"
echo SUPPORTED="$locale".UTF8 >> "$sysv_locale"
if [ -n "$locale" ]; then
echo LANG="$locale".UTF8 > "$systemd_locale"
echo LANG="$locale".UTF8 > "$sysv_locale"
echo SUPPORTED="$locale".UTF8 >> "$sysv_locale"
fi
Customization for rk3399s compatible models, including pinephone
pro.
use/phone:
@$(call add_feature)
@$(call add,THE_PAKAGES,wallpapers-mobile)
#!/bin/sh -efu
# Run screen keyboard (squeekboard) by default
cp "/usr/share/applications/sm.puri.Squeekboard.desktop" "/etc/xdg/autostart/"
#!/bin/sh -efu
# Workaround is needed due to bug in old tow-boot versions
# (until next release):
# https://github.com/Tow-Boot/Tow-Boot/issues/171
ln -s "../../PinePhonePro/PINE64-PinePhonePro-.conf" "/usr/share/alsa/ucm2/conf.d/simple-card/simple-card.conf"
#!/bin/sh -efu
# Set user perms on installed config
chown altlinux:altlinux -R "/home/altlinux/.config"
[org/gnome/desktop/background]
picture-uri='file:///usr/share/wallpapers/mobile/720x1440/basealt-background.png'
polkit.addRule(function(action, subject) {
if (action.id == "org.freedesktop.ModemManager1.Contacts" ||
action.id == "org.freedesktop.ModemManager1.Device.Control" ||
action.id == "org.freedesktop.ModemManager1.Location" ||
action.id == "org.freedesktop.ModemManager1.Messaging" ||
action.id == "org.freedesktop.ModemManager1.Time" ||
action.id == "org.freedesktop.ModemManager1.USSD" ||
action.id == "org.freedesktop.ModemManager1.Voice")
{
return polkit.Result.YES;
}
});
/* TWEAKS-START phosh-applist-background */
phosh-app-grid {
background-image: url("file:///usr/share/wallpapers/mobile/720x1440/basealt-background.png");
background-size: cover;
background-position: center;
}
/* TWEAKS-END phosh-applist-background */
/* TWEAKS-START phosh-lockscreen-background */
phosh-lockscreen, .phosh-lockshield {
background-image: url("file:///usr/share/wallpapers/mobile/720x1440/basealt-lockscreen.png");
background-size: cover;
background-position: center;
}
/* TWEAKS-END phosh-lockscreen-background */
......@@ -19,9 +19,5 @@ use/sound/pulse: use/sound
use/sound/pipewire: use/sound
@$(call set,THE_SOUND,sound/pipewire)
@$(call add,DEFAULT_SYSTEMD_USER_SERVICES_ENABLE,pipewire pipewire-pulse)
ifeq (sisyphus,$(BRANCH))
@$(call add,THE_PACKAGES,wireplumber)
@$(call add,DEFAULT_SYSTEMD_USER_SERVICES_ENABLE,wireplumber)
else
@$(call add,DEFAULT_SYSTEMD_USER_SERVICES_ENABLE,pipewire-media-session)
endif
......@@ -3,6 +3,8 @@ ext3.ko
ext4.ko
kernel/fs/exfat
kernel/fs/fat
kernel/fs/f2fs
kernel/crypto/crc32_generic.ko
kernel/fs/mbcache.ko
kernel/fs/ntfs
kernel/fs/ntfs3
......
......@@ -16,3 +16,13 @@ if ! grep -q "$BIN" "$CFG"; then
n=$(($n+1))
done
fi
EXTLINUXCFG=/boot/extlinux/extlinux.conf
if [ -f "$EXTLINUXCFG" ]; then
sed -i "s/ quiet / /g;s/ quiet'/'/" "$EXTLINUXCFG"
fi
GRUBCFG=/etc/sysconfig/grub2
if [ -f "$GRUBCFG" ]; then
sed -i "s/ quiet / /g;s/ quiet'/'/" "$GRUBCFG"
fi
......@@ -156,8 +156,9 @@ use/x11/cinnamon: use/x11/xorg +pulse
use/x11/deepin: use/x11/xorg +pulse
@$(call add,THE_LISTS,$(call tags,deepin desktop))
use/x11/gnome3: use/x11/xorg use/x11/gdm +pipewire
@$(call add,THE_PACKAGES,gnome3-minimal gnome3-default)
use/x11/gnome: use/x11/xorg use/x11/gdm +pipewire
@$(call add,THE_PACKAGES,gnome3-minimal)
@$(call add,THE_PACKAGES,tracker3) # ALT bug 42028
@$(call add,IM_PACKAGES,imsettings-gsettings)
use/x11/enlightenment: use/x11 use/net/connman use/power/acpi +pulse
......
gnome-calls
gnome-contacts
chatty
gnome-clocks
gnome-calendar
gnome-screenshot
grim
megapixels
chromium
firefox
telegram-desktop
evince
mpv
amberol
lollypop
glibc-locales
ntfs-3g
dosfstools
fatresize
exfatprogs
f2fs-tools
shadow-change
openssh
openssh-blacklist
net-tools
nfs-utils
system-report
strace
powertop@X86
pciutils
usbutils
acpi
dmidecode@X86,aarch64
apt-repo
apt-rsync
apt-scripts
apt-https
bash-completion
cpufreq-simple@X86
eject
bc
ncdu
tree
lsblk
sysfsutils
vim-console
inxi
glxinfo
lm_sensors3
udev-extras
# fix missing requires
librsvg
# icons
gnome-icon-theme
gnome-icon-theme-symbolic
# uicode fonts
fonts-ttf-gnu-freefont-mono
fonts-ttf-gnu-freefont-sans
fonts-ttf-gnu-freefont-serif
# for terminal
fonts-otf-adobe-source-code-pro
pam-limits-desktop
polkit
udev-rules-rfkill-uaccess
xdg-user-dirs
......@@ -33,7 +33,6 @@ apt-scripts
apt-https
#aptitude # See ALT bug 41622
update-kernel
eepm
bash-completion
cpufreq-simple@X86
......
......@@ -15,7 +15,6 @@ binutils
# Package management
apt-repo
aptitude
# Disk utils
dc3dd
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment