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
bc64e2d8
Commit
bc64e2d8
authored
Jul 28, 2023
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag 'v1.5.8' into sisyphus
v1.5.8
parents
ab60b876
5ff45b2f
Hide whitespace changes
Inline
Side-by-side
Showing
53 changed files
with
145 additions
and
152 deletions
+145
-152
tar2fs
bin/tar2fs
+34
-6
e2k.mk
conf.d/e2k.mk
+1
-1
live.mk
conf.d/live.mk
+1
-1
mixin.mk
conf.d/mixin.mk
+2
-2
phone.mk
conf.d/phone.mk
+16
-7
realtime.mk
conf.d/realtime.mk
+0
-1
regular-vm.mk
conf.d/regular-vm.mk
+1
-1
regular.mk
conf.d/regular.mk
+5
-10
ve.mk
conf.d/ve.mk
+3
-3
vm.mk
conf.d/vm.mk
+0
-1
config.mk
features.in/bootloader/config.mk
+1
-1
config.mk
features.in/build-vm/config.mk
+0
-1
90-cleanup-live-pkgs
...ures.in/cleanup/live/image-scripts.d/90-cleanup-live-pkgs
+2
-1
70-default-session
...res.in/deflogin/rootfs/image-scripts.d/70-default-session
+7
-2
config.mk
features.in/efi/config.mk
+1
-1
25install-vnc-connect.cfg
features.in/grub/cfg.in/25install-vnc-connect.cfg
+1
-1
25install-vnc-listen.cfg
features.in/grub/cfg.in/25install-vnc-listen.cfg
+1
-1
26live-install-vnc-listen.cfg
features.in/grub/cfg.in/26live-install-vnc-listen.cfg
+1
-1
30live.cfg
features.in/grub/cfg.in/30live.cfg
+1
-1
32live_rw.cfg
features.in/grub/cfg.in/32live_rw.cfg
+1
-1
80rescue.cfg
features.in/grub/cfg.in/80rescue.cfg
+1
-1
82rescue_rw.cfg
features.in/grub/cfg.in/82rescue_rw.cfg
+1
-1
83rescue_fm.cfg
features.in/grub/cfg.in/83rescue_fm.cfg
+1
-1
84rescue_remote.cfg
features.in/grub/cfg.in/84rescue_remote.cfg
+1
-1
85mediacheck.cfg
features.in/grub/cfg.in/85mediacheck.cfg
+1
-1
config.mk
features.in/grub/config.mk
+1
-1
config.mk
features.in/hdt/config.mk
+0
-1
generate.mk
features.in/initrd-bootchain/generate.mk
+1
-1
bootchain
features.in/initrd-bootchain/stage1/files/.disk/bootchain
+0
-0
80-make-initrd-for-bootchain
...d-bootchain/stage1/scripts.d/80-make-initrd-for-bootchain
+16
-22
01-initfs
features.in/initrd-propagator/stage1/scripts.d/01-initfs
+0
-2
11-initrd-propagator
...n/initrd-propagator/stage1/scripts.d/11-initrd-propagator
+0
-7
80-make-initrd-for-propagator
...propagator/stage1/scripts.d/80-make-initrd-for-propagator
+12
-10
config.mk
features.in/kernel/config.mk
+5
-0
82-background-config
features.in/phone/image-scripts.d/82-background-config
+0
-4
00_background
....in/phone/rootfs/files/etc/dconf/db/local.d/00_background
+0
-2
user
features.in/phone/rootfs/files/etc/dconf/profile/user
+0
-2
gtk.css
...es.in/phone/rootfs/files/etc/skel/.config/gtk-3.0/gtk.css
+0
-0
config.mk
features.in/plymouth/config.mk
+1
-1
config.mk
features.in/rescue/config.mk
+1
-1
config.mk
features.in/services/config.mk
+3
-0
config.mk
features.in/stage2/config.mk
+0
-1
50-stage2-net-cifs
features.in/stage2/stage1/modules.d/50-stage2-net-cifs
+1
-0
50-serial
features.in/tty/rootfs/image-scripts.d/50-serial
+5
-9
config.mk
features.in/x11/config.mk
+3
-3
boot.mk
lib/boot.mk
+1
-1
profile.mk
lib/profile.mk
+1
-0
vm.mk
lib/vm.mk
+1
-1
apps
pkg.in/lists/mobile/apps
+8
-2
base+rescue
pkg.in/lists/tagged/base+rescue
+1
-1
desktop+lxqt+extra
pkg.in/lists/tagged/desktop+lxqt+extra
+0
-29
rescue+backup
pkg.in/lists/tagged/rescue+backup
+0
-1
server+openvpn
pkg.in/lists/tagged/server+openvpn
+0
-1
No files found.
bin/tar2fs
View file @
bc64e2d8
...
@@ -77,7 +77,12 @@ if [ "$BOOTLOADER" == grub-efi -o "$BOOTTYPE" == EFI ]; then
...
@@ -77,7 +77,12 @@ if [ "$BOOTLOADER" == grub-efi -o "$BOOTTYPE" == EFI ]; then
EFIPART
=
"1"
EFIPART
=
"1"
EFIPARTSIZEM
=
"256"
EFIPARTSIZEM
=
"256"
EFIPARTFSTYPE
=
"fat"
EFIPARTFSTYPE
=
"fat"
ROOTPART
=
"2"
if
[
"
$ARCH
"
=
x86_64
]
;
then
BIOSPART
=
"2"
ROOTPART
=
"3"
else
ROOTPART
=
"2"
fi
fi
fi
# tested to work: ext[234], jfs
# tested to work: ext[234], jfs
...
@@ -217,7 +222,7 @@ trap exit_handler EXIT ERR
...
@@ -217,7 +222,7 @@ trap exit_handler EXIT ERR
# prepare disk image and a filesystem inside it
# prepare disk image and a filesystem inside it
rm
-f
--
"
$IMG
"
rm
-f
--
"
$IMG
"
OFFSET
=
"
$((
$CUR_BOUNDARY
+
$EFIPARTSIZEM
+
$BOOTLOADERPARTSIZEM
+
$BOOTSIZEM
+
$ROOTSIZEM
-
1
))
"
OFFSET
=
"
$((
$CUR_BOUNDARY
+
$EFIPARTSIZEM
+
$BOOTLOADERPARTSIZEM
+
$BOOTSIZEM
+
$
{
BIOSPART
:+1
}
+
$
ROOTSIZEM
-
1
))
"
dd
if
=
/dev/zero
of
=
"
$IMG
"
conv
=
notrunc
bs
=
$MB
count
=
1
seek
=
"
$OFFSET
"
dd
if
=
/dev/zero
of
=
"
$IMG
"
conv
=
notrunc
bs
=
$MB
count
=
1
seek
=
"
$OFFSET
"
losetup
-f
"
$IMG
"
losetup
-f
"
$IMG
"
LOOPDEV
=
$(
losetup
-j
"
$IMG
"
|
cut
-f
1
-d
':'
)
LOOPDEV
=
$(
losetup
-j
"
$IMG
"
|
cut
-f
1
-d
':'
)
...
@@ -249,6 +254,12 @@ if [ -n "$EFIPART" ]; then
...
@@ -249,6 +254,12 @@ if [ -n "$EFIPART" ]; then
fi
fi
fi
fi
if
[
-n
"
$BIOSPART
"
]
;
then
parting mkpart bios
$((
CUR_BOUNDARY+1
))
MiB
$((
$CUR_BOUNDARY
+
2
))
MiB
CUR_BOUNDARY
=
"
$((
$CUR_BOUNDARY
+
1
))
"
parting
set
"
$BIOSPART
"
bios on
fi
if
[
-n
"
$BOOTPART
"
]
;
then
if
[
-n
"
$BOOTPART
"
]
;
then
BOOTDEV
=
"
$BLOCKDEV$BOOTPART
"
BOOTDEV
=
"
$BLOCKDEV$BOOTPART
"
mkpart
"
$BOOTSIZEM
"
mkpart
"
$BOOTSIZEM
"
...
@@ -440,19 +451,36 @@ grub-efi)
...
@@ -440,19 +451,36 @@ grub-efi)
case
"
$ARCH
"
in
case
"
$ARCH
"
in
x86_64
)
x86_64
)
chroot
"
$ROOTFS
"
grub-install
--target
=
i386-efi
--recheck
\
chroot
"
$ROOTFS
"
grub-install
--target
=
i386-efi
--recheck
\
--no-nvram
--uefi-secure-boot
chroot
"
$ROOTFS
"
grub-install
--target
=
x86_64-efi
--recheck
\
--no-nvram
--uefi-secure-boot
chroot
"
$ROOTFS
"
grub-install
--target
=
i386-efi
--recheck
\
--removable
--uefi-secure-boot
--removable
--uefi-secure-boot
chroot
"
$ROOTFS
"
grub-install
--target
=
x86_64-efi
--recheck
\
chroot
"
$ROOTFS
"
grub-install
--target
=
x86_64-efi
--recheck
\
--removable
--uefi-secure-boot
--removable
--uefi-secure-boot
sed
-i
's/initrd16/initrdefi/g'
"
$ROOTFS
/boot/grub/grub.cfg"
sed
-i
's/initrd16/initrd/g'
"
$ROOTFS
/boot/grub/grub.cfg"
sed
-i
's/linux16/linuxefi/g'
"
$ROOTFS
/boot/grub/grub.cfg"
sed
-i
's/linux16/linux/g'
"
$ROOTFS
/boot/grub/grub.cfg"
[
-n
"
$BIOSPART
"
]
&&
chroot
"
$ROOTFS
"
grub-install
--target
=
i386-pc
"
$LOOPDEV
"
;;
;;
aarch64
)
aarch64
)
chroot
"
$ROOTFS
"
grub-install
--target
=
arm64-efi
--recheck
\
chroot
"
$ROOTFS
"
grub-install
--target
=
arm64-efi
--recheck
\
--no-nvram
--uefi-secure-boot
chroot
"
$ROOTFS
"
grub-install
--target
=
arm64-efi
--recheck
\
--removable
--uefi-secure-boot
--removable
--uefi-secure-boot
;;
;;
riscv64
)
riscv64
)
chroot
"
$ROOTFS
"
grub-install
--target
=
riscv64-efi
--recheck
\
chroot
"
$ROOTFS
"
grub-install
--target
=
riscv64-efi
--recheck
\
--no-nvram
--uefi-secure-boot
chroot
"
$ROOTFS
"
grub-install
--target
=
riscv64-efi
--recheck
\
--removable
--uefi-secure-boot
--removable
--uefi-secure-boot
;;
loongarch64
)
chroot
"
$ROOTFS
"
grub-install
--target
=
loongarch64-efi
--recheck
\
--no-nvram
--uefi-secure-boot
chroot
"
$ROOTFS
"
grub-install
--target
=
loongarch64-efi
--recheck
\
--removable
--uefi-secure-boot
;;
esac
esac
sed
-i
'/GRUB_DISABLE_OS_PROBER=true/d'
"
$ROOTFS
/etc/sysconfig/grub2"
sed
-i
'/GRUB_DISABLE_OS_PROBER=true/d'
"
$ROOTFS
/etc/sysconfig/grub2"
;;
;;
...
@@ -462,8 +490,8 @@ grub)
...
@@ -462,8 +490,8 @@ grub)
case
"
$ARCH
"
in
case
"
$ARCH
"
in
*
86
*
)
*
86
*
)
chroot
"
$ROOTFS
"
grub-install
--target
=
i386-pc
"
$LOOPDEV
"
chroot
"
$ROOTFS
"
grub-install
--target
=
i386-pc
"
$LOOPDEV
"
sed
-i
's/initrdefi/initrd
16
/g'
"
$ROOTFS
/boot/grub/grub.cfg"
sed
-i
's/initrdefi/initrd/g'
"
$ROOTFS
/boot/grub/grub.cfg"
sed
-i
's/linuxefi/linux
16
/g'
"
$ROOTFS
/boot/grub/grub.cfg"
sed
-i
's/linuxefi/linux/g'
"
$ROOTFS
/boot/grub/grub.cfg"
;;
;;
ppc
*
)
ppc
*
)
[
-z
"
$LOOPBOOTLOADER
"
]
||
[
-z
"
$LOOPBOOTLOADER
"
]
||
...
...
conf.d/e2k.mk
View file @
bc64e2d8
...
@@ -27,7 +27,7 @@ vm/e2k-mate: vm/.e2k-rescue use/deflogin/live use/x11/mate use/x11/lightdm/gtk \
...
@@ -27,7 +27,7 @@ vm/e2k-mate: vm/.e2k-rescue use/deflogin/live use/x11/mate use/x11/lightdm/gtk \
@$(call add,THE_PACKAGES,LibreOffice-langpack-ru)
@$(call add,THE_PACKAGES,LibreOffice-langpack-ru)
vm/e2k-lxqt: vm/.e2k-rescue mixin/e2k-desktop
vm/e2k-lxqt: vm/.e2k-rescue mixin/e2k-desktop
@$(call add,THE_LISTS,$(call tags,desktop && lxqt
&& !extra
))
@$(call add,THE_LISTS,$(call tags,desktop && lxqt))
vm/e2k-builder: vm/.e2k-rescue use/dev/builder/base
vm/e2k-builder: vm/.e2k-rescue use/dev/builder/base
@$(call add,KFLAVOURS,elbrus-8c elbrus-4c)
@$(call add,KFLAVOURS,elbrus-8c elbrus-4c)
...
...
conf.d/live.mk
View file @
bc64e2d8
...
@@ -10,7 +10,7 @@ distro/syslinux: distro/.boot \
...
@@ -10,7 +10,7 @@ distro/syslinux: distro/.boot \
@$(call set,BOOTLOADER,isolinux)
@$(call set,BOOTLOADER,isolinux)
endif
endif
ifeq (,$(filter-out i586 x86_64 aarch64 ppc64le riscv64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64 aarch64 ppc64le riscv64
loongarch64
,$(ARCH)))
distro/grub: distro/.boot use/grub use/hdt use/memtest +efi \
distro/grub: distro/.boot use/grub use/hdt use/memtest +efi \
use/grub/localboot_bios.cfg use/grub/sdab_bios.cfg; @:
use/grub/localboot_bios.cfg use/grub/sdab_bios.cfg; @:
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
...
...
conf.d/mixin.mk
View file @
bc64e2d8
...
@@ -86,8 +86,8 @@ mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm-gtk
...
@@ -86,8 +86,8 @@ mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm-gtk
mixin/regular-gnustep: use/x11/gnustep use/mediacheck use/browser/seamonkey
mixin/regular-gnustep: use/x11/gnustep use/mediacheck use/browser/seamonkey
@$(call add,THE_BRANDING,graphics)
@$(call add,THE_BRANDING,graphics)
mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm
-gtk
\
mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm \
use/fonts/ttf/google use/
net/nm/mmgui use/
im; @:
use/fonts/ttf/google use/im; @:
mixin/regular-deepin: use/x11/deepin use/browser/chromium +nm; @:
mixin/regular-deepin: use/x11/deepin use/browser/chromium +nm; @:
...
...
conf.d/phone.mk
View file @
bc64e2d8
mixin/waydroid:
mixin/waydroid: ; @:
ifeq (,$(filter-out aarch64 x86_64,$(ARCH)))
@$(call add,THE_PACKAGES,libgbinder1 waydroid)
@$(call add,THE_PACKAGES,libgbinder1 waydroid)
@$(call add,THE_KMODULES,anbox)
@$(call add,THE_KMODULES,anbox)
@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,waydroid-container.service)
@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,waydroid-container.service)
@$(call add,BASE_BOOTARGS,psi=1)
@$(call add,BASE_BOOTARGS,psi=1)
endif
mixin/phone-base: use/ntp/chrony use/repo use/branding/notes \
mixin/phone-base: use/ntp/chrony use/repo use/branding/notes \
use/deflogin/privileges use/deflogin/xgrp use/deflogin/hardware \
use/deflogin/privileges use/deflogin/xgrp use/deflogin/hardware \
...
@@ -14,13 +16,15 @@ mixin/phone-base: use/ntp/chrony use/repo use/branding/notes \
...
@@ -14,13 +16,15 @@ mixin/phone-base: use/ntp/chrony use/repo use/branding/notes \
@$(call add,CONTROL,fusermount:public)
@$(call add,CONTROL,fusermount:public)
@$(call add,CONTROL,libnss-role:disabled)
@$(call add,CONTROL,libnss-role:disabled)
mixin/phosh: use/
x11/gdm use/x11-autologin +pulse +nm +nm-native \
mixin/phosh: use/
services +pulse +nm +nm-native
use/services
@$(call add,THE_PACKAGES,phosh xdg-desktop-portal-gtk)
@$(call add,THE_PACKAGES,
phosh mutter-gnome
xorg-xwayland)
@$(call add,THE_PACKAGES,
gnome-control-center
xorg-xwayland)
@$(call add,THE_PACKAGES,gnome-terminal gedit)
@$(call add,THE_PACKAGES,gnome-terminal gedit)
@$(call add,THE_PACKAGES,qt5-wayland qt6-wayland)
@$(call add,THE_PACKAGES,qt5-wayland qt6-wayland)
@$(call add,THE_PACKAGES,bluez)
@$(call add,THE_PACKAGES,bluez)
@$(call add,THE_PACKAGES,tracker3 nautilus)
@$(call add,THE_LISTS,mobile/apps)
@$(call add,THE_LISTS,mobile/apps)
@$(call add,DEFAULT_SERVICES_ENABLE,phosh)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
@$(call set,DEFAULT_SESSION,phosh)
@$(call set,DEFAULT_SESSION,phosh)
...
@@ -28,8 +32,13 @@ ifeq (vm,$(IMAGE_CLASS))
...
@@ -28,8 +32,13 @@ ifeq (vm,$(IMAGE_CLASS))
vm/.phosh: vm/systemd mixin/phone-base mixin/phosh +systemd \
vm/.phosh: vm/systemd mixin/phone-base mixin/phosh +systemd \
mixin/waydroid; @:
mixin/waydroid; @:
vm/phosh: vm/.phosh use/tty/S0 use/efi/grub use/bootloader/uboot \
vm/phosh: vm/.phosh use/tty/S0 use/efi/grub use/uboot use/phone \
use/firmware +x11 +plymouth +vmguest; @:
use/firmware +x11 +plymouth +vmguest
@$(call set,KFLAVOURS,un-def)
ifeq (aarch64,$(ARCH))
@$(call set,VM_PARTTABLE,msdos)
@$(call set,VM_BOOTTYPE,EFI)
endif
endif
endif
ifeq (aarch64,$(ARCH))
ifeq (aarch64,$(ARCH))
...
@@ -43,6 +52,6 @@ mixin/pinephone: use/x11/armsoc use/firmware use/bootloader/uboot use/tty/S2 \
...
@@ -43,6 +52,6 @@ mixin/pinephone: use/x11/armsoc use/firmware use/bootloader/uboot use/tty/S2 \
@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,eg25-manager.service)
@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,eg25-manager.service)
ifeq (vm,$(IMAGE_CLASS))
ifeq (vm,$(IMAGE_CLASS))
vm/pinephone-phosh: vm/.phosh mixin/pinephone; @:
vm/pinephone-phosh: vm/.phosh mixin/pinephone
+plymouth
; @:
endif
endif
endif
endif
conf.d/realtime.mk
View file @
bc64e2d8
...
@@ -15,5 +15,4 @@ endif
...
@@ -15,5 +15,4 @@ endif
ifeq (vm,$(IMAGE_CLASS))
ifeq (vm,$(IMAGE_CLASS))
vm/regular-cnc-rt: vm/systemd mixin/regular-vm-x11 mixin/vm-archdep mixin/cnc-rt; @:
vm/regular-cnc-rt: vm/systemd mixin/regular-vm-x11 mixin/vm-archdep mixin/cnc-rt; @:
vm/regular-cnc-rt-efi: vm/regular-cnc-rt +efi; @:
endif
endif
conf.d/regular-vm.mk
View file @
bc64e2d8
...
@@ -14,7 +14,7 @@ vm/regular-systemd: vm/systemd-net use/vmguest/kvm use/tty/S0 \
...
@@ -14,7 +14,7 @@ vm/regular-systemd: vm/systemd-net use/vmguest/kvm use/tty/S0 \
mixin/vm-archdep:: use/auto-resize; @:
mixin/vm-archdep:: use/auto-resize; @:
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
mixin/vm-archdep::
mixin/vm-archdep::
+efi
@$(call set,KFLAVOURS,std-def un-def)
@$(call set,KFLAVOURS,std-def un-def)
endif
endif
...
...
conf.d/regular.mk
View file @
bc64e2d8
...
@@ -10,6 +10,7 @@ distro/.regular-bare: distro/.base use/kernel/net use/docs/license \
...
@@ -10,6 +10,7 @@ distro/.regular-bare: distro/.base use/kernel/net use/docs/license \
@$(call try,SAVE_PROFILE,yes)
@$(call try,SAVE_PROFILE,yes)
@$(call add,STAGE1_PACKAGES,firmware-linux)
@$(call add,STAGE1_PACKAGES,firmware-linux)
@$(call add,STAGE1_KMODULES,drm)
@$(call add,STAGE1_KMODULES,drm)
@$(call set,BOOTVGA,)
ifeq (sisyphus,$(BRANCH))
ifeq (sisyphus,$(BRANCH))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call set,BOOTLOADER,grubpcboot)
@$(call set,BOOTLOADER,grubpcboot)
...
@@ -34,7 +35,6 @@ distro/.regular-x11: distro/.regular-base mixin/regular-x11 \
...
@@ -34,7 +35,6 @@ distro/.regular-x11: distro/.regular-base mixin/regular-x11 \
# Network install
# Network install
distro/regular-net-install: distro/grub-net-install; @:
distro/regular-net-install: distro/grub-net-install; @:
ifeq (sisyphus,$(BRANCH))
ifeq (sisyphus,$(BRANCH))
@$(call set,BOOTCHAIN_OEM_SRV_NETINST,nightly.altlinux.org)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call set,BOOTCHAIN_OEM_URL_NETINST,/sisyphus/snapshots/$(DATE)/regular-NAME-$(DATE)-$(ARCH).iso)
@$(call set,BOOTCHAIN_OEM_URL_NETINST,/sisyphus/snapshots/$(DATE)/regular-NAME-$(DATE)-$(ARCH).iso)
else
else
...
@@ -44,7 +44,7 @@ endif
...
@@ -44,7 +44,7 @@ endif
# WM base target
# WM base target
distro/.regular-wm: distro/.regular-x11 \
distro/.regular-wm: distro/.regular-x11 \
mixin/regular-desktop
+vmguest
\
mixin/regular-desktop \
use/live/rw +live-installer
use/live/rw +live-installer
@$(call set,INSTALLER,alt-workstation)
@$(call set,INSTALLER,alt-workstation)
@$(call set,GRUB_DEFAULT,live)
@$(call set,GRUB_DEFAULT,live)
...
@@ -53,7 +53,7 @@ distro/.regular-wm: distro/.regular-x11 \
...
@@ -53,7 +53,7 @@ distro/.regular-wm: distro/.regular-x11 \
# DE base target
# DE base target
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
distro/.regular-desktop: distro/.regular-wm use/branding/full \
distro/.regular-desktop: distro/.regular-wm use/branding/full \
use/firmware/laptop +systemd +systemd-optimal
use/firmware/laptop +systemd +systemd-optimal
+vmguest
@$(call add,THE_PACKAGES,bluez)
@$(call add,THE_PACKAGES,bluez)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
...
@@ -80,7 +80,6 @@ distro/.regular-jeos-base: distro/.regular-bare \
...
@@ -80,7 +80,6 @@ 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/net/etcnet
@$(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)
@$(call add,THE_BRANDING,alterator) # just to be cleaned up later on
@$(call add,THE_BRANDING,alterator) # just to be cleaned up later on
...
@@ -95,10 +94,7 @@ distro/.regular-jeos: distro/.regular-jeos-base \
...
@@ -95,10 +94,7 @@ distro/.regular-jeos: distro/.regular-jeos-base \
distro/.regular-jeos-full: distro/.regular-jeos use/install2/vmguest \
distro/.regular-jeos-full: distro/.regular-jeos use/install2/vmguest \
use/volumes/jeos use/ntp/chrony use/bootloader/grub \
use/volumes/jeos use/ntp/chrony use/bootloader/grub \
use/grub/localboot_bios.cfg +efi
use/grub/localboot_bios.cfg use/kernel/latest +efi
ifeq (sisyphus,$(BRANCH))
@$(call set,KFLAVOURS,un-def)
endif
@$(call add,BASE_PACKAGES,nfs-utils gdisk)
@$(call add,BASE_PACKAGES,nfs-utils gdisk)
@$(call add,INSTALL2_PACKAGES,fdisk)
@$(call add,INSTALL2_PACKAGES,fdisk)
@$(call add,INSTALL2_PACKAGES,btrfs-progs)
@$(call add,INSTALL2_PACKAGES,btrfs-progs)
...
@@ -195,8 +191,7 @@ distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
...
@@ -195,8 +191,7 @@ distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
distro/regular-gnome: distro/.regular-desktop mixin/regular-gnome \
distro/regular-gnome: distro/.regular-desktop mixin/regular-gnome \
use/kernel/latest +plymouth use/browser/epiphany; @:
use/kernel/latest +plymouth use/browser/epiphany; @:
distro/regular-lxqt: distro/.regular-gtk mixin/regular-lxqt +plymouth
distro/regular-lxqt: distro/.regular-gtk mixin/regular-lxqt +plymouth; @:
@$(call add,THE_LISTS,$(call tags,lxqt desktop))
distro/regular-deepin: distro/.regular-gtk mixin/regular-deepin; @:
distro/regular-deepin: distro/.regular-gtk mixin/regular-deepin; @:
...
...
conf.d/ve.mk
View file @
bc64e2d8
...
@@ -42,7 +42,7 @@ ve/sysvinit-etcnet: ve/base use/net/etcnet \
...
@@ -42,7 +42,7 @@ ve/sysvinit-etcnet: ve/base use/net/etcnet \
@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)
@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)
ve/systemd-bare: ve/.apt use/init/systemd \
ve/systemd-bare: ve/.apt use/init/systemd \
use/control/sudo-su use/repo
use/net-ssh
use/control/sudo-su use/repo
@$(call add,BASE_PACKAGES,interactivesystem su)
@$(call add,BASE_PACKAGES,interactivesystem su)
ve/systemd-base: ve/systemd-bare
ve/systemd-base: ve/systemd-bare
...
@@ -50,8 +50,8 @@ ve/systemd-base: ve/systemd-bare
...
@@ -50,8 +50,8 @@ ve/systemd-base: ve/systemd-bare
@$(call add,BASE_PACKAGES,systemd-settings-disable-kill-user-processes)
@$(call add,BASE_PACKAGES,systemd-settings-disable-kill-user-processes)
@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)
@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)
ve/systemd-networkd: ve/systemd-base use/net/networkd/resolved; @:
ve/systemd-networkd: ve/systemd-base use/net
-ssh use/net
/networkd/resolved; @:
ve/systemd-etcnet: ve/systemd-base use/net/etcnet; @:
ve/systemd-etcnet: ve/systemd-base use/net
-ssh use/net
/etcnet; @:
ve/.lxc-bare: use/lxc-guest
ve/.lxc-bare: use/lxc-guest
@$(call add,NET_ETH,eth0:dhcp)
@$(call add,NET_ETH,eth0:dhcp)
...
...
conf.d/vm.mk
View file @
bc64e2d8
...
@@ -50,7 +50,6 @@ vm/.desktop-base: vm/.desktop-bare \
...
@@ -50,7 +50,6 @@ vm/.desktop-base: vm/.desktop-bare \
vm/icewm: vm/.desktop-base mixin/icewm; @:
vm/icewm: vm/.desktop-base mixin/icewm; @:
vm/icewm-setup: vm/.desktop-bare mixin/icewm use/oem use/x11-autostart
vm/icewm-setup: vm/.desktop-bare mixin/icewm use/oem use/x11-autostart
@$(call set,BRANDING,simply-linux)
@$(call add,THE_BRANDING,graphics)
@$(call add,THE_BRANDING,graphics)
@$(call add,THE_LISTS,$(call tags,base l10n))
@$(call add,THE_LISTS,$(call tags,base l10n))
...
...
features.in/bootloader/config.mk
View file @
bc64e2d8
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
# NB: "mysterious" conflicts if BASE_BOOTLOADER is empty
# NB: "mysterious" conflicts if BASE_BOOTLOADER is empty
GRUB_ARCHES := i586 x86_64 aarch64 ppc64le riscv64
GRUB_ARCHES := i586 x86_64 aarch64 ppc64le riscv64
loongarch64
use/bootloader: use/pkgpriorities
use/bootloader: use/pkgpriorities
ifneq (,$(filter-out e2k%,$(ARCH)))
ifneq (,$(filter-out e2k%,$(ARCH)))
...
...
features.in/build-vm/config.mk
View file @
bc64e2d8
# hooked from lib/sugar.mk
# hooked from lib/sugar.mk
use/build-vm: sub/rootfs@/ use/kernel/initrd-setup
use/build-vm: sub/rootfs@/ use/kernel/initrd-setup
@$(call add_feature)
@$(call add_feature)
@$(call set,GLOBAL_HSH_PROC,1)
features.in/cleanup/live/image-scripts.d/90-cleanup-live-pkgs
View file @
bc64e2d8
...
@@ -6,7 +6,8 @@ if [ -n "$GLOBAL_VERBOSE" ]; then
...
@@ -6,7 +6,8 @@ if [ -n "$GLOBAL_VERBOSE" ]; then
echo
"** GLOBAL_CLEANUP_LIVE_PACKAGES:
$GLOBAL_CLEANUP_LIVE_PACKAGES
"
echo
"** GLOBAL_CLEANUP_LIVE_PACKAGES:
$GLOBAL_CLEANUP_LIVE_PACKAGES
"
fi
>
&2
fi
>
&2
[
-n
"
$GLOBAL_CLEANUP_PACKAGES
"
$GLOBAL_CLEANUP_LIVE_PACKAGES
]
||
exit
0
[
-z
"
$GLOBAL_CLEANUP_PACKAGES
"
]
&&
[
-z
"
$GLOBAL_CLEANUP_LIVE_PACKAGES
"
]
&&
exit
0
CLEANUP_PACKAGES
=
"
$GLOBAL_CLEANUP_PACKAGES
$GLOBAL_CLEANUP_LIVE_PACKAGES
"
CLEANUP_PACKAGES
=
"
$GLOBAL_CLEANUP_PACKAGES
$GLOBAL_CLEANUP_LIVE_PACKAGES
"
...
...
features.in/deflogin/rootfs/image-scripts.d/
6
0-default-session
→
features.in/deflogin/rootfs/image-scripts.d/
7
0-default-session
View file @
bc64e2d8
#!/bin/sh
#!/bin/sh
account_dir
=
/var/lib/AccountsService/users
[
-d
/var/lib/AccountsService/users
]
||
exit
0
[
-n
"
$GLOBAL_USERS
"
]
||
exit
0
[
-n
"
$GLOBAL_USERS
"
]
||
exit
0
[
-n
"
$GLOBAL_DEFAULT_SESSION
"
]
||
exit
0
[
-n
"
$GLOBAL_DEFAULT_SESSION
"
]
||
exit
0
...
@@ -15,6 +14,12 @@ else
...
@@ -15,6 +14,12 @@ else
exit
1
exit
1
fi
fi
LIGHTDM_CONF
=
/etc/lightdm/lightdm.conf.d/autologin.conf
[
!
-s
"
$LIGHTDM_CONF
"
]
||
sed
-i
"s/autologin-session=.*/autologin-session=
$GLOBAL_DEFAULT_SESSION
/"
"
$LIGHTDM_CONF
"
account_dir
=
/var/lib/AccountsService/users
[
-d
/var/lib/AccountsService/users
]
||
exit
0
for
user
in
$GLOBAL_USERS
;
do
for
user
in
$GLOBAL_USERS
;
do
user
=
"
${
user
%%
:
*
}
"
user
=
"
${
user
%%
:
*
}
"
cat
>
"
$account_dir
"
/
"
$user
"
<<-
EOF
cat
>
"
$account_dir
"
/
"
$user
"
<<-
EOF
...
...
features.in/efi/config.mk
View file @
bc64e2d8
EFI_ARCHES := x86_64 aarch64 riscv64
EFI_ARCHES := x86_64 aarch64 riscv64
loongarch64
+efi: use/efi/signed; @:
+efi: use/efi/signed; @:
...
...
features.in/grub/cfg.in/25install-vnc-connect.cfg
View file @
bc64e2d8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
savedefault
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@
showopts
nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang
echo $"Loading initial ramdisk ..."
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
}
features.in/grub/cfg.in/25install-vnc-listen.cfg
View file @
bc64e2d8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
savedefault
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@
showopts
nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
echo $"Loading initial ramdisk ..."
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
}
...
...
features.in/grub/cfg.in/26live-install-vnc-listen.cfg
View file @
bc64e2d8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
savedefault
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@
showopts
nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
echo $"Loading initial ramdisk ..."
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
}
...
...
features.in/grub/cfg.in/30live.cfg
View file @
bc64e2d8
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 /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@
showopts
lowmem vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ lowmem vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
echo $"Loading initial ramdisk ..."
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
}
...
...
features.in/grub/cfg.in/32live_rw.cfg
View file @
bc64e2d8
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 /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@
showopts
live_rw vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ live_rw vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
echo $"Loading initial ramdisk ..."
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
}
features.in/grub/cfg.in/80rescue.cfg
View file @
bc64e2d8
menuentry $"Rescue LiveCD" --id 'rescue' {
menuentry $"Rescue LiveCD" --id 'rescue' {
savedefault
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash
showopts
@rescue_bootargs@ $EFI_BOOTARGS lowmem
linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS lowmem
echo $"Loading initial ramdisk ..."
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
}
features.in/grub/cfg.in/82rescue_rw.cfg
View file @
bc64e2d8
menuentry $"Rescue with sessions support" --id 'rescue_session' {
menuentry $"Rescue with sessions support" --id 'rescue_session' {
savedefault
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash
showopts
@rescue_bootargs@ $EFI_BOOTARGS live_rw
linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS live_rw
echo $"Loading initial ramdisk ..."
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
}
features.in/grub/cfg.in/83rescue_fm.cfg
View file @
bc64e2d8
menuentry $"Forensic mode (leave disks alone)" --id 'rescue_forensic' {
menuentry $"Forensic mode (leave disks alone)" --id 'rescue_forensic' {
savedefault
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash
showopts
@rescue_bootargs@ $EFI_BOOTARGS max_loop=16 forensic hash=@rescue_hash@ lowmem
linux /boot/vmlinuz fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 forensic hash=@rescue_hash@ lowmem
echo $"Loading initial ramdisk ..."
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
}
features.in/grub/cfg.in/84rescue_remote.cfg
View file @
bc64e2d8
menuentry $"Rescue with remote SSH access (DHCP)" --id 'rescue_remote' {
menuentry $"Rescue with remote SSH access (DHCP)" --id 'rescue_remote' {
savedefault
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash
showopts
@rescue_bootargs@ $EFI_BOOTARGS max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@ lowmem
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@ lowmem
echo $"Loading initial ramdisk ..."
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
}
features.in/grub/cfg.in/85mediacheck.cfg
View file @
bc64e2d8
menuentry $"Check this media for defects" --id 'mediachk' {
menuentry $"Check this media for defects" --id 'mediachk' {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR live @initrd_bootargs@ @stagename@=mediacheck lowmem mediacheck=1 nosplash
showopts
@bootargs@ $EFI_BOOTARGS
linux /boot/vmlinuz$KFLAVOUR live @initrd_bootargs@ @stagename@=mediacheck lowmem mediacheck=1 nosplash @bootargs@ $EFI_BOOTARGS
echo $"Loading initial ramdisk ..."
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
}
features.in/grub/config.mk
View file @
bc64e2d8
# default is plain text prompt
# default is plain text prompt
# NB: might be usbflash-ready hybrid iso
# NB: might be usbflash-ready hybrid iso
ifeq (,$(filter-out i586 x86_64 ppc64le aarch64 riscv64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64 ppc64le aarch64 riscv64
loongarch64
,$(ARCH)))
use/grub: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
use/grub: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
@$(call add_feature)
@$(call add_feature)
...
...
features.in/hdt/config.mk
View file @
bc64e2d8
...
@@ -6,7 +6,6 @@ use/hdt: use/syslinux use/memtest
...
@@ -6,7 +6,6 @@ use/hdt: use/syslinux use/memtest
@$(call add,STAGE1_PACKAGES,dosfstools)
@$(call add,STAGE1_PACKAGES,dosfstools)
@$(call add,SYSLINUX_MODULES,hdt)
@$(call add,SYSLINUX_MODULES,hdt)
@$(call add,GRUB_CFG,hdt_bios)
@$(call add,GRUB_CFG,hdt_bios)
@$(call set,GLOBAL_HSH_PROC,1)
else
else
use/hdt: ; @:
use/hdt: ; @:
endif
endif
features.in/initrd-bootchain/generate.mk
View file @
bc64e2d8
...
@@ -4,7 +4,7 @@ ifneq (,$(BUILDDIR))
...
@@ -4,7 +4,7 @@ ifneq (,$(BUILDDIR))
include $(BUILDDIR)/distcfg.mk
include $(BUILDDIR)/distcfg.mk
BOOTCHAIN_CFG := $(BUILDDIR)/stage1/files/bootchain
BOOTCHAIN_CFG := $(BUILDDIR)/stage1/files/
.disk/
bootchain
all: debug
all: debug
@[ -s "$(BOOTCHAIN_CFG)" ] || exit 1; \
@[ -s "$(BOOTCHAIN_CFG)" ] || exit 1; \
...
...
features.in/initrd-bootchain/stage1/files/bootchain
→
features.in/initrd-bootchain/stage1/files/
.disk/
bootchain
View file @
bc64e2d8
File moved
features.in/initrd-bootchain/stage1/scripts.d/80-make-initrd-for-bootchain
View file @
bc64e2d8
...
@@ -17,7 +17,10 @@ done
...
@@ -17,7 +17,10 @@ done
[
-s
/.in/modules
]
||
[
-s
/.in/modules
]
||
fatal
"kernel modules set not found"
fatal
"kernel modules set not found"
cat
>>
/etc/initrd.mk
<<
EOF
cd
/.image
cp
/etc/initrd.mk .disk/
cat
>>
.disk/initrd.mk
<<
EOF
FEATURES += add-modules compress cleanup rdshell kbd
FEATURES += add-modules compress cleanup rdshell kbd
FEATURES += bootchain-localdev
FEATURES += bootchain-localdev
FEATURES += bootchain-liverw
FEATURES += bootchain-liverw
...
@@ -28,47 +31,38 @@ FEATURES += bootchain-cifs
...
@@ -28,47 +31,38 @@ FEATURES += bootchain-cifs
EOF
EOF
for
module
in
$(
grep
-v
^# /.in/modules |
sort
-u
|
tr
-s
'\n'
' '
)
;
do
for
module
in
$(
grep
-v
^# /.in/modules |
sort
-u
|
tr
-s
'\n'
' '
)
;
do
echo
"MODULES_TRY_ADD +=
$module
"
>>
/etc
/initrd.mk
echo
"MODULES_TRY_ADD +=
$module
"
>>
.disk
/initrd.mk
done
done
dialog
--create-rc
/etc/dialogrc.tmp
if
[
!
-f
/etc/dialogrc.error
]
;
then
cat
/etc/dialogrc.tmp |sed
-E
\
dialog
--create-rc
/tmp/dialogrc.tmp
-e
's/^(use_colors).*/\1 = ON/'
\
cat
/tmp/dialogrc.tmp |sed
-E
\
-e
's/^(use_shadow).*/\1 = ON/'
\
-e
's/^(use_colors).*/\1 = ON/'
\
-e
's/^(screen_color).*/\1 = \(WHITE,RED,ON\)/'
\
-e
's/^(use_shadow).*/\1 = ON/'
\
>
/etc/dialogrc.error
-e
's/^(screen_color).*/\1 = \(WHITE,RED,ON\)/'
\
rm
-f
/etc/dialogrc.tmp
>
/etc/dialogrc.error
rm
/tmp/dialogrc.tmp
# replace generated config bootchain to stage1 chroot
fi
mv
/.image/bootchain /etc/sysconfig/
echo
"PUT_FILES += /etc/sysconfig/bootchain"
>>
/etc/initrd.mk
echo
"PUT_FILES += /etc/dialogrc.error"
>>
/etc/initrd.mk
# FIXME: large storage systems can get that tmpfs filled up
# FIXME: large storage systems can get that tmpfs filled up
# with debug data as of make-initrd 2.2.12
# with debug data as of make-initrd 2.2.12
rm
-vf
/usr/share/make-initrd/data/etc/udev/rules.d/00-debug.rules
\
rm
-vf
/usr/share/make-initrd/data/etc/udev/rules.d/00-debug.rules
\
/usr/share/make-initrd/data/lib/uevent/filters/debug
/usr/share/make-initrd/data/lib/uevent/filters/debug
MAKE_INITRD_OPTS
=
"--no-checks AUTODETECT="
MAKE_INITRD_OPTS
=
"--no-checks AUTODETECT=
-c .disk/initrd.mk BOOTCHAIN_PATH=.disk
"
MAKE_INITRD_VER
=
"
`
make-initrd
-V
\
MAKE_INITRD_VER
=
"
`
make-initrd
-V
\
|
sed
-rn
's/^make-initrd version ([0-9.]+)/\1/p'
`
"
|
sed
-rn
's/^make-initrd version ([0-9.]+)/\1/p'
`
"
[
-z
"
$GLOBAL_VERBOSE
"
]
||
[
-z
"
$GLOBAL_VERBOSE
"
]
||
MAKE_INITRD_OPTS
=
"
$MAKE_INITRD_OPTS
-v"
MAKE_INITRD_OPTS
=
"
$MAKE_INITRD_OPTS
-v"
# copy initrd.mk to image
mkdir
-p
/.image/.disk
cp
/etc/initrd.mk /.image/.disk
cp
/etc/sysconfig/bootchain /.image/.disk
cd
/boot
for
KVER
in
$kver
;
do
for
KVER
in
$kver
;
do
echo
make-initrd
$MAKE_INITRD_OPTS
-k
"
$KVER
"
>>
/.image/.disk/mkinitrd
echo
make-initrd
$MAKE_INITRD_OPTS
-k
"
$KVER
"
>>
/.image/.disk/mkinitrd
make-initrd
$MAKE_INITRD_OPTS
-k
"
$KVER
"
||
make-initrd
$MAKE_INITRD_OPTS
-k
"
$KVER
"
||
fatal
"make-initrd failed"
fatal
"make-initrd failed"
done
done
cd
/boot
case
`
arch
`
in
case
`
arch
`
in
e2k
)
e2k
)
kname
=
image
;;
kname
=
image
;;
...
...
features.in/initrd-propagator/stage1/scripts.d/01-initfs
deleted
100755 → 0
View file @
ab60b876
#!/bin/sh
echo
"file /.VERSION @TMPDIR@/.VERSION 0644 0 0"
>
"
$WORKDIR
"
/initfs
features.in/initrd-propagator/stage1/scripts.d/11-initrd-propagator
deleted
100755 → 0
View file @
ab60b876
#!/bin/sh
# see also http://www.altlinux.org/Make-initrd-propagator
echo
'FEATURES += propagator'
>>
/etc/initrd.mk
# FIXME: #29705 workaround
echo
'MODULES_PRELOAD += ahci'
>>
/etc/initrd.mk
features.in/initrd-propagator/stage1/scripts.d/80-make-initrd-for-propagator
View file @
bc64e2d8
...
@@ -18,38 +18,40 @@ done
...
@@ -18,38 +18,40 @@ done
[
-s
/.in/modules
]
||
[
-s
/.in/modules
]
||
fatal
"kernel modules set not found"
fatal
"kernel modules set not found"
cat
>>
/etc/initrd.mk
<<
EOF
# copy initrd.mk to image
mkdir
-p
/.image/.disk
cp
/etc/initrd.mk /.image/.disk
cd
/.image
cat
>>
.disk/initrd.mk
<<
EOF
FEATURES += propagator
FEATURES += add-modules compress cleanup
FEATURES += add-modules compress cleanup
EOF
EOF
for
module
in
$(
grep
-v
^# /.in/modules |
sort
-u
|
tr
-s
'\n'
' '
)
;
do
for
module
in
$(
grep
-v
^# /.in/modules |
sort
-u
|
tr
-s
'\n'
' '
)
;
do
echo
"MODULES_TRY_ADD +=
$module
"
>>
/etc
/initrd.mk
echo
"MODULES_TRY_ADD +=
$module
"
>>
.disk
/initrd.mk
done
done
# copy initrd.mk to image
mkdir
-p
/.image/.disk
cp
/etc/initrd.mk /.image/.disk
# FIXME: large storage systems can get that tmpfs filled up
# FIXME: large storage systems can get that tmpfs filled up
# with debug data as of make-initrd 2.2.12
# with debug data as of make-initrd 2.2.12
rm
-vf
/usr/share/make-initrd/data/etc/udev/rules.d/00-debug.rules
\
rm
-vf
/usr/share/make-initrd/data/etc/udev/rules.d/00-debug.rules
\
/usr/share/make-initrd/data/lib/uevent/filters/debug
/usr/share/make-initrd/data/lib/uevent/filters/debug
MAKE_INITRD_OPTS
=
"--no-checks AUTODETECT= "
MAKE_INITRD_OPTS
=
"--no-checks AUTODETECT=
-c .disk/initrd.mk
"
MAKE_INITRD_VER
=
"
`
make-initrd
-V
\
MAKE_INITRD_VER
=
"
`
make-initrd
-V
\
|
sed
-rn
's/^make-initrd version ([0-9.]+)/\1/p'
`
"
|
sed
-rn
's/^make-initrd version ([0-9.]+)/\1/p'
`
"
[
-z
"
$GLOBAL_VERBOSE
"
]
||
[
-z
"
$GLOBAL_VERBOSE
"
]
||
MAKE_INITRD_OPTS
=
"
$MAKE_INITRD_OPTS
-v"
MAKE_INITRD_OPTS
=
"
$MAKE_INITRD_OPTS
-v"
cd
/boot
for
KVER
in
$kver
;
do
for
KVER
in
$kver
;
do
echo
make-initrd
$MAKE_INITRD_OPTS
-k
"
$KVER
"
>>
/.image/
.disk/mkinitrd
echo
make-initrd
$MAKE_INITRD_OPTS
-k
"
$KVER
"
>>
.disk/mkinitrd
make-initrd
$MAKE_INITRD_OPTS
-k
"
$KVER
"
||
make-initrd
$MAKE_INITRD_OPTS
-k
"
$KVER
"
||
fatal
"make-initrd failed"
fatal
"make-initrd failed"
done
done
cd
/boot
case
`
arch
`
in
case
`
arch
`
in
e2k
)
e2k
)
kname
=
image
;;
kname
=
image
;;
...
...
features.in/kernel/config.mk
View file @
bc64e2d8
...
@@ -6,9 +6,13 @@ else
...
@@ -6,9 +6,13 @@ else
ifeq (,$(filter-out riscv64,$(ARCH)))
ifeq (,$(filter-out riscv64,$(ARCH)))
@$(call try,KFLAVOURS,un-def)
@$(call try,KFLAVOURS,un-def)
else
else
ifeq (,$(filter-out loongarch64,$(ARCH)))
@$(call try,KFLAVOURS,loongarch)
else
@$(call try,KFLAVOURS,std-def)
@$(call try,KFLAVOURS,std-def)
endif
endif
endif
endif
endif
@$(call xport,KFLAVOURS)
@$(call xport,KFLAVOURS)
use/kernel/latest: use/kernel; @:
use/kernel/latest: use/kernel; @:
...
@@ -44,6 +48,7 @@ use/kernel/disable-usb-autosuspend:
...
@@ -44,6 +48,7 @@ use/kernel/disable-usb-autosuspend:
# for vm targets
# for vm targets
use/kernel/initrd-setup: use/kernel
use/kernel/initrd-setup: use/kernel
@$(call add,BASE_PACKAGES,make-initrd)
@$(call try,VM_FSTYPE,ext4)
@$(call try,VM_FSTYPE,ext4)
@$(call add,VM_INITRDMODULES,$$(VM_FSTYPE))
@$(call add,VM_INITRDMODULES,$$(VM_FSTYPE))
@$(call add,VM_INITRDMODULES,ahci.ko ahci_platform.ko sd_mod.ko)
@$(call add,VM_INITRDMODULES,ahci.ko ahci_platform.ko sd_mod.ko)
...
...
features.in/phone/image-scripts.d/82-background-config
deleted
100755 → 0
View file @
ab60b876
#!/bin/sh -efu
# Set user perms on installed config
chown
altlinux:altlinux
-R
"/home/altlinux/.config"
features.in/phone/rootfs/files/etc/dconf/db/local.d/00_background
deleted
100644 → 0
View file @
ab60b876
[org/gnome/desktop/background]
picture-uri='file:///usr/share/wallpapers/mobile/720x1440/basealt-background.png'
features.in/phone/rootfs/files/etc/dconf/profile/user
deleted
100644 → 0
View file @
ab60b876
user-db:user
system-db:local
features.in/phone/rootfs/files/
home/altlinux
/.config/gtk-3.0/gtk.css
→
features.in/phone/rootfs/files/
etc/skel
/.config/gtk-3.0/gtk.css
View file @
bc64e2d8
File moved
features.in/plymouth/config.mk
View file @
bc64e2d8
+plymouth: use/plymouth/full; @:
+plymouth: use/plymouth/full; @:
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64
aarch64
,$(ARCH)))
# and a few aliases
# and a few aliases
use/plymouth/live: use/plymouth/stage2; @:
use/plymouth/live: use/plymouth/stage2; @:
use/plymouth/install2: use/plymouth/stage2; @:
use/plymouth/install2: use/plymouth/stage2; @:
...
...
features.in/rescue/config.mk
View file @
bc64e2d8
...
@@ -21,7 +21,7 @@ ifneq (,$(EFI_BOOTLOADER))
...
@@ -21,7 +21,7 @@ ifneq (,$(EFI_BOOTLOADER))
@$(call add,RESCUE_PACKAGES,grub2-efi)
@$(call add,RESCUE_PACKAGES,grub2-efi)
endif
endif
@$(call add,RESCUE_LISTS,\
@$(call add,RESCUE_LISTS,\
$(call tags,(base || extra || server ||
backup ||
misc || fs) \
$(call tags,(base || extra || server || misc || fs) \
&& !x11 && (rescue || comm || network || security || archive)))
&& !x11 && (rescue || comm || network || security || archive)))
use/rescue/rw: use/rescue use/syslinux/rescue_rw.cfg use/grub/rescue_rw.cfg; @:
use/rescue/rw: use/rescue use/syslinux/rescue_rw.cfg use/grub/rescue_rw.cfg; @:
...
...
features.in/services/config.mk
View file @
bc64e2d8
...
@@ -13,6 +13,9 @@ use/services: sub/rootfs
...
@@ -13,6 +13,9 @@ use/services: sub/rootfs
@$(call xport,SYSTEMD_USER_SERVICES_ENABLE)
@$(call xport,SYSTEMD_USER_SERVICES_ENABLE)
@$(call xport,SYSTEMD_USER_SERVICES_DISABLE)
@$(call xport,SYSTEMD_USER_SERVICES_DISABLE)
user/services/dbus-brocker: use/services
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd dbus-broker)
@$(call add,DEFAULT_SYSTEMD_USER_SERVICES_ENABLE,dbus-broker)
use/services/lvm2-disable: use/services
use/services/lvm2-disable: use/services
@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmetad)
@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmetad)
...
...
features.in/stage2/config.mk
View file @
bc64e2d8
...
@@ -5,7 +5,6 @@ use/stage2:: sub/stage1
...
@@ -5,7 +5,6 @@ use/stage2:: sub/stage1
@$(call add,STAGE1_MODLISTS,$$(FEATURES))
@$(call add,STAGE1_MODLISTS,$$(FEATURES))
@$(call xport,STAGE1_PACKAGES)
@$(call xport,STAGE1_PACKAGES)
@$(call xport,STAGE1_KCONFIG)
@$(call xport,STAGE1_KCONFIG)
@$(call set,GLOBAL_HSH_PROC,1)
ifneq (,$(filter-out e2k%,$(ARCH)))
ifneq (,$(filter-out e2k%,$(ARCH)))
ifeq (sisyphus,$(BRANCH))
ifeq (sisyphus,$(BRANCH))
...
...
features.in/stage2/stage1/modules.d/50-stage2-net-cifs
View file @
bc64e2d8
kernel/fs/cifs/cifs.ko
kernel/fs/cifs/cifs.ko
kernel/fs/smb
kernel/crypto/cmac.ko
kernel/crypto/cmac.ko
features.in/tty/rootfs/image-scripts.d/50-serial
View file @
bc64e2d8
...
@@ -17,12 +17,8 @@ if ! grep -q "$BIN" "$CFG"; then
...
@@ -17,12 +17,8 @@ if ! grep -q "$BIN" "$CFG"; then
done
done
fi
fi
EXTLINUXCFG
=
/boot/extlinux/extlinux.conf
for
c
in
/boot/extlinux/extlinux.conf /etc/sysconfig/grub2
;
do
if
[
-f
"
$EXTLINUXCFG
"
]
;
then
if
[
-f
"
$c
"
]
;
then
sed
-i
"s/ quiet / /g;s/ quiet'/'/"
"
$EXTLINUXCFG
"
sed
-i
"s/ quiet / /g;s/ quiet'/'/"
"
$c
"
fi
fi
done
GRUBCFG
=
/etc/sysconfig/grub2
if
[
-f
"
$GRUBCFG
"
]
;
then
sed
-i
"s/ quiet / /g;s/ quiet'/'/"
"
$GRUBCFG
"
fi
features.in/x11/config.mk
View file @
bc64e2d8
...
@@ -106,8 +106,8 @@ use/x11/dm: use/x11-autostart use/pkgpriorities
...
@@ -106,8 +106,8 @@ use/x11/dm: use/x11-autostart use/pkgpriorities
@$(call add,PINNED_PACKAGES,$$(THE_DISPLAY_MANAGER))
@$(call add,PINNED_PACKAGES,$$(THE_DISPLAY_MANAGER))
@$(call add,DEFAULT_SERVICES_ENABLE,$$(THE_DM_SERVICE))
@$(call add,DEFAULT_SERVICES_ENABLE,$$(THE_DM_SERVICE))
use/x11/lightdm/gtk use/x11/lightdm/slick \
use/x11/lightdm/gtk use/x11/lightdm/slick
use/x11/lightdm/kde
\
use/x11/lightdm/
qt use/x11/lightdm/lxqt use/x11/lightdm/kde
: \
use/x11/lightdm/
autologin
: \
use/x11/lightdm/%: use/x11/dm
use/x11/lightdm/%: use/x11/dm
@$(call set,THE_DISPLAY_MANAGER,lightdm-$*-greeter)
@$(call set,THE_DISPLAY_MANAGER,lightdm-$*-greeter)
@$(call set,THE_DM_SERVICE,lightdm)
@$(call set,THE_DM_SERVICE,lightdm)
...
@@ -169,7 +169,7 @@ use/x11/lxde: use/x11
...
@@ -169,7 +169,7 @@ use/x11/lxde: use/x11
@$(call add,IM_PACKAGES,imsettings-lxde)
@$(call add,IM_PACKAGES,imsettings-lxde)
use/x11/lxqt: use/x11 +pulse
use/x11/lxqt: use/x11 +pulse
@$(call add,THE_LISTS,$(call tags,desktop && lxqt
&& !extra
))
@$(call add,THE_LISTS,$(call tags,desktop && lxqt))
@$(call add,IM_PACKAGES,imsettings-qt)
@$(call add,IM_PACKAGES,imsettings-qt)
use/x11/fvwm: use/x11
use/x11/fvwm: use/x11
...
...
lib/boot.mk
View file @
bc64e2d8
...
@@ -9,7 +9,7 @@ boot/iso:
...
@@ -9,7 +9,7 @@ boot/iso:
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call try,BOOTLOADER,isolinux)
@$(call try,BOOTLOADER,isolinux)
endif
endif
ifeq (,$(filter-out aarch64 riscv64,$(ARCH)))
ifeq (,$(filter-out aarch64 riscv64
loongarch64
,$(ARCH)))
@$(call try,BOOTLOADER,efiboot)
@$(call try,BOOTLOADER,efiboot)
endif
endif
ifeq (,$(filter-out e2k%,$(ARCH)))
ifeq (,$(filter-out e2k%,$(ARCH)))
...
...
lib/profile.mk
View file @
bc64e2d8
...
@@ -105,6 +105,7 @@ ifeq (sisyphus,$(BRANCH))
...
@@ -105,6 +105,7 @@ ifeq (sisyphus,$(BRANCH))
else
else
@$(call try,BRANDING,alt-starterkit)
@$(call try,BRANDING,alt-starterkit)
endif
endif
@$(call set,GLOBAL_HSH_PROC,1)
@$(call add,PINNED_PACKAGES,branding-$$(BRANDING)-alterator:Essential)
@$(call add,PINNED_PACKAGES,branding-$$(BRANDING)-alterator:Essential)
@$(call add,PINNED_PACKAGES,branding-$$(BRANDING)-bootsplash:Essential)
@$(call add,PINNED_PACKAGES,branding-$$(BRANDING)-bootsplash:Essential)
@$(call add,PINNED_PACKAGES,branding-$$(BRANDING)-bootloader:Essential)
@$(call add,PINNED_PACKAGES,branding-$$(BRANDING)-bootloader:Essential)
...
...
lib/vm.mk
View file @
bc64e2d8
...
@@ -21,7 +21,7 @@ else
...
@@ -21,7 +21,7 @@ else
vm/.base-grub: vm/.base-grub-efi; @:
vm/.base-grub: vm/.base-grub-efi; @:
endif
endif
ifeq (,$(filter-out x86_64 aarch64 riscv64,$(ARCH)))
ifeq (,$(filter-out x86_64 aarch64 riscv64
loongarch64
,$(ARCH)))
vm/.base-grub-efi: vm/.bare use/efi/grub; @:
vm/.base-grub-efi: vm/.bare use/efi/grub; @:
else
else
vm/.base-grub-efi: vm/.bare; @:
vm/.base-grub-efi: vm/.bare; @:
...
...
pkg.in/lists/mobile/apps
View file @
bc64e2d8
...
@@ -6,10 +6,16 @@ gnome-calendar
...
@@ -6,10 +6,16 @@ gnome-calendar
gnome-screenshot
gnome-screenshot
grim
grim
megapixels
megapixels
chromium
cheese
chromium@!riscv64
firefox
firefox
telegram-desktop
telegram-desktop
@!riscv64
evince
evince
mpv
mpv
totem
amberol
amberol
lollypop
lollypop
shortwave
foliate
geary
wallpapers-mobile
pkg.in/lists/tagged/base+rescue
View file @
bc64e2d8
...
@@ -25,7 +25,7 @@ hdparm
...
@@ -25,7 +25,7 @@ hdparm
lsblk
lsblk
lsmount
lsmount
lvm2
lvm2
mdadm
-tool
mdadm
open-iscsi
open-iscsi
photorec
photorec
scalpel
scalpel
...
...
pkg.in/lists/tagged/desktop+lxqt+extra
deleted
100644 → 0
View file @
ab60b876
# carefully chosen
x-cursor-theme-BlueGlass3D
x-cursor-theme-CP38
x-cursor-theme-Obsidian
x-cursor-theme-oxy-white
# a bit lacking
icon-theme-simple
# text editor
focuswriter
# media player; see also #30556 though
clementine@!E2K
clementine-codecs-full@!E2K
# rss-reader
quiterss
# torrent client
qbittorrent@!E2K
# xmpp client
psi-plus
psi-plus-plugin-birthdayreminder
psi-plus-plugin-conferencelogger
psi-plus-plugin-screenshot
psi-plus-plugin-watcher
psi-plus-l10n
pkg.in/lists/tagged/rescue+backup
deleted
100644 → 0
View file @
ab60b876
bacula11-client@!riscv64
pkg.in/lists/tagged/server+openvpn
View file @
bc64e2d8
apt
apt
basesystem
basesystem
sysklogd
etcnet
etcnet
glibc-nss
glibc-nss
openvpn
openvpn
...
...
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