Compare commits

...

1773 Commits

Author SHA1 Message Date
Andrew A. Vasilyev
700032d054 server-v: branding and docs 2019-12-09 18:05:03 +03:00
c26e230fdb server-v: add ipmitool to base install 2019-12-02 19:52:05 +03:00
052f922ba2 server-v: add pve to aarch64 2019-11-21 21:40:48 +03:00
824b9a4198 drop non exist bootloader 2019-11-21 21:11:03 +03:00
97b29c3061 server-v: add installer-feature-repo-add for fix apt-cdrom add 2019-11-18 16:40:39 +03:00
Mikhail Gordeev
cad6c9f689 Do not remove fuse module
It is needed by ntfs
2019-11-15 20:23:03 +03:00
f65705c781 add mc to base+rescue 2019-11-15 20:16:15 +03:00
4f0e684403 server-v: update base.pkgs 2019-11-15 20:11:03 +03:00
4978a117d4 server-v: add ntfs-3g to INSTALL2_PACKAGES 2019-11-13 21:38:36 +03:00
e6cf64c43e server-v: add lsb-release 2019-11-13 21:34:14 +03:00
0712a37a37 add rescue-launcher to tagged/base+rescue 2019-11-13 21:33:44 +03:00
4ded1baa66 server-v: add tagged list server+network 2019-11-13 21:33:44 +03:00
b20ebcab8f update tagged list server+alterator 2019-11-13 21:33:44 +03:00
122a4e4a50 server-v: installer-feature-quota-stage2 added 2019-11-13 21:33:44 +03:00
4ef72dd23d server-v: move fdisk xfsprogs btrfs-progs file from INSTALL2_PACKAGES to SYSTEM_PACKAGES 2019-11-13 21:33:44 +03:00
d365af9200 server-v: add font from use/fonts/install2 to INSTALL2_PACKAGES 2019-11-13 21:33:44 +03:00
Anton Midyukov
a03b452b2d base+rescue, rescue+extra: replace glibc-locales in base+rescue
See-also:
https://lists.altlinux.org/pipermail/devel-distro/2019-November/001788.html
2019-11-11 18:33:05 +03:00
f7f082bece server-v: update base.pkgs 2019-11-08 20:20:26 +03:00
425fc1def0 ignore use/efi/lilo use/efi/grub on an unsupported target arch 2019-11-01 19:51:25 +03:00
5577800554 switch to grub for EFI 2019-11-01 17:06:04 +03:00
f560150f19 drop elilo 2019-11-01 17:05:34 +03:00
23a460dd3d add use/grub feature as use/syslinux 2019-11-01 17:05:07 +03:00
7b9d60d666 add grub feature 2019-11-01 17:05:07 +03:00
9ad8dc0972 server-v: add drm kernel modules to stage2 and install 2019-11-01 17:05:07 +03:00
ed332d578d add use/kernel/drm 2019-11-01 17:05:07 +03:00
9f89ba5d38 server-v: move vdo to extra.pkgs 2019-11-01 17:05:07 +03:00
aae5403715 server-v: update Depends for PVE 2019-11-01 17:05:07 +03:00
Michael Shigorin
bc1f6f710b server: add kvm kernel module
Just reasonable given the server/kvm pkglist.

Suggested-by: Andrew Kornilov <hiddenman@altlinux.org>
See-also: http://altlinux.org/Терминальный_сервер_NoMachine_в_KVM
2019-10-28 15:13:13 +03:00
Anton Midyukov
58592585b5 init: drop bash-completion-elogind
Conflicts with systemd-utils.

See-also: http://bugzilla.altlinux.org/37352
2019-10-28 15:10:38 +03:00
b5bae16ea5 ipset included in kernel-image-5.X 2019-10-22 22:15:03 +03:00
28575be1a1 server-v: update profile:
- disable openstack
- disable ocfs2
- disable moosefs
- disable openvz
2019-10-21 20:01:13 +03:00
f14af75ff8 virt: add un-def as optional kernel 2019-10-21 19:54:10 +03:00
5c83e0a523 server-v: update extra.pkgs 2019-10-21 19:47:47 +03:00
f138e08184 init: drop bash-completion-systemd 2019-10-21 19:21:14 +03:00
8bd65d9702 init: add +systemd-optimal 2019-10-21 19:19:11 +03:00
Anton Midyukov
8ab0b6c14a syslinux: add pxelinux.0
...so that bits required for PXE boot are handy in the image.

Suggested-by: glebfm@altlinux.org, klark@altlinux.org
2019-10-02 21:04:17 +03:00
d1ac863698 disable virtual keyboard for VNC install mode 2019-09-30 16:51:36 +03:00
7dd35f52c5 server-v: fix install branding-alt-server-alterator, not branding-xalt-kworkstation-alterator 2019-09-26 20:49:20 +03:00
23c589fb54 server-v: alterator-users not be removed by apt-get autoremove 2019-09-26 19:58:50 +03:00
66129ca04f cleanup fonts 2019-09-26 19:45:56 +03:00
8f277adb1c server-v: delete iptables-nft 2019-09-26 14:26:57 +03:00
Anton Midyukov
a95a6264af Revert "install2: added installer-feature-create-ghost-directories"
This reverts commit 147964b05f.
installer-feature-create-ghost-directories not needed more.
See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=37171
2019-09-26 14:26:57 +03:00
1a9f2a7c06 server-v: add OpenVZ group,list and profile 2019-09-26 14:26:57 +03:00
8bb036662b server-v: update podman pkg list 2019-09-26 14:26:56 +03:00
f90b105c3d server-v: update base pkgs 2019-09-26 14:26:56 +03:00
Anton V. Boyarshinov
181e72060b cleanup Xorg in minimal server 2019-09-26 14:26:56 +03:00
Anton V. Boyarshinov
2f0ecfa101 features.in/install2/config.mk: don't add basesystem+alterator into
basesystem
2019-09-25 18:23:39 +03:00
Anton V. Boyarshinov
4b683d11f1 define vmguest/base for non-intel platforms 2019-09-25 18:22:09 +03:00
Andrey Cherepanov
3943d7307e install2: fix use/install2/autoinstall (thanks sin@) 2019-09-25 18:10:04 +03:00
fe98a02c39 server-v: add use/rescue/base and use/efi/refind 2019-08-30 22:14:58 +03:00
3df582a319 server-v: add use/install2/stage3 2019-08-21 16:56:49 +03:00
99e484ac4f update menu name for vnc 2019-08-20 21:55:46 +03:00
fc647874d4 try fix aarch64 THE_PACKAGES 2019-08-20 21:45:19 +03:00
65a4b501cf server-v: fix build for aarch64 2019-08-20 21:30:10 +03:00
093c6b1ebc server-v: use feature instead STAGE1_MODLISTS 2019-08-20 20:54:08 +03:00
146b6bb2b7 server-v: add use/init/systemd/settings/optimal 2019-08-20 20:41:05 +03:00
Anton Midyukov
92fe7dc752 init: add use/init/systemd/settings/*
See-also: https://lists.altlinux.org/pipermail/devel-distro/2019-July/001710.html
2019-08-20 20:39:18 +03:00
1eb3e6bfe4 cleanup systemd features 2019-08-20 20:38:56 +03:00
Michael Shigorin
8cb610230a syslinux: tweak vncconnect item description
I've just borrowed glebfm@'s one introduced by commit
ec23a8ec7b before; this
still might be improved it seems.

Suggested-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
2019-08-20 20:36:32 +03:00
b5f21c27a2 server-v: cleanup 2019-08-20 20:36:32 +03:00
aa77f7e29f server-v: fixed show license 2019-08-19 20:02:33 +03:00
b30595ff9e server-v: return minimal profile as default 2019-08-19 19:01:30 +03:00
572f45e7c0 server-v: disable plymouth 2019-08-19 17:45:20 +03:00
ed277f0ccf server-v: not cleanup vnc 2019-08-19 17:42:29 +03:00
877fba2929 aarch64: fix find grub cfg for aarch64 2019-08-19 16:06:28 +03:00
8a5e4a537f move more features to distro/.server-v-base 2019-08-16 20:56:18 +03:00
523e7b00a7 add features for autoinstall and cleanup vnc 2019-08-16 18:31:23 +03:00
12588547f0 aarch64: use syslinux cfg for convert to grub 2019-08-16 16:55:15 +03:00
67df18e642 server-v: add kernel modules for all primary arches 2019-08-16 16:54:32 +03:00
a9a348c00f server-v: renumbering group and profiles 2019-08-15 18:54:38 +03:00
1c64824023 server-v: update russian name and descriptions for groups 2019-08-15 18:33:13 +03:00
26473fc556 Add installer VNC configs with different labels for aarch64 images 2019-08-14 23:41:53 +03:00
2dd2355153 server-v: update base.pkgs list 2019-08-12 20:09:49 +03:00
23961bc359 server-v: add extra.pkgs list 2019-08-12 20:00:27 +03:00
8063e85d87 add use/server/virt features and migrate server-v to use it 2019-08-09 22:47:01 +03:00
09c36632f0 intel-ucode allow for X86 only 2019-07-26 13:37:24 +03:00
dbfec168e6 server-v: add use/isohybrid 2019-07-26 12:43:45 +03:00
Anton Midyukov
9912062836 workstation/extras: Fix portability on aarch64 2019-07-26 12:25:42 +03:00
Anton Midyukov
bde3910eb8 efi: fix portability on aarch64 2019-07-26 12:24:47 +03:00
Anton Midyukov
7d1f1b11dd 90-build-distro.mk, boot.mk: add ARM64 EFI support for distro targets
# Conflicts:
#	features.in/build-distro/lib/90-build-distro.mk
2019-07-26 12:22:15 +03:00
1370bfb150 server-v: not use systemd-full(+systemd), because install vconsole-setup-kludge 2019-07-24 22:20:24 +03:00
6e22a8cbcb server-v: disable autostart services, which should first configure 2019-07-24 22:08:17 +03:00
dc14fbac7b server-v: fix use profiles_arch 2019-07-24 22:03:25 +03:00
6adf3bfe3f server-v: update names of groups 2019-07-24 21:58:16 +03:00
85853a323c use bootsplash for installer only, not install plymouth to destination 2019-07-24 20:57:23 +03:00
f9eb0bff2d server-v: drop rkt from containers 2019-07-24 20:29:53 +03:00
6bd482755f server-v: enable more services 2019-07-24 19:22:13 +03:00
fc990ac970 server-v: update used features 2019-07-24 19:20:02 +03:00
d573bfdbe9 server-v: disable package cockpit 2019-07-24 19:15:32 +03:00
70b7d2f35e server-v: update network software 2019-07-24 18:47:03 +03:00
782e890269 server-v: update backup software 2019-07-24 18:47:03 +03:00
e171d12497 add more backup software 2019-07-24 18:47:03 +03:00
74a984b20c Revert "Revert "90-enable-repo: use ftp.altlinux.org as default mirror""
This reverts commit 11b5865dc1.
2019-07-24 18:47:03 +03:00
b0b1211215 server-v: update meta-info changes 2019-07-24 18:47:03 +03:00
b657f8e40c server-v: add docker-compose to docker list 2019-07-24 18:47:03 +03:00
e1c3885890 server-v: move nfs-clients,dhcpcd,tzdata from pve to base.pkg, and add su and sudo 2019-07-24 18:47:03 +03:00
6580be4c60 server-v: update base pkg list 2019-07-24 18:47:03 +03:00
Gleb Fotengauer-Malinovskiy
405c678323 server-v: add initial ppc64le support 2019-07-20 11:46:46 +03:00
Gleb Fotengauer-Malinovskiy
3d91acda28 Add installer VNC configs with different labels for images with grub bootloader 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
9a3fed339f install2: fix definition of default password in vnc listen config 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
ed0fb56327 regular-jeos: use grub on architectures not supported by lilo 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
a354ba8c14 bootloader: provide lilo and grub support only on corresponding arches 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
ee37afc199 install2: +install: enable use/install2/full for all arches 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
759e06b40c install2: enable kvm on all arches supported by qemu 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
527ebf7d63 workstation: add arch conditions to package lists 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
bcc849c816 lists/grub: add powerpc-utils on aarch64
When grub-install(1) works on non-virtualized PowerPC system it may
execute scripts from powerpc-utils package.
2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
2727d2a94a rescue: add arch conditions to package lists 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
03dd78f6eb rescue: on ppc64le install grub-ieee1275 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
2dbb72ff25 ppc64le: use syslinux feature only to generate config 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
4148aa61e8 build-distro: use ieee1275boot BOOT_TYPE for ppc64le 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
ad24a9f80a Use ieee1275boot as bootloader on ppc64le
ieee1275boot bootloader support was added in mkimage 0.2.27.
2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
bc6856edec Add support of ppc64le vm images 2019-07-18 16:42:00 +03:00
Anton Midyukov
faa75ccdfd tar2fs: switch case for $BOOTLOADER
This allows you not to hope that only the packages of the desired
loader will be installed.

(cherry picked from commit 0f56e181892d7df64c123a509e8be31fba5f49b1)
2019-07-18 16:42:00 +03:00
Anton Midyukov
b0fdb2e935 build-vm, kernel, tar2fs: make-initrd happens now in build-vm 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
a0ecbb1784 Stop treating all ppc* architectures as ppc 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
3c429f1ce9 branding: pull gfxboot and plymouth in only on x86
Plymouth is (much more) portable, but our branding packages contain
bootsplash designs only on x86 nowdays.
2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
4bb2064529 vmguest: always provide vmguest/base and vmguest/complete features 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
48e6fc4796 vmguest: add kvm/x11 for all arches supported by qemu 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
5f05cbd031 syslinux: drop BOOT_TYPE definition (it is already defined by build-distro) 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
d78619af22 Untie plymouth feature from gfxboot 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
b2f8715797 90-enable-repo: uncomment all matching lines; drop always-broken arch logic 2019-07-18 16:42:00 +03:00
Gleb Fotengauer-Malinovskiy
c6dc3a4445 deflogin: add /altroot feature to create users root:alt and alt:root 2019-07-18 16:42:00 +03:00
a00e627e9d update Name and Comment for Server-V 2019-07-11 21:13:32 +03:00
9bf9e8c9d4 fix after renumbering of groups 2019-07-11 20:41:19 +03:00
c96e3f2d1a disable services systemd-networkd and systemd-resolved 2019-07-11 17:01:05 +03:00
687c5b9029 add bond,bridge,vlan alterator modules to server 2019-07-10 20:26:41 +03:00
f02e2fb90a fix bacula package list 2019-07-10 20:11:59 +03:00
1de940e974 switch back to MooseFS 2019-07-10 18:46:48 +03:00
7927e669bc renumbering of groups for Server-V 2019-07-10 18:45:33 +03:00
67dff1d05c not include swift to openstack 2019-07-10 15:23:14 +03:00
6ce746efed drop zfs group; install zfs support by default in Server-V 2019-07-10 14:13:46 +03:00
5ebb561e92 add ocfs2 feature to Server-V 2019-07-09 20:22:50 +03:00
d674941a71 add OCFS2 grop and list 2019-07-09 20:22:43 +03:00
4973189b88 do not cleanup ipv6 kernel module from install2 2019-07-09 20:22:37 +03:00
1f1067a9c2 do not cleanup btrfs kernel module from install2 2019-07-09 20:22:32 +03:00
2812f9801b switch to LizardFS in Server-V 2019-07-09 19:32:59 +03:00
4d79d94532 add LizardFS group and list 2019-07-09 19:31:13 +03:00
2b634c24f8 update libvirt packages list 2019-07-09 19:22:09 +03:00
4f200ae2bd use mariadb in Server-V 2019-07-09 18:28:03 +03:00
9279660ec5 disable use acpi power button by default 2019-07-09 17:48:10 +03:00
Michael Shigorin
70f15f7e02 gear-store-tags 2019-07-09 09:38:55 +03:00
Michael Shigorin
d8e050dc59 1.3.11.1-alt1
- x11: reverted vulkan changes (need more testing)
2019-07-09 09:38:12 +03:00
Michael Shigorin
093c8c4864 Revert "x11: add amdgpu and vulkan support into base target"
This reverts commit 115a1901cd:
the change has not been tested properly unfortunately,
and it broke today's regular-rc builds fortunately;
there are no vulkan-{intel,radeon} packages in sisyphus
(only amdgpu), and these are present in lakostis@' repo:
http://www.unsafe.ru/lakostis/RPMS/ALTLinux/glvnd/repo/x86_64/RPMS.hasher/

Just drop the whole thing until it gets sorted out.
2019-07-09 08:32:05 +03:00
Michael Shigorin
5c220aa88c gear-store-tags 2019-07-08 22:18:23 +03:00
Michael Shigorin
e5ee381a2f 1.3.11-alt1
- pkg.in/profiles subdirs support (shaba@)
- repo fixup regarding target arch (obirvalger@)
- switch back to yandex mirror by default,
  portability fixes, refactoring, cleanups (antohami@)
- x11 amdgpu/radeon and dm fixups, vmguest refactoring (me)
2019-07-08 22:17:19 +03:00
Michael Shigorin
23481978fa x11: eliminate amdgpu/radeon switch
The whole RADEON_PACKAGES affair was introduced to deal
with fglrx/radeon incompatibility; it got basically
deprecated following fglrx removal from sisyphus,
and lakostis@ should have done "add" logic instead
of reusing the "set" one inappropriately.

Fixes: 85c52d71c6
See-also: https://lists.altlinux.org/pipermail/devel/2019-July/208126.html
2019-07-08 21:55:31 +03:00
Anton Midyukov
115a1901cd x11: add amdgpu and vulkan support into base target
...at least on x86 for now.

Split use/x11/vulkan properly while at that.
2019-07-08 21:54:37 +03:00
Anton Midyukov
50a9dbf268 mixin.mk, regular.mk: factor out cinnamon, kde5
...into mixins to make the distro configuration
more reusable and portable across target arches.
Think grafting instead of just growing from seed.

See-also: ba437ba828
2019-07-08 21:37:34 +03:00
Anton Midyukov
fddbb12ab4 memtest: x86-only 2019-07-08 21:19:14 +03:00
Anton Midyukov
d2937227ce syslinux: X86 only 2019-07-08 21:09:39 +03:00
Anton Midyukov
a1e9e8f39f rescue+misc: portability fix on aarch64 2019-07-08 21:03:18 +03:00
Anton Midyukov
d4abcecbcf efi: portability fix on aarch64
Signed UEFI loader not required for aarch64.

NB: i586 images don't need UEFI SB either
and 32-bit shim is used for x86_64 images
along with proper 64-bit one.
2019-07-08 21:00:42 +03:00
Anton Midyukov
d77259a552 lists/grub: fix portability
GRUB is available on several target platforms for us,
but the particular package needed will vary.
2019-07-08 20:55:05 +03:00
Anton Midyukov
11b5865dc1 Revert "90-enable-repo: use ftp.altlinux.org as default mirror"
This reverts commit 1b457a5d85.
It wasn't prudent to switch everyone to master FTP server;
Yandex mirror still has an order of magnitude more bandwidth.
2019-07-08 20:53:09 +03:00
Anton Midyukov
528d55e41e tty: add ttyAMA0 and ttySI0 support
ttyAMA0 needed for qemu on aarch64 and armh.
ttySI0 needed for HiFive Unleashed (riscv64).
2019-07-08 20:51:01 +03:00
Anton Midyukov
de8a578f87 live: switch to yandex mirror
...and drop duplication tossed in by i-f-online-repo.

See-also: https://bugzilla.altlinux.org/36952
2019-07-08 20:50:21 +03:00
Mikhail Gordeev
1540ada091 repo: use %_arch macros to get host arch
%_host_cpu was a wrong choice in the first place,
and the particular case of %_arch == ppc64le
with %_host_cpu == powerpc64le became the culprit.
2019-07-08 20:50:12 +03:00
Michael Shigorin
b8c42c6c2f x11: don't chkconfig dm on explicitly
The problem is that `chkconfig dm on' will enable
display manager service on *all* runlevels feasible
without paying any attention to its customary subset
of those; the solution seems just to avoid that.

Note that there's at least one more similar case
with networking services vs runlevels 2 and 3;
it's to be handled either in a similar manner,
or somewhat more generically.

Reported-by: Konstantin Savun and Speccyfighter
Suggested-by: Anton Midyukov <antohami@altlinux.org>
See-also: https://bugzilla.altlinux.org/36967
See-also: https://forum.altlinux.org/index.php?topic=36177.msg340553#msg340553
See-also: https://www.opennet.ru/openforum/vsluhforumID3/117762.html#81
2019-07-03 20:19:59 +03:00
Michael Shigorin
55adcbb68d regular.mk: avoid open-vm-tools in jeos
As noted in the previous commit,
it's just not making it now.
2019-07-03 09:19:14 +03:00
Michael Shigorin
1a7f74677b vmguest: factor out use/vmguest/vmware
It's actually sisyphus jeos image that needed this:
open-vm-tools got installed and then removed just
before the final reboot (unlike p8 jeos); not clear
what exactly caused this as subsequent installation
only pulled in libdnet and libicu56, neither of which
were excplicitly removed during cleanup.

Let's make the image a bit leaner until someone asks
for VMware support there.
2019-07-03 09:19:06 +03:00
Anton Midyukov
3897e5505d mixin.mk: add l2tp and TUI support in NetworkManager for sysv-xfce
Suggested by Speccyfighter:
https://forum.altlinux.org/index.php?topic=36177.msg340161#msg340161
2019-06-24 20:36:46 +03:00
2d748fea57 rename profiles for server-v and move to server-v dir 2019-06-18 16:15:00 +03:00
8f81f3110e pkg.in: more --parents
Allow placing profiles in directory like groups and lists.
2019-06-18 16:14:19 +03:00
Anton Midyukov
262d353742 education: drop kde5-i18n-ru, kf5-i18n-ru
These packages have long been empty and are being removed from Sisyphus.
2019-06-18 14:58:57 +03:00
Anton Midyukov
77b0549dad x11: drop kde5-i18n-ru, kf5-i18n-ru
These packages have long been empty and are being removed from Sisyphus.
2019-06-18 14:58:08 +03:00
Michael Shigorin
808f52f03d gear-store-tags 2019-06-17 22:23:33 +03:00
Michael Shigorin
42cdc1d74d 1.3.10-alt1
- add server-v profile, drop groups/openstack (shaba@)
2019-06-17 22:22:20 +03:00
Michael Shigorin
b80c1aa87a p[89].mk, regular.mk, server, groups: drop openstack
We've decided that there's not much sense to continue building
server-openstack flavour of starterkits since it does take quite
an effort to even test properly, and there was rather no feedback
on those (maybe silent users will at least ping back this time).

Those interested are invited to follow server-v development
and contact Alexey Shabalin <shaba@altlinux.org> for cooperation.

PS: the actual pkglists are here, it's only the bunch of groups
tailored for standalone server-openstack with its group selection
menu layout that are being removed regarding the shared bits.
2019-06-17 22:21:48 +03:00
9da92a21b3 add server-v profile 2019-06-17 22:21:44 +03:00
b9ce1072de move openstack lists to virt dir 2019-06-17 22:21:41 +03:00
4f2cc925ca move lxd list to container dir 2019-06-17 22:01:55 +03:00
45b8a7107d update postgresql-1C to version 10 2019-06-17 21:58:03 +03:00
34602db785 update postgresql to version 11 2019-06-17 21:57:57 +03:00
ed6579738c firmware-linux includes firmware-ql2* now
Removed from sisyphus, actually:
http://git.altlinux.org/tasks/archive/done/_197/202601/
2019-06-17 21:56:49 +03:00
4e8abe53fb update package list for openstack 2019-06-17 21:55:39 +03:00
b001f1b022 migrate openstack server from openntpd to chrony 2019-06-17 21:55:01 +03:00
782727d7d2 update collectd package list 2019-06-17 21:54:28 +03:00
Michael Shigorin
ca7f28250b gear-store-tags 2019-06-10 22:24:21 +03:00
Michael Shigorin
d55ecf43ed 1.3.9-alt1
- uboot feature, bootloader refactoring, etc (antohami@)
- cleanlog factored out from reports.mk (me)
2019-06-10 22:23:35 +03:00
Anton Midyukov
d571ab545e tar2fs: implement u-boot support 2019-06-10 20:37:06 +03:00
Anton Midyukov
9488b53ece mixin.mk, regular.mk: move sddm to distro/regular-lxqt
sddm doesn't work with sysvinit currently, so this
mixin is not a good place to specify the display manager;
and different platforms may have different needs,
e.g. sddm has just stopped working on aarch64 boards.
2019-06-10 19:56:12 +03:00
Anton Midyukov
86b2a33bde mixin.mk: add xfce-settings branding 2019-06-10 19:49:01 +03:00
Anton Midyukov
b09d2af23a p9.mk: fix typo for vm/alt-p9-lxde 2019-06-10 19:48:04 +03:00
Michael Shigorin
f8ae619bbb cleanlog, reports.mk: factor the script out
Sometimes REPORT=1 just wasn't passed to make, and the build.log
saved is noisy and harder to compare through diff(1); let's move
the implementation out of the makefile and into a standalone
script so it can be reused like this:

  BUILDDIR=$(sed -rn "s/^mki-image-scripts: export GLOBAL_BUILDDIR='(.*)'$/\1/p" build/build.log
  bin/cleanlog < build/build.log > build/reports/clean.log

See "export GLOBAL_BUILDDIR=" line in the particular log
(grabbing that one from stdin is not exactly trivial though).
2019-06-10 19:47:14 +03:00
Anton Midyukov
0039b215ae efi: major refactoring, fix portability 2019-06-10 19:47:00 +03:00
Anton Midyukov
aea4ceaa18 bootloader: add GRUB_ARCHES variable
$GRUB_ARCHES is the list of GRUB 2 supported architectures
2019-06-04 18:50:38 +03:00
Anton Midyukov
760c09c393 bootloader: major refactoring
Add target use/bootloader/uboot. Das U-Boot -- the Universal Boot
Loader, used on single board PCs (also in qemu).

Use bootloader lists to provide better portability and to avoid
overcomplicating bootloader switch.

Added restriction for alterator-$$(BASE_BOOTLOADER)) only for
ISO images. Since the new uboot bootloader is not supported in
Alterator and is not used when building ISO images.
2019-06-04 18:48:23 +03:00
Anton Midyukov
b1c1dd488f uboot: initial feature 2019-06-04 18:25:36 +03:00
Anton Midyukov
2194c95f68 grub, lilo, uboot: initial lists
Package lists for bootloaders available on supported platforms.
2019-06-04 18:15:51 +03:00
Anton Midyukov
572aa46ddb bootloader: os-prober appears to be generally available 2019-06-04 18:06:25 +03:00
Anton Midyukov
07f9abb0bc regular.mk: add bootloader branding to all desktop flavours
branding-*-bootloader package contains grub2 theme.
2019-06-04 18:05:04 +03:00
Anton Midyukov
9cb31b98aa mixin/xfce-sysv: switch to default browser (firefox), drop caffeine
caffeine is not needed anymore as xfce-power-manager has a presentation mode.
newmoon browser is not maintained in ALT's repositories for quite some time.
2019-06-04 17:59:57 +03:00
Anton Midyukov
12f8d8e2f4 tar2fs: unified partition type selector
Currently, only e2k requires specific disk partitioning.
2019-06-04 17:58:36 +03:00
Anton Midyukov
d55bfec1e9 tar2fs: clean duplicate
INITRD_MODULES is reset further down the script.

Fixes: be75d3c3d2
2019-06-04 17:48:33 +03:00
Anton Midyukov
8ef6383457 base+efi: portability fix
elilo is available only for x86_64
2019-06-04 17:40:40 +03:00
Anton Midyukov
dfbfcf56a4 vmguest: add qemu-guest-agent support for aarch64 and armh 2019-06-04 17:37:52 +03:00
Michael Shigorin
c018343efd rescue+misc: mv {i,}scsitarget-utils
Looks like the Provides: line is missing right now...

See-also: http://git.altlinux.org/tasks/archive/done/_225/231132/
2019-06-04 12:04:15 +03:00
Michael Shigorin
a5ed88279c gear-store-tags 2019-06-03 23:35:17 +03:00
Michael Shigorin
6503141c55 1.3.8-alt1
- p9.mk, office feature and other enhancements/fixes (antohami@)
- education (cas@)
- simply (sem@)
- minor tidbits and major merge-up (me)
2019-06-03 23:32:53 +03:00
Anton Midyukov
ed8aff34ea p9.mk: add vm/* targets for all platforms 2019-06-03 23:30:53 +03:00
Anton Midyukov
b454f1cdb3 p9.mk: initial config 2019-06-03 23:29:55 +03:00
Andrey Cherepanov
c4e0681943 x11-autologin: use separate lightdm config for autologin
Set autologin parameters for lightdm in
/etc/lightdm/lightdm.conf.d/autoinstall.conf
2019-06-03 23:11:17 +03:00
Michael Shigorin
38e149a7fc x11-autologin: harden the previous commit
It could result in a broken config given broken chroot state;
it's of no practical difference as both cases just won't work
but we can at least provide meaningful diagnostics (and a bit
of perfectionism, heh).

Fixes: 2527fe94da2e810cf5d52cf548f84456fd5a6b4d
2019-06-03 23:11:11 +03:00
Andrey Cherepanov
5b7c189385 x11-autologin: detect default lightdm session 2019-06-03 23:10:35 +03:00
Michael Shigorin
7755845dcd mobile+mate: drop acpid bits
These belong to power feature, if still.
2019-06-03 23:08:27 +03:00
Anton Midyukov
ba7efe5685 mixin.mk: run cups by default for desktop regular builds
It's only included in kde5 flavour anyways :-)
2019-05-29 20:25:10 +03:00
Anton Midyukov
5a79db50e1 office: initial feature
This feature ensures the availability and specification of the choice of
office package by analogy with the choice of browser. Additional options
may be set by explicit or indirect request.
2019-05-29 20:25:05 +03:00
Anton Midyukov
7812a153f8 mixin.mk: use default DM for sysvinit (gdm2.20) in mixin/xfce-sysv 2019-05-29 20:25:00 +03:00
Anton Midyukov
ad762a035c mixin.mk, regular.mk: unified sysv-xfce and xfce-sysv
Also added qasmixer in mixin/regular-xfce-sysv
2019-05-29 20:24:51 +03:00
Anton Midyukov
a4373ab7e5 regular.mk: cleanup qt5-base-common for regular-server 2019-05-29 20:24:44 +03:00
Anton Midyukov
27c9734f58 hyperv: fix portability 2019-05-29 20:24:40 +03:00
Anton Midyukov
046dd9ec21 singleboard-tools: initial list 2019-05-29 20:24:36 +03:00
Anton Midyukov
9c9af4d811 x11: use/x11/armsoc for aarch64 and armh only 2019-05-29 20:24:31 +03:00
Anton Midyukov
51280120ed kernel: use different default flavour for riscv64 2019-05-29 20:24:26 +03:00
Anton Midyukov
73ed631be1 openstack/controller: drop openstack-ceilometer-{api,collector}
...it's no more in Sisyphus
2019-05-29 20:24:18 +03:00
Anton Midyukov
ae58b7e1c3 sound/alsa: drop udev-alsa
udev-alsa is not needed. Volume problems are no more.
2019-05-29 20:24:16 +03:00
Andrey Cherepanov
2c65c49b02 slinux/misc-base: remove gnome-system-monitor
...from Xfce-based distributions.
2019-05-29 19:24:48 +03:00
Michael Shigorin
7d20d6da5c workstation/base.pkgs: add task-auth-ldap-sssd
This one provides support for authenticating against ALT Domain.

Suggested-by: Andrey Cherepanov <cas@altlinux.org>
2019-05-29 19:24:46 +03:00
Andrey Cherepanov
13e5a174d0 education/base: completely remove xscreensaver 2019-05-29 19:24:45 +03:00
Anton Midyukov
db600e7020 x11, regular.mk: enable gdm and lightdm services instead of prefdm
gdm3 and lightdm have their own startup services,
and can no longer be started via prefdm.
Other display managers still run through prefdm.

See-also: https://bugzilla.altlinux.org/36769
2019-05-29 19:24:40 +03:00
Andrey Cherepanov
6dba582805 education: replace old ganttproject with newer projectlibre 2019-05-29 19:24:38 +03:00
Andrey Cherepanov
ae39278c4b education/base: add mugshot for xfce4-whiskermenu-plugin 2019-05-29 19:24:36 +03:00
Mikhail Efremov
f3d360f91b slinux: Drop xfce4-session-engines
Removed in the upstream.
2019-05-29 19:24:34 +03:00
Mikhail Efremov
cec072843a slinux: Replace imagewriter -> rosa-imagewriter
Suggested by cas@.
2019-05-29 19:24:31 +03:00
Andrey Cherepanov
a90af4befe education: add ganttproject 2019-05-29 19:24:30 +03:00
Andrey Cherepanov
b277e614fa education/base: add pidgin 2019-05-29 19:24:30 +03:00
Andrey Cherepanov
3215b2f394 domain-client, server-apps-edu: remove nss-ldapd
New version of alterator-auth uses sssd.
2019-05-29 19:24:30 +03:00
Andrey Cherepanov
c0883876b1 education.mk, education: remove kino and arduino
...and move lmms to disk.
2019-05-29 19:24:29 +03:00
Andrey Cherepanov
c9ff58f441 education.mk, education: replace slinux/misc-full by education/misc 2019-05-29 19:24:26 +03:00
Andrey Cherepanov
1fe0bc75b6 educaton.mk: reorder rules 2019-05-29 19:24:25 +03:00
Andrey Cherepanov
c7d719d8bf education.mk: fix build by removing duplicate feature 2019-05-29 19:24:22 +03:00
Mikhail Efremov
0cf85162e1 slinux: Replace light-locker with xfce4-screensaver 2019-05-29 19:24:19 +03:00
Andrey Cherepanov
b6e4b2868e education: add semaphore for teacher and docker-ce as server app 2019-05-29 19:24:18 +03:00
Andrey Cherepanov
333f05e3e5 education.mk, education/live: move from use/slinux/full
Copy all features and lists from use/slinux/full and stop reusing it.
2019-05-29 19:24:17 +03:00
Andrey Cherepanov
bc2b4ba47f education.mk: remove education software from LiveCD 2019-05-29 19:24:12 +03:00
Andrey Cherepanov
2849c244f9 workstation/3rdparty: skype-preinstall is x86_64 now
...following skypeforlinux platform support changes.
2019-05-29 19:24:07 +03:00
Andrey Cherepanov
c40db390d4 education.mk, server-apps-edu: remove rujel 2019-05-29 19:24:07 +03:00
Andrey Cherepanov
386df4501b education.mk, education: simplify lists
- Merge base and desktop
- Remove all specialized software from LiveCD
- Move biggest education applications to appropriate group lists
2019-05-29 19:24:07 +03:00
Andrey Cherepanov
1e480a9d0c education/base: add useful utilities for work in domain 2019-05-29 19:24:07 +03:00
Andrey Cherepanov
cac743d219 education/teacher: remove mate-document-viewer
...because it conflicts with atril-gtk from use/simply/full.
2019-05-29 19:24:07 +03:00
Andrey Cherepanov
0dd3531bd5 education.mk, groups, lists: add levels 2019-05-29 19:24:05 +03:00
Andrey Cherepanov
a57bc9c674 server-apps-edu: add xrdp 2019-05-29 19:23:56 +03:00
Andrey Cherepanov
dd6ccc9f19 education/desktop: add more screensavers 2019-05-29 19:23:55 +03:00
Andrey Cherepanov
445cb9673e education/teacher: more applications 2019-05-29 19:23:52 +03:00
Andrey Cherepanov
f88676a7bb education: add tools for mass management and remote assistance 2019-05-29 19:23:46 +03:00
Andrey Cherepanov
59f9c0f148 education.mk, education/desktop: add projectlibre to disk
...add thunderbird too; move firefox-esr to pkglist.
2019-05-29 19:23:46 +03:00
Andrey Cherepanov
b880b3379c education.mk: simplify install2 part using use/install2/full 2019-05-29 19:23:46 +03:00
Andrey Cherepanov
64088a8047 install2: add useful tools for disk management and network 2019-05-29 19:23:44 +03:00
Andrey Cherepanov
3fdc2276ce education.mk et al: use nextcloud instead of owncloud
Nextcloud provides more functionality as free software
being a developer-led fork of ownCloud.
2019-05-29 19:23:40 +03:00
Andrey Cherepanov
4fed6f459d education: use LibreOffice-still-gtk3 and LibreOffice-still-kde5 2019-05-29 19:23:34 +03:00
Andrey Cherepanov
55440b6ae8 education.mk, education/desktop, robotics/umki: use kumir2
...instead of old kumir.
2019-05-29 19:23:32 +03:00
Andrey Cherepanov
732c02b7ef server-apps-edu: remove libmysqlclient18 and duplicate mariadb entry 2019-05-29 19:23:29 +03:00
Andrey Cherepanov
347d9c94a4 install2: add use/install2/autoinstall
...included by default in use/install2
2019-05-29 19:23:28 +03:00
Mikhail Efremov
32c9f80de7 slinux: Drop xfce4-quicklauncher-plugin
Removed from Sisyphus:
http://git.altlinux.org/tasks/archive/done/_221/226873/
2019-05-29 19:23:28 +03:00
Andrey Cherepanov
0f78e505ed education.mk: use chrony as ntp client 2019-05-29 19:23:28 +03:00
Andrey Cherepanov
92b1ec10c3 education.mk: use/efi/shell 2019-05-29 19:23:27 +03:00
Andrey Cherepanov
ad388f6bd7 education/base: remove kde4libs 2019-05-29 19:23:26 +03:00
Andrey Cherepanov
3843419d0f server-apps-edu: remove ejudge 2019-05-29 19:23:25 +03:00
Andrey Cherepanov
235a644b0e education: puppet-server is replaced by puppetserver+puppetdb 2019-05-29 19:23:25 +03:00
Andrey Cherepanov
a255dc1f1f education/base: remove umki 2019-05-29 19:23:24 +03:00
Andrey Cherepanov
87d1f45d44 education/base: use gimagereader-qt5 2019-05-29 19:23:23 +03:00
Andrey Cherepanov
efd39a9dea education/base, desktop+engineering: remove obsolete blender-i18n 2019-05-29 19:23:20 +03:00
Andrey Cherepanov
ffd4e21df5 education/base: remove ICAClient-preinstall 2019-05-29 19:23:19 +03:00
Mikhail Efremov
a8d298ce20 slinux: Drop compiz for now
Fusion-icon was removed from Sisyphus.
2019-05-29 19:23:17 +03:00
Andrey Cherepanov
7e98d3b2b5 education/desktop: drop xorg-drv-openchrome 2019-05-29 19:23:16 +03:00
Andrey Cherepanov
d207711641 education.mk, education: drop syslogd 2019-05-29 19:23:14 +03:00
Andrey Cherepanov
405e785281 education: use italc3 instead of italc2 2019-05-29 19:23:13 +03:00
Andrey Cherepanov
cb02fcf7bd desktop+office: use LibreOffice-still 2019-05-29 19:23:12 +03:00
Andrey Cherepanov
9fccd23258 server-apps-edu: cleanup, adapt for installed-db-office-server 1.4.1 2019-05-29 19:23:10 +03:00
Andrey Cherepanov
d14d0c7865 education.mk: add vim-console and lftp to installer 2019-05-29 19:23:08 +03:00
Andrey Cherepanov
ca5a82176c server-apps-edu: add ansible/puppet
...and uncomment all network services such as
Moodle, Mediawiki, Owncloud, Rujel.
2019-05-29 19:23:08 +03:00
Andrey Cherepanov
3930551128 education/base: add packages for build by default in Qt Creator and Codeblocks 2019-05-29 19:23:08 +03:00
Andrey Cherepanov
57015a7ecc education.mk: rename education target to alt-education
...and increase version to 8.2.
2019-05-29 19:23:08 +03:00
Andrey Cherepanov
137ba7cff8 education.mk: fix order and move alterator-fbi to THE_PACKAGES 2019-05-29 19:23:08 +03:00
Andrey Cherepanov
fccb10d511 server-apps-edu: add anonftp for anonymous access to FTP server by default 2019-05-29 19:23:07 +03:00
Andrey Cherepanov
a5bb60c467 education.mk: enable cups and ahttpd services by default 2019-05-29 19:23:06 +03:00
Andrey Cherepanov
2cf1e5f247 education.mk: add openssh-clients to installer 2019-05-29 19:23:02 +03:00
Andrey Cherepanov
2b41bda0ed education/base: add qt-creator-doc 2019-05-29 19:22:48 +03:00
Andrey Cherepanov
2de09ac9ec education.mk: add disk end restore utilities to install stage 2019-05-29 19:22:47 +03:00
Andrey Cherepanov
f8b0acd250 education.mk, education/base: add xorg-conf-synaptics to installer
...and arrange yandex-browser-preinstall only for x86_64.
2019-05-29 19:22:46 +03:00
Andrey Cherepanov
28413ec15b education.mk: add stellarium to disk 2019-05-29 19:22:42 +03:00
Andrey Cherepanov
248093308b education/base: add simplescreenrecorder for screencast 2019-05-29 19:22:39 +03:00
Andrey Cherepanov
7204fefc12 education/base: add blender-i18n 2019-05-29 19:22:31 +03:00
Andrey Cherepanov
cffa1bcf2f education/base: remove gnome-disk-utility 2019-05-29 19:22:29 +03:00
Andrey Cherepanov
8173cef0a0 Revert "education.mk: use un-def as kernel flavour"
This reverts commit 376630e4ee1912aeb0fed211b28e70d20d6a55e2.
2019-05-29 19:22:25 +03:00
Andrey Cherepanov
380783d001 education.mk: add curl to INSTALL2 for autoinstall feature 2019-05-29 19:22:24 +03:00
Andrey Cherepanov
556505504a server-apps-edu: remove obsoleted drupal package 2019-05-29 19:22:18 +03:00
Andrey Cherepanov
fd5aa16c00 education.mk: use un-def as kernel flavour 2019-05-29 19:22:12 +03:00
Andrey Cherepanov
53d1c28abc education.mk: eMMC support 2019-05-29 19:22:10 +03:00
Andrey Cherepanov
c01c017241 education.mk: add vnc to install image 2019-05-29 19:22:01 +03:00
Andrey Cherepanov
8cf26e79d2 education/base: add Scilab and Qt Creator 2019-05-29 19:22:00 +03:00
Andrey Cherepanov
0488247586 education: remove basic256 and logisim from LiveCD 2019-05-29 19:22:00 +03:00
Andrey Cherepanov
de292ec837 education/desktop: workaround for i586-wine selection 2019-05-29 19:21:59 +03:00
Andrey Cherepanov
f9eeda3ab2 .gitignore: add image.in/files/*
These are explicitly supposed to not be a part of the profile
in the first place.
2019-05-29 19:21:57 +03:00
Andrey Cherepanov
d9fa81de0f education.mk: enable crond services, add disk utilites 2019-05-29 19:21:57 +03:00
Andrey Cherepanov
e5c65b50fe education/desktop: add xfce-polkit (ALT #33435) 2019-05-29 19:21:56 +03:00
Andrey Cherepanov
09de9021f0 education, workstation: use wine instead of wine-vanilla
...as it tends to have more chances to perform on average.
2019-05-29 19:21:53 +03:00
Andrey Cherepanov
8811cf7c5a education/base: authenticate both with Active Directory and FreeIPA through SSSD 2019-05-29 19:21:52 +03:00
Andrey Cherepanov
be449541c5 education.mk: add base+regular pkglist
...for make-initrd-lvm and other packages.
2019-05-29 19:21:50 +03:00
Andrey Cherepanov
a67889e523 education.mk: enable bind service
...because installer-feature-resolver-bind-stage3 requires it.
2019-05-29 19:21:47 +03:00
Andrey Cherepanov
8f04dc9a5c education, workstation: switch to AD auth with SSSD 2019-05-29 19:21:46 +03:00
Andrey Cherepanov
3dc79d4382 education/base: add some utilites
...namely inxi, screenfetch, ntpdate, fdisk;
add support of exfat and complete auth in Active Directory too
2019-05-29 19:21:44 +03:00
Andrey Cherepanov
76a843b79c education.mk: add Refind to run LiveCD on EFI 2019-05-29 19:21:41 +03:00
Andrey Cherepanov
2bb711bbee education.mk: remove samba-DC from disk
...due to conflicts with samba.

See-also: https://bugzilla.altlinux.org/30806
2019-05-29 19:21:38 +03:00
Andrey Cherepanov
56da7a16cb education.mk: add owncloud-client 2019-05-29 19:21:36 +03:00
Andrey Cherepanov
2547ec858e education.mk, education/base: revert to chromium from chromium-stable
...and add kumir2, rujel and task-samba-dc to disk
2019-05-29 19:21:34 +03:00
Andrey Cherepanov
5855318a10 education/teacher: get puppet-server back 2019-05-29 19:21:31 +03:00
Andrey Cherepanov
c32e35f52a education: add chromium-stable, wine-vanilla-programs (i586 only) and task-auth-ad 2019-05-29 19:21:22 +03:00
Andrey Cherepanov
bff28d409d education/base: add useful utilities, preinstall packages and chromium 2019-05-29 19:21:14 +03:00
Andrey Cherepanov
e6b94ed542 education.mk: add complete install pack for systemd
...including bash-completion-systemd.
2019-05-29 19:21:13 +03:00
Andrey Cherepanov
a24a7451cb education.mk: do not install monitoring tools, just add to disk 2019-05-29 19:21:12 +03:00
Andrey Cherepanov
4c5f2792d4 education.mk: enable services for real 2019-05-29 19:21:06 +03:00
Andrey Cherepanov
70d8e242ae education/desktop: add libreoffice-languagetool 2019-05-29 19:21:05 +03:00
Andrey Cherepanov
f7fc861a08 desktop+xfce+extra: remove xfdashboard 2019-05-29 19:21:04 +03:00
Andrey Cherepanov
fe2bca50f8 education: package list cleanup
- Replace yagf by gimagereader-gtk
- Replace goldendict by stardict
- Add translations and icons for KDE5 applications (such as kdenlive)
2019-05-29 19:21:03 +03:00
Andrey Cherepanov
81fadbddd2 education.mk: turn on service start hooks 2019-05-29 19:21:01 +03:00
Andrey Cherepanov
f2c49ca5fe education.mk: add monitoring tools 2019-05-29 19:20:59 +03:00
Andrey Cherepanov
aa3703d2aa education.mk: enable guest session support in LightDM 2019-05-29 19:20:58 +03:00
Andrey Cherepanov
fffd065711 education/desktop: add man-pages-ru and accountsservice 2019-05-29 19:20:57 +03:00
Andrey Cherepanov
ef705bb47c education.mk: enable sshd service by default 2019-05-29 19:20:57 +03:00
Andrey Cherepanov
189ef62d39 education/desktop: add missing Alterator modules 2019-05-29 19:20:56 +03:00
Andrey Cherepanov
6ceee29282 education/desktop: workaround for Russian hyphenation support in LibreOffice 2019-05-29 19:20:52 +03:00
Andrey Cherepanov
d18b264fb8 education/kde5: fix NetworkManager 2019-05-29 19:20:51 +03:00
Andrey Cherepanov
71b2b7d684 education.mk, education: add installer features as in ALT Server 8.0 2019-05-29 19:20:48 +03:00
Andrey Cherepanov
a4df572f58 education.mk: really install firefox-esr and firefox-esr-ru 2019-05-29 19:20:46 +03:00
Andrey Cherepanov
62f3ac1c2c server-apps-edu: remove RUJEL and old Moodle 2.5 2019-05-29 19:20:31 +03:00
Andrey Cherepanov
775f62ac17 education.mk, education: add bluetoothd, KF5 settings, alt-domain-server 2019-05-29 19:20:24 +03:00
Andrey Cherepanov
08ec1254ac education.mk: return package group selection to installer 2019-05-29 19:20:24 +03:00
Michael Shigorin
07cac36d3d education: optimize more 2019-05-29 19:20:22 +03:00
Michael Shigorin
1e14418f9b education.mk, education: split off base list from desktop 2019-05-29 19:20:20 +03:00
Andrey Cherepanov
77de1c8db7 education.mk: refactor lists 2019-05-29 19:20:19 +03:00
Andrey Cherepanov
7a58ffd355 education.mk: add vim-console and Live support 2019-05-29 19:20:11 +03:00
Andrey Cherepanov
6a3355135d education.mk: add disable-usb-autosuspend and bluetooth support 2019-05-29 19:20:11 +03:00
Andrey Cherepanov
a2d42b5df5 education.mk: add os-prober to detect other systems 2019-05-29 19:20:10 +03:00
Andrey Cherepanov
547e6ba455 education.mk: add some utilities and synaptic device support 2019-05-29 19:20:09 +03:00
Andrey Cherepanov
e04c7a4ade education.mk: add EFI support 2019-05-29 19:20:07 +03:00
Andrey Cherepanov
6d4a210924 education.mk, groups, lists: move into education/ 2019-05-29 19:20:05 +03:00
Andrey Cherepanov
ecaeac595d server-apps-edu: temporarily disable installed-db-* 2019-05-29 19:20:00 +03:00
Andrey Cherepanov
7311bce3b9 education.mk, education/desktop: add vmware drivers
...to installer and disk; put disable-usb-autosuspend to installer
2019-05-29 19:19:54 +03:00
Andrey Cherepanov
d17ef9d1e7 education/desktop: adapt arch-dependent package names
...as per doc/archdep.txt
2019-05-29 19:19:52 +03:00
Andrey Cherepanov
5c5857c5ae education/desktop: add useful stuff
New utilites:
autossh
disable-usb-autosuspend
color-prompt-and-man

Popular sofware prerequsites:
1c-preinstall
crypropro-preinstall
2019-05-29 19:19:52 +03:00
Andrey Cherepanov
e92679b75f education.mk, kde5, server-apps-edu: improve contents
- Use firefox-esr instead of firefox
- Use mariadb insead of MySQL
- Add memtest check to disk menu
- Use kde5 without kde5-kdepim
- Use Moodle 2.5 instead of 2.2
2019-05-29 19:19:51 +03:00
Andrey Cherepanov
aabf932327 education.mk, groups, lists: rename server-apps to server-apps-edu 2019-05-29 19:19:50 +03:00
Andrey Cherepanov
9fe8396f89 kde5: use kde5-big instead of kde5 metapackage 2019-05-29 19:19:46 +03:00
Andrey Cherepanov
e7434704fc education.mk, groups, lists: add teacher, kde5 and server-apps 2019-05-29 19:19:36 +03:00
Andrey Cherepanov
5f3a8542e9 education/desktop: add xfce4-whiskermenu-plugin 2019-05-29 19:19:33 +03:00
Andrey Cherepanov
59b8da8c61 education.mk: ALT Education 8.0 2019-05-29 19:19:33 +03:00
Andrey Cherepanov
eed7a25b21 education/desktop: use Java 1.8.0 OpenJDK 2019-05-29 19:19:33 +03:00
Mikhail Efremov
c602ba7904 slinux: Drop installer-distro-desktop 2019-05-29 19:19:32 +03:00
Mikhail Efremov
37aaa679f8 alt-workastation: Drop alterator-bacula-client
Removed from Sisyphus.
2019-05-29 19:19:28 +03:00
Mikhail Efremov
60d5f41fff alt-workstation: bacula-client -> bacula9-client 2019-05-29 19:19:27 +03:00
Mikhail Efremov
864962919c slinux: Use kernel std-def 2019-05-29 19:19:25 +03:00
Mikhail Efremov
fb6f54fb72 slinux: Replace LibreOffice -> LibreOffice-still 2019-05-29 19:19:20 +03:00
Mikhail Efremov
e1dfbb3ae5 slinux: Drop ppracer
Package is not present in the Sisyphus.
2019-05-29 19:19:20 +03:00
Mikhail Efremov
3b7314cad0 slinux: Replace libspice-gtk -> libspice-gtk3
And drop python module: there is no such thing any longer.
2019-05-29 19:19:20 +03:00
Mikhail Efremov
e35a0fa52f slinux: Replace tracker-search-tool -> tracker 2019-05-29 19:19:19 +03:00
Mikhail Efremov
102513d2a4 slinux: Don't try to remove non-existent packages 2019-05-29 19:19:18 +03:00
Mikhail Efremov
8f5d7b00ec slinux: Drop fontconfig-infinality
It is not supported in the Sisyphus.
2019-05-29 19:19:17 +03:00
Mikhail Efremov
0b0a32c854 slinux: Replace gimagereader-qt4 -> gimagereader-qt5 2019-05-29 19:19:17 +03:00
Mikhail Efremov
5722cf477d slinux: Drop docs-linux_intro
It is not present in the Sisyphus.
2019-05-29 19:19:15 +03:00
Mikhail Efremov
7d8b041f7c slinux: Drop bcm43xx-fwcutter
It is not present in the Sisyphus.
2019-05-29 19:19:13 +03:00
Mikhail Efremov
3878e5dfa9 slinux: Add alterator-printers
Show system-config-printer in the alterator.
2019-05-29 19:19:12 +03:00
Mikhail Efremov
800ff39227 slinux: Replace gcalctool -> mate-calc
Actually gcalctool is gnome-calculator, so get rid of GNOME3 stuff.
2019-05-29 19:19:08 +03:00
Mikhail Efremov
1ba541f4bb slinux: Drop alterator-fbi
There is no web interface.
2019-05-29 19:19:05 +03:00
Mikhail Efremov
550273b3ea slinux: Add wesnoth again
Make image notably bigger then 4Gb to avoid attemts to write
it on 4Gb flash drive.
2019-05-29 19:19:02 +03:00
Mikhail Efremov
1b49dd0ea5 slinux: Replace java-1.6.0-sun with java-1.8.0-openjdk 2019-05-29 19:19:00 +03:00
Mikhail Efremov
35fac18278 slinux: Possibly fix for EMMC disks
https://bugzilla.altlinux.org/show_bug.cgi?id=32171
2019-05-29 19:18:56 +03:00
Mikhail Efremov
de0b9dadcd slinux: Add p7zip-standarlone
It allows xarchiver to support 7z archives.
2019-05-29 19:18:50 +03:00
Mikhail Efremov
f722064d4e slinux: Require background packages
Background were separated from b-s-l-xfce-settings.
2019-05-29 19:18:44 +03:00
Mikhail Efremov
138680f93b slinux: Use custom luks step on live 2019-05-29 19:18:43 +03:00
Mikhail Efremov
d7150fc3e1 slinux: Add use/fonts/install2
Workaround for a-b-qt5: it don't use fonts-ttf-google-droid-sans
for some reason. It just pulls fonts-ttf-google-croscore-arimo.
2019-05-29 19:18:38 +03:00
Mikhail Efremov
c1abac1d8f slinux: Add hplip-sane 2019-05-29 19:18:36 +03:00
Mikhail Efremov
e6abb3cfde slinux: Add tesseract-langpack-{ru,en}
They used by gimagereader.
2019-05-29 19:18:32 +03:00
Mikhail Efremov
fe6cc42ba5 slinux: Replace blueman -> blueberry 2019-05-29 19:18:27 +03:00
Mikhail Efremov
d301822ac7 slinux: Enable xdg-user-dirs
It was disabled on live
2019-05-29 19:18:27 +03:00
Mikhail Efremov
9e80b74b44 slinux: Use live with sessions 2019-05-29 19:18:26 +03:00
Mikhail Efremov
11a3785f55 slinux: Don't install nano on live
It pollutes menu (we have a text editor already) and we don't have
nano in the lists.
2019-05-29 19:18:22 +03:00
Mikhail Efremov
88449a1e0f slinux: Rename gnome-games-glchess -> gnome-games-chess 2019-05-29 19:18:15 +03:00
Mikhail Efremov
b0595fcdef slinux: Drop steam
It can be broken and no one tested it.
See https://bugzilla.altlinux.org/show_bug.cgi?id=32063
2019-05-29 19:18:14 +03:00
Mikhail Efremov
efe310a7ab slinux: Add xfce4-session-engines 2019-05-29 19:18:00 +03:00
Mikhail Efremov
8ae212d92d slinux: Use GLOBAL_LIVE_NO_CLEANUPDB 2019-05-29 19:17:57 +03:00
Mikhail Efremov
1f1d839142 slinux: Disable dnsmasq on live
Due to race with livecd-timezone.
2019-05-29 19:17:51 +03:00
Mikhail Efremov
cb8d64615c slinux: Explicitly enable livecd-* services on live 2019-05-29 19:17:47 +03:00
Mikhail Efremov
857e00b854 slinux: Add livecd-timezone 2019-05-29 19:17:46 +03:00
Mikhail Efremov
851ed60071 slinux: Replace yagf -> gimagereader-gtk 2019-05-29 19:17:42 +03:00
Mikhail Efremov
1b5a3add46 slinux: Use +efi and use/efi/refind 2019-05-29 19:17:40 +03:00
Mikhail Efremov
cc13e3b458 slinux: Don't pull ancient gstreamer plugin
Replace it with some gstreamer-1.0 plugins.
2019-05-29 19:17:35 +03:00
Mikhail Efremov
f089184fe2 slinux: Add shadow-change 2019-05-29 19:17:34 +03:00
Mikhail Efremov
e351e1eeff slinux: Use xorg-drv-libinput
Replace xorg-drv-synaptics with xorg-drv-libinput.
2019-05-29 19:17:33 +03:00
Mikhail Efremov
cb3df8836e slinux: Don't require mozilla-plugin-adobe-flash
Replace mozilla-plugin-adobe-flash with ppapi-plugin-adobe-flash.
The former is compatibility package for firefox.
2019-05-29 19:17:24 +03:00
Mikhail Efremov
e4eed893da slinux: Move some packages network-base -> misc-base
List network-base is for Communication group and can be not installed.
2019-05-29 19:17:22 +03:00
Mikhail Efremov
d23aba896f slinux: Install *-base lists conditionally
Add *-base lists on live only.
On the full distro they will be added by the corresponding groups.
Otherwise these packages will be _always_ installed.
2019-05-29 19:17:18 +03:00
Mikhail Efremov
9cb77e4f92 slinux: Move chestnut-dialer-gtk2 to not-install-full
Dialers is rather legacy nowaday. But keep it as not-install
for now.
2019-05-29 19:17:18 +03:00
Mikhail Efremov
34c7f808c9 slinux: Remove 1c-preinstall
It was commented out anyway.
2019-05-29 19:17:17 +03:00
Mikhail Efremov
0e23e3cc5d slinux: Cleanup misc-full
Drop some apparently not needed packages.
2019-05-29 19:17:15 +03:00
Mikhail Efremov
5cbd7aea70 slinux: Use misc-full list 2019-05-29 19:17:15 +03:00
Mikhail Efremov
740fa64aae slinux: Repalce file-roller with xarchiver 2019-05-29 19:17:14 +03:00
Mikhail Efremov
eaac01bf4c slinux: Replace firefox-esr with chromium 2019-05-29 19:17:10 +03:00
Mikhail Efremov
ca3d103aa0 slinux: Disable tracker on live
Based on init5-disable-tracker from m-p-d.
2019-05-29 19:17:09 +03:00
Mikhail Efremov
92f056e2d7 slinux: Add make-initrd-lvm
https://bugzilla.altlinux.org/show_bug.cgi?id=32980
2019-05-29 19:17:08 +03:00
Mikhail Efremov
77a29bedb3 slinux: Drop instead
https://bugzilla.altlinux.org/33365
2019-05-29 19:17:08 +03:00
Mikhail Efremov
52e824abf0 slinux: Use un-def kernel 2019-05-29 19:17:08 +03:00
Mikhail Efremov
7fc57a9cf0 slinux: Add os-prober 2019-05-29 19:17:07 +03:00
Mikhail Efremov
85e874d814 slinux: Add gparted 2019-05-29 19:17:06 +03:00
Mikhail Efremov
02c9ff4d3b slinux: Add mc-full 2019-05-29 19:17:03 +03:00
Mikhail Efremov
bf29d04ca6 slinux: Use vmguest feature
For install on various virtual machines.
2019-05-29 19:16:59 +03:00
Mikhail Efremov
52d8197c90 slinux: Add all nvidia drivers to not-install 2019-05-29 19:16:55 +03:00
Mikhail Efremov
34be7b0548 slinux: Drop i586-fglrx_glx too. 2019-05-29 19:16:49 +03:00
Mikhail Efremov
5a5b1173da slinux: Add anacron 2019-05-29 19:16:49 +03:00
Mikhail Efremov
1494f7528d slinux: Set META_APP_ID variable 2019-05-29 19:16:48 +03:00
Mikhail Efremov
e4c841ed20 slinux live: Update services list 2019-05-29 19:16:43 +03:00
Mikhail Efremov
b315be503a slinux: Add libcanberra-gtk2
It needed for system sounds at least.
2019-05-29 19:16:43 +03:00
Mikhail Efremov
e1b95cb1ab slinux: Add vconsole-setup-kludge 2019-05-29 19:16:43 +03:00
Mikhail Efremov
a3855183b1 slinux: Setup correct META_* variables
At least META_VOL_ID must be Simply*, otherwise  bootloader can't
find the install image.
2019-05-29 19:16:42 +03:00
Mikhail Efremov
51f3b30dba slinux: Add pam-limits-desktop 2019-05-29 19:16:42 +03:00
Mikhail Efremov
ee8ad58f36 slinux: Add xfce4-weather-plugin 2019-05-29 19:16:41 +03:00
Mikhail Efremov
e5804d3c52 slinux: Drop xfce4-volumed-pulse
xfce4-pulseaudio-plugin can show notifications too.
2019-05-29 19:16:33 +03:00
Mikhail Efremov
e97ac330e5 slinux: Add xfce4-whiskermenu-plugin 2019-05-29 19:16:33 +03:00
Mikhail Efremov
8c42cf9a9c slinux: Replace xfce4-mixer with xfce4-pulseaudio-plugin 2019-05-29 19:16:32 +03:00
Mikhail Efremov
7b59b31d61 slinux: Add installer-distro-simply-linux-stage3 2019-05-29 19:16:29 +03:00
Mikhail Efremov
7903df3c41 slinux: Drop fglrx
It don't work with current xorg.
2019-05-29 19:16:20 +03:00
Mikhail Efremov
e3338a2891 slinux: Add dhcp-client
For DHCPv6 should be used dhclient.
2019-05-29 19:16:19 +03:00
Mikhail Efremov
34d938729d slinux: Add strace 2019-05-29 19:16:17 +03:00
Mikhail Efremov
8ca181858c slinux: Replace xscreensaver with light-locker 2019-05-29 19:16:10 +03:00
Mikhail Efremov
7294d00957 slinux: Explicitly add mplayer
Smplayer don't depend on mplayer now: it can use mpv as well.
2019-05-29 19:16:09 +03:00
Mikhail Efremov
485abfbdfa slinux: Initial port Simply Linux distro from m-p-d 2019-05-29 19:16:06 +03:00
Mikhail Efremov
7c10e793b1 alt-workstation: Drop ICAClient-preinstall
No ICAClient-preinstall in the Sisyphus.
2019-05-29 19:16:02 +03:00
Mikhail Efremov
e2ba46aa55 alt-workstation: Drop non-existent mate-file-manager-* packages 2019-05-29 19:16:00 +03:00
Mikhail Efremov
2c07301ac9 alt-workstation: Use LibreOffice-still 2019-05-29 19:15:57 +03:00
Michael Shigorin
f8ceaef00b gear-store-tags 2019-05-06 18:40:08 +03:00
Michael Shigorin
54d8ce33a2 1.3.7-alt1
- docker, vm, browser fixups (obirvalger@)
- elogind support, refactoring, cleanups (antohami@)
- a couple more improvements (me)
2019-05-06 18:38:13 +03:00
Michael Shigorin
c0ecc0654e {mixin-,}basealt.mk: generalize gnome-peer-to-peer
It's available for e2k too now.
2019-05-06 18:10:59 +03:00
Anton Midyukov
aee8c1721b kernel: use different default flavour for aarch64, armh 2019-05-06 16:34:10 +03:00
Michael Shigorin
ffa7919f60 kernel: use different default flavour for e2k
This might evolve into some form of per-arch logic,
or otherwise x86 might get moved into a feature of
its own instead of being the presumed one.

The first step is done.
2019-04-29 13:48:45 +03:00
Anton Midyukov
d4170557c2 Revert "net: 50-net-nm band-aid"
This reverts commit 226a2395e5.

Users are getting upset about NetworkManager being unable to
configure "System EthX" connections that are meant to set up
with "acc" (which isn't obvious at all).

See-also: https://forum.altlinux.org/index.php?topic=42519.0
2019-04-29 13:48:40 +03:00
Anton Midyukov
89a51b7baf browser, mixin.mk: drop use/browser/firefox/classic
firefox-classic_theme_restorer is not there anymore
(following pre-quantum fx29+ australis it countered):
http://git.altlinux.org/tasks/archive/done/_222/227910/logs/events.1.2.log
2019-04-29 13:48:36 +03:00
Anton Midyukov
25fe1bc814 openstack/controller: drop openstack-nova-cert
...it's no more in Sisyphus as of openstack-nova 18.1.0-alt1.
2019-04-29 13:48:32 +03:00
Anton Midyukov
ec84f1c95b mixin.mk: add wmaker-autostart-polkit-gnome
...since wmaker doesn't autostart anything.
2019-04-29 13:48:29 +03:00
Anton Midyukov
0c873dd010 regular.mk: use/efi/refind for all targets, except jeos
elilo does not support secure boot with shim-signed 15.
jeos does not require Secure Boot.
2019-04-29 13:48:24 +03:00
Anton Midyukov
bd50f525df regular.mk, desktop+lxde: refactoring
With the arrival of elogind in sysvinit, the lxde metapackage can
be used for all builds.
2019-04-16 17:24:29 +03:00
Anton Midyukov
804c89243f mixin.mk: add xfce-polkit
With the arrival of elogind in sysvinit, the polkit agent is needed
within all builds using it.
2019-04-16 17:24:20 +03:00
Anton Midyukov
b75b2cc330 init: workaround for elogind to run
Let's provide some shim until directory migration is over.
2019-04-16 17:24:18 +03:00
Anton Midyukov
fbc102f2d5 mixin.mk, regular.mk: switch sysvinit builds to elogind
elogind provides sessions for polkit; use/init/sysv/polkit
and use/deflogin/sysv/nm are not needed anymore,
polkit-agent is needed instead.
2019-04-16 17:23:54 +03:00
Anton Midyukov
08d93ed851 init: elogind support
elogind is the systemd project's "logind" extracted out to be
a standalone service.  It integrates with PAM to know the set
of users that are logged in to a system and whether they are
logged in graphically, on the console, or remotely.
2019-04-15 14:50:38 +03:00
Anton Midyukov
5fb451ec9b wireless: add rtl8821ce 2019-04-08 19:42:24 +03:00
Anton Midyukov
a8bd2ffbf7 tagged/basesystem: drop apt-conf
apt-conf is a virtual package provided by apt-conf-branch or
apt-conf-sisyphus. This can result in the wrong provider being
chosen during image build.  Stable branches got apt-conf-branch
only, and Sisyphus got both; so either strict versioning is needed
or apt-conf should be not specified explicitly at all.
2019-04-02 20:23:22 +03:00
Mikhail Gordeev
57ea839f8a browser: make use/browser/firefox/esr a pure selector
...through ensuring that the intentinal lack of dependencies
is actually *complete* and not still pulling the default elinks
in if nothing else was specified (this was still too much for
virtualization base images aiming to make use of mixin/p8).
2019-04-02 20:22:18 +03:00
Mikhail Gordeev
a4d5464ade conf.d/vm.mk: Add locales and tzdata to vm/systemd 2019-04-02 17:44:02 +03:00
Mikhail Gordeev
edb44bf43b conf.d/ve.mk: Add ve/systemd-base
More than ve/systemd-bare (for now has locales and tzdata).
2019-04-02 17:43:55 +03:00
Mikhail Gordeev
0143cf9af7 conf.d/ve.mk: base ve/systemd-bare on .apt
Sytemd contains systemd-networkd for network configuration package.
2019-04-02 17:43:51 +03:00
Mikhail Gordeev
95ee98b3bf conf.d/ve.mk: base ve/docker on .apt
Docker uses iproute2 to configure network.
2019-04-02 17:43:47 +03:00
Mikhail Gordeev
e1cc0863de lib/ve.mk: split package management and networking
Some images (i.e. docker and systemd-bare) require apt
but do not require etcnet.
2019-04-02 17:43:34 +03:00
Michael Shigorin
ea1b8832ec gear-store-tags 2019-04-01 21:21:45 +03:00
Michael Shigorin
a60b082ae3 1.3.6-alt1
- no joke!
2019-04-01 21:10:19 +03:00
Anton Midyukov
03bda0fa74 regular.mk: switch icewm to default display manager
...that is, gdm2.20 for sysvinit; it was clobbering lightdm
before commit 510e2933f7 anyways.
2019-04-01 21:02:28 +03:00
Anton Midyukov
184f3f2ac2 rescue+misc: added jdupes
A powerful duplicate file finder and an enhanced fork of 'fdupes'.

Suggested-by: Vitaly Lipatov <lav@altlinux.org>
2019-04-01 21:02:26 +03:00
Anton Midyukov
dbb29ee01b desktop+cups: added splix driver
This is a free reverse-engineered driver for Samsung SPL
printers that used to have problems for mike@ back then
but works well now.
2019-04-01 21:02:16 +03:00
Anton Midyukov
b9ff1b6089 regular+icewm: update list
Replaced tray_mixer_plus to pnmixer which allows
selecting the audio channel to control;
added qasmixer - simple ALSA mixer.
2019-04-01 21:02:14 +03:00
Anton Midyukov
4c191a8727 mixin.mk, regular.mk: factored out mixin-builder
This mixin will be used for non-x86 image builds.
2019-04-01 20:27:08 +03:00
Anton Midyukov
2f5cb67331 mixin.mk: switch to chrony
chrony is a modern ntp client working better than openntp's one
in many circumstances (especially on e2k hardware).
2019-04-01 20:12:00 +03:00
Anton Midyukov
82bf8c1c0f regular.mk: added dependency on mixin/regular-x11
This allows to unify the contents of regular builds.
2019-04-01 20:11:26 +03:00
Anton Midyukov
e52e1d6c08 desktop+mate: added mpv
...as mate-maxi doesn't require mplayer.
2019-04-01 20:11:20 +03:00
Anton Midyukov
f05cdb490c desktop+engineering: added povray
povray is needed to render models in Blender and FreeCAD.
2019-04-01 19:22:28 +03:00
Anton Midyukov
bfce16daea desktop+enlightenment+extra: replaced gnome-mplayer with mpv
gnome-mplayer no more in Sisyphus
2019-03-12 18:48:26 +03:00
Anton Midyukov
2dd4a480f7 rescue+crypto: drop stegdetect
...it's no more in Sisyphus too:
http://git.altlinux.org/tasks/archive/done/_219/224790/logs/events.2.3.log
2019-03-11 20:02:40 +03:00
Anton Midyukov
147964b05f install2: added installer-feature-create-ghost-directories
Workaround ALT bug 35350 for install2.
2019-03-11 16:34:48 +03:00
Anton Midyukov
11442dd9e4 Drop php5
php5 has been completely removed from Sisyphus following its EOL:
http://git.altlinux.org/tasks/archive/done/_214/219816/
2019-03-11 15:47:42 +03:00
Anton Midyukov
824f4b84f8 desktop+wmaker+extra: lost wmcube-gdk, wmmsg
...as these have been removed from sisyphus:
http://git.altlinux.org/tasks/archive/done/_215/220898/logs/events.13.3.log
2019-03-11 15:45:23 +03:00
Anton Midyukov
b8931f3132 Drop TDE support
It's missing in Sisyphus altogether:
http://git.altlinux.org/tasks/archive/done/_184/188854/
2019-03-11 15:45:00 +03:00
Anton Midyukov
c5aa77220c Drop kde4 support
Sisyphus doesn't contain suitable KDE4 package set by now.
2019-03-11 15:37:05 +03:00
Anton Midyukov
7ef157e2b1 use/ntp/chrony: initial target
chrony synchronizes time when connecting to a network using
NetworkManager. This feature is great for computers without
hardware clock, for example Raspberry Pi.
2019-03-11 15:36:03 +03:00
Michael Shigorin
960ccea04e install2: figure out whose vm-profile.scm is
This file is contained in multiple sources,
let's document the particular one in build.log.
2019-03-08 17:56:22 +03:00
Michael Shigorin
0a004a8e88 power: add e2k support
Needs an extra package and a service at the moment.
2019-03-08 17:27:45 +03:00
Michael Shigorin
801455fece build.mk: added Conflicts: to error filter
Just stumbled into that and (falsely) blamed vseleznv@! :(
2019-03-08 17:27:24 +03:00
Michael Shigorin
2f389cfce1 build-distro: added META_DISK_INFO support
This one can be used to override the default content
of .disk/info file (used by propagator but can find
some other uses within installer as well); the reason
being that ISO9660's Volume ID is up to 32 characters
and a file lacks that particular limitation.
2019-03-08 17:27:07 +03:00
Michael Shigorin
9cfec60c22 gear-store-tags 2019-03-04 20:53:54 +03:00
Michael Shigorin
aa5bd5de24 1.3.5-alt1
- Spring 2019 patch queue cleanup
  + antohami@, jqt4@, iv@, obirvalger@, zerg@, me
  + tar2fs fixes for mipsel, qemu etc
  + lots of pkglist updates
2019-03-04 20:53:06 +03:00
Ivan A. Melnikov
dab41865b2 build-vm: proper cleanup for *.img
We should delete the tarball whenever it's not the target.
2019-03-04 20:24:21 +03:00
Mikhail Gordeev
7f1ec09c9b tar2fs: do not chown ROOTFS and WORKDIR
Changing ROOTFS owner causes a problem:
created image's root directory is owned
by user executing make instead of root.

Changing WORKDIR owner is unnecessary
because it will be removed anyways.
2019-03-04 20:23:58 +03:00
Anton Midyukov
0315b4e232 desktop+regular: added arm-rootfs-installer
arm-rootfs-installer is a script to deploy rootfs archive
onto an SD card for ARM computers.
2019-03-04 20:23:32 +03:00
Anton Midyukov
f90dddf1f5 rescue+extra, diag: drop tcptraceroute
...as it's been removed from sisyphus:
http://git.altlinux.org/tasks/archive/done/_216/222169/logs/events.1.1.log
2019-03-04 20:23:14 +03:00
Anton Midyukov
3a0d8f197f lists/domain-client: samba4-client renamed to samba-client 2019-03-04 20:20:09 +03:00
Anton Midyukov
40f08ec324 mixin/regular-xfce-sysv: added xfce4-screensaver
regular-xfce-sysv doesn't use xfce4-full so still needs a screensaver.
2019-03-04 20:19:56 +03:00
Anton Midyukov
c6e716b3fc mixin/regular-xfce: drop xscreensaver
xfce4-full now provides its own xfce4-screensaver
2019-03-04 20:19:03 +03:00
Anton Midyukov
f8bd58ac6f desktop+gnustep: lost gnustep-steptalk
...as it's been dropped from sisyphus as well:
http://git.altlinux.org/tasks/archive/done/_216/221376/logs/events.2.3.log
2019-03-04 20:18:52 +03:00
Anton Midyukov
397808f840 distro/regular-lxqt: added desktop+lxqt+extra
regular-lxqt.iso is intended for actual use, and therefore may be
allowed to contain a lot of packages that are not related to DE.
2019-03-04 20:18:34 +03:00
Anton Midyukov
8e4a18e428 use/x11/lxqt: exclude desktop+lxqt+extra
desktop+lxqt+extra contains some qtdesktop bits that do not
relate directly to lxqt. Therefore, it makes it difficult
to use use/x11/lxqt for the more basic builds based on lxqt.
2019-03-04 20:17:52 +03:00
Anton Midyukov
7ac8a70523 desktop+lxqt{,+extra}: replace lxqt with lxqt-regular
lxqt-regular contains all the necessary dependencies
to get the minimally working lxqt configuration.
Duplicate list items have been cleaned up therefore.
2019-03-04 20:12:46 +03:00
Anton Midyukov
bf9772dff5 use/x11/lxqt: added +pulse
lxqt-regular needs pulseaudio
2019-03-04 20:07:51 +03:00
Anton Midyukov
1963de1e90 use/browser: update targets
- added netsurf - lightweight html4 browser
- added otter-browser - opera12-like browser
- drop qupzilla, konqueror: removed from Sisyphus
- palemoon not work on non-x86 systems
2019-03-04 20:07:28 +03:00
Anton Midyukov
89c65ba9a1 mixin.mk, distro.mk: move falkon to the distro itself
It is wrong to make it impossible to use the default browser
(firefox) for targets using mixin/regular-lxqt given the
caveat with setting a variable to X, then to Y, then to X
again through make targets (see e.g. bootloader feature's
README).
2019-03-04 20:05:47 +03:00
Anton Midyukov
e42c9d8b2c mixin.mk: new target mixin/office
mixin/office contains packages for solving typical office tasks

Co-authored-by: Ivan A. Melnikov" <iv@altlinux.org>
2019-03-04 20:01:18 +03:00
Ivan A. Melnikov
db9e4423ef mixin.mk: move lists from LIVE_LISTS to THE_LISTS
This way the packages will get into the vm and mipsel images.
2019-03-04 20:00:54 +03:00
Ivan A. Melnikov
39050aab74 desktop+office: update the list
There is no libreoffice5 in Sisyphus anymore.
2019-03-04 20:00:44 +03:00
Anton Midyukov
8cb4cca255 lists: added remote-access pkglist
...featuring remote access clients (surprise!).

Co-authored-by: Ivan A. Melnikov" <iv@altlinux.org>
2019-03-04 19:56:58 +03:00
Ivan A. Melnikov
24b901440e rescue+x11: mark several packages as @X86
.. in attempt to use this list on mipsel.
2019-03-04 19:56:52 +03:00
Ivan A. Melnikov
e3d0dd270d mobile+mate: mark eeepc-acpi-scripts as @X86
This package does not make sense on any other platform.
2019-03-04 19:56:46 +03:00
Ivan A. Melnikov
a71435adb2 fonts: add use/fonts/ttf/xo target
A small set of font packages inspired by MyOffice dependencies.
2019-03-04 19:56:43 +03:00
Dmitriy Terekhin
be75d3c3d2 need /.host/qemu* in the chroot if qemu is used
The original commit broke system tar2fs use by accidentally
moving TOPDIR definition into a separate shell execution;
thanks iv@ for spotting and fixing it promptly.

Co-authored-by: Ivan A. Melnikov" <iv@altlinux.org>
2019-03-04 19:56:03 +03:00
803bdabbd2 wireless: add rtl8723de 2019-03-04 19:51:36 +03:00
Anton Midyukov
a9094c1f15 Revert "init: drop vconsole-setup-kludge"
This reverts commit 408cc17429.

See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=28805#c45
2019-03-04 19:10:29 +03:00
Michael Shigorin
285f8b5573 rescue+extra: drop aimage
...as it's been removed from sisyphus during openssl transition:
http://git.altlinux.org/tasks/archive/done/_213/219085/logs/events.1.2.log
2019-03-04 19:10:26 +03:00
Anton Midyukov
1f55197036 sound/pulseaudio: drop pavucontrol
Pavucontrol is a graphical utility, and most of DEs have
similar graphical utilities. Do not duplicate them.
2019-03-04 19:09:58 +03:00
Michael Shigorin
f34d4327de desktop+wmaker+extra: drop wmtunlo
Deleted from sisyphus due to ftbfs:
http://git.altlinux.org/tasks/archive/done/_214/220018/logs/events.1.2.log
2019-01-26 16:53:17 +03:00
Anton Midyukov
b1ee7d7215 base+comm: dropped ckermit
it's no more in Sisyphus too:
http://git.altlinux.org/tasks/archive/done/_214/219915/logs/events.2.1.log
2019-01-26 16:49:56 +03:00
Anton Midyukov
33212b108e rescue+backup: upgraded bacula7 to bacula9
...as v7 is no more in Sisyphus:
http://git.altlinux.org/tasks/archive/done/_214/219913/logs/events.2.1.log
2019-01-26 16:49:23 +03:00
Anton Midyukov
8bc9e7fb14 server/kvm: dropped virt-top
...it's no more in Sisyphus too:
http://git.altlinux.org/tasks/archive/done/_213/218398/logs/events.1.1.log
2019-01-26 16:48:24 +03:00
Anton Midyukov
838d9f4171 plymouth: added make-initrd-plymouth explicitly
make-initrd-plymouth missing in squashfs results in
plymouth bootsplash not available at boot.

See-also: https://bugzilla.altlinux.org/35941
2019-01-22 18:34:02 +03:00
Anton Midyukov
6bb1d1cd93 use/init/ConsoleKit: switch to Consolekit2-service
A separate ConsoleKit2-service package should help here...

See-also: https://bugzilla.altlinux.org/35915
2019-01-21 18:20:41 +03:00
Anton Midyukov
5d790776d2 mixin.mk: re-added NetworkManager to icewm
NetworkManager works on sysvinit again.
2019-01-21 17:55:28 +03:00
Anton Midyukov
15888b4d95 desktop.mk, mixin.mk: replace desktop-extra target
mixin/desktop-extra will be used for non-ISO builds
2019-01-21 17:50:58 +03:00
Anton Midyukov
35530c6789 desktop+mate: mate-maxi is not x86-only
mate-maxi has lighter dependencies now than it had before,
and now it's not x86-only.
2019-01-21 17:47:32 +03:00
Anton Midyukov
1224e73b62 desktop+lxqt+extra: make clementine X86 only
clementine cannot be ported to armh now. It is required to update
it, build with qt5 and OpenGL ES.
2019-01-21 17:17:31 +03:00
Anton Midyukov
9a9e1a2c9f desktop+lxqt+extra: restrict cool-retro-term to X86
cool-retro-term can be a problem on non-X86
2019-01-21 17:15:03 +03:00
Michael Shigorin
0184a3b7fc net: +nm shouldn't provoke races
Brief version: otherwise DNS resolving might fail to perform
until dnsmasq service restart or system reboot (ouch!).

The problem:

1) NetworkManager requires dnsmasq;
2) dnsmasq can win a race against dhcpcd on ethernet.

The result:

1) /etc/resolv.conf looks fine;
2) dnsmasq is running;
3) resolving beyond /etc/hosts fails.

Suggested-by: Mikhail Efremov <sem@altlinux.org>
2019-01-17 20:56:05 +03:00
Michael Shigorin
a3f47946d4 rescue+extra: added rescue-launcher
This one can be autorun iff:
- "autorun=..." kernel boot parameter is specified;
- the image has startup-rescue instead of conventional startup;
- it's tty1.

Suggested-by: Leonid Krivoshein <klark@altlinux.org>
2019-01-15 14:20:22 +03:00
Anton Midyukov
6be04a5bb8 desktop+ibus: dropped ibus qt4
...it's no more in Sisyphus too:
http://git.altlinux.org/tasks/archive/done/_214/219379
2019-01-15 11:53:28 +03:00
Michael Shigorin
151fc48322 gear-store-tags 2019-01-14 19:30:29 +03:00
Michael Shigorin
d95ab7ea8a 1.3.4-alt1
- new 2019 year release ;-)
- tar2fs related security fix (iv@) iff sudo's been configured
- use/x11/dm rework (antohami@)
- archfixes (antohami@, iv@)
- pre-p8 bits cleanup (me)
2019-01-14 19:20:12 +03:00
Anton Midyukov
4419c81a89 desktop+engineering: added qelectrotech
qelectrotech - an electric, hydraulic, pneumatic diagram editor
2019-01-14 19:09:35 +03:00
Anton Midyukov
408cc17429 init: drop vconsole-setup-kludge
https://bugzilla.altlinux.org/28805 was fixed long ago.
2019-01-14 19:08:41 +03:00
Anton Midyukov
9d5fbe86f1 mixin.mk, regular.mk: restrict plymouth to x86
...as it's might be unavailable in non-x86 repositories.
2019-01-14 19:06:04 +03:00
Anton Midyukov
c8a8abe74c x11: ensure gnome3 has gdm
It's up for the packages since gnome-shell can't work
with anything but gdm -- still just in case...
2019-01-14 18:56:38 +03:00
Michael Shigorin
e89cd72778 x11: cleanup use/x11/kde4/nm
The overcomplicated scheme tacked the difference between
p7/t7 and sisyphus-armh of those days that's not there
anymore; all of those repos carry kde4-plasma-nm and not
plasma-applet-networkmanager.
2019-01-14 18:49:41 +03:00
Michael Shigorin
67effcd5a8 x11, lists: drop e17
It's been replaced by e18 and eventually the rolling
enlightenment package long ago, in fact missing by p8;
moksha might be a worthy replacement but now just drop
the good ol' stable bits in the profile either.
2019-01-14 18:49:37 +03:00
Michael Shigorin
74e340d95f x11: remarks fixup
xf86-video-intel is not excellent anymore, in fact it's been
problematic enough for debian to offer modesetting instead;
a shame but still a fact.
2019-01-14 18:49:28 +03:00
Anton Midyukov
510e2933f7 x11: refactor display manager targets
use/x11/dm allows to switch between display managers
and cleans up the common bits of configuration too.
2019-01-14 18:49:20 +03:00
Michael Shigorin
e18765b4a2 x11: drop fglrx support
It's missing in sisyphus (and the last maintainer
was desperate with efforts required to keep it going),
just drop the cruft; if it ever returns, we'll revert this.
2019-01-14 18:43:19 +03:00
Michael Shigorin
61ac519312 x11: drop tde/kdm support
These have been broken by p8 already, and missing in sisyphus;
kde4 is broken in sisyphus but that's still not irreversible
(unlike our old and unmaintained TDE build, sigh).
2019-01-14 18:01:56 +03:00
Anton Midyukov
1b457a5d85 90-enable-repo: use ftp.altlinux.org as default mirror
Yandex mirror can lag behind at times:
http://mirmon.altlinux.org/sisyphus.html#ru

...and we've got 1GbE there now, not that bad
compared to 100Mbps back then...

NB: yandex traffic might be billed as "local"
    in many regions, this should be revisited.
2019-01-14 17:31:20 +03:00
Anton Midyukov
e1974cf1cb regular.mk: drop vconsole-setup-kludge
https://bugzilla.altlinux.org/28805 was fixed long ago.
2019-01-14 17:31:09 +03:00
Anton Midyukov
10ba71f417 mixin.mk, regular.mk: refactor desktop targets
...as more packages become available across the arches.
2019-01-14 17:12:55 +03:00
Anton Midyukov
3d2d80a25f desktop+lxqt+extra: drop juffed-plugins
juffed Provides: juffed-plugins.
2019-01-14 17:09:39 +03:00
Anton Midyukov
c6b80f3457 mixin.mk, regular.mk: fix portability
mixin/regular-desktop can be used in non-x86 builds
where dualboot situation tends to be more rare;
let's keep this installer feature (tweaking installer
to pick up "other" filesystems) to regular.mk.
2019-01-14 17:09:15 +03:00
Anton Midyukov
ac489474a3 build-{ve,vm}: there can be no syslogd
...if it's a systemd-based image; no real error then.
2019-01-14 17:00:37 +03:00
Anton Midyukov
d1d5e3e460 mixin.mk, regular.mk: factored out mixin-icewm
This mixin will be used for non-ISO image builds.
2019-01-14 16:57:08 +03:00
Anton Midyukov
1c80e7a008 mixin.mk, regular.mk: factored out mixin/regular-x11
This mixin will be useful for non-ISO image builds.
2019-01-14 16:54:24 +03:00
Michael Shigorin
fa2a10ac7d desktop+gnustep: lost gnustep-Cynthiune
...as it's been dropped from sisyphus as well:
http://git.altlinux.org/tasks/archive/done/_213/218976/logs/events.1.1.log
2019-01-05 23:23:45 +03:00
Ivan A. Melnikov
bedd7cf453 tar2fs: set defaults for mips* 2018-12-25 15:43:21 +03:00
Ivan A. Melnikov
45b38f389d build.mk: Run mips{,64}el builds natively on mips* machines 2018-12-25 15:43:08 +03:00
Ivan A. Melnikov
98a9c1f303 Use correct path for system tar2fs
tar2fs comes from m-p, not from mkimage. Also, we should
use $TOPDIR from shell, not $(TOPDIR) from make, when
calling it.

Note: this is a security fix for environments relying
on packaged mkimage-profiles with sudo enabled for the
builder user.

Fixes: f293239d5b
2018-12-25 15:42:56 +03:00
Michael Shigorin
4cc5067d7d gear-store-tags 2018-12-24 20:49:29 +03:00
Michael Shigorin
c873aa1be3 1.3.3-alt1
- aarch64/armh portability fixups (antohami@)
- grub-based vm images (shaba@)
- even smaller images (glebfm@)
- lxc/lxd lists/feature/image (dans@)
- updated robotics lists/image (dd@)
- e2k: 801/101/jeos tweaks (me)
2018-12-24 20:48:40 +03:00
Michael Shigorin
b382921136 e2k.mk: added python-module-serial
...to any installer: tends to be useful, documented already.
2018-12-24 20:39:22 +03:00
Michael Shigorin
344914c3ae basealt.mk: videodriver choice for 101/ws
It's been tiresome to setup a few hosts having to rollback
to modesetting which exposes no artifacts at all (albeit
being slower) from mga2 that has issues with GTK3 for me...
do it this way.
2018-12-24 20:37:30 +03:00
Michael Shigorin
f8af203a87 basealt.mk: tweak e2k workstation names
"ALT Workstation/?01" presented some minor problem
with ISOs, I don't even recall this one precisely;
could be a readability or differentiability;
just go ahead with slightly better names.
2018-12-24 20:36:01 +03:00
Michael Shigorin
a381382949 basealt.mk: auto-dualseat support for alt-workstation-801
This one-liner turns ALT Workstation for Elbrus 801-PC
into a more convenient distribution for dualseat rollouts.

(we didn't tackle sound aspects yet -- these can be handled
through PulseAudio locally -- and media mounting ones either;
still much beta than nothin')

See-also: http://0x1.tv/20180930D
2018-12-24 20:34:10 +03:00
Michael Shigorin
744950aff2 e2k: rework use/x11/101* targets
This is meant to provide failsafe configuration by default,
at least until mga2 works reliably for me.
2018-12-24 20:28:49 +03:00
Michael Shigorin
05dc44235e workstation/e101-*: 1c+ videodriver choice
I've shipped modesetting-based images and mga2-based ones
(and reverted to modesetting by hand "when it MUST work");
let's just do it right.

NB: found out that Name fields must NOT contain ";"
    or alterator-apt chokes in runtime (not fatal
    but still spectacular, see #35526).
2018-12-24 20:28:38 +03:00
Michael Shigorin
16df1040f9 e2k.mk: add jeos iso metadata
These deserve to be distinguished already.
2018-12-24 20:27:51 +03:00
Michael Shigorin
a631149aec e2k.mk: move vm/e2k-rescue to unified kernel
elbrus-def works for me on either of 4c, 8c, or 1c+ based systems;
call it properly then.
2018-12-24 20:26:12 +03:00
Michael Shigorin
8f1e411f2b e2k: add fstrim support
None of Elbrus systems I had a chance to use as root
had any problems regarding TRIM feature of SSDs these
used to carry/support; let's start with e2k and maybe
carry over to x86 later.
2018-12-24 20:25:57 +03:00
Dmitry Derjavin
17a3e4ced4 regular.mk, live.mk: use regular-mate for regular-robotics
...instead of live-tde.
2018-12-24 20:07:10 +03:00
Dmitry Derjavin
d2ff5036fe live.mk: use live-tde as a base instead of icewm 2018-12-24 20:07:02 +03:00
Dmitry Derjavin
e4dae573a3 robotics/{reprap,umki}: updated pkglists 2018-12-24 20:07:00 +03:00
Dmitry Derjavin
18b49bb8bf robotics/{reprap,umki}: added packages
CuraEngine, Meshlab, GLC_Player, Arduino IDE, Gnuplot, QTFM, OpenSCAD
to be exact.
2018-12-24 20:06:59 +03:00
Gleb Fotengauer-Malinovskiy
2f0bffda8b image.in: add INSTALL_LANGS variable to setup rpm _install_langs
This option allows to make smallest images even smaller by reducing
amount of installed locales.
2018-12-24 20:06:57 +03:00
Denis Pynkin
20b0b23fa2 regular.mk, lxc, lxd: updated regular-server-lxd
Use lxd-bridge for networking.
2018-12-24 19:54:15 +03:00
Denis Pynkin
b2f8702774 regular.mk: added regular server with LXD 2018-12-24 19:49:38 +03:00
Denis Pynkin
32e2ca5510 init: added multi-user boot target for systemd 2018-12-24 19:47:35 +03:00
Denis Pynkin
624893701c lxd: pkglist for LXC/LXD containers 2018-12-24 19:47:06 +03:00
Denis Pynkin
c01e073803 lxc: new feature for linux containers 2018-12-24 19:46:05 +03:00
cf420b2174 vm.mk: add vm/.bare-grub{,-efi}
Some images will now be better off with GRUB;
rework ve/.bare while at that (splitting the
image targets appropriately).
2018-12-24 19:36:31 +03:00
11e1bf73db tar2fs: add grub support
...for vm images; BIOS one tested, EFI one untested yet
but will be required for AArch64 VMs it seems.
2018-12-24 19:33:41 +03:00
f35351d877 init: avoid add root dev to fstab for vm image
This was erroneously added to overly broad class of images.
2018-12-24 19:22:33 +03:00
90ab85abfa init: delete non-existing systemd feature
It was dropped from make-initrd back in 2012:
http://git.altlinux.org/gears/m/make-initrd.git?p=make-initrd.git;a=commitdiff;h=853eed35ea72cf5a6409ef7f465f76da4f5dd097
2018-12-24 19:22:32 +03:00
Anton Midyukov
5a04178b10 mixin/regular-desktop: requires polkit
Needed explicit require polkit for regular on arm port
2018-12-24 19:04:05 +03:00
Anton Midyukov
bbe5085633 x11: new target use/x11/armsoc
xorg-dri-armsoc for armh and aarch64
2018-12-24 18:28:10 +03:00
Anton Midyukov
048140c2aa mixin-regular-mate: added NetworkManager applet
A desktop distro usually needs use/x11/gtk/nm (applet) in addition
to +nm (NetworkManager subsystem) itself.
2018-12-24 18:27:21 +03:00
Anton Midyukov
b87d0a90fc mixin/xfce: added xscreensaver with gui
xscreensaver needed in regular-xfce, not just xfce-sysv
2018-12-24 18:13:57 +03:00
Anton Midyukov
118f9bf6e8 desktop+lxqt: 's/xscreensaver/xscreensaver-frontend'
xscreensaver needs a gui to set it up
2018-12-24 18:13:21 +03:00
Michael Shigorin
8d35c74ccc rescue+extra: dropped libvshadow-tools
...shot down in sisyphus as well:
http://git.altlinux.org/tasks/archive/done/_213/218359/logs/events.1.1.log
2018-12-23 12:32:05 +03:00
Michael Shigorin
5dec742af3 desktop+gnustep: drop gnustep-FisicaLab, gnustep-quartzcore
...no more in sisyphus either:
http://git.altlinux.org/tasks/archive/done/_213/218353/logs/events.1.1.log
http://git.altlinux.org/tasks/archive/done/_213/218356/logs/events.1.1.log
2018-12-22 13:19:21 +03:00
Michael Shigorin
8ec0fadefa desktop+gnustep+etoile: no more
The last packages included were dropped from Sisyphus:
http://git.altlinux.org/tasks/archive/done/_213/218348/logs/events.1.1.log
http://git.altlinux.org/tasks/archive/done/_213/218349/logs/events.1.1.log

Sad but true :(
2018-12-22 12:28:37 +03:00
Anton Midyukov
dcc9181eaf rescue+extra: drop partimage
...it's no more in Sisyphus too:
http://git.altlinux.org/tasks/archive/done/_212/217864/logs/events.1.2.log
2018-12-17 14:27:52 +03:00
Anton Midyukov
8a87c0a37f base+rescue: fix portabiity
partclone not built on aarch64
2018-12-13 16:40:59 +03:00
Anton Midyukov
bd888c25b2 mixin.mk: new target mixin/mate
factor out mixin/mate portability target
2018-12-13 16:36:48 +03:00
Anton Midyukov
4b290ff8ab desktop+ibus: fix portability on aarch64
ibus-pinyin cannot be rebuild other architectures right now, since
it requires rebuilding package pyzy that in FTBFS.
2018-12-13 16:25:49 +03:00
Michael Shigorin
3645677095 gear-store-tags 2018-12-10 21:38:29 +03:00
Michael Shigorin
c9daed5d58 1.3.2-alt1
- sisyphus drops
2018-12-10 21:37:51 +03:00
Michael Shigorin
950558da7c archive+extra: dropped xar
...it's no more in Sisyphus too:
http://git.altlinux.org/tasks/archive/done/_212/217411/
2018-12-10 20:51:52 +03:00
Michael Shigorin
80545072e9 rescue+backup: upgrade to bacula7-client
...as bacula 5.x has been dropped from Sisyphus
during OpenSSL 1.1 transition.

Suggested-by: Anton Midyukov <antohami@altlinux.org>
See-also: http://git.altlinux.org/tasks/archive/done/_212/217414/
2018-12-10 20:31:14 +03:00
Anton Midyukov
25ddbf2596 desktop+mate: added clipboard manager parcellite 2018-12-06 18:41:07 +03:00
Michael Shigorin
35c2b7b3df xorg+vaapi: drop xvba-video
Package removed from Sisyphus.

See-also: http://git.altlinux.org/tasks/archive/done/_211/217069/
2018-12-04 13:33:20 +03:00
Anton Midyukov
a9c212b804 {base,network}+bench: drop nepim
nepim package removed from Sisyphus

See-also: http://git.altlinux.org/tasks/archive/done/_212/217089
2018-12-04 12:57:52 +03:00
Michael Shigorin
7daaeca287 live.mk: fixed {dos,syslinux}.iso build
These are supposed to be bootable indeed,
not just some data (e.g. repo) carrying images;
if distro/.boot's metadata are deemed superfluous
here, welcome to discuss and improve.

Reported-by: Anton Midyukov <antohami@altlinux.org>
Fixes: 3c2ef1c035
2018-12-03 15:59:33 +03:00
Michael Shigorin
83d7b9b3c8 mixin.mk: added extra google fonts to xfce mixin
Those Windows-like ones.

Suggested-by: Speccyfighter
See-also: https://www.altlinux.org/index.php?title=Starterkits%2Fbugs&type=revision&diff=43060&oldid=42739
2018-11-15 19:15:28 +03:00
Michael Shigorin
0ef3192cac regular.mk: add eMMC support
Should have been done along with commit
d887dd1f8a
back then!

Reported-by: Leonid Krivoshein <klark@altlinux.org>
2018-11-13 18:55:53 +03:00
Anton Midyukov
45e47303f7 distro/.regular-install-x11: use/init/sysv/consolekit
Added missing consolekit for regular sysVinit with
classic installer
2018-11-08 18:19:51 +03:00
Michael Shigorin
7b63af792f workstation/mate: dropped altlinux-freedesktop-menu-mate
...which has been dropped from current p8/branch as well;
see also commit 227df18eed.
2018-11-08 17:13:20 +03:00
Michael Shigorin
7feec8e80e regular.mk: drop xpra from icewm flavour
This one was added along with winswitch as a nice
solution to cross-host GUI problem; there was no
feedback on the inclusion though, and antohami@
tells that xpra-browser complains regarding dbus now.

Reported-by: Anton Midyukov <antohami@altlinux.org>
2018-11-06 14:43:09 +03:00
Michael Shigorin
1787dc7a10 gear-store-tags 2018-11-05 21:43:51 +03:00
Michael Shigorin
21f8054f95 1.3.1-alt1
- current fixes and tweaks
2018-11-05 21:40:58 +03:00
Michael Shigorin
19e21d0910 rootfs: upgrade to /etc/firsttime.flag
Just missed this change somehow...

See-also: http://git.altlinux.org/people/shaba/packages/?p=startup.git;a=commitdiff;h=2441f9438b7956fabdb353400b9df4abace1d7a0

Suggested-by: Anton Midyukov <antohami@altlinux.org>
2018-11-05 21:34:50 +03:00
Anton Midyukov
a724e8e55d regular-lxde: switch to default browser (firefox)
The fate of the browser palemoon in Sisyphus is questionable.
And firefox now has no more problems with ALSA.
2018-10-29 12:46:37 +03:00
Anton Midyukov
4aa54c9ea3 drop use/palemoon/suggested
Package palemoon-suggested no longer exists.
2018-10-29 12:46:25 +03:00
Anton Midyukov
b443f9ca4a new target use/x11/lxdm
lxdm - lightweight display manager for LXDE
2018-10-29 12:46:18 +03:00
Michael Shigorin
c71ff2a39e tar2fs: handle single boot label as default
No sense to "provide" choice when there's none.
2018-10-29 12:46:08 +03:00
Michael Shigorin
b724c1c271 mixin-basealt.mk: add use/docs/indexhtml
...so iso image has docs/ handy.
2018-10-29 12:46:06 +03:00
Michael Shigorin
8202a2ae01 workstation/the.pkgs: added python-module-serial
...for its nice miniterm.py (thx glebfm@).
2018-10-29 12:46:00 +03:00
Michael Shigorin
4ec7fb14cf workstation/vlc: added more vlc-plugin-*
These were on TODO for some time...
2018-10-29 12:45:52 +03:00
Michael Shigorin
ce0f4ed33c tty: use proper i-f-serial
...the one starting agetty in installer if told so (0.4+);
also improve runlevel 2 with potential serial access.
2018-10-29 12:45:49 +03:00
Michael Shigorin
b13ba8129f stage2: fix make-initrd environment on p8
This has manifested on e2k for me -- still using older
make-initrd lacking R: file -- so let's get this kludge
back for a while, or until any reasonable make-initrd
around has *everything* it needs to create images
listed in its runtime requirements.

Fixes: 2b3455c29a
2018-10-29 12:45:47 +03:00
Michael Shigorin
27b07b2dca tar2fs: ensure proper cwd when cleaning up
...so that umounts can happen reliably.

Reported-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
2018-10-29 12:45:46 +03:00
Michael Shigorin
45a2b09037 basealt.mk: add setup-libgl-dri3-disable
This works around DRI3 problems resulting in caja getting
BadWindow with panel applets subsequently failing to jump
into dock (which doesn't exist just yet).

Suggested-by: Denis Medvedev <nbr@altlinux.org>
2018-10-29 12:45:40 +03:00
Michael Shigorin
dba5fe0cbe systemd: added systemd-services
...following yet another packaging scheme tweak.
2018-10-29 12:45:38 +03:00
Michael Shigorin
6329b432af regular.mk: temporarily drop NM from icewm
NM-1.4 is broken under sysvinit as of right now;
let's switch to etcnet until sem@ gets around
to fix it.

Reverts: 182d32f739
Reported-by: Anton Midyukov <antohami@altlinux.org>
2018-10-17 09:47:46 +03:00
Michael Shigorin
ffd3211e4f gear-store-tags 2018-10-15 22:57:49 +03:00
Michael Shigorin
56012af3d2 1.3.0-alt1
- pre-p9 sisyphus: fixes, drops and just two kludges
2018-10-15 22:52:11 +03:00
Michael Shigorin
ae4007c2ca rescue, rootfs: #35350 workaround
filesystem package has been severely broken in sisyphus
since late August unfortunately, and I was too busy to
even notice that for too long; let's plug this kludge
until it's fixed now that I've finally seen that crap :-/

See-also: https://bugzilla.altlinux.org/35350
2018-10-15 22:50:57 +03:00
Michael Shigorin
3331e03888 live.mk, regular.mk: move use/stage2/cifs upwards
sin@ was overly optimistic about CIFS boot needs,
I think he rather meant starterkits so let's move
this into regular build rules -- use/stage2/cifs
is the only addition (the other things just got
re-messed up).
2018-10-15 22:46:10 +03:00
Michael Shigorin
2b3455c29a stage2: fix cifs-related bits
sin@ was kind enough to just stick mount.cifs into initrd
regardless of its presence in the chroot in question;
let's look first and only add what's found.

This started as a stopgap fix after make-initrd 2.2.0
which happened to collide with cifs-related m-p commits
in a somewhat unfortunate manner...
2018-10-15 22:46:05 +03:00
Anton Midyukov
1710b0005d regular-icewm: drop winswitch
winswitch removed from Sisyphus. See:
http://git.altlinux.org/tasks/archive/done/_208/213900/logs/events.13.4.log
2018-10-15 22:45:59 +03:00
Michael Shigorin
227df18eed desktop+mate: dropped altlinux-freedesktop-menu-mate
...or it fails to build off the current sisyphus :-/
2018-10-15 22:45:53 +03:00
Michael Shigorin
248dfdcc8c rescue+extra: dropped ext3grep
...following its removal from sisyphus due to ftbfs:
http://git.altlinux.org/tasks/archive/done/_208/213573/
2018-10-15 22:45:48 +03:00
Anton Midyukov
cabe92c2d4 s/sysk*logd/rsyslog/g
ldv@ has dropped sysklogd from sisyphus due to
its long-standing FTBFS and "other problems":
http://git.altlinux.org/tasks/archive/done/_207/211999/logs/events.6.1.log

The current recommended replacement is rsyslog
which is fine by itself but really overcomplicated
for the barebones logging system we usually need...
2018-10-15 22:45:41 +03:00
Michael Shigorin
78b4b88bdd efi: drop sbsigntools
These got removed from Sisyphus during OpenSSL 1.1 transition.
2018-10-15 22:45:36 +03:00
Evgeny Sinelnikov
877711d5dc Add CIFS install support 2018-10-15 22:45:24 +03:00
Evgeny Sinelnikov
00a828bc85 stage1: fix CIFS installation method 2018-10-15 22:45:19 +03:00
Michael Shigorin
3a0f91e2dc desktop+regular: added lcdtest
Weird it was missing for *so* long...
2018-10-15 22:45:10 +03:00
Michael Shigorin
51d74103b1 base+desktop+live, rescue+extra: added curl
There's wget already but curl makes http://wttr.in,
http://cht.sh and other Igor Chubin's console oriented
web services more usable out-of-box!
2018-10-15 22:44:52 +03:00
Michael Shigorin
5adfa20b2a mixin.mk: added xscreensaver to sysv-based xfce targets
Suggested-by: Speccyfighter IIRC
See-also: http://altlinux.org/starterkits/bugs#alt-p8-xfce
2018-10-15 22:44:45 +03:00
Michael Shigorin
1a525c89fb lists: drop leading/trailing whitespace
This is a workaround for presumably alterator-pkg's
misbehaviour given a pkglist with a line ending with
a space character; my particular case grew from @E2K
suffix resulting in "%name@e2k %name@e2kv4" which,
in its turn, became "%name " in e2k-arch build.

Installer complained about being

  unable to install in selected configuration

with /tmp/install2.log "clarifying" the problem to be
%name  being unavailable (while %name package was there
in both RPMS.main and metadata)... not obvious at all!

So while downstream should be hardened either, let's do
what we can do here.
2018-10-15 22:44:40 +03:00
Michael Shigorin
528cabd5c0 apt-conf: fix IMAGE_INIT_LIST handling
It shouldn't be overridden but rather appended to;
the leading "+" is ensured by lib/profile.mk
(see also mkimage's README for details).
2018-10-15 22:44:34 +03:00
Mikhail Gordeev
eca0ce0fcf regular.mk: add docker-sisyphus
- docker-sisyphus is an alias for docker
2018-09-24 19:51:18 +03:00
Mikhail Gordeev
9535fd4bc9 p8.mk: add docker-p8
- docker-p8 is a docker with p8 (starterkit) branding
2018-09-24 19:51:13 +03:00
Michael Shigorin
a8b5d25174 gear-store-tags 2018-08-13 20:07:52 +03:00
Michael Shigorin
e3043208f6 1.2.21-alt1
- volumes feature; fixups
2018-08-13 20:06:48 +03:00
Michael Shigorin
c5c2ea9d79 init: tweak +systemd
Added chkconfig (spotted in alt-server's m-p-d)
and vconsole-setup-kludge@X86 (common problem
stop-gap item, unfortunately).
2018-08-13 20:02:16 +03:00
Michael Shigorin
fdd117f4e6 kernel, regular.mk: use/kernel/server
It's apparently needed for ALT Server and has been
used implicitly for server-pve starterkit.
2018-08-13 20:01:58 +03:00
Michael Shigorin
42ae9f2fab kernel, firmware: fix KMODULES use
Looks like a thinko by now...
2018-08-13 20:01:52 +03:00
Michael Shigorin
a490e39d35 bootloader, mixin.mk: use/bootloader/os-prober
This really belongs to bootloader feature rather than
to mixin/desktop-installer alone; moving out.
2018-08-13 20:01:42 +03:00
Michael Shigorin
d6a8aae34d conf.d, workstation/live.pkgs: use/volumes/regular
...instead of hardwiring the particular variant;
this one is switchable down the road at least.

The commit is a no-op otherwise.
2018-08-13 20:00:12 +03:00
Michael Shigorin
1ee6e31b92 volumes: initial feature
This one is directly a counterpart to mkimage-profiles-desktop's
vm-profile-% contained in use.mk.in.
2018-08-13 20:00:12 +03:00
Michael Shigorin
97719fe8b3 apt-conf: obvious fix
A brown paper bag class bug :-(
2018-08-07 16:35:44 +03:00
Michael Shigorin
231337179c gear-store-tags 2018-08-06 22:03:52 +03:00
Michael Shigorin
dc96bfb155 1.2.20-alt1
- isoboot/isodata; apt-conf feature; dual-seat e801
2018-08-06 22:03:14 +03:00
Michael Shigorin
0957c745b7 e2k.mk: change e2k-*-base to alt-jeos-*
...as these targets are now considered worth the name.
2018-08-06 21:44:53 +03:00
Michael Shigorin
35dd7a4a17 mixin-basealt.mk: use/apt-conf/branch
This is a distribution proper so should be built off a stable branch
*and* refer to the same either.
2018-08-06 21:39:41 +03:00
Michael Shigorin
e35e3db878 apt-conf: initial feature
This has been factored out from distro/alt-workstation
adaptation for e2k arch (as it looks more widely useful).
2018-08-06 21:39:31 +03:00
Michael Shigorin
d7c587500c {mixin-,}basealt.mk: adjust for dual-seat e801
The main challenge for this change appeared to be lightdm:
it can do dualseat but in a quite peculiar way tied to systemd;
while wdm-based implementation well prepared and described by viy@
can survive both systemd and sysvinit just fine.

branding-alt-workstation-mate-settings pulls in lightdm-gtk-greeter,
and lightdm takes over; it should probably be masked in systemd case
(sysvinit should need no further hassle as /etc/X11/prefdm considers
wdm before lightdm for historical reasons; or /etc/sysconfig/desktop
could be filled in to be sure) *but* the current stopgap "solution"
is what it is now.

See-also: http://altlinux.org/X11/DualSeat
2018-08-06 21:39:20 +03:00
Michael Shigorin
413b3fcd23 {groups,lists}/workstation: single/dualseat e801
These describe what's needed to set up a single-seat (as usual,
now just default) or dual-seat (out-of-box, given a checkbox)
Elbrus 801-PC.

Huge thanks to bircoph@ for actually implementing this!
2018-08-06 21:39:17 +03:00
Michael Shigorin
9c24e587db workstation/base.pkgs: make apt-indicator x86-only
...for now as

  xdg-su -c "/usr/sbin/synaptic --update-at-startup \
    --dist-upgrade-mode --non-interactive"

got me exit code 4.
2018-08-06 21:39:08 +03:00
Michael Shigorin
5cea1defac mixin.mk: tweak up mixin/e2k-mate
I decided to switch lightdm greeter from gtk to slick,
while adding the default user created to xgrp group
(to facilitate them access to DRI device nodes)
and turning off MATE's desire to spend extra resources
on bells and whistles though compositing window manager.
2018-08-06 21:38:39 +03:00
Michael Shigorin
8745bee846 e2k: support e101/mga2
Elbrus 101-PC was initially supported through kernel
modesetting driver only, now it's got a sort of native
driver running on ALT too.
2018-08-06 21:38:25 +03:00
Michael Shigorin
7ada49f7bf install2: add fatresize too
IIRC it's actually looked for by EVMS fat plugin.
2018-08-06 20:38:01 +03:00
Michael Shigorin
8124656575 {mixin-,}basealt.mk: online-repo @X86
...actually just not published for e2k yet;
avoid uncommenting the lines in sources.list.
2018-08-06 20:35:44 +03:00
Michael Shigorin
98e889830e main, repo: introduced suffix support
This is to make building addon images possible;
those carrying packages but lacking any stage2.
2018-08-06 20:33:10 +03:00
Michael Shigorin
f8a264bbb3 doc: assorted updates/fixups
doc/archdep.txt was the reason to look closer,
and some other files needed a bit of facelift
by now too (would be better to do that in sync).
2018-07-25 16:49:05 +03:00
Michael Shigorin
611ec48ecb slightly better license info
There's an ISO9660 COPY tag for license info file;
make use of it, factoring use/docs/license out
while at that.

One of the goals was to make it hold the reference
to reference to GPL in regular builds and starterkits
;-)
2018-07-25 16:49:04 +03:00
Michael Shigorin
a257c2aece build-distro: add isodata metadata support
A bunch of duplicated variable names for mkimage,
just short-circuit those to the already available
(and hopefully filled in) BOOT_* ones.
2018-07-25 16:49:02 +03:00
Michael Shigorin
3c2ef1c035 rework isoboot support beyond x86
Every .iso was assumed to be bootable since the very beginning[*],
and isoboot images were deemed to be x86 isolinux ones; this didn't
change with basic ppc/armh support as I never ran into hardware
that would _boot_ those ISOs, not only run the code, and it was
only e2k isodata project that finally forced this refactoring.

It's still not perfect: pack and syslinux features still end up
somewhat interwoven, and too much places care for architecture
the image is being built for (instead of archdep features tossing
their appropriate bits and pieces in).

Should help:
- any-arch regarding isodata images;
- {x86,aarch64}/efi by decoupling isoboot and isolinux;
- ppc{,64} as introducing yaboot support will be easier now;
- mipsel{,64} too, hopefully.

* I knew of school addon images baked with mkimage-profiles-desktop
  but postponed and then neglected the whole problem for years...
2018-07-25 16:49:01 +03:00
Michael Shigorin
db319bb4b3 e2k: skip license step during installation
This one will be handled by MCST at the moment.
2018-07-25 16:48:47 +03:00
Michael Shigorin
c8e0685c0a gear-store-tags 2018-07-23 18:23:22 +03:00
Michael Shigorin
4e159e4c68 1.2.19-alt1
- alt-workstation: x86 (sem@), e2k (me)
2018-07-23 17:53:42 +03:00
Michael Shigorin
b519ce0aff workstation/freecad: drop freecad-thumbnailer
It's no more in p8 and sisyphus.
2018-07-23 17:44:33 +03:00
Michael Shigorin
ba437ba828 basealt.mk: factor out mixin-basealt.mk
It's the common part that should be more or less architecture
independent (given enough packages in the corresponding repo)
that's been moved into a mixin; archdep bits kept in basealt.mk
(albeit rewritten).

Note that this approach should help building ALT Workstation
for both new arches (like aarch64 or mipsel) and new targets
(like vm) altogether.
2018-07-23 17:44:33 +03:00
Michael Shigorin
c51702737d mixin.mk: restrict os-prober
...to those arches having it.
2018-07-20 16:13:55 +03:00
Michael Shigorin
bb7bec0a97 lists: sprinkle with @X86
...to make those usable on other architectures as well!
2018-07-20 16:11:48 +03:00
Michael Shigorin
98601e13f7 vmguest: make arch-aware
+vmguest should work everywhere it can at all either;
it's most advanced on x86_64 in terms of hypervisors
available; still aarch64 has kvm too.
2018-07-20 15:51:01 +03:00
Michael Shigorin
9e59e5a111 install2: make arch-aware
+installer should work everywhere it can at all,
but full-blown one is currently developed on x86;
provide at least the reasonable chunk elsewhere.
2018-07-20 15:41:42 +03:00
Mikhail Efremov
a9f8834707 rescue+extra: Add bcache-tools
It can be useful for bcache repair.
2018-07-16 20:52:17 +03:00
Mikhail Efremov
d44ea0a59c alt-workstation: Add alterator-printers
Show system-config-printer in the alterator.
2018-07-16 20:52:17 +03:00
Mikhail Efremov
5d47ed6a49 alt-workstation: Add vino-mate
https://bugzilla.altlinux.org/34217
2018-07-16 20:52:17 +03:00
Mikhail Efremov
e12d2262fc alt-workstation: Add iucode_tool and make-initrd-ucode
See https://lists.debian.org/debian-devel/2017/06/msg00308.html
2018-07-16 20:52:17 +03:00
Mikhail Efremov
2a346b5134 alt-workstation: Add fonts-bitmap-wqy
ALT bug #34142.
2018-07-16 20:52:17 +03:00
Mikhail Efremov
e561eb9610 alt-workstation: Add fdisk into installer
It usefull if something goes wrong in the alterator-vm.
2018-07-16 20:52:17 +03:00
Mikhail Efremov
410a00d40c live: Install /etc/*-release files if needed
Seems some other branding-*-release can be installed in live
chroot and post of needed branding-*-release package don't copy
these files.
2018-07-16 20:52:17 +03:00
Mikhail Efremov
e307a3dbdb alt-workstation: yandex-browser-preinstall is x86_64 only 2018-07-16 20:52:17 +03:00
Mikhail Efremov
e0a278a5e9 alt-workstation: Don't install chromium by default
One browser will be enough. Let it be firefox.
2018-07-16 20:52:17 +03:00
Mikhail Efremov
4950066422 alt-workstation: Add amdgpu 2018-07-16 20:52:17 +03:00
Mikhail Efremov
17de4f1b75 alt-workstation: Add xorg-conf-synaptics to installer
For touchpad during installation.
2018-07-16 20:52:17 +03:00
Mikhail Efremov
c9ac5e8c4a domain-client: Split out installer-features*
Otherwise they can be pulled on live.
2018-07-16 20:52:17 +03:00
Mikhail Efremov
5333e4c6f7 alt-workstation: Add vconsole-setup-kludge 2018-07-16 20:52:16 +03:00
Mikhail Efremov
29eec92b46 alt-workstation: Use FreeIPA client 2018-07-16 20:52:16 +03:00
Mikhail Efremov
ba0be189ef alt-workstation: Add FreeIPA client list/group 2018-07-16 20:52:16 +03:00
Mikhail Efremov
b99210b85e alt-workstation: Don't remove rpm, apt, etc on live 2018-07-16 20:52:16 +03:00
Mikhail Efremov
308901c6d4 live: Enable livecd-timezone by default 2018-07-16 20:52:16 +03:00
Mikhail Efremov
ac19696c39 desktop+live: Add livecd-timezone 2018-07-16 20:52:16 +03:00
Mikhail Efremov
5a9f3c5b22 alt-workstation: Use DISTRO_VERSION variable 2018-07-16 20:52:16 +03:00
Mikhail Efremov
a618abb49f syslinux: Use vga=normal
This is more appropriate default value nowaday.
2018-07-16 20:52:16 +03:00
Mikhail Efremov
85a7258d69 cleanup: Add GLOBAL_LIVE_NO_CLEANUPDB support
If set then don't remove apt and rpm from live images.
2018-07-16 20:52:16 +03:00
Mikhail Efremov
2af6d0be75 image: Add DISTRO_VERSION variable support
Use it in the image filename, so we'll know what version of a distro
it is.
2018-07-16 20:52:16 +03:00
Mikhail Efremov
20dfef8045 l10n: Don't hardcode lang in kernel cmdline
The 'lang' option will be added by gfxboot according with
choosed language.
2018-07-16 20:52:16 +03:00
Mikhail Efremov
2b50111650 services: Don't touch services already listed in the config
If service already listed in the config files, then ignore
status in the profiles variables.
2018-07-16 20:52:16 +03:00
Michael Shigorin
b6e5d3df69 gear-store-tags 2018-07-16 20:46:36 +03:00
Michael Shigorin
d4684ef9af 1.2.18-alt1
- ldm feature (lakostis@)
2018-07-16 20:43:40 +03:00
Konstantin A. Lepikhov
05ca4dd4e3 x11/use/glvnd: added GLVND support
Added glvnd packages to test.
2018-07-09 09:36:42 +03:00
Konstantin A. Lepikhov
b278c718ad features: added LDM support
Linux Driver Management (aka LDM) allows easy configuration of different
hardware. Currently this hook does GPU configuration on systems with
multiple GPUs (aka Optimus/PRIME).
2018-07-08 20:44:41 +03:00
Michael Shigorin
e53a7b031e regular.mk: change lightdm-gtk-greeter to slick-greeter
...as gtk one is quite bare to be frank.
2018-07-08 20:41:35 +03:00
Michael Shigorin
9f13f129ec x11: add slick-greeter support
Looks better than lightdm-gtk-greeter indeed;
present in both sisyphus and p8 as of today.
2018-07-08 20:41:30 +03:00
Michael Shigorin
40cd1c580f install2: use/install2/fat target
This adds mkfs.fat and fsck.fat utilities to installer
so it's able to create/mount this "filesystem" as well.
2018-07-08 20:41:18 +03:00
Michael Shigorin
d993b90710 gear-store-tags 2018-06-25 20:59:16 +03:00
Michael Shigorin
c757d5d792 1.2.17-alt1
- e2k & profiles
2018-06-25 20:57:41 +03:00
Michael Shigorin
eaa41979b1 pkg.in: mention profiles as well
The comment was incomplete since commit
1f13b3a039.
2018-06-25 09:55:13 +03:00
Michael Shigorin
7573547328 profiles: introduce @IA32, @X86 archdep macros
See commit 2d257a425b
for details, this just brings those to pkg.in/profiles/
(along with the generic archdep support, of course).
2018-06-25 09:55:01 +03:00
Michael Shigorin
9e80387420 profiles, metadata: s/PKG_PROFILES/THE_PROFILES/g
...to reduce the divergence with the rest of related variables;
these installer profiles affect the default checkbox states.
2018-06-25 09:54:53 +03:00
Michael Shigorin
f03933f3a5 e2k.mk: added base installers for 401/801
101's one has been useful enough so far.
2018-06-25 09:54:36 +03:00
Michael Shigorin
9d4b3e1f42 e2k: avoid messing with hwclock
...which will only result in a FAILED message,
most probably the solitary one throughout the
whole sysvinit boot.
2018-06-25 09:54:31 +03:00
Michael Shigorin
45d9147955 e2k, e2k.mk: better platform support
The goal was simple: every use/e2k/{x11,install2}/$MACHINE
must be self-sufficient regarding platform support, that is
it must depend on the corresponding CPU-specific target.

A bit less make-tech but still better overall.

NB: llvm cleanup is not needed anymore after upgrade to
    Mesa-17/llvm-3.7, should be dropped like this year.
2018-06-25 09:40:30 +03:00
Michael Shigorin
d87956cc51 e2k.mk: installer targets refactoring
This one started with pulling use/init/sysv/polkit
out from distro/.e2k-installer since there are now
some systemd-based e2k installers as well; it looks
better to provide two distinct intermediate targets
(and leave polkit-sysvinit up for the distro ones).
2018-06-25 09:40:06 +03:00
Michael Shigorin
bc37f88407 e2k: cleanup comments
Forgot to do that before merging, sorry.

(xorg-drv-ati cares for dependencies
but we still prefer modesetting driver
in the installers to make them versatile)
2018-06-25 09:39:31 +03:00
Michael Shigorin
04ac44d46a rescue+extra: added fuse-exfat
exfat-utils were already there but this one wasn't.

Suggested-by: Jozsef K <racunar@inbox.ru>
See-also: http://lists.altlinux.org/pipermail/community-en/2018-June/001313.html
2018-06-22 15:30:03 +03:00
Anton Midyukov
b37bfb33d6 regular-engineering: added java for LibreOffice
Java is required for LibreOffice Base.
Dropped LibreOffice-extensions while at that
due to segfaults and other problems in Sisyphus'
LO with those installed.
2018-06-15 13:24:39 +03:00
Michael Shigorin
a0dfa08cc0 gear-store-tags 2018-06-11 22:26:18 +03:00
Michael Shigorin
25efc879d8 1.2.16-alt1
- starterkits-20180612
2018-06-11 22:25:11 +03:00
Michael Shigorin
7e905332b4 rescue+extra: drop old squashfsprogs*
These have been purged from sisyphus:
http://git.altlinux.org/tasks/archive/done/_203/207990/
2018-06-11 15:58:58 +03:00
Michael Shigorin
7dd4815fa7 regular.mk: avoid systemd in sysv server images too
This is alike to the previous commit by antohami@
but affecting the intermediate server target:
no systemd-timesyncd when it's not asked for.
2018-06-11 15:58:54 +03:00
Michael Shigorin
77908d8a08 main, live, rescue: reorder package list variables
The places of the terms *do* affect the sum in apt's case;
start with lowlevel items like SYSTEM_PACKAGES and end with
high-level ones like THE_LISTS to reduce the chance of getting
hit by premature virtual dependency expansion/fixation.

Adapt live and rescue features accordingly.

See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=30806#c5
Suggested-by: Leonid Krivoshein <klark@altlinux.org>
2018-06-11 15:58:41 +03:00
Michael Shigorin
a2d55319e1 init: set pkgpriorities
The infamous systemd infiltration through secondary
"targets" using virtual dependencies started with
syslogd-daemon, continued with network-config-subsystem
and later with ntp-server; all of its implementations
pulling in the main package which is explicitly unwanted
in sysv-based images.

Let's try employing pkgpriorities.
2018-06-11 15:24:10 +03:00
Michael Shigorin
6e53db42a9 pkgpriorities: add main subprofile support
Fix stage2 meta-subprofile support while at that:
it was a questionable idea to use "/" as a delimiter
when part of the substitution is a pathname.
2018-06-11 15:15:32 +03:00
Anton Midyukov
75c28d412c regular.mk: *avoid* systemd in sysv-based images
alterator-datetime pulls in ntp-server which is a virtual
dependency provided by both openntpd (which was assumed)
ntpd and systemd-timesyncd (which is undesired in those
images and pulls systemd either).

Be explicit.
2018-06-11 13:20:46 +03:00
Michael Shigorin
87e5c54ff4 pkgpriorities: minor docs cleanup
...and clarification (had to look up the prio list in apt sources).
2018-06-11 12:46:19 +03:00
Anton Midyukov
902d23a9e5 use/ntp: ensure openntpd
...and not any stray ntp-server
(which tends to end up with systemd-timesyncd).
2018-06-11 12:35:46 +03:00
Michael Shigorin
9cc9d88143 reports.mk: added "contents" one
"Provide iso contents file" has been a long-standing
feature request regarding both starterkits and distros
proper; release managers used to compensate this with
their own scripts.

Suggested-by: sem@, legion@ and someone else too
2018-06-11 12:31:04 +03:00
Michael Shigorin
c62416112d tools/monitoring: dropped collectd-openvz
It's no more in sisyphus as of 5.8.0:
https://lists.altlinux.org/pipermail/devel/2018-June/204500.html
2018-06-07 15:52:45 +03:00
Michael Shigorin
9ce11c24e3 workstation/agens: add zabbix-agent-sudo
...as it is done for spt in m-p-d.
2018-06-07 15:52:43 +03:00
Michael Shigorin
a3957e2fea workstation/smartcard: move task-rutoken under @X86
This metapackage depends on librtpkcs11ecp which is
proprietary x86-only blob as of today's sisyphus.
2018-06-07 15:52:41 +03:00
Ivan Zakharyaschev
8e94854858 profile.mk: fix thinko
find's argument order is a bit different indeed.
2018-06-05 18:22:01 +03:00
Anton Midyukov
d657a65ec6 install2: remove xorg-drv-nv too
Not that it was critical here but rather to reduce bit rot.

See-also: https://lists.altlinux.org/pipermail/devel/2018-June/204486.html
2018-06-04 22:58:40 +03:00
Michael Shigorin
012ce1fa8e regular.mk: a few more packages in sysv-xfce
Added on Speccyfighter's request:
https://forum.altlinux.org/index.php?topic=41577
2018-06-04 22:49:14 +03:00
Michael Shigorin
85ba3ddaa2 desktop+regular: added htop
It was only found in regular+tde, let's generalize a bit.

Suggested-by: Speccyfighter, antohami@
See-also: https://forum.altlinux.org/index.php?topic=41577.0
2018-06-04 22:48:25 +03:00
Michael Shigorin
4a953c91fc regular.mk: enable alteratord service in sysv-*
Thanks squire for having mentioned this omission
and antohami@ for bringing attention to the report:
https://forum.altlinux.org/index.php?topic=41577.0
2018-06-04 22:28:53 +03:00
Michael Shigorin
10a3bafb37 services: fix README
It (mis)stated that this feature does *not* influence install2
when it *does* since f5fd77640a.
2018-06-04 22:27:47 +03:00
Michael Shigorin
dc77abf2c3 desktop+xorg: drop xorg-drv-nv
It's no more in sisyphus (and generally obsolete):
http://git.altlinux.org/tasks/archive/done/_202/207378/
2018-05-31 16:44:23 +03:00
1081d8ddba remove xorg-drv-modesetting dup 2018-05-29 14:52:17 +03:00
Michael Shigorin
a2de23a961 gear-store-tags 2018-05-28 18:45:23 +03:00
Michael Shigorin
ba89e83bc1 1.2.15-alt1
- fixup release
2018-05-28 18:43:22 +03:00
Anton Midyukov
93e823bdb1 desktop+lxqt: added metapackage lxqt
...there's now proper DE maintainer out there ;-) // mike@
2018-05-28 18:36:37 +03:00
Michael Shigorin
8a5a9fd2d8 net: rework towards a switch variable
The common problem was network-config-subsystem getting
resolved into something completely wrong (like net-scripts
or systemd-networkd) *before* it got specified precisely;
let's just avoid the common cause, that is, a metapackage.

See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=30806
2018-05-24 17:26:08 +03:00
Michael Shigorin
49ce23470e pkgpriorities: generalize for any stage2
install2 and live are both stage2 flavours, and I see no reason
rescue (the last one) should be any different here.
2018-05-24 17:26:02 +03:00
Michael Shigorin
756af48bd1 net: make the comment actually useful
It's not much use for it to stay without the actual
pointer to the place where NM GUIs are referenced,
I've almost started out implementing the "missing"
bit myself right now :-/
2018-05-23 15:32:37 +03:00
Ivan Zakharyaschev
0ecfb35700 profile.mk: safer find/grep
Don't go crazy if Dir::Etc::sourceparts/d
gives something strange (e.g., /).
2018-05-23 11:30:15 +03:00
Michael Shigorin
26cf322550 stage1, stage2: move af_packet to 50-stage2-net
af_packet rather belongs to networking stack
than to common module library indeed.

Suggested-by: Alexey Gladkov <legion@altlinux.org>
2018-05-23 09:44:35 +03:00
Anton Midyukov
8c58310716 regular.mk: fix enabling gdm.service for gnome3
services feature works like this:

  1. enable whatever services are in DEFAULT_SERVICES_ENABLE
  2. disable whatever is in DEFAULT_SERVICES_DISABLE
  3. enable services in SERVICES_ENABLE
  4. finally, disable those in SERVICES_DISABLE

So one should not disable display-manager service!

Disabling prefdm is not needed as it doesn't start
when display-manager.service symlink exists.
2018-05-22 09:52:38 +03:00
Michael Shigorin
bb52ad4741 gear-store-tags 2018-05-21 23:31:45 +03:00
Michael Shigorin
12a223a1c5 1.2.14-alt1
- pkgpriorities feature (manowar@)
- extended e2k support
2018-05-21 23:08:56 +03:00
Michael Shigorin
77b86870ea e2k.mk: distro/*
Yes we've got e2k-*.iso images by now!
Should see quite some deduplication though.
2018-05-21 22:51:21 +03:00
Michael Shigorin
7b396b0c47 e2k: much improved hardware support
Elbrus-801 and -101 are now added; 401's support refactored
and modified to cover 4.4 server system as well.
2018-05-21 22:51:17 +03:00
Michael Shigorin
60f3cc9610 mixin.mk: more e2k bits
These clearly aren't final but have been stabilizing
for quite some time already, let's just merge.
2018-05-21 22:51:10 +03:00
Michael Shigorin
d010cef393 build.mk: just go on for e2k*
There's no qemu there so far, and there's no need
to fiddle with setarch either.

NB: part of this commit erroneously went into
    1c777c8ad4
    quite some time ago, sorry about the mess.
2018-05-21 22:51:07 +03:00
Michael Shigorin
f7eadc2fc8 e2k: added ru_RU.UTF-8 preconfiguration
It's legit here as I know no Elbrus users among
non-Russian-speakers, at least so far; should move
to generic l10n feature (which will definitely see
its glory by then).
2018-05-21 22:51:01 +03:00
Michael Shigorin
89bc47f35c e2k: provide canned KOI8-R configs
This is to avoid extra actions when one actually needs
KOI8-R (which is still hardwired in some lcc messages).
Should all be rolled into l10n feature some day...
2018-05-21 22:50:51 +03:00
Michael Shigorin
bbfad01e55 e2k: make serial hook more fault-proof
The early scheme consisted of boot.conf template
with a separate hook filling it in; this was nice
for serial console setup script which could just
amend the kernel command line as needed _but_
this got changed towards the more generic scheme
(breaking the hook in question, unfortunately).
2018-05-21 22:50:35 +03:00
Michael Shigorin
d44be875f6 e2k.mk: some ve/* targets
manowar@ had some experiments with usbflash-based installer,
and we needed a git-server chroot as well.
2018-05-21 22:50:30 +03:00
Michael Shigorin
17513ba38a e2k.mk: minor vm/* refactoring
Let's provide a more competent multi-system rescue image
while keeping some rescue bits common to all of the others.
2018-05-21 22:50:22 +03:00
Michael Shigorin
cdaa9cdaa3 boot.mk, build-distro: handle e2k
It needs (and has) no isolinux in the first place;
this is also the situation with most or all non-x86
arches, the code should probably reflect that.
2018-05-21 22:50:18 +03:00
Michael Shigorin
daa81f9ba9 pkg.in: added workstation/claws-mail list/group
There was no thunderbird built for e2k for a while,
and some images might benefit from a lightweight
GUI MUA; the only question is whether it belongs
to workstation classification or not really.
2018-05-21 22:50:15 +03:00
Michael Shigorin
7155a93100 Revert "x11: e2k repo has no imsettings so far"
This reverts commit b98bf15a42:
we've got imsettings built for e2k as well now.
2018-05-21 22:50:10 +03:00
Michael Shigorin
b31af10c79 tar2fs: generate proper boot.conf for e2k
This one supports multiple kernels (and tweaks boot
labels aiming to simplify target kernel selection
for the CPU at hand) instead of an earlier attempt
to fill in a template.

No need for the template so just drop it.
2018-05-21 22:50:07 +03:00
Michael Shigorin
650e92bf7f build-vm, tar2fs: handle multiple kernels either
This was crucial for e2k rescue image supporting
multiple CPU versions but can be useful elsewhere.
2018-05-21 22:50:00 +03:00
Michael Shigorin
4743947ea5 desktop+xorg: add modesetting explicitly
Wonder why it was missing for so long...
2018-05-21 22:49:57 +03:00
Michael Shigorin
04a12ef053 stage2: cosmetic fixup for aufs/overlayfs check
This has been made a bit messy with commit
9f72780d17,
just split the "involved" and straightforward
checks into two.
2018-05-21 22:49:50 +03:00
Michael Shigorin
d2f892abda rescue: error-proof 60-apt
It's not a blocker if enabling online repos fails;
we should provide a better handling of warnings
with e.g. a summary of those after build.
2018-05-21 22:49:36 +03:00
Paul Wolneykien
4298315d0c pkgpriorities: pinned packages feature
This one might probably change into core functionality but right now
it should help when you get not the branding, init system, or whatever
alternative you do _not_ need.

See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=30806
2018-05-21 22:12:19 +03:00
Anton Midyukov
4b212b6714 regular-gnome3: explicitly enable gdm.service
prefdm.service can't start gdm.

See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=26405#c26
2018-05-21 15:21:28 +03:00
Michael Shigorin
6d003a1485 desktop+lxqt+extra: dropped fatrat
It's no more in Sisyphus:
http://git.altlinux.org/tasks/archive/done/_200/205257/
2018-04-27 09:46:22 +03:00
Michael Shigorin
9b52dd6019 gear-store-tags 2018-04-23 23:57:41 +03:00
Michael Shigorin
f81e51085a 1.2.13-alt1
- antohami@'s improvements
2018-04-23 23:56:53 +03:00
Anton Midyukov
c92d623263 desktop+regular: added unicode fonts
It was noted that Ancient Cyrillic glyphs aren't available
out-of-box (and people wondered why there are no Chinsese
glyphs before), so adding proper Unicode font looks worth it.

Reported-by: Mikhail Novoselov <mikhailnov@dumalogiya.ru>
2018-04-23 15:32:02 +03:00
Anton Midyukov
5f96d89a31 regular+icewm: added spacefm
This flavour is likely missing a lightweight graphical
file manager with great features.
2018-04-23 15:30:33 +03:00
Anton Midyukov
9094be4a73 desktop+enlightenment: added polkit agent
Enlightenment does not provide its polkit agent.
Added a lightweight polkit agent without dependencies
on a specific DE; it won't be autostarted though.
2018-04-23 13:26:30 +03:00
Anton Midyukov
1c777c8ad4 base+rescue: added udpcast and partclone
These two should improve rescue image usability
for system provisioning.
2018-04-23 13:20:54 +03:00
Anton Midyukov
1f82082c8c regular.mk: switch lxqt, kde4, kde5 to falkon
The reason for all of them is simple: a modern webkit-based browser.

The particular justification for each is:
- lxqt: Qupzilla is officially deprecated in favour of Falkon;
- kde4: Rekonq simply doesn't cut the mustard;
- kde5: Firefox is fine but there's more suitable one.
2018-04-11 19:16:16 +03:00
Anton Midyukov
d43fae17d4 browser: add falkon, drop rekonq
We definitely don't want to see rekonq anywhere,
it's grossly incompetent as a web browser;
and Qupzilla is now being developed under KDE
umbrella and the new name Falkon.
2018-04-11 19:12:50 +03:00
Michael Shigorin
030685c15e kernel: update for e2k
Kernel packages we have on this architecture use
uncompressed vmlinux file called image; handle that.
2018-04-04 12:46:33 +03:00
Michael Shigorin
3bb96df3d2 e2k.mk: extend vm/e2k-rescue
These changes were actually recorded as needed for
vm/e2k-builder but let's put these into a common base
for the win.
2018-04-04 12:46:32 +03:00
Michael Shigorin
d813c43112 build-vm: spare all gettys on e2k
It has no VM hypervisor so far, the images are intended
for bare metal execution.
2018-04-04 12:46:21 +03:00
Michael Shigorin
6aa4af20c4 e2k.mk: initial vm/e2k-lxqt
This one is actually refactored on the base of
41b5a5b and fd4f2a6 commits but let's consider
it to be the first released one ;-)
2018-04-04 12:46:05 +03:00
Michael Shigorin
b045cea53d rescue+extra: move fio into base+bench
It's 15 Mb off x86_64 regular-rescue.iso as of today
(libicu and a few other hefty libraries are only needed
for fio), and benchmarks are probably a better company
albeit fio could be useful as a stress testing tool.
2018-03-29 17:12:34 +03:00
Michael Shigorin
bb6e543b89 rescue+extra: dropped btparser
...following its dropout from sisyphus:
http://git.altlinux.org/tasks/archive/done/_198/203122/
2018-03-29 14:55:17 +03:00
Michael Shigorin
37373f6a38 rescue+misc: dropped smbios-utils
There's a problematic dependency chain as of today's sisyphus:

smbios-utils => python3-module-smbios, python3, python-base

python3 => python3-base => python3-test

python3-test => python3-modules-tkinter => tk => libtk => libX11

...and libX11 is explicitly banned in regular-rescue.iso
which is determined to stay text-only; let's drop this package
until this problem is resolved.

See-also: https://bugzilla.altlinux.org/34451
See-also: https://lists.altlinux.org/pipermail/devel/2018-March/204130.html
2018-03-28 16:47:37 +03:00
Anton Midyukov
5a727dec12 desktop+regular: add librsvg explicitly
librsvg is requires to display svg icons in some apps;
e.g., lightdm misses some of those without it.
2018-03-26 21:22:33 +03:00
Anton Midyukov
3d96d92291 desktop+lxqt: update list
Remove compton-conf: not needed without compon itself
(which rather looks abandoned), and would need an update
from 0.1 to 0.3 anyways.
2018-03-25 21:25:36 +03:00
Anton Midyukov
0d8dd00ff0 desktop+lxde{,+extra}: update lists
lxde-icon-theme is required by lxde-settings-upstream only
(and that's been changed for lxde-settings-lxdesktop),
just drop it; move essential packages from -extra to the
main lxde list; lxde-shortcut has been specified twice.
2018-03-25 21:25:17 +03:00
Michael Shigorin
03312d7f5d doc: mention #34638
pauli@ has proposed slightly different setup to what is provided
by livecd-qemu-arch; but the use case might be different either.
At least provide the link to those interested.
2018-03-21 11:56:34 +03:00
Michael Shigorin
2d38fc3f0d gear-store-tags 2018-03-19 23:19:17 +03:00
Michael Shigorin
70463d3f9e 1.2.12-alt1
- @IA32, @X86
2018-03-19 23:18:38 +03:00
Anton Midyukov
8c6f24015c desktop+regular: added extra rules for udev
This will expand the support for devices, for example web cameras
2018-03-18 18:44:05 +03:00
Anton Midyukov
cc5b7b71ac desktop+lxqt+extra: drop axkb
axkb is no longer needed. Now there is a native layout switcher
2018-03-18 18:44:00 +03:00
Michael Shigorin
78d2f2e818 regular.mk: add refind to icewm flavour
This flavour has turned into a distribution proper quite some
time ago (thanks jinn@), and its role of pretty minimalistic
proving grounds for things like minimalistic EFI boot path
is now neglectible.

So let's add a proper boot manager there too.  It might be better
to fit it into distro/.regular-sysv-gtk or even up the dependency
tree but I'm not focused enough to do it right now.

Reported-by: klark@, antohami@
2018-03-18 17:22:48 +03:00
Michael Shigorin
16a1919e65 regular.mk: added dhcpcd to server-openstack
Not that it's always needed but when it is...

Reported-by: Leonid Krivoshein <klark@altlinux.org>
2018-03-18 00:40:16 +03:00
Michael Shigorin
05ed0fe227 graphics-editing: dropped gimp-plugin-separateplus
It's no more in sisyphus, p8 and any supported repo
(perished after p7/t7)...
2018-03-17 19:55:45 +03:00
Michael Shigorin
ea3e1609f9 rescue+extra: dropped winusb
Reportedly useless by now.

Reported-by: lex.shen@yandex.ru
See-also: https://lists.altlinux.org/pipermail/sisyphus/2018-March/366561.html
2018-03-16 15:13:18 +03:00
Michael Shigorin
8eecce9efd diag.directory: mark as Required
It's small but useful enough to justify installation by default.
2018-03-14 15:52:47 +03:00
Michael Shigorin
d268e329a5 lists: update regarding non-x86
sisyphus/e2k still lacks qt4; other changes introduced
are mildly x86-specific too.
2018-03-14 11:25:59 +03:00
Michael Shigorin
49aed476cd workstation: adjust pkglists accordingly
Wish I knew why we do different wine flavours
on x86_64 and i586...
2018-03-14 08:45:09 +03:00
Michael Shigorin
2d257a425b lists, doc: introduce @IA32, @X86 archdep macros
The former ("proper 32-bit x86 package form") has been suggested
by zerg@ quite some time ago but the desired interface wasn't clear
at the moment IIRC; a quiet morning helped me realize that

  ICAClient-preinstall@IA32

is rather more readable than

  ICAClient-preinstall@i586 i586-ICAClient-preinstall@x86_64

so here's the (trivial) implementation; and I actually needed
the latter, @X86 ("any-x86") to mark x86-only packages so

  xorg-drv-intel@X86

is now equivalent to

  xorg-drv-intel@i586 xorg-drv-intel@x86_64
2018-03-14 08:45:07 +03:00
Michael Shigorin
3bcb5000d8 gear-store-tags 2018-03-12 00:06:39 +03:00
Michael Shigorin
af08ea1445 1.2.11-alt1
- starterkits-20180312
2018-03-12 00:02:34 +03:00
Michael Shigorin
0ec1ecb717 p8.mk: piggyback ibus-unicode
...into cinnamon and lxde flavours; it got dropped out from
regular builds but this file controls p8-based starterkits
specifically!

PS: looks like unikey can get configured but either fails
    to actually work or I forgot how to use it already...
2018-03-11 20:58:02 +03:00
Michael Shigorin
988976bc3b regular.mk: added gdisk to jeos
The image is small but the storage can be huge;
this is to handle it (less than +500k installed).
2018-03-11 20:28:56 +03:00
Michael Shigorin
0c2c8bab47 regular.mk: leave glib2 alone with jeos
It's needed for both qemu-guest-agent and open-vm-tools, sigh.

Will only impact installed size but quite noticeably: installing these
into an overcleaned system as of previous commit and today's p8
takes 42 Mb more.
2018-03-11 20:04:02 +03:00
Michael Shigorin
b0f71907e1 regular.mk: disable fbsetfont service for jeos
...as it doesn't setup framebuffer in the first place.
2018-03-11 19:14:03 +03:00
Michael Shigorin
cf355f2f97 ve.mk: added apt-rsync to generic
Suggested-by: glebfm@altlinux.org
2018-03-11 18:56:12 +03:00
Michael Shigorin
c43ac64b80 regular.mk: added nfs-utils to jeos
Has been a personal todo item recently;
costs 1 Mb unpacked, ~500k image size
but I do need NFS out-of-box here.
2018-03-11 18:53:29 +03:00
Michael Shigorin
b081fa131f server: disable php7-fpm by default
This one is for nginx basically, and requires
a bit more setup anyways; let it be disabled
out-of-box to spare some memory.

Suggested-by: Altexander
See-also: https://forum.altlinux.org/index.php?topic=40290.0#msg321161
2018-03-11 17:53:34 +03:00
Michael Shigorin
eed85921b8 server/php7: added php7-pdo*
Suggested-by: Altexander
See-also: https://forum.altlinux.org/index.php?topic=40290.0#msg321161
2018-03-11 17:53:24 +03:00
Anton Midyukov
a3f79f2219 mixin.mk: update regular-xfce-sysv packages
- replace firefox to palemoon
- added packages wishes from Speccyfighter
2018-03-11 13:13:27 +03:00
Anton Midyukov
6822106ae1 browser: add use/browser/palemoon/suggested
palemoon-suggested pulls in recommended setplugins for newmoon
2018-03-11 13:11:09 +03:00
Anton Midyukov
207a035bc3 desktop-engineering: update-lists
qslave and qmaster: modbus network emulator
2018-03-11 13:09:11 +03:00
Anton Midyukov
3229b8b379 desktop+lxqt+extra: update lists 2018-03-11 13:06:26 +03:00
Michael Shigorin
828006f0ed rescue+extra: added myrescue
It's a yet another rescue dd(1) alike trying to save
those blocks which still can be read first and getting
back to the rest later; suggested by someone (User294?)
over at opennet.

See-also: https://www.opennet.ru/openforum/vsluhforumID3/113652.html#8
2018-03-04 08:38:07 +03:00
Michael Shigorin
4d0ae3af60 syslinux: dedup generate.mk
Should be a (slightly cleaner) no-op.
2018-03-03 15:22:33 +03:00
Michael Shigorin
5cfcd809fb vnc: different labels for install+vnc* targets
These happened to collide after initial copypaste
of 20install2.cfg snippet, spotted that recently.
2018-03-03 15:13:35 +03:00
Anton Midyukov
8257891623 desktop+engineering: update lists 2018-03-02 14:40:20 +03:00
Anton Midyukov
846c2c2a71 Update regular-engineering
- Fix stupid errors
2018-03-02 14:39:58 +03:00
Michael Shigorin
e4e5363a2a groups: slightly better diags
The message could be confusing.
2018-03-02 14:38:10 +03:00
Michael Shigorin
0b251d0703 regular.mk: drop xsane from mate
The problem being worked around by this is:
anything in the lists that Requires: webclient
results in rekonq being pulled into the image
(after mate-default requires firefox no more).

The proper fix is to force *_PACKAGES, *_LISTS
and *_REGEXP to be processed in a _single_
transaction for each destination so that
early mis-expansion of virtual packages
doesn't occur when _installing_ those.

This commit should be reverted then.

See-also: https://bugzilla.altlinux.org/30806
2018-02-20 18:50:12 +03:00
Michael Shigorin
07f02295e2 gear-store-tags 2018-02-19 22:47:41 +03:00
Michael Shigorin
e9da7959b7 1.2.10-alt1
- antohami@'s fixups
2018-02-19 22:47:05 +03:00
Anton Midyukov
dc1170b578 init, regular.mk: use/init/sysv/consolekit
This target is only needed for systems based on sysV init
to replace logind; it conflicts with systemd-logind.
2018-02-19 22:33:37 +03:00
Anton Midyukov
560f74c2a8 lxdesktop+lxqt: add libqt4-qt3support
Added qt4 configuration tool: there are enough
qt4-based applications in the image.
2018-02-19 22:31:26 +03:00
Anton Midyukov
f44948057e mixin/regular-lxde: another imagewriter
SUSE imagewriter requires qt4 that isn't needed for other
applications. This will remove qt4 from regular-lxde.
2018-02-19 22:29:51 +03:00
Michael Shigorin
e48e1cf078 regular.mk: added dev/builder group to server
We^H^HI need that *now*!
2018-02-19 13:22:49 +03:00
Michael Shigorin
32105cfd9a dev, pkg.in: introduce dev/builder pkggroup
This looks like missing in server starterkit for me;
builder one can be installed by hand if one knows how
to do that but let's better be explicit about that.
2018-02-19 13:20:10 +03:00
Michael Shigorin
1c4a7bd5dd net, net-dns: don't spam lo iface
Putting any configuration into /etc/net/ifaces/lo/resolv.conf
makes etcnet *overwrite* /etc/resolv.conf, while putting that
into /etc/resolv.conf itself makes e.g. vzctl --nameserver
*append* to what's been specified.

Reported-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
2018-02-19 12:54:33 +03:00
Michael Shigorin
d5f71b3716 image.in, build-*: generalize SUBDIRS
This is a fix to previous failures of
ve/vm + use/repo/main build attempts
(in fact, any non-distro/ targets).

SUBDIRS were just optimized away...
2018-02-15 17:03:19 +03:00
Michael Shigorin
9441c1ce70 rootfs: minor README fixup
There's no "arm" entity, what could I mean?..
2018-02-15 13:03:02 +03:00
Michael Shigorin
7b9d8e9cd1 build-vm: whitespace fixup
...so that it doesn't show up in a diff with build-vm.
2018-02-14 18:34:47 +03:00
Michael Shigorin
5fbe38b092 gear-store-tags 2018-02-12 22:59:23 +03:00
Michael Shigorin
fc84a5cb83 1.2.9-alt1
- antohami@'s release
2018-02-12 22:58:46 +03:00
Anton Midyukov
8cf4a8cbe5 desktop+lxqt+extra: added file archiver
file-roller seems not the best appropriate but its
support is integrated into lxqt; maybe peazip-qt
or something else will be better some day.

See-also: https://wiki.manjaro.org/List_of_Qt_Applications#Files_Archivers
2018-02-12 22:40:36 +03:00
Anton Midyukov
a2c8501fad mixin.mk: added beesu
...to mixin/regular-desktop so that all regular desktop
images could benefit from it.
2018-02-12 22:39:48 +03:00
Anton Midyukov
c0418eff24 desktop+lxqt, desktop+lxqt+extra: update lists
- added missing localization for lxqt and psi+
- added qasmixer
- replaced smplayer with smplayer-mpv
- removed screengrab (lxqt has its own program for screenshots)
2018-02-12 22:31:16 +03:00
Anton Midyukov
93ad3c748b desktop+lxde+extra: replace smplayer-mpv with mpv
smplayer pulls Qt4 in, mpv might be enough for LXDE.
2018-02-12 22:27:52 +03:00
Anton Midyukov
a1f539a724 regular.mk, pkg.in/lists: drop ConsoleKit
This one conflicts with systemd-logind; so let's move it
from generic pkglists into specific regular.mk targets
(those based on distro/.regular-sysv).
2018-02-12 22:22:40 +03:00
Anton Midyukov
c4f9521e49 mixin.mk: dedup mixin/regular-lxde
+alsa is already pulled in by mixin/regular-desktop.
2018-02-12 22:17:25 +03:00
Anton Midyukov
c3fa1a933c x11: added +pulse for PA-dependent flavours
These will either pull half-baked pulseaudio in or even not
(and fail to produce sound later on).
2018-02-12 22:16:54 +03:00
Michael Shigorin
06b2e605e9 gear-store-tags 2018-02-05 21:51:41 +03:00
Michael Shigorin
0e8820452a 1.2.8-alt1
- regular fixes
2018-02-05 21:49:48 +03:00
Michael Shigorin
adb5900708 regular.mk, mixin.mk: drop use/fonts/infinality
It's been used in cinnamon, enlightenment and lxde{,-based} flavours
but is rather deprecated/unsupported by now as maintainer explains
the upstream status:

https://lists.altlinux.org/pipermail/sisyphus/2018-February/366450.html
2018-02-04 02:48:34 +03:00
Michael Shigorin
0e796f37b3 rescue+extra: dropped wdfs
No more in sisyphus:
http://git.altlinux.org/tasks/archive/done/_193/198507/
2018-01-30 10:53:19 +03:00
Michael Shigorin
b92f022478 bootloader, live: arrange alterator module
...explicitly; this has been triggered by the change to
livecd-install as of 0.9.10-alt2 (doesn't R: alterator-grub
anymore to allow non-grub platforms as well).

This should be a no-op _together_ with the mentioned change
by now as grub is selected explicitly; will take more attention
for e.g. e2k as the problem just shifted here from livecd-install.

Reported-by: Leonid Krivoshein <klark@altlinux.org>
2018-01-24 14:44:51 +03:00
Michael Shigorin
b57762d1b9 regular.mk: added thunderbird-ru to cinnamon
This asks for future improvement within l10n feature though.

Reported-by: Leonid Krivoshein <klark@altlinux.org>
2018-01-23 14:18:44 +03:00
Michael Shigorin
0d21c7ae33 gear-store-tags 2018-01-22 20:25:48 +03:00
Michael Shigorin
d12420522a 1.2.7-alt1
- 2018: better sound feature (antohami@)
2018-01-22 20:24:56 +03:00
Anton Midyukov
5c8144dfe7 desktop+regular: added apf
An apt-file analog.
2018-01-22 17:04:34 +03:00
Anton Midyukov
93f5dd7d5d regular.mk: update lxde, engineering flavours
- switch browser from firefox to palemoon (firefox needed pulseaudio)
- switch LXDE theme from upstream to lxdesktop (cf. ALT Engineering)
- added qastool: ALSA mixer GUI
- added qpdfview: PDF viewer (there was none)
- update regular-engineering pkglist
2018-01-16 15:19:44 +03:00
Anton Midyukov
2a2b3e1b7b mixin.mk: replace use/sound with +alsa for desktop/regular
This will solve the sound problems when using regulars:
- The sound when the computer is restarted is set to 0
- Some applications do not know how to work directly with ALSA,
  apulse allows you to solve this problem partially.

Using feature +pulse will override use of +alsa feature.
2018-01-16 15:05:00 +03:00
Anton Midyukov
530d4c1740 sound: added a switch between alsa and pulseaudio
Those images who are fine with ALSA might still benefit
from addons like udev-alsa to have mixer levels restored
on boot; and PulseAudio-bearing images can be based upon
the same intermediate targets now without receiving the
addons they don't need.
2018-01-10 19:34:57 +03:00
Anton Midyukov
c13ec2d67b sound: added udev-alsa in feature use/sound/alsa (+alsa)
This one should care for default mixer levels upon boot.
2018-01-10 19:31:06 +03:00
Michael Shigorin
9573d6e905 base+regular: added ncdu, tree
Suggested-by: Mikhail Novoselov <mikhailnov@dumalogiya.ru>
Acked-by: Anton Midyukov <midyukov-anton@ya.ru>
2018-01-05 12:33:34 +03:00
Michael Shigorin
fa0fcaa836 regular.mk: experimental regular-mate-sysv
This one has been asked for by someone in starterkits-20171212 thread:
http://www.opennet.ru/openforum/vsluhforumID3/113074.html#45
2018-01-05 12:29:01 +03:00
Michael Shigorin
d5976dc3b7 mixin.mk: added apulse to lxde one
That is, +alsa which basically means it.

Reported-by: Leonid Krivoshein <klark@altlinux.org>
2018-01-05 12:28:53 +03:00
Michael Shigorin
39acd516e9 server+openvz: drop yabeda
Not that it was bad but it's just no more around...
2017-12-15 08:49:02 +03:00
Michael Shigorin
9c44541d3c rescue+misc: added nvme
Too bad it wasn't spotted a couple nights ago...
2017-12-13 05:00:20 +03:00
Michael Shigorin
5a6e03b676 gear-store-tags 2017-12-11 23:55:26 +03:00
Michael Shigorin
e4d54acd98 1.2.6-alt1
- starterkits-20161212
2017-12-11 23:53:31 +03:00
Michael Shigorin
71b2e237bd regular.mk: add xorg-conf-synaptics to installer
...following alt-workstation as well (thank you sem@!).
2017-12-11 23:51:31 +03:00
Michael Shigorin
e97a21ca0d regular.mk: add fdisk to installers
...following alt-workstation as well.
2017-12-11 23:50:06 +03:00
Michael Shigorin
c337b5c977 regular.mk: use/fonts/chinese
...following alt-workstation.
2017-12-11 23:48:59 +03:00
Michael Shigorin
444790293a fonts: add use/fonts/chinese
...with the basic bitmap one.

Suggested-by: 9gigabit@gmail.com
See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=34142
2017-12-11 23:48:52 +03:00
Michael Shigorin
ae7729cef1 regular.mk: add amdgpu support
Following alt-workstation; thanks lakostis@.
2017-12-11 23:46:36 +03:00
Michael Shigorin
1cc3a2f164 pkg.in, server: revamped server lists/groups
This has been long overdue: pretending that "http server"
is an Apache2 with PHP5 was wrong for ages, and providing
apache2/nginx, php5/php7 choice along with more databases
was waiting for its user proposal.

Follow these changes in server feature as well.

Suggested-by: Altexander
See-also: https://forum.altlinux.org/index.php?topic=40290
2017-12-11 23:38:00 +03:00
Michael Shigorin
0c31b9898b regular.mk: disable-usb-autosuspend wider
This kludge should go to at least desktop installers as well,
and WM-based images shouldn't suffer either.  Regarding server
ones, let's see.

Suggested-by: Speccyfighter
See-also: https://forum.altlinux.org/index.php?topic=36963.msg289422#msg289422
Suggested-by: Иволгин
See-also: https://forum.altlinux.org/index.php?topic=36963.msg292251#msg292251
2017-12-11 22:08:55 +03:00
Michael Shigorin
459a46b868 syslinux: fix rescue_rw config snippet
This one enables rw session support for Rescue images;
the nitpick is that syslinux' gfxboot *will* set this up
when booting the same ISO from USB Flash media instead of
optical one (CD/DVD-ROM/RW), and we don't put gfxboot into
a standalone rescue image.

See-also: http://altlinux.org/propagator
See-also: http://altlinux.org/remount_rw
2017-12-11 20:09:20 +03:00
Michael Shigorin
e45dab0435 regular.mk: add btrfs support to graphical images
This is an experiment that should finally land in install2
but SYSTEM_PACKAGES is not enough, mkfs.btrfs doesn't land
in the installer somehow.

See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=32403
2017-12-06 21:05:41 +03:00
Anton Midyukov
d465848793 Update list desktop+engineering: - remove slic3r (conflict perl-OpenGL with pycam) - added qucs-s - added blender - added libuniset2 - added solvespace 2017-12-06 16:09:07 +03:00
Michael Shigorin
fbde9fc722 gear-store-tags 2017-12-04 22:13:10 +03:00
Michael Shigorin
84183f8818 1.2.5-alt1
- qcow2c
2017-12-04 22:12:05 +03:00
Michael Shigorin
051b8ef2b8 p8.mk: added vm/opennebula-systemd bridge
Suggested-by: Alexey Shabalin <shaba@altlinux.org>
2017-12-04 21:00:27 +03:00
Michael Shigorin
e043f87775 build-vm, pack: implement qcow2c support
This is a compressed version of good ol' qcow2.

Suggested-by: Alexey Shabalin <shaba@altlinux.org>
2017-12-04 20:02:19 +03:00
Michael Shigorin
0f2411ec34 image.in, build-vm: handle qemu-img absence properly
This isn't a warning cause, this is a error cause!
2017-12-04 19:41:51 +03:00
Michael Shigorin
a173bbd070 browser: drop -be
Maybe this commit will be reverted but this is the current state
of both sisyphus and p8.

See-also: http://bugzilla.mozilla.org/show_bug.cgi?id=1304743
See-also: http://www.opennet.ru/opennews/art.shtml?num=45909
See-also: http://www.opennet.ru/opennews/art.shtml?num=46987
2017-12-04 18:24:53 +03:00
Michael Shigorin
3ca9ae4ba2 gear-store-tags 2017-11-20 21:50:10 +03:00
Michael Shigorin
cf0fe91f0e 1.2.4-alt1
- opennebula-systemd
2017-11-20 21:49:45 +03:00
Michael Shigorin
ea373cec67 desktop+ibus: dropped ibus-unikey
No more in sisyphus:
http://git.altlinux.org/tasks/archive/done/_189/193808/
2017-11-14 19:01:36 +03:00
Michael Shigorin
5dd5c0b618 base+regular: added make-initrd-ucode
Suggested-by: Anton Farygin <rider@altlinux.org>
See-also: https://lists.debian.org/debian-devel/2017/06/msg00308.html
2017-11-03 15:58:54 +03:00
890390a89a add vm/opennebula-systemd 2017-10-31 13:24:02 +03:00
91e0c6e933 cleanup vm/cloud-systemd 2017-10-31 13:23:56 +03:00
e0dfa733e6 install open-vm-tools-desktop for use/vmguest/vmware/x11 2017-10-31 13:23:49 +03:00
a9b1f05501 add use/vmguest/kvm/x11 2017-10-31 13:13:09 +03:00
Michael Shigorin
af20f89346 rescue: make libX11 test a bit more helpful
It should be more clear what gets libX11 test triggered.
2017-10-23 18:54:37 +03:00
Michael Shigorin
3afb96a824 rescue+extra: drop tcpflow
...as it pulls libX11 in now.
2017-10-23 18:53:26 +03:00
Anton Midyukov
9f10e9d12a Update pkg.in/lists/tagged/desktop+engineering 2017-09-28 18:40:36 +03:00
Michael Shigorin
4a07391d93 gear-store-tags 2017-09-26 00:11:00 +03:00
Michael Shigorin
efcb82b4f1 1.2.3-alt1
- p8+
2017-09-26 00:00:48 +03:00
Michael Shigorin
fd4f2a675d e2k.mk, mixin.mk: add more targets
mixin/e2k-desktop was asking for separation from its day zero,
and the rest just came in naturally (the temporary patch to
add lxqt and mate looked awfully with all the duplication in).
2017-09-26 00:00:31 +03:00
Michael Shigorin
41b5a5b633 desktop+lxqt*: reshuffle qt4 bits
This is to make desktop+lxqt packages installable on e2k
as there's no qt4 package within this Sisyphus port and
things might just stay this way (it's long unsupported,
looks like porting software to qt5 is more worthwile
an effort).

There's one more removal though: qupzilla. This browser
fits lxqt like a glove *but* it's pulled in already by
mixin/regular-lxqt, and browser feature is available now
to make the selection more flexible.  It's also going to
be renamed on the way to incusion into KDE SC.
2017-09-26 00:00:02 +03:00
Michael Shigorin
f32fd9a3b0 firmware: add firmware-rt* to use/firmware/wireless
...for firmware-rt61pci; thanks to an anonymous bugreporter.

See-also: http://www.opennet.ru/openforum/vsluhforumID3/112310.html#177
2017-09-25 23:59:25 +03:00
Michael Shigorin
9d10d78b48 desktop.mk, live.mk, regular.mk, test.mk: cleanup
There was a semi-awful lot of long-abandoned targets
spotted while factoring out mixins; let's just drop
these for good, and if anyone needs some of those
drop me a commit.
2017-09-25 23:58:59 +03:00
Michael Shigorin
0a87d47748 p7.mk, t7.mk: drop completely
These branches are officially unsupported for the whole
two years, probably just the time to clean up.

See-also: http://altlinux.org/branches
2017-09-25 23:58:52 +03:00
Michael Shigorin
24defe9461 mixin.mk: gather all mixin/* targets
These have appeared in desktop.mk, regular.mk, vm.mk
over time, and there are two problems around.

The minor one is that mixins have been introduced as
handy reusable bits close in context of their use;
this practically means that they fall under the same
class restrictions as their parent targets, that is
a mixin coming from regular.mk will only be available
for "distro" IMAGE_CLASS, and so on.

The major one is probably the worst design flaw in m-p:
building images from ground up, where ground is a valid
standalone buildable target as well.

Life has shown that we rather want to build up images
the other way around, choosing what essentials go in first
and then fitting the fine details along with the packaging.

The first sign of this difference appeared with ARMv7 Simply:
we had a well-built configuration aiming for x86 ISO, still
we needed roughly the same app/environment configuration
put into armh disk image.

Those platforms were different enough that we didn't actually
plan shipping *lots* of distributions but the problem was clear,
and it was much alike to the one that sprang m-p to life in the
first place (when we had a range of "common" distros and needed
to create and maintain a set of "school" ones that mostly had
similar or even identical difference to their respective base
ones -- and we couldn't do something like conf.d/p8.mk does now).

So mixins are going to become the softer way to turn m-p's
target configuration chain upside down to considerable extent:
build up what you're going to mix into the various deliverables,
and make it as portable across image classes, hardware platforms,
repository branches as feasible so that total maintenance effort
needed goes down or at least doesn't spike too bad.

And here's the first strike at that.
2017-09-25 23:58:40 +03:00
Michael Shigorin
b558f88bfa vm.mk: factor out mixin/cloud-init
This one has been clearly duplicated before.
2017-09-25 23:56:42 +03:00
Michael Shigorin
ef0394f810 regular.mk: conditionally add kdeedu*
It's been expelled from sisyphus.

See-also: http://git.altlinux.org/tasks/archive/done/_183/187993/
2017-09-12 14:29:58 +03:00
Mike Radyuk
fe07f4091f Fix armh feature 2017-09-12 14:28:28 +03:00
Michael Shigorin
2828090d6b gear-store-tags 2017-09-11 21:25:50 +03:00
Michael Shigorin
40fd44377b 1.2.2-alt1
- regular-engineering
2017-09-11 20:47:19 +03:00
Anton Midyukov
9c5a47a4ce New target regular-engineering and alt-p8-engineering 2017-09-11 16:23:29 +03:00
Michael Shigorin
59c1a58793 regular.mk: pnmixer to sysv-based xfce flavours
...instead of xfce4-mixer which is based on gstreamer 0.10
(with its mixer API that perished in 1.0); this has been
tested on e2k already.

Suggested-by: Mikhail Efremov <sem@altlinux.org>
See-also: http://forum.altlinux.org/index.php?topic=36177.msg316175#msg316175
2017-09-11 09:38:06 +03:00
Anton Midyukov
a21ab528da Update pkg.in/lists/tagged/desktop+engineering 2017-09-08 18:44:01 +03:00
792e70e237 - add open-vm-tools to use/vmguest/vmware 2017-09-08 18:41:28 +03:00
Michael Shigorin
86ed95a7e1 e2k: need startx too
Weird it got overlooked in the first place.
2017-09-08 18:25:02 +03:00
Michael Shigorin
9383fce946 regular.mk: add screenpen to gnome3 flavour
ROSA's legacy...
2017-09-08 17:38:36 +03:00
Michael Shigorin
4cec22b957 deflogin: add nm-sysvinit to use/deflogin/sysv/nm
Suggested-by: Speccyfighter
See-also: http://forum.altlinux.org/index.php?topic=39476.msg315597#msg315597
2017-09-07 15:45:23 +03:00
Michael Shigorin
9371719edc regular.mk: trim kdeedu set in tde flavour
Suggested-by: squire
See-also: http://forum.altlinux.org/index.php?topic=38966.msg312602#msg312602
2017-09-07 15:29:31 +03:00
Michael Shigorin
032b3a1bf1 rescue+extra: add fio
Suggested-by: Evgenii Terechkov <evg@altlinux.org>
2017-08-29 16:38:22 +03:00
Michael Shigorin
53c2c7fd1d gear-store-tags 2017-08-21 22:05:01 +03:00
Michael Shigorin
58844d304a 1.2.1-alt1
- seven years ago...
2017-08-21 22:01:57 +03:00
Michael Shigorin
16da13ff70 e2k.mk: add vm/e2k-builder
...and somewhat improve vm/e2k-xfce.
2017-08-21 21:59:37 +03:00
Michael Shigorin
29bbcaa14b e2k: add sound setup
Radeon HDMI as the default soundcard isn't really optimal,
and trying to push 44100 kHz samples towards 48 kHz interface
isn't going to sound great; provide sane ALSA dmix defaults
for Elbrus-401 PC workstation.
2017-08-21 21:57:54 +03:00
Michael Shigorin
cf9559287b build-ve, build-vm: handle *_PACKAGES_REGEXP
BASE_PACKAGES_REGEXP and THE_PACKAGES_REGEXP,
to be exact; the lack of handling these appears
to have been the culprit of firefox missing in
vm images which use/browser/firefox.
2017-08-21 21:44:01 +03:00
Michael Shigorin
1b0f8e2d65 Revert "browser: tweak for multi-branch compatibility"
This reverts commit 41a3f09132:
at least build-vm doesn't do *_REGEXP (which is worth fixing
but all relevant branches got firefox-classic_theme_restorer
so this tweak is now irrelevant and a bit wasteful).
2017-08-21 21:21:38 +03:00
Michael Shigorin
2600bc2c1d build-vm: purge tarball even with DEBUG=1
...and leave it for possible further investigation
only if debug level is 2 or higher (which is uncommon).
2017-08-21 21:10:32 +03:00
Michael Shigorin
1a272e44b2 dev, ve.mk: factor out builder+extra
It's strange but ve/builder and distro/live-builder
along with distro/regular-builder are all mostly
"independent", that is duplicating functionality
without any reasonable gain; spotted finally.
2017-08-21 20:02:59 +03:00
Michael Shigorin
4ac0b6bcd3 workstation/base.pkgs: add screen
Suggested-by: gremlin@altlinux.org
2017-08-15 22:15:55 +03:00
Michael Shigorin
58168c8fee gear-store-tags 2017-08-07 21:58:52 +03:00
Michael Shigorin
f1c4c60272 1.2.0-alt1
- e2k
2017-08-07 21:52:59 +03:00
Michael Shigorin
319fdfc5ee image.in, main.mk: align debug targets
Weird but the last round of image builds on e2k started complaining:

  Makefile:95: *** target file `debug' has both : and :: entries.  Stop.

Looks like these should have been fixed indeed.
But why didn't this surface before then?
2017-08-07 21:51:17 +03:00
Michael Shigorin
fae0bb94e7 e2k.mk: vm/e2k-xfce
Let's build an Xfce based image, got anything needed (well, almost:
xorg-drv-libinput isn't there and no one is crying over that here).

And let's change "e2k" suffix to be prefix while at that.
2017-08-07 21:48:55 +03:00
Michael Shigorin
b98bf15a42 x11: e2k repo has no imsettings so far
BR: imsettings -> libgxim -> ruby, and it's missing still.
2017-08-07 18:03:23 +03:00
Michael Shigorin
0d6fe3500c e2k: official x11 support
The early builds used to rely upon a non-committed
rootfs/files/etc/X11/xorg.conf within this feature
which was a bit annoying and would have screwed an
Elbrus system based on any other GPU.

So let's provide some flexibility by packaging it.
2017-08-07 18:00:28 +03:00
Michael Shigorin
9c263dcb37 l10n: generalize to rootfs
Turns out that vm images might need localization too,
not just live ones.
2017-08-07 18:00:27 +03:00
Michael Shigorin
aa7f2d8423 tar2fs: chgrp and failsafe kpartx
The current state made vm images belong to root group,
no reason to not change those to the primary group of
the user building an image.

kpartx -d -s could fail in some circumstances,
make a safety cleanup call more verbose.
2017-08-07 18:00:16 +03:00
Michael Shigorin
209c610f80 live, server, e2k.mk, regular.mk: use/services/lvm2-disable
These used to carry (or need) their own means for the same
problem of extra services consuming bootup time.
2017-08-02 22:14:45 +03:00
Michael Shigorin
5174ec5dff services: lvm2-* disable target
These are creeping throughout m-p and aren't really needed
by default as these should be enabled upon configuration;
let's provide a single switch off point.
2017-08-02 22:14:37 +03:00
Michael Shigorin
c903e3b0ce e2k.mk: initial suite
These images have been tested on an Elbrus-401 PC.
2017-08-02 22:14:32 +03:00
Michael Shigorin
a2f2cd93bd server+network: add wget
It's like missing here!
2017-08-02 22:14:18 +03:00
Michael Shigorin
009e3a4d13 tty: restrict installer features to distros
...as vm images don't need extra processing.
2017-08-02 22:14:14 +03:00
Michael Shigorin
35dd200883 tar2fs: add e2k arch support
Somewhat ARM-like with only the bootloader bits
standing out; Elbrus 2000 firmware can read ext2
and boot the kernel directly.
2017-08-02 22:14:09 +03:00
Michael Shigorin
78ac727d7b e2k: initial implementation
Elbrus 2000 only takes us a few lines to get up and running ;-)
2017-08-02 22:14:05 +03:00
Michael Shigorin
db1d0ee592 kernel: try std-def instead of forcing it
KFLAVOURS could have been set earlier and got overridden here.
2017-08-02 22:13:57 +03:00
Michael Shigorin
3d7a0c5c39 build-vm, tar2fs: unify kver handling
No need to deduce kernel version again,
just save it in a temporary file.

The main reason to change what worked is
that e2k kernel-image package has Linux bits
named as image-$kver and not vmlinuz-$kver;
the guessing logic taking all of this into
account resulted in non-aesthetic patch.

NB: there's a duplicating script within
    kernel feature; it wasn't easy to avoid
    this and it might differ when handling
    multiple kernels, I didn't think much
    about this now as vm images tend to ship
    with the sole one.
2017-08-02 22:13:44 +03:00
Michael Shigorin
f58f10d1e1 gear-store-tags 2017-07-31 23:04:09 +03:00
Michael Shigorin
9bb71fbbd1 1.1.110-alt1
- lxde-sysv
2017-07-31 23:02:56 +03:00
Anton Midyukov
97ace27fff Added list desktop+engineering 2017-07-30 14:44:07 +03:00
Anton Midyukov
d383f53f71 Added distro/regular-lxde-sysv and distro/alt-p8-lxde-sysv 2017-07-30 14:42:53 +03:00
Anton Midyukov
ce814b771b Fix lists packages regular-lxde: - added lxde-lxhotkey to desktop+lxde - added deadbeef-etcskel smplayer-mpv to desktop+lxde+extra - remove sakura from desktop+lxde+extra 2017-07-30 14:42:41 +03:00
Anton Midyukov
82228d35fd Delete openscada from distro/regular-tde 2017-07-30 14:42:11 +03:00
Michael Shigorin
d58e5b58d6 cleanup, install2: don't drop glibc-gconv-modules
It's needed for alterator-wizardface ported to guile22.

Suggested-by: Sergey Bolshakov <sbolshakov@altlinux.org>
2017-07-30 14:40:32 +03:00
Michael Shigorin
14f1f84095 desktop+enlightenment+e17+extra: drop gst-plugins-nice
It's no more built from libnice in sisyphus,
replaced by gst-plugins-nice1.0:
http://git.altlinux.org/tasks/archive/done/_180/184665/

PS: in fact, drop all of them (gstreamer 0.10 related)!

Suggested-by: Yuri Sedunov <aris@altlinux.org>
2017-06-27 19:12:41 +03:00
Michael Shigorin
63b96a0750 Revert "stage2: force grub-compatible ext4 options"
This reverts commit 4a4da37d06
as Sisyphus has got GRUB 2.02 in the mean time:
http://git.altlinux.org/tasks/archive/done/_179/183896/
2017-06-16 18:26:41 +03:00
Michael Shigorin
1814490ec2 lists/workstation: rem-sys additions
These few tweaks have been proposed by Remote Systems.

Suggested-by: Erik Palvanov <erik@rem-sys.ru>
2017-06-14 15:43:08 +03:00
Michael Shigorin
004075442a basealt.mk: add efi-memtest86
Suddenly noted workstation images lack that one.
2017-06-13 14:38:12 +03:00
Michael Shigorin
b23aa4198d basealt.mk: add smartcard support checkbox
Note that LiveCD includes tagged/base+smartcard pkglist
but the installed system lack these unconditionally;
change that for dd@.
2017-06-13 14:11:26 +03:00
Michael Shigorin
2a3bfdb237 pkg.in: added workstation/smartcard group/list
These have been asked for by dd@, let's provide a checkbox.
2017-06-13 14:07:45 +03:00
Michael Shigorin
206f0844c9 gear-store-tags 2017-06-12 20:54:56 +03:00
Michael Shigorin
78938337d3 1.1.109-alt1
- starterkits-20170612
2017-06-12 20:52:22 +03:00
Michael Shigorin
31ecda7272 docs update
Another minor facelift:
- s/ALT Linux/ALT/gc (where applicable);
- s/7.0/8.0/g;
- 2017;
- e2k;
- links.
2017-06-09 19:31:42 +03:00
Michael Shigorin
0b2da1ab8f spec: s/ALT Linux/ALT/g; add Russian description
The former relates to company change and rebranding;
the latter is long overdue, just do that *now*.
2017-06-09 19:26:28 +03:00
Michael Shigorin
d9e2fb2b91 [*] desktop+mate: add pavucontrol
"Sound [volume knob] is missing in regular-mate"

Reported-by: Alexey Kostarev <kaf@nevod.ru>
2017-06-07 14:42:56 +03:00
Michael Shigorin
c72468b28b desktop+regular: add mc
It's been found missing in sysv-xfce flavour.
2017-06-06 14:45:40 +03:00
Michael Shigorin
bb03a7d27f desktop+lxde+extra: replaced geeqie with gpicview
It's an LXDE project *not* pulling in ImageMagick-tools with its
display's ImageMagick.desktop jumping into menu to confuse users!
2017-06-05 15:40:00 +03:00
Michael Shigorin
cba35602aa base+bench: drop postal
It's not a base benchmark as tackling mail servers
takes it libp11-kit and friends which no one else
expected to come and occupy enough space.
2017-06-01 16:48:56 +03:00
Michael Shigorin
aa07fb044d regular.mk: add smartcard support to mate flavour
This makes more sense than with rescue as it's not only hardware
support check then but also actual functionality can be tested.

Looks like MATE is the DE we rather expect/recommend in environments
where PC/SC tends to pop up.
2017-06-01 16:22:20 +03:00
Michael Shigorin
e1982cd71b regular.mk: dropped smartcard support from rescue
It's rare enough that more complete images could be used,
and it pulls in polkit with mozjs which is terrible here.

Never been a feature request but rather a TODO item,
and image size is what folks seem to be actually
concerned with.

Reverts: 29ad239354
2017-06-01 16:18:08 +03:00
Michael Shigorin
342bf61219 base+bench: drop dbench
It's pretty small but dbench-data is *huge* (~25 Mb)!
2017-06-01 16:13:12 +03:00
Michael Shigorin
8f6bbd87b7 regular.mk: rehash domain-client support
This hefty bunch of packages gets dropped from most of the flavours;
those ones pulling it in explicitly (kde4, kde5, mate, xfce) get rid
of krb5-ticket-watcher as it's now autostarting (which is annoying
if one doesn't really intend to use kerberos auth off a livecd).

Parties looking into integrating non-mainstream starterkits into ALT
domain or whatever are highly probably best served by a custom build
including libreoffice et al. anyways, and those experimenting can
just follow wiki instructions when needed.

Feedback is welcome, of course.

See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=33518
2017-06-01 14:25:59 +03:00
Michael Shigorin
4a4da37d06 stage2: force grub-compatible ext4 options
We use grub2 2.00, it's not compatible with new mke2fs
options (namely "64bit" one); disable it for now.

See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=33489#c6
2017-05-31 22:47:55 +03:00
Michael Shigorin
d887dd1f8a basealt.mk: add eMMC support to installer
This one has been considered to be in already!
2017-05-31 19:08:33 +03:00
Michael Shigorin
4cabc223ad desktop+enlightenment+e17+extra: drop gst-plugins-ugly
It's no more in sisyphus.

See-also: http://git.altlinux.org/tasks/archive/done/_177/182028/
2017-05-31 19:08:28 +03:00
65398a221d - cleanup l10n 2017-05-31 19:08:17 +03:00
Michael Shigorin
dd1ed169e2 gear-store-tags 2017-04-24 19:41:43 +03:00
Michael Shigorin
a03319806a 1.1.108-alt1
- yandex.mirror
2017-04-24 18:58:50 +03:00
Michael Shigorin
645f95f0a8 regular.mk: initial rescue-netbootxyz flavour
This one has been split from regular rescue following
discussion with Will Glynn; some hefty bits like UEFI
support or an extra squashfs to check the image integrity
aren't needed, so let's just build a slimmer ISO instead.

Suggested-by: Will Glynn <will@willglynn.com>
See-also: https://bugzilla.altlinux.org/33374
2017-04-21 13:03:32 +03:00
Michael Shigorin
4321fefc60 live, repo, rescue: use yandex mirror
...instead of (often-crowded) ftp.altlinux.org for updates.
2017-04-21 13:03:27 +03:00
Michael Shigorin
2f6457eaed server: s/drbd83/drbd/
...as drbd83 has been dropped.
2017-04-05 10:43:48 +03:00
Michael Shigorin
89baad8223 rescue+{extra,misc}: dropped partclone, drbd83-tools
These have been removed from sisyphus:
http://git.altlinux.org/tasks/archive/done/_176/181218/
http://git.altlinux.org/tasks/archive/done/_177/181341/
2017-04-05 10:43:38 +03:00
Michael Shigorin
ac743e2b93 ve.mk: enable sshd in systemd-bare
Suggested-by: Anton Farygin <rider@altlinux.org>
2017-04-04 13:23:44 +03:00
Michael Shigorin
e93bf355b7 gear-store-tags 2017-04-03 20:35:34 +03:00
Michael Shigorin
8be3dab7c6 1.1.107-alt1
- serial improvements
2017-04-03 20:34:54 +03:00
Michael Shigorin
f207f9d538 desktop+enlightenment+e17+extra: added ephoto
Suggested-by: Yuri N. Sedunov <aris@altlinux.org>
2017-04-03 19:33:28 +03:00
Michael Shigorin
f4b2816af0 rescue+extra: added socat
...tiny bits and pieces...
2017-03-31 21:52:32 +03:00
Michael Shigorin
aa8d2bba45 x11: add +x11 shortcut
This should have been done before the first DE/WM-specific one!
2017-03-31 21:51:37 +03:00
Michael Shigorin
bb473203e7 install2: shrink the cleanup
libgpg-error and libgcrypt20 are apparently needed for current
systemd-tmpfiles which has been tossed into basesystem, alas.

See-also: https://lists.altlinux.org/pipermail/devel/2017-March/202518.html
See-also: https://lists.altlinux.org/pipermail/devel/2017-March/202527.html
2017-03-31 21:50:18 +03:00
Michael Shigorin
3330e24e1a regular.mk: split out .regular-jeos-base
This is needed for a custom autoinstalling image with grub
(as installer-feature-serial-stage3 doesn't support lilo
reliably yet); see bootloader feature's README regarding
the switch but the change is basically a no-op for the
.regular-jeos intermediate target.
2017-03-31 21:45:08 +03:00
Michael Shigorin
142dd30e77 base+smartcard: added m-p-d bits
These were spotted in mkimage-profiles-desktop's
profiles/pkg/lists/pkcs11, carry over.
2017-03-31 21:05:28 +03:00
Michael Shigorin
f0c0d142c2 regular.mk: updated #28805 workaround
See-also: http://bugzilla.altlinux.org/28805
2017-03-31 20:58:29 +03:00
Michael Shigorin
bca1342015 syslinux, tty: better serial support
A one-liner for syslinux and a simple installer feature
change a lot in this regard!
2017-03-31 20:53:59 +03:00
Konstantin A. Lepikhov
85c52d71c6 Added support of new AMDGPU drivers
Added vulkan support
2017-03-24 12:47:27 +03:00
Michael Shigorin
fb125e0900 gear-store-tags 2017-03-13 22:47:26 +03:00
Michael Shigorin
ac06f8d856 1.1.106-alt1
- starterkits-20170312
2017-03-13 22:46:52 +03:00
Michael Shigorin
9efdc3f58a regular.mk: update regular-server-samba4
...as its former base, regular-server, includes Samba DC too now.
2017-03-09 12:24:34 +03:00
Michael Shigorin
d27f05e8be archive+extra: added zpaq
...just in case.
2017-03-07 12:47:04 +03:00
Michael Shigorin
f80d1d5d62 live:mk: use firefox-esr for live-privacy
The real cause is the current lack of firefox-be;
it's obsoleted but not provided anymore since upstream
ceased to provide the translation.  Will have to be fixed
in browser feature if things stay this way.
2017-03-05 19:28:54 +03:00
Michael Shigorin
48e505622e regular.mk, the.pkgs: added pam-limits-desktop
This bumps desktop process/files limits quite considerably; see also
http://lists.altlinux.org/pipermail/devel/2017-February/202397.html
2017-03-04 23:22:06 +03:00
Michael Shigorin
a47a0383d9 server: add tools/tuning
...where appropriate.
2017-03-02 17:49:18 +03:00
Michael Shigorin
0cadf830de pkg.in: add tools/tuning list/group
This one is for tuned(8) indeed but more useful bits
might go in over time.
2017-03-02 17:45:57 +03:00
Michael Shigorin
8dc762d56f base+regular: added shadow-change
Small things like chsh(1) are quite useful to those in the know...
2017-02-28 18:40:03 +03:00
Michael Shigorin
bdb8dcac29 gear-store-tags 2017-02-27 20:13:24 +03:00
Michael Shigorin
3b24b68b22 1.1.105-alt1
- disable git hooks (glebfm@)
2017-02-27 20:12:19 +03:00
Michael Shigorin
d49f3bce8e server: added hdparm to ovz-base target
This one lacked there recently, todo--.
2017-02-25 19:56:01 +03:00
Michael Shigorin
dd87c70ee5 ve.mk: initial ve/samba-DC
This one has been used in e2k build testing, let it live.
2017-02-25 19:52:34 +03:00
Michael Shigorin
ad8f0a1b80 base+comm: added python-module-serial
It's a worthwile alternative to minicom and friends: just

  miniterm.py /dev/ttyUSB1 115200

and voila.
2017-02-24 13:32:11 +03:00
Michael Shigorin
431d9f0d1a tools/monitoring: added vnstat
It's a simple but useful utility to gather
interface traffic statistics over time.
2017-02-23 01:23:36 +03:00
Michael Shigorin
d12f702282 live: added default xfce theme setup
This is unfortunate but Sisyphus' Xfce can't really strive with its
default /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml,
namely IconThemeName; while p8's one still does pretty good.

Thanks antohami@ for his analysis and workaround suggestion.

See-also: https://bugzilla.altlinux.org/32924
See-also: https://lists.altlinux.org/pipermail/devel/2017-February/202348.html
Suggested-by: Anton Midyukov <midyukov-anton@ya.ru>
2017-02-21 19:55:41 +03:00
Michael Shigorin
0a1a2287ef the.pkgs: added userpasswd
Should help mate-about-me actually change password.

See-also: https://bugzilla.altlinux.org/33096
2017-02-18 08:58:34 +03:00
Michael Shigorin
1a2a9d2155 regular.mk: added rescue+misc to .regular-server
...so it hits the common server images
tossing in all the goodies.
2017-02-13 16:23:47 +03:00
Michael Shigorin
a77cf63957 rescue+misc: added cpuid2
...just in case.
2017-02-13 16:14:15 +03:00
Gleb Fotengauer-Malinovskiy
1f63af0159 mp-commit: disable git hooks
These commits are temporary, so we do not care about stuff like
trailing whitespaces at all.
2017-02-08 23:04:24 +03:00
Michael Shigorin
f09b70e343 desktop+lxde: added lxde-lxpolkit explicitly
This is moved out of lxde-lxsession deps for sysvinit compatibility;
requires logind (and complains without it) but isn't strictly needed.

Suggested-by: Anton Midyukov <antohami@altlinux.org>
2017-02-08 18:47:47 +03:00
Michael Shigorin
1c99f5d309 gear-store-tags 2017-02-06 23:19:38 +03:00
Michael Shigorin
5f042e01e3 1.1.104-alt1
- [[vncinst]] fixed
2017-02-06 23:18:56 +03:00
Michael Shigorin
c9e1f17a1d regular.mk: added vlan-utils to server-pve
...as requested by chemyakyn; the implementation
differs somewhat as the whole server+network pkglist
seems reasonable in all of the regular server builds.
2017-02-03 16:02:49 +03:00
Michael Shigorin
38f3987725 desktop+regular: added cpu-x
Seems reasonable.
2017-02-02 16:12:03 +03:00
Michael Shigorin
38d338e0ee basealt.mk: refactor a bit
"+sysvinit +systemd" looks somewhat weird,
and "+vmguest use/vmguest" is clearly a dup;
both have finally caught my eye when staring
at a long-forgotten build/reports/targets.png
for alt-workstation.iso...

NB: rider@ notes that syslogd alongside journal
    tends to be problematic due to split logging
    and periodic dropouts.
2017-02-02 16:11:57 +03:00
Michael Shigorin
274ead6274 live.pkgs: replaced virt-viewer with connector
Those who intend to connect to KVM instances know better
what they need (and are less likely to need a LiveCD to
do that); let's put Connector instead.

See-also: http://www.opennet.ru/openforum/vsluhforumID3/109727.html#482
2017-02-01 21:16:43 +03:00
Michael Shigorin
ee01557ead regular+server: added mailx
This has been missing, obviously.  Even if it was
http://bugzilla.altlinux.org/31636 to show that...
2017-02-01 20:48:17 +03:00
Michael Shigorin
013fd43294 armh, build-ve, ve.mk: reworked accordingly
Drop duplicated code pulled into armh feature in haste
and another half-copy that made it into build-ve feature;
make ve.mk more explicit about what it actually does
regarding default nameservers (and switch it to level3
while at that, just for diversity they preach).
2017-02-01 20:20:03 +03:00
Michael Shigorin
7459a74abc net: adjust accordingly
Refer to net-dns feature where appropriate
(it actually started out as an extension of
net feature but the reasons to separate it
quickly became apparent to me).
2017-02-01 19:59:35 +03:00
Michael Shigorin
e4bd17cc3d net-dns: initial implementation
This feature implements default nameserver configuration
and provides some canned variants for public consumption.

Thanks Andrey Mitrofanov for involuntarily reminding of it:
http://www.opennet.ru/openforum/vsluhforumID3/110309.html#31
2017-02-01 19:45:58 +03:00
Michael Shigorin
37325673bd regular.mk: add VNC install support
Server image might hit a system accessible via e.g.
serial console and ethernet; let's make it feasible
to install ALT there without falling back to using
http://en.altlinux.org/rescue and manual deployment
(with all stops including manual bootloader setup).
2017-02-01 18:45:04 +03:00
Michael Shigorin
c73abccd2c install2, syslinux: fix VNC support
Was broken in too many places including several libraries
x11vnc currently links against getting removed, several
utilities missing, and no way to guess what to do...

One could stumble upon http://altlinux.org/vncinst
or find the implementation in installer.git but it's
not exactly user-friendly.
2017-02-01 18:32:43 +03:00
Michael Shigorin
20c6cb25e4 gear-store-tags 2017-01-30 23:08:43 +03:00
Michael Shigorin
97bcab37ea 1.1.103-alt1
- rescue -= bootsplash
2017-01-30 23:04:15 +03:00
Michael Shigorin
b7374c4f13 rescue+extra: added cu, uucp as well
This commit aimed for cu(1) as a tty "client"
but some rare user might direly need uucp...
2017-01-30 23:02:00 +03:00
Michael Shigorin
7524e1752c rescue+extra: added perftest, infiniband-diags
Might be useful for Infiniband testing.

PS: move iperf where it belongs and add iperf3 while at that :]
2017-01-30 21:27:28 +03:00
Michael Shigorin
c0d7b19b22 features.in: fixed glitches found
Those few places lacking "; @:" replacement for a real recipe
have been finally -spotted- identified with `make check'
and fixed.
2017-01-29 16:00:18 +03:00
Michael Shigorin
a289726792 check-recipe: generalize dependency control
An initial (and quite naive) implementation was done
for conf.d/ files but features do need it as well --
which became obvious during a casual inspection of
distro/alt-workstation's target graph (which occured
broken).

The code is a messy hackery unfortunately, regexes used
are fragile regarding e.g. [A-Z_] in target names.
Read with care.

NB: lib/ might need this too but it's rather stable
    and contains some special cases that would obstruct
    the regexes even more...
2017-01-29 15:50:58 +03:00
Michael Shigorin
949733a9b4 report-targets: tweak targets
There's yet another m-p target class, ve/*; and
let's put a semicolon after anything else, too.
2017-01-29 15:02:05 +03:00
Michael Shigorin
c9806d9b5c syslinux: *disable* bootsplash for rescue targets
Turns out it's "splash=0" that does the job.

Suggested-by: Lenar Shakirov <snejok@altlinux.org>
See-also: https://bugzilla.altlinux.org/28625
2017-01-24 17:39:58 +03:00
Michael Shigorin
db7ec7515b build-distro: ensure prerequisites' order
...just in case (make doesn't guarantee that it's left-to-right
for normal-prerequisites so make them order-only-prerequisites).
2017-01-24 17:23:31 +03:00
Michael Shigorin
2504cdba75 desktop+enlightenment+e17+extra: dropped gst-ffmpeg
No more in sisyphus:
http://git.altlinux.org/tasks/176491/logs/events.7.1.log
http://lists.altlinux.org/pipermail/devel/2017-January/202228.html
2017-01-17 15:30:17 +03:00
Michael Shigorin
9dd8131187 dev: add gear remotes support
See http://altlinux.org/gear/remotes for rationale.
2017-01-14 12:10:43 +03:00
Michael Shigorin
d28950caed 90-build-vm.mk: better error reference
In this case it's rather worth it to examine build.log
than read documentation again (as vm.txt should have been
read or at least skimmed through to get sudo setup ready,
and the problem might be either an environment one or a bug).
2017-01-14 12:08:13 +03:00
Michael Shigorin
04a5f363a2 gear-store-tags 2017-01-09 18:28:02 +03:00
Michael Shigorin
02708faccd 1.1.102-alt1
- 2017
2017-01-09 18:26:29 +03:00
Michael Shigorin
cac2a8e93e server: empty BOOTVGA by default
...so there's no forced mode switch (unless modesetting
kicks in which is another story to X server starting up
to carry the installer).
2016-12-30 16:35:42 +03:00
Michael Shigorin
91075d008f syslinux: introduced BOOTVGA
...instead of hardwired 0x314 (which is rather wrong
for modern kernels and hardware, just ran into that
with yet another Matrox G200eW WPCM450).
2016-12-30 16:25:48 +03:00
Michael Shigorin
f06284b528 slinux/misc: dropped python-module-fusion-icon-gtk
No more in p8, breaks education-junior.iso build.
2016-12-28 09:13:25 +03:00
Michael Shigorin
b85c8710cd desktop+lxqt: dropped qt4-dbus
No longer reasonable for Qt5-based LXQt, anyways.

Reported-by: Sergey V Turchin <zerg@altlinux.org>
2016-12-27 13:22:02 +03:00
Michael Shigorin
4bcfc2d71b desktop+regular: added fuse-exfat
...to help those with larger flash cards.

Suggested-by: Andrey Cherepanov <cas@altlinux.org>
2016-12-27 12:01:55 +03:00
Michael Shigorin
3bfaf9c014 repo: harden against missing keydir
rpm-4.13 stopped bringing alt-gpgkeys in, and specifying it
explicitly for STAGE1_PACKAGES didn't help somehow; don't presume
/usr/lib/alt-gpgkeys/ existence anyways.
2016-12-26 17:23:11 +03:00
Michael Shigorin
524d38b0f4 live.mk: dos.iso isn't ALT Linux :)
...so set RELNAME explicitly.
2016-12-26 16:13:36 +03:00
Michael Shigorin
2fcfe3a70e syslinux: update branding defaults
s/ALT Linux/ALT/g as per s/ALT Linux/BaseALT/g Ltd
2016-12-26 16:12:39 +03:00
Michael Shigorin
4e7cdb0712 ve.mk: added builder target
This is a toolchain chroot that should be convenient
for e.g. new architectures after initial bootstrap
has been done; in my case that's e2k.
2016-12-26 16:03:06 +03:00
Michael Shigorin
86df2cde0a spec: doc knob that's useful
Building it --without doc wouldn't result in actual
build dependency list shrinking as fop still remained;
figured that out while building it for e2k.
2016-12-26 15:59:46 +03:00
Michael Shigorin
b3caf70fa9 mktmpdir: refer to docs
Manual BUILDDIR specification isn't exactly obvious
from this script (aiming to derive it automatically),
so at least point those interested at QUICKSTART
they might have long forgotten already or, gasp,
not even started reading.
2016-12-26 15:56:46 +03:00
Michael Shigorin
a65c3f27ff conf.d: added "make check"
The preceding commit fixes an easy but somewhat nasty bug
that spoils graphs (REPORT=1) and the fix for it spoils
merging side branches touching these files; so it's worth
a linter procedure, even if it's pretty trivial.
2016-12-20 19:39:30 +03:00
Michael Shigorin
ffa2497c78 regular.mk: added a dummy recipe
...so that SHELL hook in lib/report.mk could fire.
2016-12-20 15:55:05 +03:00
Michael Shigorin
83caa4bb24 desktop+xorg: dropped more legacy drivers
These weren't built with xorg-server 1.19:
http://git.altlinux.org/tasks/archive/done/_170/174308/logs/events.6.1.log
2016-12-13 18:00:42 +03:00
Michael Shigorin
9fcff7c442 rescue: add os-prober to base rescue
Should get into distributions' rescue image indeed.
2016-12-13 13:36:16 +03:00
Michael Shigorin
ccc377ee8b gear-store-tags 2016-12-12 19:32:37 +03:00
Michael Shigorin
90d7e4b0a4 1.1.101-alt1
- starterkits-20161212
2016-12-12 19:32:07 +03:00
Michael Shigorin
1ed547876b regular.mk: fix server-pve
X-Brown-Paper-Bag: nfs-clients were missing
2016-12-12 17:23:14 +03:00
Michael Shigorin
8258d316fd regular.mk: added dhcpcd to server-pve
Looks like its base is a tad too bare...
2016-12-12 01:17:44 +03:00
Michael Shigorin
2bfe8070f0 regular.mk: switched icewm to chromium
...as (mildly) proposed by jinn@:
https://lists.altlinux.org/pipermail/devel-distro/2016-December/001442.html
2016-12-12 00:28:24 +03:00
Michael Shigorin
ac59f7d6fd regular.mk: added multipath feature to servers
Has been omitted in commit 35ae35d unfortunately;
thanks shrek@ for pointing this out.
2016-12-08 14:42:25 +03:00
Michael Shigorin
da82600d4a server/kvm: added virt-top
Thanks snejok@ for providing this one.
2016-12-06 17:01:59 +03:00
Dmitriy Khanzhin
182d32f739 regular-icewm.iso: add support of NetworkManager 2016-12-06 00:12:09 +03:00
Michael Shigorin
766c4277b4 gear-store-tags 2016-12-05 23:43:29 +03:00
Michael Shigorin
50c18ed20a 1.1.100-alt1
- preparing for starterkits
2016-12-05 23:42:21 +03:00
Michael Shigorin
35ae35d203 regular.mk: add multipath support to servers
This might work, need to check with shrek@...
(note that installer-scripts-remount-stage2 >= 0.5.10-alt1
is required)
2016-12-05 22:11:36 +03:00
Michael Shigorin
0c920be1a4 regular.mk: soften server cleanup
Some things might need libX11 -- like collectd or qemu;
don't just rush ahead purging it anyways but rather
prefer removing the unneeded libraries.
2016-12-05 21:54:31 +03:00
Michael Shigorin
70f9bf6ded browser: safer fallback browser
elinks doesn't require libX11 (unlike links2),
and webclient can become e.g. rekonq pulling
in kde4libs -- that's exactly what I ran into
while preparing 201612xx server starterkits.
2016-12-05 20:37:24 +03:00
Michael Shigorin
789190aecf regular.mk: console cyrillic workaround
...by adding the very same kludge:
https://bugzilla.altlinux.org/show_bug.cgi?id=28805#c12
2016-12-05 01:02:03 +03:00
Michael Shigorin
3c4de5fd5a base+regular: added ps_mem
Tangentially suggested by Mihail Zenkov:
http://www.opennet.ru/openforum/vsluhforumID3/109255.html#64
2016-12-05 00:04:35 +03:00
Michael Shigorin
9dc631c593 workstation/base.pkgs: console cyrillic workaround
...by adding a kludge:
https://bugzilla.altlinux.org/show_bug.cgi?id=28805#c12

Reported-by: daianovich@mail.ru
2016-12-05 00:04:22 +03:00
Michael Shigorin
7eca94774a regular.mk, p8.mk: initial sysv-xfce flavour
This has been prepared with immense help by sem@ and our users:
http://forum.altlinux.org/index.php?topic=36177.msg299358#msg299358
(well that's the xfce-sysv livecd, sysv-xfce is pure installer
geared to replace sysv-tde for starterkits due to regressions
within the latter).
2016-12-05 00:04:00 +03:00
Michael Shigorin
3dc01e0719 metadata: add THE_PACKAGES_REGEXP to DOT_BASE too!
For some reason DOT_BASE only got BASE_PACKAGES_REGEXP so e.g.
browser feature use well could result in the lack of a browser
if no metapackage pulls one in!

X-Brown-Paper-Bag :-(
2016-12-05 00:03:40 +03:00
Michael Shigorin
0bac7d68d4 regular.mk: introduced mixin/regular-xfce-sysv
This is also no-op for the particular image being modified
as LIVE_PACKAGES is a subset of THE_PACKAGES in terms of
subprofiles affected.

NB: move use/browser/firefox/classic from systemd-based
    xfce flavour here -- looks more appropriate ;-)
2016-12-05 00:01:37 +03:00
Michael Shigorin
bd7e2257be regular.mk: introduced distro/.regular-install-x11-full
This one is slated for sysv installers (but should be rather
generic in that regard) through adding features suggested
by those users who also tend to care for sysvinit here. :)

The commit should be no-op either.
2016-12-03 22:28:15 +03:00
Michael Shigorin
b88781962b regular.mk: introduce mixin/regular-xfce
This holds the common bits, the whole commit should be a no-op.
2016-12-03 22:27:51 +03:00
Michael Shigorin
fbb2552d07 workstation/base.pkgs: add libusb-compat
This turned out to be required for some PCSC bundle.
2016-12-03 20:35:41 +03:00
Michael Shigorin
cffd88da30 groups/workstation: fix voip-clients.directory
'twas copypasted from agents and a real-life interrupt
has chimed in for me to fail updating the file contents
as intended :-/

The funny thing is that it never made it to Workstation 8.1...
2016-12-01 15:18:54 +03:00
Michael Shigorin
fb750abaa9 profile.mk: update default branding
Should be ALT instead of ALT Linux now following
the update of the branding itself; ALT Linux Team
stays ALT Linux Team of course.
2016-11-29 20:35:57 +03:00
Michael Shigorin
cdea94b9e7 regular.mk: switched lxqt from connman to NM
Looks like qconnman-ui is not on par with nm-applet
regarding wifi connections; reported by a user:
http://www.opennet.ru/openforum/vsluhforumID3/109727.html#276
http://www.opennet.ru/openforum/vsluhforumID3/109691.html#32
2016-11-29 20:25:41 +03:00
Michael Shigorin
0097492bcd desktop+regular: added lsblk
Suggested by an anonymous reporter:
http://www.opennet.ru/openforum/vsluhforumID3/109727.html#410
2016-11-26 19:20:13 +03:00
Michael Shigorin
f0726c5500 desktop+regular: added alterator-services, inxi
Suggested by a Belarussian user:
http://www.opennet.ru/openforum/vsluhforumID3/109727.html#276
2016-11-24 17:28:57 +03:00
Michael Shigorin
41f60ce1b1 basealt.mk: added agents and {cloud,voip}-clients
...a day too late for 8.1 release unfortunately,
these have evaded both the images and review somehow.
2016-11-23 16:14:36 +03:00
Michael Shigorin
3a008d0e6d gear-store-tags 2016-11-14 21:51:04 +03:00
Michael Shigorin
635e8b84ee 1.1.99-alt1
- xfce-sysv
- preparing...
2016-11-14 21:50:31 +03:00
Michael Shigorin
5db773d011 lists/workstation: webcam tweaks
The goal is to provide a simple and lightweight
webcam app with the LiveCD while handing some more
advanced one under a multimedia checkbox for installation.
2016-11-14 21:34:55 +03:00
Michael Shigorin
bd4153fa00 workstation/mate-usershare: cleanup
...just line noise...
2016-11-14 21:26:34 +03:00
Michael Shigorin
70b6533404 basealt.mk: purge acpid-events-power
Let MATE handle the power button keypress event presenting
user with an action chooser instead of just shuttin' down.
2016-11-14 21:24:36 +03:00
Michael Shigorin
5bd3017b67 pkg.in/lists: more alterator modules
...for workstation, and one of those (fixing #29856)
should be better than MATE's current log viewer.
2016-11-14 21:12:31 +03:00
Michael Shigorin
ee523f6ff5 basealt.mk: do add gpm
...but leave it disabled due to reported conflict with libinput.
2016-11-14 21:11:19 +03:00
Michael Shigorin
608ac3ac1a install2: *add* xorg-drv-libinput
It's required for many touchpads these days,
just get it in for the "full" (+installer) target.
2016-11-14 21:08:46 +03:00
Michael Shigorin
37fd3d03b3 basealt.mk: revert to use/branding/complete
This has been split during the preparation of initial commit
introducing this file as indexhtml wasn't ready for release;
now the time has come to fix it (still mate-settings need to
be mentioned separately).
2016-11-14 20:56:57 +03:00
Michael Shigorin
3a9de2c17f workstation/scanning: get rid of comments
...that replace the actual group contents while
trying to preview that during installation.
2016-11-14 19:42:11 +03:00
Michael Shigorin
235208b9b3 basealt.mk: shift to pkglists
The distro description grew package by package
and started resembling a pile of those; let's
finally reorganize it with lists and generally
improve layout (should be no-op otherwise).

See the discussion of the changes in basealt.mk
package lists in preceding commits touching it.
2016-11-14 13:23:28 +03:00
Michael Shigorin
e878cad934 basealt.mk: generalize auth-ad
task-auth-ad pulls in samba-winbind, among the rest...
2016-11-14 13:01:24 +03:00
Michael Shigorin
17daff9fd2 basealt.mk: enable sshd for workstation
It gets enabled most of the time anyways,
and Education 8.1 has enabled it either.
2016-11-14 12:58:44 +03:00
Michael Shigorin
af67c76e0d wireless: dedup via pkglist
The two package sets seemed *too* identical when
I finally needed to add another package there...
2016-11-14 12:54:44 +03:00
Michael Shigorin
cd3082433a workstation/scanning: drop skanlite
It adds kde4libs being no justification for this.
2016-11-12 22:29:49 +03:00
Michael Shigorin
acc4321f02 basealt.mk: replaced uvcview with qwebcam
Less visual noise!
2016-11-11 18:22:41 +03:00
Michael Shigorin
5f2778ec83 basealt.mk: yet another missing package
This time the omitted elephant is rpminstall!

Suggested-by: Sergey V Turchin <zerg@altlinux.org>
2016-11-11 15:19:16 +03:00
Michael Shigorin
3a07042b97 basealt.mk: added open-iscsi to install2
This means potential iSCSI installation support
which isn't official though; having binaries handy
even if consoderable runtime configuration is need
is still better than lacking those.
2016-11-11 14:48:34 +03:00
Michael Shigorin
80084c6baa basealt.mk: even more packages
How could I miss recoll even if I didn't know about solaar?
(which jumps into panel at the session startup time so let's
hold it to the available packages but not install away)

Suggested-by: Erik Palvanov <erik@tonk.ru>
2016-11-11 14:48:30 +03:00
Michael Shigorin
5cce7aa7f8 workstation/vlc: added youtube browser
Suggested-by: Erik Palvanov <erik@tonk.ru>
2016-11-11 13:57:40 +03:00
Michael Shigorin
607e0d9591 basealt.mk: even more packages for workstation
Some of these are included already but let's ensure that.

Suggested-by: Erik Palvanov <erik@tonk.ru>
2016-11-10 20:35:55 +03:00
Michael Shigorin
02e3ab0915 xorg+vaapi: initial VA API pkglist
Note that these might have problems being *installed*
together, consider using this list for MAIN_LISTS only
(or providing more feedback).

Suggested-by: Erik Palvanov <erik@tonk.ru>
2016-11-10 20:34:41 +03:00
Michael Shigorin
7a3118acd4 pkg.in: more workstation groups/lists
agents: suggested by myself, widely approved;
cloud-clients: suggested by peers (aen@?);
voip-clients: suggested by Erik.
2016-11-10 20:31:26 +03:00
Michael Shigorin
5271518e4f workstation/pidgin: added OTR plugin
...as OTR is used by default in quite a few clients by now.

Suggested-by: Erik Palvanov <erik@tonk.ru>
2016-11-10 16:47:10 +03:00
Michael Shigorin
3b60b8abbd workstation/libreoffice: added gnome integration
This was problematic with some builds:
https://bugzilla.altlinux.org/show_bug.cgi?id=31918
https://bugzilla.altlinux.org/show_bug.cgi?id=32320
...but that's been overcome.

Suggested-by: Andrey Cherepanov <cas@altlinux.org>
2016-11-10 16:41:47 +03:00
Michael Shigorin
43137b9f49 basealt.mk: added apt-indicator to workstation
"It's ugly but it's the best we have" (c)
2016-11-09 17:07:37 +03:00
Michael Shigorin
38a9cdfa83 regular.mk: switch kernels for xfce* flavours
xfce goes un-def, xfce-sysv rolls back to std-def:
http://forum.altlinux.org/index.php?topic=36177.msg299141#msg299141
(and Simply 8 is going to use std-def as well,
so for more diversity...)
2016-11-08 20:42:23 +03:00
Michael Shigorin
a340e3a5a0 basealt.mk: Russian by default
...in EFI mode too!
2016-11-07 19:48:00 +03:00
Michael Shigorin
f293239d5b build-vm: try system tar2fs first
It's at least removing the very obvious user->root
attack through (maliciously) modifying bin/tar2fs
and waiting for it to be run; if mkimage-profiles
is installed system-wide as a package, the script
from /usr/share/mkimage-profiles will be tried so
those willing to allow vm/* build to themselves
can provide for a passwordless sudo (as described
in doc/vm.txt) to run a root-only writable script,
not user-writable.

Still not perfect but a step away from the abyss.
2016-11-07 19:47:53 +03:00
Michael Shigorin
f39890cb7c regular.mk: xfce{,-sysv} tweaks
xfce flavour is updated according to the previous commit.

xfce-sysv makes no use of xfce-polkit,
and _nmconnect group is rather helpful instead:
http://forum.altlinux.org/index.php?topic=36177.msg298424#msg298424
2016-11-07 19:47:35 +03:00
Michael Shigorin
cabaf137bc x11: xfce tweaks
It turns out that -regular pulls in too much
(including xfce-polkit that doesn't work with
sysvinit); let's provide means to have it both
ways, need xfce4 4.12-alt5 or later metapackage
for this change to be effective.
2016-11-07 18:17:12 +03:00
Michael Shigorin
db3da22457 init: sysvinit+NM support
The issue at hand it _nmconnect group that's supported
in ALT NM for polkit-less cases; it has to be added
*before* 50-users hook from deflogin feature fires off.

The existing systemd-related hook has been renamed
to reflect its job better.
2016-11-04 23:21:30 +03:00
Michael Shigorin
734b04f16f deflogin: added target to use NM with sysvinit
Our NetworkManager will lend the knobs to those
in _nmconnect group, thanks sem@.
2016-11-04 19:17:55 +03:00
Michael Shigorin
42730a7da3 basealt.mk: exclude chromium from livecd
It's added to installed system and pulling 200+ megabytes into
LiveCD isn't going to help the image size; the practical limits
being tested by that were 3.0 Gb x86_64 ISO making it impossible
to fit RW partition onto 4 Gb USB Flash ("1 Gb free" test added)
and booting it on a 2 Gb RAM system without "lowmem" option would
fail on ~95% of squashfs-to-RAM loading process or so.

TL;DR: one browser in a *LiveCD* should be still enough these days.
2016-11-03 17:45:34 +03:00
Michael Shigorin
0dd098572c workstation: rehash GOST related bits a bit
cryptopro-preinstall is now an optional checkbox,
and openssl-engines (including GOST one) goes to RPMS.main.
2016-11-03 17:15:56 +03:00
Michael Shigorin
afcc8c8521 workstation/3rdparty: add i586-*
Thanks zerg@ for having brought this up back then.
2016-11-03 17:10:52 +03:00
22a95333f9 add UseMTU for systemd dhcp client 2016-11-02 23:46:57 +03:00
Michael Shigorin
91ae336078 basealt.mk: enable fstrim.timer
...to handle #32687 -- tests show that it works for
ext4/SSD, doesn't work (with no observed problems) for
xfs/SSD, and ignores HDD-based filesystems.
2016-11-02 21:39:26 +03:00
Michael Shigorin
393f9a7d0b rescue: add nfs-utils
Even base rescue images should get mount.nfs and rpcbind.
2016-11-02 18:16:08 +03:00
Michael Shigorin
368755cff0 basealt.mk: a few more packages
I've been personally missing these either in a few scenarios!
2016-11-01 20:25:34 +03:00
Michael Shigorin
244984e4fc basealt.mk: a few Education-based tweaks
These include packages that have been added to Education 8.1
but missing in Workstation for no good reason so far
(thanks cas@ again).
2016-11-01 20:22:32 +03:00
Michael Shigorin
7d533faa86 workstation/scanning: extend a bit
Provide both tesseract and its Russian langpack
for Workstation; the proper solution would be to
tweak l10n feature to be able to dynamically
configure things like this given languages
to try and support (not easy though).
2016-11-01 20:22:14 +03:00
Michael Shigorin
cb6bf571cb pkg.in: added workstation/3rdparty list/group
These deliver *-preinstall packages (thanks cas@).
Yes, a local sysadmin still needs to actually get
those wares (if they do) but it's less pain when
the libraries needed are in place.
2016-11-01 20:20:38 +03:00
Michael Shigorin
29c575b5fd gear-store-tags 2016-10-31 22:19:04 +03:00
Michael Shigorin
1aaa5285c2 1.1.98-alt1
- preparing for workstation 8.1
2016-10-31 22:18:40 +03:00
Michael Shigorin
0aa3d840f0 basealt.mk: essence of Workstation 8.1
The changes might have been a bunch of one-liners,
these have accumulated though and let these live together:

- add Chromium browser;
- add "LiveCD with sessions" (upon fixing real RO LiveCD mode);
- provide better Bluetooth support out-of-box;
- fixup services (mostly related to "KVM server" checkbox);
- use the renamed "workstation/raccess" pkglist/group;
- demote ClamAV from base component to a checkbox (off by default).
2016-10-31 22:10:01 +03:00
Michael Shigorin
d03838dd2c basealt.mk: update trademark
We don't use BaseALT(tm) for 8.1+ distributions anymore
having standardized on ALT(tm) for good; update strings
accordingly.
2016-10-31 22:09:56 +03:00
Michael Shigorin
73d54d1b91 regular.mk: tweak server-pve a bit
...or rather add the tweaker component so that
less work remains to be done upon installation.
2016-10-31 22:09:56 +03:00
Michael Shigorin
b250253381 rename workstation/{remmina,raccess} (+connector)
These filenames became a bit too specific when
connector got added there too (thanks ekorneechev@
for both creating it and packaging for ALT).
2016-10-31 22:09:55 +03:00
Michael Shigorin
b6e5ea3e17 workstation/kvm: add libvirt
It's advertised as KVM *server* after all (and intended so),
let's at least add the base for that ;-)
2016-10-31 22:09:54 +03:00
Michael Shigorin
e29e932a51 workstation/scanning: upgrade to gimagereader-qt4
This has been proposed by cas@ (actually the change
follows a similar one in Education).
2016-10-31 22:09:50 +03:00
Michael Shigorin
e10598853b mobile+mate: prune superfluous packages
acpi-events-power is clearly unndeed here
(it's rather a distro-level knob), and
powermgmt-base is a bit problematic by now
(e.g. conflicts some of libvirt dependencies
which is a release-blocker for Workstation).

Better options are welcome.
2016-10-31 22:09:46 +03:00
Michael Shigorin
6f0754e129 net-usershares: sync groups with alterator-users
'video' group has been missing compared to /users 10.10-alt1.
2016-10-31 22:09:44 +03:00
Michael Shigorin
e031c486ff pkg.in: added workstation/clamav list/group
This is to get rid of a "useful" component in default installation
but to keep it available for those who might need it for some reason
(like regulatory one).
2016-10-31 22:09:41 +03:00
Michael Shigorin
6b70361b08 rescue+extra: added exabgp
...because why not.
2016-10-31 22:09:41 +03:00
Michael Shigorin
1113ba0f87 rescue+extra: added pdsh, sshpt
How come these multi-host ssh addon utilities were missing??
2016-10-31 22:09:40 +03:00
Gleb Fotengauer-Malinovskiy
e59e1cda26 use/repo: add support modern sources.list format
Old format:
rpm [p7] http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/branch x86_64 classic
New format:
rpm [p8] http://ftp.altlinux.org/pub/distributions/ALTLinux p8/branch/x86_64 classic
2016-10-31 22:09:39 +03:00
Michael Shigorin
0112879c29 services: optimize loop
No use to distinguish between "on" and "off"
each iteration when the resulting files with
differing names should end up identical.
2016-10-31 22:09:38 +03:00
Michael Shigorin
572ba27759 regular.mk: disable gpm by default
...at least for X11-carrying images; vseleznv@ says he's seen
a conflict with libinput resulting in touchpad disfunction.

Reported-by: Vladimir D. Seleznev <vseleznv@altlinux.org>
2016-10-03 22:42:18 +03:00
Michael Shigorin
ed62195694 gear-store-tags 2016-10-03 22:32:01 +03:00
Michael Shigorin
a72584b30d 1.1.97-alt1
- regular tweaks
2016-10-03 22:31:23 +03:00
Michael Shigorin
b43509a54e regular.mk: added dvd+rw-tools
I actually missed these last time I needed to write
an optical media for a test!
2016-09-28 13:26:12 +03:00
Michael Shigorin
d09f92aa75 regular.mk: disable pve-* services by default
These need configuration before starting things up.
2016-09-22 15:27:11 +03:00
Michael Shigorin
30f0d36314 regular.mk: added postfix to server-pve
Thanks shrek@ for reporting.
2016-09-22 15:00:02 +03:00
Michael Shigorin
4130212a23 install2: leave hwmon.ko in place
Spoils nouveau otherwise, see also
https://bugzilla.altlinux.org/show_bug.cgi?id=32340#c6

Reported-by: Sergey Turchin <zerg@altlinux.org>
2016-09-12 18:48:50 +03:00
Michael Shigorin
15f0b520f1 build.mk: added AUTOCLEAN variable
This performs distclean upon successful image build.

Suggested-by: Andrey Cherepanov <cas@altlinux.org>
2016-09-12 18:48:48 +03:00
Michael Shigorin
7dd35b79b2 basealt.mk: added clamav to workstation
...as asked for by aen@.
2016-09-12 18:48:46 +03:00
Michael Shigorin
7970f14b88 initial clamav related lists
Some distros got requirements of "antivirus" software
imposed onto theb by third parties; sigh.
2016-09-12 18:48:46 +03:00
Michael Shigorin
51102047f2 regular.mk: s/seamonkey/palemoon/g
Sad to have to do this but until Seamonkey Project
releases something they don't warn against themselves
our users can't be bluntly subjected to using a *known*
vulnerable browser.
2016-09-12 18:48:46 +03:00
Michael Shigorin
0357923bd9 browser: add palemoon support
...as suggested for the next starterkits since
seamonkey 2.40 is officially full of security bugs
and there's no 2.46 (or whatever stable/plugged)
release available despite the plans:

https://wiki.mozilla.org/SeaMonkey:Home_Page
https://forum.altlinux.org/index.php?topic=37268
2016-09-12 18:48:46 +03:00
Michael Shigorin
cda521618d regular.mk: disable lvmpolld as well
It's just not needed on a LiveCD.
2016-09-12 18:48:46 +03:00
Michael Shigorin
ec7f92c0a5 gear-store-tags 2016-09-12 18:42:02 +03:00
Michael Shigorin
fea8a6a584 1.1.96-alt1
- starterkits-20160912
2016-09-12 12:54:34 +03:00
Michael Shigorin
704978b80b base+xorg: added xorg-drv-libinput
This is required for quite some touchpads as of p8+.
2016-09-06 19:40:42 +03:00
Michael Shigorin
f3a9a210a4 regular.mk: *DISABLE* powertop
...for wmaker and friends as well, not only for desktops.
2016-09-06 19:39:24 +03:00
Michael Shigorin
46e28dad7d regular.mk: enable bluetooth for most DEs
...except TDE due to kdebluetooth problems there; see also:

https://forum.altlinux.org/index.php?topic=37238.msg293595#msg293595
https://bugzilla.altlinux.org/show_bug.cgi?id=32449
2016-08-31 16:00:07 +03:00
Michael Shigorin
85bb96e45b regular.mk: make cinnamon flavour use droid fonts
Related to https://bugzilla.altlinux.org/32457
and https://bugzilla.altlinux.org/32427; thanks cow@.

Suggested-by: <vladimir.didenko@gmail.com>
2016-08-31 15:30:07 +03:00
Michael Shigorin
f7df0f588c syslinux: un-tweak showopts for rescue_fm snippet
This one is related to forensics mode handling in mkimage:
there's a regex that's expecting the old string ending with
hash value, and it stops working when this is changed here
(at least as of mkimage 0.2.18).

So partially undo the change for this particular file to avoid
refind's example menu for regular-rescue.iso (or any other image
involving forensics mode), and hope to revert this commit some day.
2016-08-23 20:58:56 +03:00
Gleb Fotengauer-Malinovskiy
ac156c1957 ve/ldv: use control/server/ldv feature 2016-08-19 17:55:25 +03:00
Michael Shigorin
ed1c73b173 syslinux: tweak showopts
This keyword was misused due to the lack of understanding
of its meaning; thanks zerg@ for the hint, let's hide the
kernel boot parameters not expected to be modified by user
under the hood (and vice versa in some cases).

Note that this is just a keyword shift in all cases
but mediacheck where "showopts" is now added.

NB: this keyword is only relevant for gfxboot.
2016-08-19 14:01:04 +03:00
Michael Shigorin
8b186a6312 gear-store-tags 2016-08-15 18:15:24 +03:00
Michael Shigorin
ac42367f2b 1.1.95-alt1
- s/basealt/alt/g
2016-08-15 18:06:19 +03:00
Michael Shigorin
8a77faa3fc regular.mk: *disable* powertop
First I thought leaving it enabled for some images might be good
for testing but someone has asked if it's going to be fixed
in regular-kde4.iso:

https://bugzilla.altlinux.org/32377
2016-08-15 15:04:20 +03:00
Michael Shigorin
d2253de7ab vmguest: add vmware support to "complete" target
'twas somewhat incomplete otherwise,
and these two packages are pretty tiny.

Note that +vmguest is affected too.
2016-08-15 14:09:06 +03:00
Michael Shigorin
a0355f8f7d install2, vmguest: add vmmouse too
xorg-drv-vmmouse should accompany xorg-drv-vmware.

Reported-by: Anton Farygin <rider@altlinux.com>
2016-08-15 14:08:59 +03:00
Michael Shigorin
1f59689b20 basealt.mk: drop workstation/qgis for now
grass (required by qgis-grass <- qgis) results in
"GRASS GIS 7" menu item that just fails:

https://bugzilla.altlinux.org/31954
2016-08-15 13:51:00 +03:00
Michael Shigorin
ced061dc6d workstation/extras: added for 3rd party software
This has been added due to various requests (via cas@).
2016-08-15 13:50:19 +03:00
Michael Shigorin
eca96bc44e regular.mk, p8.mk: drop some corner cases
No need to shorten most of the image names now due to #28271:
"ALT" prefix is 6 bytes shorter than "ALT Linux" and this
changes a lot for these particular names (<= 32-byte long)!
2016-08-15 13:23:34 +03:00
Michael Shigorin
9f0af1d112 p8.mk: s/basealt/alt/g
This is hopefully the final change regarding trademark
related commit "series" tracking change from ALT Linux
to BaseALT and now to ALT; starterkits get this too.
2016-08-15 12:44:35 +03:00
Michael Shigorin
6c352f3d48 regular.mk: disable powertop service
See the corresponding basealt.mk commit for explanation
(basically the superfluous USB autosuspend problem).
2016-08-15 12:33:38 +03:00
Michael Shigorin
af0452dac5 basealt.mk: disable powertop service
It appears to be the culprit for the "mouse fell asleep"
problem due to not-so-careful use of autosuspend against
hardware that doesn't implement that correctly.

Let the disable-usb-autosuspend hack remain though as
those wishing to enable powertop service might be helped
by that (I've seen a Logitech mouse willing to exhibit
this problem even in its presence though).
2016-08-15 12:28:17 +03:00
Michael Shigorin
503f2d00da regular.mk: updated default distro prefix
s/ALT Linux/ALT/gc for the few custom cases too.
2016-08-15 11:53:54 +03:00
Michael Shigorin
106e3a9587 x11: reorganize synaptic/kde affair
Both KDE4 and KDE5 images should carry it this way
according to zerg@; pkglists duplication is not needed.
2016-08-08 15:52:15 +03:00
Michael Shigorin
4a362955bf init: added bash-completion-systemd
...for a "full" systemd target that's been re-aliased
as "+systemd"; please adjust any minimalistic images
to use/init/systemd instead of +systemd.
2016-08-04 17:06:46 +03:00
Michael Shigorin
f1dffda8d5 stage2: added virtio_console
Reported-by: Sergey Bolshakov <sbolshakov@altlinux.org>
2016-07-28 15:57:40 +03:00
Michael Shigorin
f8d1773eaa vmguest: no-op on non-x86 for now
This might be an overreaction but let's handle
non-x86 virtualization on per-case basis.

Thanks sbolshakov@ for the notice.
2016-07-28 15:55:10 +03:00
Konstantin A. Lepikhov
1683636200 features/firmware: add right ucode for Intel
We don't use microcode_ctl anymore.
2016-07-27 14:26:24 +03:00
Konstantin A. Lepikhov
6fc8716acd lists/tagged/e17: update package list
Changes:
- Removed e17-extra-modules package (apt-cache knows nothing about)
+ Replaced xterm by terminology
+ Added ConsoleKit (to make buttons work)
2016-07-27 14:23:53 +03:00
Michael Shigorin
d2fedf6d1e distro.mk: updated default distro prefix
s/ALT Linux/ALT/gc
2016-07-26 17:46:19 +03:00
Michael Shigorin
da4ac35514 *rescue*: moved gpm from extra to base
This has been suggested by imz@ for alt-workstation;
looks sane.
2016-06-29 17:56:30 +03:00
Michael Shigorin
a980f60d37 gear-store-tags 2016-06-27 20:07:47 +03:00
Michael Shigorin
d172c32010 1.1.94-alt1
- workstation
2016-06-27 20:06:23 +03:00
Michael Shigorin
ccd6e171cf basealt.mk: initial release
This has been brewing since April, and is starting to get ready...
2016-06-27 20:05:03 +03:00
Michael Shigorin
40080a18b7 docs: en_US fallback for index.html symlink
It's unfortunate but leaving "upstream" redirector
index.html files without their final target is worse yet;
hope this gets popravleno some day.
2016-06-27 13:50:19 +03:00
Michael Shigorin
3c65c49817 docs: don't pull branding bits in unconditionally
...just do it when actually requested for the main image part.
2016-06-27 13:50:17 +03:00
Michael Shigorin
eae7b38cc0 groups: added `make check'
This one has became direly needed while reworking
Centaurus' pkglists/groups into a tree.
2016-06-27 13:50:15 +03:00
Michael Shigorin
4c2ff13085 cleanup: leave docs/manpages alone
...for those images that can be installed.
2016-06-27 13:50:13 +03:00
Michael Shigorin
137e738cf7 main, metadata, lists: switch to groups2lists()
Now that we don't ignore X-Alterator-PackageList
in pkggroup files these few places referencing
group names as list names have broke; bring 'em
in line through this new and shiny function.
2016-06-27 13:50:10 +03:00
Michael Shigorin
cbbc23edfb image.in: added groups2lists()
NB: PKGDIR might be overridden now so that these functions
can be used within both metaprofile and generated profile
contexts; this isn't clean but I couldn't come up with
anything better so far.
2016-06-27 13:50:07 +03:00
Michael Shigorin
85c1a0f2ea pkg.in: ported several centaurus lists
These mostly come from m-p-d but have been heavily reworked
for the new workstation distro, here's a list of the
typical changes:

- changed X-Alterator-Parent from centaurus-desktop
  to a more fine-grained toplevel entry;
- tweaked Categories for the desktop file (e.g. pidgin);
- packages added or removed (like sane to scanning);
- adapted for m-p's biarch support scheme (see emulators);
- renamed more appropriately (for example, 3d -> blender);
- improved descriptions (e.g. by adding specific product
  names to groups referencing single-package lists).

Several ones were done from scratch.

NB: lists/groups have been moved into workstation/
    and intersynced accordingly.
2016-06-27 13:50:06 +03:00
Michael Shigorin
47d38cb1c1 assumptions.txt: mention REPORTS
It wasn't clear enough what the whole tracing affair is for;
thanks ykos@ for spelling it aloud.
2016-06-16 15:16:31 +03:00
Michael Shigorin
43a495f45b regular.mk: tweaked server-pve contents
A few packages are still missing in p8 metapackage deps,
let's add these here instead of having to install by hand
every single deployment.
2016-06-15 17:58:11 +03:00
Michael Shigorin
97073d16c8 gear-store-tags 2016-06-13 19:06:24 +03:00
Michael Shigorin
18a37af977 1.1.93-alt1
- starterkits-20160612
2016-06-13 19:05:13 +03:00
Michael Shigorin
57aa2732d3 p8.mk: stub server-pve
pve-* packages have just hit p8/branch as well.
2016-06-10 18:39:55 +03:00
Michael Shigorin
d3f54dbdce regular.mk: initial server-pve
This one includes shrek@'s work on proxmox packages
ported to ALT Linux (pve-*) and might be incomplete yet.
2016-06-10 18:39:51 +03:00
Michael Shigorin
a65cbc7fa7 sound/base: add alsa-set-initial-options
...to deal with zero ALSA mixer levels out-of-box.
2016-06-10 11:05:57 +03:00
Michael Shigorin
2e1a5d5915 desktop+lxde+extra: mention deadbeef-incomplete
...instead of bare deadbeef which can't play anything, basically.
2016-06-10 11:00:13 +03:00
Michael Shigorin
8be5b8d476 install2: add xorg-drv-synaptics
This has been spotted by rider@ and reproduced by me as well:
some touchpads would work in livecd/installed system but not
within the installer itself.
2016-06-09 11:45:23 +03:00
Michael Shigorin
7f43723503 desktop+regular: added gpart
...for gparted to use for data recovery attempts.
2016-06-09 11:21:39 +03:00
Michael Shigorin
8dc26e0d1c cleanup: fixed GLOBAL_CLEANUP_BASE_PACKAGES
Commit 514652f has broke GLOBAL_CLEANUP_PACKAGES by accidentally
excluding it from export (in favour of GLOBAL_CLEANUP_BASE_PACKAGES
that's been added then); fix that.
2016-06-07 13:47:53 +03:00
Michael Shigorin
a732c4aa58 stage2: more eMMC-related modules
eMMC installation support has a few bugs:

https://bugzilla.altlinux.org/30239
https://bugzilla.altlinux.org/30269
https://bugzilla.altlinux.org/32171

Handle the latest one.
2016-06-03 16:52:52 +03:00
Michael Shigorin
282bf5da18 regular.mk: removed bc dup from xfce-sysv
It's in base+regular by now.
2016-06-01 17:35:23 +03:00
Michael Shigorin
ab6a4c941d server, regular.mk: adjust accordingly
All MAIN_GROUPS users which refer to the groups/lists
renamed have to adapt; sorry for an incompatible change
(still it's 1.1.x).
2016-06-01 17:35:15 +03:00
Michael Shigorin
58a2feffab pkg.in: rename server/tools lists/groups
Make it prefix not suffix so that sorting order
in alterator-pkg is natural instead of chaotic
during installation; turn some implicit "tools"
into explicit ones for consistency either.
2016-06-01 17:35:11 +03:00
Michael Shigorin
928c148f46 gear-store-tags 2016-05-30 21:24:51 +03:00
Michael Shigorin
a6dc910d14 1.1.92-alt1
- server-openstack
2016-05-30 21:10:08 +03:00
Michael Shigorin
9dc1437b58 lists: added a conflict
shaba@ says that compute node role should conflict
with the rest of the roles; OK.
2016-05-30 20:48:44 +03:00
Michael Shigorin
1bf964095f p8.mk: added server-openstack bridge
Unlike back in Dec 2015, we do have p8/branch now.
2016-05-30 18:08:48 +03:00
Michael Shigorin
04be9772da regular.mk: added server-openstack
This has been basically asked for in this forum thread:
http://forum.altlinux.org/index.php?topic=36122

Thanks shaba@ and pauli@ for advice and testing.
2016-05-30 18:08:43 +03:00
Michael Shigorin
44f145a85c regular.mk: distro/.regular-server-base target
This one is intermediate for openstack server too.
2016-05-30 18:06:13 +03:00
Michael Shigorin
0f5b9fbc93 server: use/server/base target
This one is a point halfway through use/server/mini
for an openstack server image; made the server-base
pkglist selection more explicit while at that.
2016-05-30 18:06:09 +03:00
Michael Shigorin
03c280260f server: added openstack groups target
This list has been borrowed from m-p-d's use.mk.in either
and adapted accordingly.
2016-05-30 18:06:00 +03:00
Michael Shigorin
9c755dafef pkg.in: added openstack lists/groups
These have been imported from m-p-d, thanks boyarsh@:

http://git.altlinux.org/people/boyarsh/packages/?p=mkimage-profiles-desktop.git;a=commitdiff;h=ee6f940f6b543cd03e43dbabe66332654cd6f896

...and reworked a bit:
* tree -> flat for representation;
* flat -> tree for implementation.
2016-05-30 18:05:56 +03:00
Michael Shigorin
ffd2a78dd2 {desktop,regular}+tde: use metapackage
Another zerg@'s surprise was the change with amarok,
k3b and ktorrent packages in sisyphus/p8: these have
been changed to use kde4libs/kf5 and KDE3-related
packages have now been renamed to kde3-*.

Handling this without metapackages is more tricky
so do just that.
2016-05-30 13:17:41 +03:00
Michael Shigorin
fa56731d9c cleanup: handle empty variable (ouch!)
This script was completely careless regarding the chance
to meet an empty variable resulting in plain "rpm -qa"
and subsequent attempt to, well, remove *all* packages.

Thanks zerg@ for being persistent this time, even if
he could probably find the culprit and send in this patch.
:)
2016-05-27 16:21:01 +03:00
Michael Shigorin
03bb07b4b0 gear-store-tags 2016-05-23 21:52:56 +03:00
Michael Shigorin
4f1f1fb601 1.1.91-alt1
- nvidia/nouveau rehash
- overlayfs support (lakostis@)
2016-05-23 21:50:50 +03:00
Michael Shigorin
55ab1a485d x11: rework free/proprietary driver support
The problem at hand was that use/x11/xorg has been final,
and zerg@ just couldn't switch from nouveau to nvidia
when kdesktop needs that one.

Initial approach included a "big" FREE/PROP switch that
chose the particular KMODULES/PACKAGES to get added to
THE_* but that fails to achieve e.g. nvidia+radeon combo;
looks like these need individual switches.
2016-05-23 17:30:40 +03:00
Michael Shigorin
07ffce9d05 desktop+lxde+extra: added xscreensaver-frontend
Current lxsession would offer to lock screen but will silently
fail within default regular-lxde.iso environment (that does lack
any kind of X screen lock utility); add some.
2016-05-23 17:30:33 +03:00
Michael Shigorin
73a6e8c2cf regular.mk: explicitly enable powertop for desktop
This is a nice utility clamping default power strain
*and* heat generation on intel-based PCs; I was actually
surprised to see it available but not firing off at system
startup time; fix that.
2016-05-23 17:30:27 +03:00
Konstantin A. Lepikhov
e8f6335734 sub.in/stage2: Added copy-tree to stage2
stage2 only allows to run certain scripts and install packages, but
sometimes one need just to copy something to stage2 (like stage1 does).

How to use:

put files under ./files directory with the same structure as on
resulting image.
2016-05-23 17:30:19 +03:00
Konstantin A. Lepikhov
9f72780d17 Experimental overlayfs support
If aufs not available/broken we could try to use overlayfs.
NB: changes below doesn't work without modified make-initrd-propagator!
2016-05-23 17:30:14 +03:00
Michael Shigorin
388f2d79a2 regular.mk: update gnome3 "setup done" package
See also https://bugzilla.altlinux.org/32040
(there's no P:/O: in the new one so the update
must be done in sync here)
2016-05-16 09:19:33 +03:00
Michael Shigorin
a85e011c68 install2: add tools subtarget
The use case at hand was: "we'd better backup this system
to a flashdrive before installing" (given quad-core CPU
and half-terabyte HDD); pxz is pretty tiny, no worries.
2016-05-13 14:28:29 +03:00
Michael Shigorin
9350393f8f desktop+regular: added sysfsutils
Looks like `alsactl init' needs this now:

http://forum.altlinux.org/index.php?topic=36177.msg285840#msg285840
http://bugzilla.altlinux.org/show_bug.cgi?id=32065
2016-05-05 13:13:39 +03:00
Michael Shigorin
7c07acd203 live.mk: forced to use KMS
The problem is the same as the recent one with server:
FBDEV won't work for no good reason :-/
2016-05-04 14:39:41 +03:00
Michael Shigorin
881ccfe8c2 gear-store-tags 2016-05-03 16:56:11 +03:00
Michael Shigorin
55e0de41a2 1.1.90-alt1
- starterkits-20160429
2016-05-03 16:55:15 +03:00
Michael Shigorin
7d0a863151 fixed regular-server.iso
There were two problems:
- the latest pgsql related groups made installation
  impossible (yes, that last minute change);
- hardware testing shows that use/stage2/kms is now
  requisite as xorg-drv-fbdev might just refuse to work
  with what looks like a perfectly good framebuffer...

Do away with them *quick*.
2016-04-28 15:54:41 +03:00
Michael Shigorin
d7567f3ed8 p8.mk: initial contents
Basically an updated p7.mk.
2016-04-27 18:09:41 +03:00
Michael Shigorin
1032741079 regular.mk: a few more checkboxes to the server
PostgreSQL has been long neglected way too bad in mkimage-profiles
and the actual builds, let's go and fix that!
2016-04-27 16:59:28 +03:00
Michael Shigorin
dd01181e65 pkg.in: added pgsql*-server groups/lists
Pg 9.5 is the current stable version
while 9.4-1C is the current version
patched to run 1C Enterprise.
2016-04-27 16:47:56 +03:00
Michael Shigorin
defda09a2d regular.mk: reworked regular-server a bit
This starts a sort of "server merger" by consuming
both samba4 and hyperv subflavours into checkboxes.

Rationale is pretty clear: environment -- including
hypervisors -- is just an install/run-time variable,
and the set of initial services is another one;
no need to maintain a distinct image for each value
when we've done enough of that to know we can merge.
2016-04-27 14:33:52 +03:00
Michael Shigorin
e2bcc33a53 pkg.in: added hyperv group/list
These are based on regular-server-hyperv
(thanks Matt Lewandowsky yet again) turned
into a mere checkbox.
2016-04-27 14:28:05 +03:00
Michael Shigorin
e7b7e6b05a pkg.in: added sambaDC-server group/list
This is a clone of tagged/server+sambaDC pkglist
with added metadata *and* an installer feature
to make things happen at install time; not sure
if regular-server-samba4 is going away any time
soon though as it's useful standalone too.
2016-04-27 14:26:03 +03:00
Michael Shigorin
07d0cc30b4 syslinux: split 20install2.cfg
"Failsafe install" disabling APIC/LAPIC looks somewhat obsolete
by now; the only reasonable part seems to be the attempt to force
VESA videodriver for the installer (should be done within installer
itself though).
2016-04-27 12:53:09 +03:00
Michael Shigorin
e41be1a0e6 desktop+{cinnamon,enlightenment,kde4}: CK shuffle
Turns out that commit fb4bd77 broke two of the regular builds
by crippling their ability to reboot/poweroff via desktop menu:
http://lists.altlinux.org/pipermail/devel/2016-April/201319.html

Note that kde4 one doesn't need CK indeed.
2016-04-26 13:33:54 +03:00
Michael Shigorin
0c0357ca83 fonts: be explicit about droid
zerg@ tells that Obsoletes: is flakey in fonts-ttf-droid
so it's better to specify these three packages instead.
2016-04-26 11:48:13 +03:00
Michael Shigorin
6aca002099 gear-store-tags 2016-04-25 20:30:13 +03:00
Michael Shigorin
178e3bf24c 1.1.89-alt1
- preparing for p8 starterkits
2016-04-25 20:29:27 +03:00
Michael Shigorin
41efe00554 gear-store-tags 2016-04-25 20:29:00 +03:00
Michael Shigorin
813a84d11c docs: fix thinko
This single-byte error has led to premature variable
substitution thus non-existant "docs-" package being
requested; ouch.
2016-04-25 20:01:16 +03:00
Michael Shigorin
b91216e7d4 live.mk: updated packages for p8
live-privacy haven't graduated from beta status yet
but it's useful anyways; a bit of housekeeping
is due though.
2016-04-25 20:01:15 +03:00
Michael Shigorin
2645cfb053 desktop+enlightenment+e17+extra: drop that glob!!
gst-plugins-* was an /extremely/ bad and ugly idea indeed;
it pulled in every -devel it could.
2016-04-25 19:59:40 +03:00
Michael Shigorin
12e8a4bd0a regular.mk: add firmware-linux to available packages
This is to avoid "unzip.zip" situations with some NICs:
those needing extended firmware package (which is hefty)
can at least install it by hand off the ISO.

*Maybe* a switch to use/firmware will appear reasonable
some day for this image either, don't know yet; this adds
firmware to installer itself (should only be needed if the
storage device used for rootfs *needs* firmware found in
that package as networking setup is omitted from JeOS
installer).
2016-04-21 12:15:34 +03:00
Michael Shigorin
4c4ba35ae6 regular.mk: switch jeos to un-def
Rationale: it's the minimalistic image for those who know
what they're doing, let's maximize their chances to get it
installed and running by using a recent kernel.
2016-04-21 12:11:06 +03:00
Michael Shigorin
143e1038ca regular.mk: rework server{,-ovz}
My failure to recognize that it is a "generic" server that
might need some generalization and not an already specialized
one like OpenVZ HN installer had to be fixed up some day;
today is fine.

Basically, let's move package groups ("checkboxes") and alterator
from server-ovz to server, and maybe beef it up a lil' bit more
later; server-ovz is still far from jeos-ovz but the difference
that looks unmergeable is strict sshd control setup that's going
to bite those unsuspecting, so let's leave it for those of us
who are more suspicious of stray ISOs. :)
2016-04-20 18:47:51 +03:00
Michael Shigorin
d5da95ba72 server: refine server groups
Services and tools are clearly different entities,
and we need tools for a slimmer OpenVZ HN installer.
2016-04-20 18:43:55 +03:00
Michael Shigorin
84bb55d09f syslinux: fix gfxboot hook
...to *not* error out if there's no gfxboot at all.
2016-04-20 16:58:45 +03:00
Michael Shigorin
fb4bd77f20 sound/base: dropped udev-alsa
This pulls ConsoleKit in which isn't even operational by now...

Reported-by: Sergey V Turchin <zerg@altlinux.org>
2016-04-18 16:06:54 +03:00
Michael Shigorin
b214d5c18e vm.mk: fixed thinko regarding lilo arches
A classic brown paper bag bug: this was typed in a hospital
and that commit was a sick one indeed, the condition should
have been the opposite.

Reported-by: Ildar Mulyukov <ildar@altlinux.org>
Closes: #31982
2016-04-15 16:16:57 +03:00
Michael Shigorin
3efa389326 syslinux: fixed RESCUE_BOOTARGS support
"Forensic mode" submenu has fallen apart after the original commit
as the tricky logic in mkimage::tools/mki-copy-efiboot failed to
pick up the new variant; this should all be redone (solo@ has
started doing something but it needs a time-consuming review).

Fixes: 79d0208841
2016-04-14 16:18:30 +03:00
Michael Shigorin
e46b6f3d1e gear-store-tags 2016-04-11 21:38:59 +03:00
Michael Shigorin
004ff14c64 1.1.88-alt1
- pkg.in/profiles
2016-04-11 21:35:44 +03:00
Michael Shigorin
cc9d8c2f53 regular.mk: use/docs/license
This has been requested by Andrey Mitrofanov:
http://www.opennet.ru/openforum/vsluhforumID3/107265.html#162

Putting the image license text into its toplevel directory
is *very* reasonable as it's much more accessible then.
2016-04-11 21:04:38 +03:00
Michael Shigorin
40620fa18d docs: introduced license support
use/docs/license will copy the texts contained in branding
package ("notes" one) over to the image's rootdir so these
can be read with ease; otherwise one has to look up the
right package at best (or unpack squashfs, no user can be
really expected to do that just to *read* a *license*).

This was originally profiles/scripts.d/01-copy-license
script from m-p-d; got cut down heavily.
2016-04-08 14:50:31 +03:00
Michael Shigorin
79d0208841 syslinux: added RESCUE_BOOTARGS support
This one is just like STAGE2_BOOTARGS but for rescue images
(which don't do that one for quite a few reasons).
2016-04-04 13:53:18 +03:00
Michael Shigorin
ae088e3bb0 live: use CLEANUP_BASE_PACKAGES either
See the previous commit for rationale.
2016-04-04 13:05:16 +03:00
Michael Shigorin
514652f8ba cleanup: introduce CLEANUP_BASE_PACKAGES
The problem at hand was that an installer component
of a "DVD class" image does use/cleanup/installer
while installable LiveCD component gets broken by that
(livecd-install -> installer-scripts-remount-stage2
which gets removed as installer-*).

Split those.
2016-04-04 13:05:03 +03:00
Michael Shigorin
33de2428ab live: support livecd-install in 99-cleanupdb too
The same that was done by commit 50bfea9.
Note the duplication, maybe worth to split off...
2016-04-01 16:17:07 +03:00
Michael Shigorin
a2bfcfb135 metadata: tweak list output a bit
Mark the particular pkglists included into what's dumped;
makes content analysis considerably more convenient.
2016-04-01 14:54:33 +03:00
Michael Shigorin
bc03cde15e pkg.in: bail out if anything goes wrong
Failing to kaboom just in time can make (and has just made)
it harder to figure out the culprit down the road; e.g.
metadata target's tar(1) might fail to find *some* files
that haven't been copied over due to a single one missing
by that run.
2016-04-01 14:49:17 +03:00
Michael Shigorin
9d449ed113 metadata: initial pkg profiles handling
Package profiles -- the ones allowing for a multi-purpose
installer -- have been basically overlooked during previous
mkimage-profiles development, unfortunately.

This is the very basic part: put them into pkg-groups.tar.
2016-04-01 14:35:41 +03:00
Michael Shigorin
caf25f0279 image.in: pkg profile handling functions
These are alike to lists/groups ones.
2016-04-01 14:28:04 +03:00
Michael Shigorin
1f13b3a039 pkg.in: initial profiles/
This is to support Centaurus-like images featuring
more than a single installation profile (e.g.,
"workstation/server/minimal").

Quite a few more modifications are needed to do it
right though as m-p has fallen prey to exactly the
"single root composition" assumption with its current
THE_* variables semantics and processing.
2016-04-01 14:25:08 +03:00
Michael Shigorin
39acb23760 efi: shim is a lower level component
THE_* variables serve user needs while shim belongs
to either SYSTEM or COMMON level packages, not needed
explicitly for stage1 though (mkimage will put it there
when needed) so it's just COMMON.
2016-04-01 14:24:50 +03:00
Michael Shigorin
3b97bdb88b lists: cleanup Makefile
DOTBASE variable setup has been superceded by metadata feature
(commit c83cc11); this reference is thus useless.
2016-04-01 14:23:10 +03:00
Michael Shigorin
0d9c1d9110 main: README tweak
...regarding THE_* use.
2016-04-01 14:22:53 +03:00
Michael Shigorin
c58fb96f00 lists: minor tweaks
...following another inspection of m-p-d's centaurus pkglists.
2016-04-01 14:22:48 +03:00
Michael Shigorin
afb547b6d8 install2: introduce stage3 bits
use/install2/stage3 is only needed for distributions
implementing their own installer-*-stage3 package
(e.g., centaurus and simply but not kdesktop).
2016-04-01 14:22:18 +03:00
Michael Shigorin
1287c9b36b kernel: add desktop, laptop targets
This has been borrowed from m-p-d for Centaurus, actually.
2016-04-01 14:22:11 +03:00
Michael Shigorin
b9e3c59c00 firmware: cleanup deps
It's not reasonable for use/firmware/laptop to depend on
use/firmware/wireless as some laptops come without WiFi
cards and wireless userspace to use those is specified
elsewhere anyways.
2016-04-01 14:22:07 +03:00
Michael Shigorin
23f9309aa2 firmware, kernel, wireless: fixup interdeps
It's unreasonable for firmware to depend on kernel,
the features should go in the other way around.
2016-04-01 14:21:22 +03:00
Michael Shigorin
fe3fb88ff6 desktop+cups: initial contents
This might (and probably should) get split into
{base,desktop}+cups somewhere down the road,
maybe when we do print servers again; let's keep
things simple at the moment though, we only need
this for desktop images.
2016-04-01 14:14:19 +03:00
Michael Shigorin
37e55f76d4 desktop+sane: added hplip-sane
This one is required for HP MFP scanners to work;
note that setup is still quite peculiar (via cups/hpaio):
http://lists.alioth.debian.org/pipermail/sane-devel/2009-February/024117.html
2016-04-01 14:10:25 +03:00
Michael Shigorin
3d9a50ba28 init: re-rework de-systemd-ization
This partially reverts commit 30d3838: trying to use/rescue
with e.g. distro/simply results in conflict between SysVinit
and systemd-sysvinit; INIT_TYPE had to relation to RESCUE_LISTS
in the first place.  Ugh.
2016-03-25 19:27:25 +03:00
Michael Shigorin
1ccdc90a3d pkg.in: more --parents
This cp(1) option has been employed already but just for the lists
(and still incomplete as it didn't cover the names coming through
groups mechanism); thanks sem@ for trying out groups/simply/*,
failing to build an image and reporting the problem.

Reported-by: Mikhail Efremov <sem@altlinux.org>
2016-03-25 16:59:28 +03:00
Michael Shigorin
d053375ee2 x11: change kde5 metapackage
...from "big" to "maxi" as per zerg@'s proposal.
2016-03-25 14:22:20 +03:00
Michael Shigorin
27c912ed0f vm.mk: don't install lilo for non-x86
...as it's x86-specific.
2016-03-15 09:37:00 +03:00
Michael Shigorin
4b0121d2ab p7.mk: add jeos-ovz
The forgotten commit: it's not the "official" target
but one of the worthy "beta" ones, let's still do it.
2016-03-14 19:14:04 +03:00
Michael Shigorin
ee24e9e79f gear-store-tags 2016-03-14 19:02:38 +03:00
Michael Shigorin
44736c0b5c 1.1.87-alt1
- starterkits-20160312
2016-03-14 19:01:47 +03:00
Michael Shigorin
87fcd251e0 regular.mk: switch to volumes-profile-regular
This one has took long in thinking it over,
and it is definitely still not perfect;
hope that better than we had before.

https://lists.altlinux.org/pipermail/smoke-room/2016-March/062275.html
2016-03-12 02:28:10 +03:00
Michael Shigorin
304f548b8d base+regular: added bc
This turned out to be requisite for volumes-profile-lite
which sat there silent about that (#31877).
2016-03-12 00:17:19 +03:00
Michael Shigorin
b11dc7a7e6 regular.mk: use/vmguest to disable extra services
...when installing in a VM; this adds no extra packages.
2016-03-11 23:49:04 +03:00
Michael Shigorin
c7da08282b vmguest: learn to disable useless services under VMs
This has long been a TODO item but an elegant solution
just didn't come until the night before starterkits...
some services (mostly those operating on real hardware)
do not fit virtual environments at all, won't even start.
2016-03-11 23:49:01 +03:00
Michael Shigorin
92ff0b779b regular+server: added quota
This is a pretty useful package on a typical multi-user server indeed.
2016-03-11 21:31:30 +03:00
Michael Shigorin
d08d0f6a44 regular.mk: added fonts-ttf-levien-inconsolata to kde4
Let's still provide this font package with at least one flavour;
kde4 is both quite large and paying some special font attention.
2016-03-11 17:13:41 +03:00
Michael Shigorin
01e2938e76 desktop+regular: dropped fonts-ttf-levien-inconsolata
Turns out that this package made cinnamon's terminal mix up
font glyphs (latin ones would appear vector ones from it,
and numeric ones would come from a fixed bitmap font).

Any additions should make the set better so if any particular
image degrades we'd better fallback and regroup.

PS: boyarsh@ tells that this well might be an infinality problem.
2016-03-11 16:49:51 +03:00
Michael Shigorin
c2fb322228 browser, slinux/network: upgrade java browser plugin
There's no more 1.7.0 browser plugin package in sisyphus,
move on to 1.8.0...
2016-03-11 16:34:44 +03:00
Michael Shigorin
51db8e5e0c regular.mk: move "vga=0" into base jeos target
It's not only related to jeos-ovz but also to jeos
it seems (even if more fixing is clearly needed in
sisyphus case as e.g. radeon driver might still
refuse to work).
2016-03-11 00:04:51 +03:00
Michael Shigorin
438df49af0 cleanup: drop autologin-sh-functions too
This one has been introduced by alterator-users update;
makes no sense on its own, just drop.
2016-03-10 21:24:28 +03:00
Michael Shigorin
1ab8f507b7 p7.mk: tweak ISO volume ID
The default "ALT Linux IMAGE_NAME/ARCH" turns into
"ALT Linux altlinux-p7-FLAVOUR/ARCH" which is both
redundant and prone to hitting the ISO9660 volume ID
length limit of 32 bytes (see also #28271).
2016-03-10 21:23:09 +03:00
Michael Shigorin
f2a25425dc regular.mk: server-hyperv: disable more services
It'd be better yet to avoid installing hardware-related
packages for a purely VM-targeted distro but it'd require
some more intermediate forking; while its objectives do
include reasonable minimalism it's not as ultimate as for
jeos images, thus let's keep some superfluous services
around (but disable them).
2016-03-10 19:20:02 +03:00
Michael Shigorin
07ed1b34d9 regular.mk: add H.264 support to desktop images
This is the actual implementation of feature request by mvk@.
2016-03-10 19:01:53 +03:00
Michael Shigorin
a11384edc1 browser: add use/browser/firefox/h264
These packages have been suggested by mvk@ to enable H.264 support
when no flash plugin is shipped (most likely for security reasons).
2016-03-10 18:55:57 +03:00
Michael Shigorin
e4384c1c42 net-eth: bumped DHCP_TIMEOUT from 3 to 7
This has been requested by Balbes so as to avoid premature
DHCP timeouts with some gigabit networks; see also
http://forum.altlinux.org/index.php?topic=36495.msg281385#msg281385
2016-03-09 18:24:58 +03:00
Michael Shigorin
16f1a75a10 desktop+regular: added userpasswd
I've read about it while working on http://altlinux.org/upstream page
and thought that providing it within ALT Linux Regular/Starterkits
project builds would be reasonable (upon having checked it of course).
2016-03-04 15:13:53 +03:00
Michael Shigorin
0402716918 regular.mk: use "vga=0" for jeos-ovz instead
regular-jeos-ovz with "xdriver=vesa" might still fail
where "vga=0" would chug on.
2016-03-03 16:23:45 +03:00
Michael Shigorin
d3d3920c2b Revert "desktop+lxqt+extra: added KF5 translations"
This reverts commit 7017d1ef16:
kf5-i18n-* got misnamed, these are actually plasma5-i18n-*
(as explained by zerg@ now).
2016-03-03 13:43:46 +03:00
4ff27b6a25 use use/net-eth/networkd-dhcp for vm/systemd-net 2016-03-02 07:39:26 +03:00
2271b03445 add use/net-eth/networkd 2016-03-02 07:38:58 +03:00
Michael Shigorin
5ea3f714aa net-eth: systemd-networkd configuration support
shaba@ asked if it's feasible to extend 50-net-eth
with a generator for systemd-networkd style configs
having provided examples; here it is (depends on
/etc/systemd/network/ being packaged into that one).

(fixed up by shaba@'s removal of superfluous quotes)
2016-03-02 07:38:47 +03:00
b7901e580d add vm/cloud-systemd and vm/cloud-sysv profiles
(amended with a later fixup)
2016-03-02 07:35:38 +03:00
43b8835922 add qemu-guest-agent to vmguest kvm 2016-03-02 07:28:21 +03:00
9526477124 - add virtio modules to initrd
- add output to console=ttS0 for run in cloud
2016-03-02 07:20:22 +03:00
ad4bffe965 enable service network for etcnet and NM, not for systemd-networkd 2016-03-02 07:20:22 +03:00
fd4cb2a30d add distro/server-mini-systemd-networkd 2016-03-02 07:20:22 +03:00
Michael Shigorin
3da8d84a42 gear-store-tags 2016-02-29 22:38:45 +03:00
Michael Shigorin
aaed3a8308 1.1.86-alt1
- junior
2016-02-29 22:38:22 +03:00
Michael Shigorin
33aad6ce66 spec: add doc knob
This one is both by Leo-sp50's request and within
BOOTSTRAP commits' vein: do here what I do there.
2016-02-29 22:36:26 +03:00
Michael Shigorin
dda5cc71a1 education.mk: speak Russian by default, care for VMs
The former is part of requirements for this distribution,
and the latter is part of expectations.
2016-02-29 21:49:36 +03:00
Michael Shigorin
b5900acbe3 slinux: use lightdm and installer fonts
gdm2.20 seems rather obsolete by now, let's move on;
and m-p doesn't just lump a huge bunch of stuff in,
vector fonts for installer are requested explicitly.
2016-02-29 21:49:33 +03:00
Michael Shigorin
6047c71440 simply.mk, slinux: optimize for reuse
...by moving reference to a package list that *deducts*
packages from a feature (that should lend itself for reuse)
to a particular distribution's configuration (that can have
some specific polish).

The problem was that basing junior on slinux feature while
adding some KDE/Qt-based packages to it failed miserably
in a hard-to-debug manner: adding every package that's been
requested but not installed by hand suddenly made it build,
see also http://altlinux.org/mkimage/debug [ru]
2016-02-29 21:49:06 +03:00
Michael Shigorin
3c4bc85f9a make education-junior build *and* install
Removing packages in a feature's pkglists that seemed to be
reusable caused to have been a disastrous idea; fix that,
and let the distro-specific bits care for particular removals
(if these are still needed with m-p).
2016-02-29 21:49:02 +03:00
Michael Shigorin
a24f36325c slinux/xfce: drop line noise 2016-02-29 18:54:37 +03:00
Andrey Cherepanov
fac227f367 add Education Junior (target education-junior)
Based on ALT Linux School 7.0.5 Junior and Simply Linux target:
- simplify rules
- use list with educational software missing in Simply Linux
- fix Simply Linux build on Sisyphus
2016-02-29 18:52:59 +03:00
Michael Shigorin
8de05d9abc desktop+xfce: just use regular subpackage 2016-02-29 18:47:15 +03:00
Michael Shigorin
2b22350f28 slinux: drop xulrunner-gnome-support
This got dropped from sisyphus (and upstream) currently.
2016-02-29 18:47:04 +03:00
Michael Shigorin
b2e454333a slinux: do not duplicate branding
docs are pulled in by branding-*-indexhtml which could be
switched through BRANDING variable; hardwiring these asks
for a file conflict.
2016-02-29 18:46:56 +03:00
Michael Shigorin
b190779ef5 desktop+gnustep: gnustep-MusicKit is no more in sisyphus
http://git.altlinux.org/tasks/archive/done/_156/160144/
2016-02-28 23:39:42 +03:00
Michael Shigorin
89f894485c browser: upgrade Java 6 to Java 7
...and Sun JDK to OpenJDK (thx cas@).
2016-02-28 22:23:02 +03:00
Michael Shigorin
f10abd4cf3 live.mk: separate live-flightgear-tu154b target
This one is less documented than FG's default C172P,
let's stick with that for "ALT-FGLive".
2016-02-24 14:50:40 +03:00
Michael Shigorin
c32e91f789 spec: BR: fop instead of xmlgraphics-fop
This has been true for quite some time, and actually recommended by viy@:
https://lists.altlinux.org/pipermail/devel-distro/2016-February/001378.html
2016-02-19 21:40:30 +03:00
Michael Shigorin
51fac3637d ipmi: agetty too
It's needed for SoL, see also
http://altlinux.org/ipmitool
2016-02-19 01:00:13 +03:00
Michael Shigorin
dc3b42d35d regular.mk: added cpio to jeos images
'twas missing in jeos-ovz for me.
2016-02-16 21:02:52 +03:00
Michael Shigorin
b65a2167d6 gear-store-tags 2016-02-15 22:51:53 +03:00
Michael Shigorin
ec23157ead 1.1.85-alt1
- regular-jeos-ovz
2016-02-15 22:50:02 +03:00
Michael Shigorin
3f53a7a3f3 debug.txt: uncosmetic fix
A fellow got confused by the original header somehow,
let's spell this a lil' bit differently.
2016-02-15 21:27:33 +03:00
Michael Shigorin
935d250834 desktop.mk, fonts, install2: explicit installer fonts
mixin/desktop-installer became *quite* inobvious
even for me over time, and it's not easy to grep up;
let's introduce explicit targets where one is expected
to expect those.
2016-02-10 18:01:33 +03:00
Michael Shigorin
522eff5708 README, pkglists.txt: minor fixes
Thanks cas@ and Ivan Khakhaev for feedback!
My docs are clearly not the best in town,
please help bring those into shape :-)
2016-02-10 16:49:17 +03:00
Michael Shigorin
47ffa675d4 install2: cosmetic fix
(missing space)
2016-02-10 15:12:06 +03:00
Michael Shigorin
8ce8ce89cf control: install2 support
rootfs scripts should hit installer some day; the problem
is with variables (dumping 'em wholesale looks dirty,
and proxying those sort of defeats the approach)
rather than with scripts.

Until then, transform the data from the single variable
into a file containing one facility per line for
installer-1.8.31+ to consume.
2016-02-10 15:12:00 +03:00
Michael Shigorin
37ce3f632c regular.mk: force "xdriver=vesa" for jeos-ovz
The issue at hand is that recent xorg has suddenly started
to both depend on kernel modesetting *and* not fail through
towards e.g. vesa driver which would save the day for minimal
environments like installer; I definitely don't want to plug
a pile of DRM modules into this image for just this reason.
2016-02-10 15:11:55 +03:00
Michael Shigorin
2776e07dbd QUICKSTART: tweaked a tiny bit
~/.gitconfig is only relevant when git-core is installed,
no need to put it as a standalone item (turned up when
discussing things with cas@ on the way from #OSEDUCONF).
2016-02-10 15:11:51 +03:00
Michael Shigorin
1c23cf0e7f regular.mk: lock down jeos-ovz as per ldv@'s advice
This is a set of control(8) non-defaults that's recommended
for use with servers of significant security requirements.
2016-02-10 15:11:46 +03:00
Michael Shigorin
1e39ab3a30 control: added some actual ldv@'s settings
As noted in the comment, these include a few quite strong ones:
- sshd(8) will only allow in "wheel" and "users" members
  by keys, no password access is allowed;
- password change even by root is subject to quality checks;
- su(8) is only useful to lower privileges and not gain those
  (so root access is available either through local console
  or via use of ssh keys).

Don't use if frowned upon.
2016-02-10 15:11:41 +03:00
Michael Shigorin
fd0fb5f137 regular.mk: refactored jeos, added jeos-ovz
We've been pruning quite a few packages from a recently installed
altlinux-p7-server-ovz instance; looks like server-ovz's added
functionality should go into plain server instead, and -ovz flavour
should focus on bare metal HN.

In particular, bash-completion-1.99-alt3 seems to misbehave with
mount(8) at the very least -- better drop it for now.
2016-02-10 15:11:33 +03:00
Michael Shigorin
0717417e11 cleanup: add jeos targets
This is based on distro/regular-jeos but torn into two
and somewhat updated for sisyphus-going-to-bring-p8:
1) libcap-ng is now required by util-linux;
2) bridge-utils might be needed for subsequent images.
2016-02-10 15:11:24 +03:00
Michael Shigorin
b1005e5146 ovz-server: split into tagged/{base,server}+openvz
Those packages which are *required* should be available
for standalone use; and those which are optional should go
into extras.

Adjust server feature accordingly.
2016-02-10 15:11:18 +03:00
Michael Shigorin
e208d97f5a gear-store-tags 2016-02-08 23:05:21 +03:00
Michael Shigorin
9ecb784b07 1.1.84-alt1
- %name(7) :)
2016-02-08 23:04:27 +03:00
Michael Shigorin
a40a07253e image.in: cosmetic fix
Bring the stage/step prefix into line for those greppin' through.
2016-02-08 22:52:05 +03:00
Michael Shigorin
094cc85927 spec: install the manpage
%install wants a proper makefile target badly by now...
2016-02-08 22:51:58 +03:00
Michael Shigorin
93f9a2080a doc: added mkimage-profiles(7)
This initial page might lack a lot, don't be shy to blame me!
(thanks ldv@ for having skimmed it through though)
2016-02-08 22:51:55 +03:00
Michael Shigorin
f197b9714c firmware: a trivial tracing fixup
The issue with these "; @:" thinglets is that mkimage-profiles
relies on target tracing (see commit 788cad8 some four years ago);
and this tracing approach relies on non-empty recipes which do call
shell (which gets (ab)used) unlike empty ones which oviously don't.

So this _will_ be traced properly:

    a: b
	@echo "hello world"

and this will too:

    a: b; @:

but this will result in a broken graph with REPORT=1:

    a: b
2016-02-05 09:19:43 +03:00
Michael Shigorin
32e77dc97b regular.mk: added mdadm
...just in case a minimalistic server system
is needed on an actual bare metal host...
2016-02-05 09:19:33 +03:00
Michael Shigorin
7017d1ef16 desktop+lxqt+extra: added KF5 translations
kf5-i18-ru, in this case (of course this should be handled
by a proper l10n subsystem -- yet another use case for it,
just not clear what exactly do we want).
2016-02-03 17:36:32 +03:00
Michael Shigorin
647294f40a x11: tweak kde5 target
icon-theme-oxygen is required by kf5-oxygen <- kde5 <- kde5-big
by now so it's not needed to specify it explicitly anymore;
and zerg@ has just packaged some translations, let's jump in!
2016-02-03 17:34:55 +03:00
Michael Shigorin
a0058e54d4 gear-store-tags 2016-01-25 23:10:19 +03:00
Michael Shigorin
f6d5370e3a 1.1.83-alt1
- openssh 7.x (see also #31716)
2016-01-25 23:04:41 +03:00
Michael Shigorin
4de3463b81 rescue: relax OpenSSH 7 key/algo restrictions
Apparently DH SHA1 key exchange algorithm is still in wide
use at least within Cisco products (there's a real world
case involving our user), and some still use DSA keys
which might be longer than "allowed" yet not trusted anymore.

See also:
http://www.openssh.com/legacy.html
http://bugzilla.altlinux.org/31716
http://altlinux.org/changes (Jan 2016; RU)
2016-01-25 23:04:27 +03:00
Michael Shigorin
ee590934b4 desktop+gnustep: dropped FTBFS packages
These got removed from sisyphus
by cas@' task #156038
due to build failure.
2016-01-19 16:03:19 +03:00
Michael Shigorin
83c2df00a9 desktop+gnustep{,+etoile}: dropped FTBFS packages
These get removed from sisyphus
by sem@'s task #156063
due to build failure.
2016-01-19 16:01:03 +03:00
Michael Shigorin
929fb2f333 live: improve README regarding variables
It's been an old intent to add/move feature-specific
variable documentation into the features themselves,
this might be a pilot project. :-)
2016-01-16 18:45:33 +03:00
Michael Shigorin
1fd6e2d342 {base,desktop}+regular: commoditize smartmontools
Thanks ldv@ for having wondered aloud about
why server starterkits lack smartctl(8);
which is a shame indeed.
2016-01-14 20:23:07 +03:00
Michael Shigorin
37e77285cd stage2: tweak 99-cleanup-boot for efficiency
Thanks glebfm@ for noticing that Simply (an m-p-d product)
takes no kernel inside squashfs but relies on livecd-install's
50-restore-kernel.sh hook to copy the kernel from iso9660
and regenerate initrd (which is a must anyways but requires
System.map to be still around).

This saves about 3 Mb in ISO size for a LiveCD using
kernel-image-std-def-4.1.15-alt1.x86_64.rpm.
2016-01-12 20:10:37 +03:00
Michael Shigorin
837e6be9a7 gear-store-tags 2016-01-11 21:22:53 +03:00
Michael Shigorin
8d3dc12a9a 1.1.82-alt1
- firmwarez
2016-01-11 21:03:13 +03:00
Michael Shigorin
ce544b034e pkg.in/lists: updated server-ovz ones
Got a chance to have a look at your pkglists with ldv@
while setting up a new server? :)

-freeipmi-doc
-mkve
+postfix-tls
+traceroute
2016-01-11 20:57:30 +03:00
Michael Shigorin
97eee80f27 style.txt: avoid merge commits!
Merge commits aren't going to be merged upstream
for these break all sorts of git tools including
log -p, blame, bisect, etc (or make their use less
convenient).
2016-01-10 13:34:36 +03:00
Michael Shigorin
41d2644ebe style.txt: slightly better call for documenting
Sometimes we tend to "just" translate the code to human
which doesn't really help; what usually helps is noting
down what the code author intended to implement or fix,
and what was the case for that.
2016-01-10 13:31:38 +03:00
Michael Shigorin
3b3cf4cc93 QUICKSTART, mktmpdir, build.mk: hasher's /proc
Either /etc/hasher-priv/system or /etc/hasher-priv/user.d/$USER
must contain at least "allowed_mountpoints=/proc" for mkimage
to work for mkimage-profiles; thanks Daniil Golovanov for
providing feedback indicating the lack of the corresponding
checks.
2016-01-10 13:08:03 +03:00
Michael Shigorin
4dfc4417b7 rescue+extra: added jmtpfs
This one is useful for dealing with MTP-compatible
Android devices.
2016-01-03 18:29:08 +03:00
Michael Shigorin
ca8fbf4d04 regular.mk: add qlogic firmware to rescue too
This should have been committed yesterday
(or a year ago, better yet).
2015-12-24 12:07:47 +03:00
Michael Shigorin
0206553ab7 regular.mk: add qlogic firmware to server images
This might go to server-mini but should hit server-ovz as well...
oh well.
2015-12-23 20:34:46 +03:00
Michael Shigorin
1335e4cfd3 firmware: added qlogic target
This has been (tangentially) requested for HP blades:
http://forum.altlinux.org/index.php?topic=36122.0
2015-12-23 20:31:50 +03:00
Michael Shigorin
9758417d42 desktop+sane: added gscan2pdf
Thanks Jeffrey Ratcliffe for reminder:
http://lists.alioth.debian.org/pipermail/sane-devel/2015-December/034185.html
2015-12-15 00:37:43 +03:00
Michael Shigorin
de513c9f3a regular.mk: added a few more benchmarks
unixbench might still come handy, and stream-mem is better
custom-tailored for the task but still beta than nothin'.
2015-12-10 00:46:28 +03:00
Michael Shigorin
0fb879e0f2 base+bench, bench+x11: initial pkglists
These have been partially inspired by inquisitor's
build/altlinux/profile.live/packages collection of
more or less benchmarks/burn-in tools.

Those requiring libX11 won't hit regular-rescue.iso
so let's put them on a file of their own.

And while at that, there are a couple of MPI/IB
benchmarking tools as well.
2015-12-10 00:45:40 +03:00
Michael Shigorin
2b9e2f1a2b security+extra: added hashcat
It's been added to both sisyphus and p7/t7, so why not? :)
2015-12-08 19:05:35 +03:00
Michael Shigorin
4a88029366 gear-store-tags 2015-12-07 21:20:43 +03:00
Michael Shigorin
2784e38b96 1.1.81-alt1
- regular fixes
2015-12-07 20:51:45 +03:00
Michael Shigorin
5fad0e3d95 live.mk: added pciutils to game livecds
distro/.live-games really lacked this for a *long* time,
and asking people for what's their hardware given the
abscence of tools is wrong.
2015-12-07 16:42:10 +03:00
Michael Shigorin
9e03dee41c conf.d/README: be more concise
THE_KMODULES isn't referencing the actual *.ko files
but rather kernel-modules-* packages; it was a bit too
verbose to name *_KMODULES as *_KMODULE_PACKAGES even
if it was more self-explanatory of course, but still
we've got the first victim to that ambiguity.
2015-12-05 22:12:01 +03:00
Michael Shigorin
b50d011ad0 regular.mk: a few netsec tools to the rescue
This one has been triggered by a macchange NMU
speeding through sisyphus-cybertalk@...
2015-12-05 13:32:38 +03:00
Michael Shigorin
457c00b823 stage2, lowmem: update cleanup hooks for qt5
There's /usr/share/qt5/translations/ now too, handle that.

OTOH we've got some CJK support already, time to split up
those "cleanups" into some target locale set dependent form.
2015-12-04 20:58:32 +03:00
Michael Shigorin
5147dd43d8 xorg+misc: drop xorg-drv-multimedia
Not available as of xorg 1.18.0.
2015-12-04 20:07:28 +03:00
Michael Shigorin
d89aefd6b7 base+rescue: added acl
This is a tiny "trivial" package that's useful at times.
2015-12-04 15:55:06 +03:00
Michael Shigorin
efa2b9c8b3 regular.mk, regular+kde4: rosa-imagewriter use extended
It's been proposed to add an image writing tool to all of
the desktop regular builds (which is reasonable).

rosa-imagewriter depends on qt5 that's currently found in
lxqt, kde4 and kde5 flavours only so let's put it there.

imagewriter (the openSUSE's original one) goes to the rest of
DE builds: xdg-su would fallback to gksu if none of the desktops
got "detected", and that means several more megabytes of crap
(completely unneeded in WM-based images I think).
2015-12-04 15:38:08 +03:00
Aleksey Avdeev
58254f05eb install2: Add xorg-drv-vboxvideo
Signed-off-by: Aleksey Avdeev <avdeev@pkcc-tb.ru>
2015-12-03 19:42:46 +03:00
Michael Shigorin
72156f9334 gear-store-tags 2015-11-30 23:44:49 +03:00
Michael Shigorin
08c59ff030 1.1.80-alt1
- pre-starterkit cleanups
2015-11-30 23:44:15 +03:00
Michael Shigorin
12454d7d24 regular+server: add screen
It's been REALLY lacking in server starterkits as of 20150912.
2015-11-30 23:12:21 +03:00
Michael Shigorin
cfdf4dc0cc network+extra: add postfix
It's lacking in server starterkits for no good reason;
if there's another well supported MTA some day that's
challenging postfix as the default in any images,
just drop me a note/commit.
2015-11-30 23:10:57 +03:00
Michael Shigorin
5a1def512b server: add firmware to installers
It's been found out in the field that the lack of firmware
can hurt quite significantly; just add that.
2015-11-30 23:08:02 +03:00
Michael Shigorin
d54e449e75 sysvinit: add etcnet
This is to avoid systemd components getting pulled in
during early dependency resolution stage for no good
reason (see also http://bugzilla.altlinux.org/30806);
should be fixed within mkimage so that hardwiring
both sysklogd and etcnet here gets unneccessary.
2015-11-30 17:17:57 +03:00
Michael Shigorin
547af7bd8a init: drop useless bits
These lines don't effect anything currently due to #30806.
2015-11-30 17:17:08 +03:00
Michael Shigorin
dfed18a5cb Revert "pkg.in/lists/sysvinit: added systemd-services- for remove him as well"
This reverts commit 1c44272f00
which breaks p7 builds with sysvinit emitting this message:

  E: Couldn't find package systemd-services-
2015-11-30 16:50:08 +03:00
Michael Shigorin
41f6e5c820 rescue+extra: added hivex
This package has CLI utilities as well and no X dependencies,
fits ALT Linux Rescue just fine.
2015-11-30 16:50:02 +03:00
Michael Shigorin
bdf15dbd9e desktop+regular: added x11-ssh-askpass
Some regular builds might get their specific ones
but let's provide something for any of those, it's tiny.
2015-11-30 16:49:59 +03:00
Michael Shigorin
21883b057f build.mk: drop an extra space
Spotted when working on http://linuxpiter.ru slides.
2015-11-30 16:49:52 +03:00
Michael Shigorin
cbd0d4d2f5 regular.mk, desktop+regular: use ntp feature
...instead of those two homegrown lines.
2015-11-30 16:49:41 +03:00
Michael Shigorin
df45ac1bca initial ntp feature
This one has been partially implemented for regular builds
but making it generally available seems much better.
2015-11-30 16:49:32 +03:00
Michael Shigorin
514ee63baa gear-store-tags 2015-11-16 22:11:11 +03:00
Michael Shigorin
87c49583ad 1.1.79-alt1
- faked workaround
2015-11-16 22:10:03 +03:00
Michael Shigorin
c388017022 regular.mk: custom VOL_IDs for E-based images
Enlightenment is a long enough word to trigger #28271;
E, on the other hand, is pretty slim to fit that space.

"Volume id: ALT Linux regular-enlightenment/" just isn't
pretty at all.
2015-11-16 21:57:20 +03:00
Michael Shigorin
2d13c05329 regular.mk: move un-def from cinnamon to gnome3
rider@ asked to move gnome3 to un-def kernel flavour,
and there's an unofficial policy for regular builds
that these carry reasonable diversity (in a good sense)
as in various kernels, inits, etc; that diversity would
drop a bit of both GNOME3 based flavours would end up
with the same kernel, so let's mv not cp.
2015-11-16 21:42:50 +03:00
Michael Shigorin
5427f3afdc image.in, stage2: reworked TCB fixup hook
The issue at hand is that:

/etc/tcb/USER/shadow gets USER:auth ownership (OK);
/etc/tcb/USER/shadow- backup file is root:root (broken);
/etc/tcb/USER/shadow.lock file is also root:root (broken).

This is observed for all pseudousers created by package installation
process within working chroots as well as for users created by deflogin
feature; the problem is that e.g. echo USER:PASS | chpasswd will break.

Looks like the cuplrit might be fakeroot/faked.
2015-11-16 20:24:25 +03:00
Michael Shigorin
e02d0cf9f1 regular.mk: added winbind to disabled samba4 services
Samba 4.x in domain controller mode works with "samba"
service, not legacy smbd/nmbd/winbindd; all of those
must be stopped before running the newly-configured one:
http://altlinux.org/SambaDC
2015-11-16 17:36:27 +03:00
Michael Shigorin
fb9f3884de base+desktop+live, network+extra, server+network: added nfs-utils
Ensure NFS client support in distributions with these pkglists:
https://bugzilla.altlinux.org/31498
2015-11-16 16:01:21 +03:00
Michael Shigorin
79b92db55d stage2: mv use/stage2/cifs{-install,}
This has no users in master but out-of-tree branches might need
a trivial update.

The rationale is that it's actually for *any* stage2 and not related
to specifically "install" at all (otherwise it should have been moved
to install2 feature altogether).

Note that there's no reason to add nfs-utils similarly as make-initrd
requires kinit-utils which includes its own nfsmount.
2015-11-16 15:48:33 +03:00
Michael Shigorin
256bd90f20 base+regular: added nfs-utils
All regular images (except for jeos) should be able to work with
or install via NFS, and nfs-utils dependency is finally being
removed from the package carrying mount(8):

https://bugzilla.altlinux.org/31498
2015-11-16 14:52:23 +03:00
Michael Shigorin
0dec1c14ee QUICKSTART: mention BUILDDIR
Some people might end up with setup that leads bin/mktmpdir
to accept e.g. tmpfs on /tmp but that's not enough to build
a larger image (e.g. 2 Gb RAM); let's quickly hint that it's
not the only way to go :-)
2015-11-15 22:25:12 +03:00
Michael Shigorin
073c65efb7 regular.mk, desktop+regular: commoditize gparted
Done due to Balbes' (quite reasonable) suggestion
to do so for all of the installable regular builds
as changing disk partition layout is better made
with the proper tool.

Drop qtparted from lxqt pkglist as it's broken :(

See also (in Russian):
https://forum.altlinux.org/index.php?topic=35681.msg269732#msg269732
2015-11-12 11:16:47 +03:00
Michael Shigorin
4bcc0bbd1d rescue+extra: added afpfs-ng
It's an Apple Filing Protocol client, reportedly with
its own share of problems but working with at least some
AFP versions.
2015-11-10 20:49:47 +03:00
Michael Shigorin
fe6d3d6288 gear-store-tags 2015-11-09 20:37:08 +03:00
Michael Shigorin
c1be1d5bcb 1.1.78-alt1
- regular-enlightenment
2015-11-09 20:36:41 +03:00
Michael Shigorin
16aa4dbcef base+smartcard: added pam_p11
This is what Aladdin folks asked for.
2015-11-09 20:31:45 +03:00
Dmitriy Khanzhin
1c44272f00 pkg.in/lists/sysvinit: added systemd-services- for remove him as well 2015-11-08 17:00:06 +03:00
Michael Shigorin
7e29ad9c18 regular.mk: updated server-samba4
Adjust accordingly to the pkglist having been renamed.
2015-11-06 19:01:02 +03:00
Michael Shigorin
e1721ddec7 server+sambaAD: renamed to server+sambaDC, pruned
samba-DC-4.3.1-alt1 package set introduced task-samba-dc metapackage,
let's use that one while still carrying around what's missing there
and got collected here.
2015-11-06 19:00:43 +03:00
Michael Shigorin
3014fde9fd regular.mk: enable ntpd for desktops
...if any (and there should be some now).
2015-11-03 18:13:17 +03:00
Michael Shigorin
d437a3e971 desktop+regular, regular+tde: commoditize NTP support
It's just wrong to see arbitrary time when LiveCD gets booted,
sem@ tells he runs openntpd in Simply; let's do the same.
2015-11-03 18:13:16 +03:00
Michael Shigorin
d5d5377079 desktop+lxqt+extra: disable arandr
It's a GTK utility, in contrast to the rest of LXQt;
and looks like it's not that needed anymore with
better native display setup (if anyone does prefer
arandr in this particular image, drop me a note).
2015-11-03 18:13:14 +03:00
Michael Shigorin
fd1044d540 regular.mk: move lxqt to sddm
lxqt-lightdm-greeter is finally *really* deprecated,
LXQt's build system has changed enough to warrant its
FTBFS without the same changes.

Note that this won't cut it for p7 starterkits anymore.
2015-11-03 18:13:12 +03:00
Michael Shigorin
8fc08068f3 x11-autologin: updated sddm case
Looks like "LXQt" session type is broken for
sddm 0.12.0 with lxqt 0.10.0 while "lxqt" one
is fine; so be it.
2015-11-03 18:13:11 +03:00
Michael Shigorin
fb1781a4c9 regular.mk: added wmxkbru to wmaker
This one has been suggested by YYY:
https://forum.altlinux.org/index.php?topic=35623.msg268496#msg268496
2015-11-03 18:13:09 +03:00
Michael Shigorin
8b35dcc48a regular.mk: e19 -> enlightenment
The packages have been renamed quite some time ago indeed,
and dancing image URLs don't help a lot.
2015-10-29 16:56:47 +03:00
Michael Shigorin
708cc4fc4b x11: e19 -> enlightenment
The packages have been renamed quite some time ago,
no need to introduce artificial multifurcation.
2015-10-29 16:53:21 +03:00
Michael Shigorin
35dd7ece35 regular.mk: added flashback session to gnome3
This one adds a "classic" GNOME2-like session;
one needs to select it by hand though, and gdm
won't bother them with a selector "gear" widget
unless there's a password set for the user.

Thus no autologin without explicit session
specification seems possible so far.

Note that there's no way to have gdm without
gnome-shell currently.
2015-10-29 16:15:00 +03:00
Michael Shigorin
4534ca313b init: improve systemd debug facilities
The "best" "feature" of systemd "init system" has just
emerged once again: it will happily sit there idling
given startup or shutdown loops resulting in what looks
like a hang to an unsuspecting user; let's provide the
suspecting one with at least some tools described at
http://www.freedesktop.org/wiki/Software/systemd/Debugging
2015-10-20 14:18:18 +03:00
Michael Shigorin
80448ae1bf gear-store-tags 2015-10-19 23:43:39 +03:00
Michael Shigorin
dd8cbc4982 1.1.77-alt1
- webkiosk improvements
2015-10-19 23:43:16 +03:00
Michael Shigorin
206491d078 x11-autologin: nopasswdlogin group for sddm too
See also this somewhat related conversation (in Russian):
https://forum.altlinux.org/index.php?topic=28619.345
2015-10-14 18:50:01 +03:00
Michael Shigorin
b31006e20c live.mk: reduce webkiosk boot noise
Let's try to denoise kiosks a bit (this has been
tested on a project-specific image first)...
2015-10-14 17:29:42 +03:00
Michael Shigorin
37d178800e live.mk: use more of the browser feature
use/browser/firefox/esr was not enough to actually select firefox-esr
as the FX_FLAVOUR handler was simply not getting included (see also
the preceding commit); specify it explicitly.

The future mod might be introducing some "live" flag for that feature
to use it instead of adding livecd-webkiosk-* packages by hand...
2015-10-14 17:21:36 +03:00
Michael Shigorin
4a503294a3 browser: tweak target dependencies
The issue with this was that plain use/browser/firefox/esr
didn't actually pull in the feature as such; it MUST NOT
pull in use/browser/firefox since it will change semantics
from "if it's Firefox make it ESR" to outright "use FX ESR"
(starterkits depend on the former and it was intentional).
2015-10-14 17:04:49 +03:00
Michael Shigorin
ef9b20cd29 rescue+extra: added htop
...so it hits regular-rescue.iso...
2015-10-14 12:59:25 +03:00
Michael Shigorin
3f7d935159 gear-store-tags 2015-10-12 18:47:23 +03:00
Michael Shigorin
33f4fc79ff 1.1.76-alt1
- no more GREP_OPTIONS
2015-10-12 18:43:46 +03:00
Michael Shigorin
5c49535c59 build.mk: get rid of GREP_OPTIONS
It was superfluous in the first place indeed,
and new grep(1) considers the option deprecated.
2015-10-09 16:40:02 +03:00
Michael Shigorin
e37f5e1307 gear-store-tags 2015-09-28 19:34:16 +03:00
Michael Shigorin
1d77e3778b 1.1.75-alt1
- systemd-specific hook for installer (solo@)
2015-09-28 19:32:57 +03:00
Michael Shigorin
1f107fcbd3 regular.mk: font tweaks for test images
Both kde5 and xfce-sysv have received their fair share
of criticism for substandard fonts; zerg@ has proposed
adding droid fonts to the former and someone expressed
their frustration with Terminal fonts in the latter:
http://www.opennet.ru/openforum/vsluhforumID3/104750.html#70

Let's try to make some difference between Xfce based
flavours as well by changing the kernel to a bit more
"bleeding" one as proposed either.
2015-09-24 22:04:32 +03:00
Michael Shigorin
42905a7b5a live.mk, regular.mk: move plymouth to test mediacheck
It was observed in regular-gnustep-20150916-*.iso that
mediacheck boot target sort of starts plymouth bootsplash
when not intended to; let's plug this by moving +plymouth
away to a test image *but* there are couple things with it:

1) supporting plymouth in mediacheck *might* be a good thing
   for distros proper -- this will likely require some support
   on bootsplash theme side either;
2) it's not enough to just drop @bootargs@ from syslinux.cfg
   snippet as the extra payload will still go in to no avail.
2015-09-24 22:04:29 +03:00
Michael Shigorin
bf232c04bf x11-autologin: updated KDE5 session name
s/PLASMA/Plasma/ (thanks zerg@)
2015-09-24 22:04:24 +03:00
Aleksey Avdeev
47f8d6ef1c services: Add systemd-specific hooks
Signed-off-by: Aleksey Avdeev <avdeev@pkcc-tb.ru>
2015-09-24 20:41:39 +03:00
Michael Shigorin
17d9f63a58 gear-store-tags 2015-09-14 21:01:18 +03:00
Michael Shigorin
d5fb22a7f8 1.1.74-alt1
- starterkits-20150912
2015-09-14 21:00:16 +03:00
Michael Shigorin
d2de19e1f3 live.mk, p7.mk: prefer ESR if it's firefox
Both starterkits and live webkiosk images carrying Firefox
are switched to ESR packages by this commit; note that those
images with other browsers aren't affected.
2015-09-08 20:18:29 +03:00
Michael Shigorin
5af8b76db8 browser: introduce firefox-esr support
FX_FLAVOUR variable can be set anywhere to switch
use/browser/firefox to prefer ESR packages, including
the appropriate localization ones.

Note that there's no dependency as it can be set in e.g.
starterkits (still unset in regular builds) wholesale
but shouldn't affect those of them lacking firefox.
2015-09-08 20:11:45 +03:00
Michael Shigorin
8dd2c5d00d im: drop dependency upon l10n
This was wrong as l10n with no LOCALE would result
in "lang=" being added to the boot menu and not
overridden by F2 selection.
2015-09-08 18:07:20 +03:00
Michael Shigorin
dcd8a865e7 desktop+regular, rescue+extra: added ldd-requires
This one has been proposed by antohami@ so as to ease support:
http://forum.altlinux.org/index.php?topic=35274.msg263698#msg263698
2015-09-08 14:54:09 +03:00
Michael Shigorin
b7b3d7b07f desktop+lxde+extra: added notify-osd
This one has been suggested by shadowsbrother@ and restored
in Sisyphus as a lightweight notifyd provider.
2015-09-08 14:52:41 +03:00
Michael Shigorin
29ad239354 regular.mk: added smartcard support
This has been an old TODO item either.
2015-09-08 14:29:07 +03:00
Michael Shigorin
7258e7508a live.mk: added efi/isohybrid to webkiosk images
This has apparently been a TODO item stuck until finding out
whether efi and isohybrid conflict or not; it's been a *long*
time since this has been found out (no conflict) actually,
let's add isohybrid to all of the images as it's completely
free size-wise and efi to chromium image as it's the largest
base one (I don't think that adding any extra functionality
to the already overweight and full of potential and kinetic
security bugs "flash" flavour is a good idea as it would
promote its use among those who need EFI but not Flash).
2015-09-08 11:50:27 +03:00
Michael Shigorin
bcf4c4a265 gear-store-tags 2015-09-07 23:29:08 +03:00
Michael Shigorin
9c075aa2c9 1.1.73-alt1
- im feature
2015-09-07 21:06:04 +03:00
Michael Shigorin
025e611057 mktmpdir: fixed sort key
The sort key field value has been off-by-one apparently,
"6" corresponds to "capacity" field of df -PT output
while the "available" one was meant:

Filesystem     Type  1024-blocks     Used Available Capacity Mounted on
/dev/sda9      ext4     15350768 12799972   1747980      88% /
tmpfs          tmpfs     1967204    27396   1939808       2% /tmp

1              2               3        4         5       6

This lapse has been five years old, looks like it's only
been masked by lower available space limit *and* filesystem
ordering by type so far.  It didn't hit me even now, rather
inspected the code while implementing volumes-profile-starterkit...
2015-09-07 21:01:14 +03:00
Michael Shigorin
881163dcff live: tweak HOMEPAGE
The reason behind this silly patch is that the default URL
can be left alone with no rebuilds neccessary but with the
intranet services delivered through a "captive portal" or
a redirecting proxy; we definitely don't want the canonical
wiki URL, http://www.altlinux.org, blocked by a rule made
for redirecting the default homepage, so let it be another
one which is served but not widely known or linked to.
2015-09-07 19:33:11 +03:00
Michael Shigorin
dde1fe2473 base+smartcard: add PAM module too
pam_pkcs11 is needed for SC-based authentication,
let's carry it as well.

Note that further configuration is still required.
2015-09-07 19:26:48 +03:00
Michael Shigorin
e8e244f74a regular.mk: added templates to gnome3
This has been proposed and largely implemented
by antohami@, see also #30851.
2015-09-06 17:52:49 +03:00
Michael Shigorin
427239601d base+desktop+live: added nano too
gd07e9c3 was apparently not enough to cover regular desktop images...
2015-09-06 17:52:43 +03:00
Michael Shigorin
7e9bf819dd regular.mk: add IM support to some desktop images
Wish this was done before starterkits alpha but still;
here are the preliminary (unqualified) test results:

- cinnamon: OK (vi_VN, zh_CN, ko_KR)
- gnome3: no way to change the hotkey; menu font troubles
- kde4: OK but lacks corresponding localization subpackages
- lxde: OK (vi_VN, zh_CN, ko_KR)
- lxqt: imsettings-xfce somehow gets in (unrequested!)
- mate: unable to change hotkey, applet complains to stderr
- tde: native apps don't recognize ibus input
2015-09-06 17:52:20 +03:00
Michael Shigorin
7f742a8ac2 x11: add IM hints
This makes use of IM_PACKAGES variable processed by
newly added im feature so that DE-specific targets
could tell which DE-specific IM packages they'd like
on a system *iff* use/im has been requested.

Might be lacking right now, to be sorted out with
the actual users.
2015-09-02 16:32:34 +03:00
Michael Shigorin
d773be4dc9 im: new feature
This one has emerged due to request by Chú minh
to add Vietnamese support to LXDE starterkit.
2015-09-02 16:31:42 +03:00
Michael Shigorin
db9615cb9c gear-store-tags 2015-08-31 21:13:34 +03:00
Michael Shigorin
df7a24a965 1.1.72-alt1
- starterkits alpha
2015-08-31 21:13:03 +03:00
Michael Shigorin
adad0d6fa2 regular+server: added fdisk
This was another TODO item based on my own use of this starterkit.
2015-08-31 15:12:03 +03:00
Michael Shigorin
40e776214f rescue+misc: added encled
It's a small python utility to deal with Supermicro/LSI
SAS enclosures via /sys/class/enclosure (got some).
2015-08-31 11:05:54 +03:00
Michael Shigorin
1e0d91b8e4 base+smartcard: purge dirt
Ouch, a dup and both cases of trailing whitespace...
2015-08-25 12:54:09 +03:00
Michael Shigorin
d07e9c37a7 base+extra: added nano
It's a simple text editor quite popular among
debian/ubuntu users for some reason; let's make
it available so that those uncomfortable with
vim(1) aren't totally at loss.
2015-08-14 14:06:13 +03:00
Michael Shigorin
80f9b4ed3b gear-store-tags 2015-08-10 21:03:23 +03:00
Michael Shigorin
d9ad6052e3 1.1.71-alt1
- docs feature
2015-08-10 21:01:42 +03:00
Michael Shigorin
2a29fb1294 added smartcard support pkglists
These should come handy when PC/SC libraries, drivers and
utilities are required.
2015-08-07 16:55:42 +03:00
Michael Shigorin
c83b1f105b image.in, branding: comment fixups
(rather cosmetic changes)
2015-08-07 16:55:34 +03:00
Michael Shigorin
9d77c2d4b3 docs: new feature
This one has been brewin' for quite a while but has been
completed finally; some tweaks sure can come in later but
it's working.

Please note that it's rather needed for "proper" distros
with specific branding and docs packages prepared for those;
one should use l10n feature most likely too.
2015-08-07 16:55:28 +03:00
Michael Shigorin
33f79ccf8a cleanup: a tiny but importand hint
I keep forgetting that CLEAUP_PACKAGES come with
/var/lib/{apt,rpm} purge, gotta do something...
2015-08-04 15:58:59 +03:00
Michael Shigorin
73facd5063 regular.mk: added kde5-telepathy to kde5 flavour
This one conflicts with kde4 so isn't included into
kde5-big metapackage [yet]; just add by hand.
2015-07-23 17:42:05 +03:00
Michael Shigorin
82aa130441 wireless: add rescue support
The "full" target should care for rescue bits as well
(remember that THE_* won't go there); thus regular-rescue.iso
will receive these couple hundred useful kilobytes as well.
2015-07-22 00:32:18 +03:00
Michael Shigorin
31da489243 gear-store-tags 2015-07-20 22:28:43 +03:00
Michael Shigorin
a2a3af0f1d 1.1.70-alt1
- check KFLAVOURS
2015-07-20 22:27:15 +03:00
Michael Shigorin
a277a6cce3 stage2: no kernels no go
The flexible KFLAVOURS handling has a downside:
if no packages match the regexp it's silently OK
until too late, and the error is incomprehensible.
Let's fix the latter at least.
2015-07-11 14:03:16 +03:00
Michael Shigorin
928d7a8188 live.mk, regular.mk: use desktop+sane
I decided that it's worth the added size to sprinkle more
hardware-related packages like SANE throughout the regular
crop so that compatibility tests are easier to do; there's
sane usage in there already, let's port live-gimp over too.
2015-07-03 12:59:03 +03:00
Michael Shigorin
80a9c2a9a0 desktop+sane: it's reused now
There's a rarely-used live-gimp for new GIMP builds
and looks like there's another target now...
2015-07-03 12:58:59 +03:00
Michael Shigorin
fca33ce246 gear-store-tags 2015-06-29 21:32:52 +03:00
Michael Shigorin
0be4f885c5 1.1.69-alt1
- yet another systemd- tweak
2015-06-29 20:38:18 +03:00
Michael Shigorin
155845f468 regular.mk, p7.mk: server-samba4 flavour
The configuration has rather settled down by now
although the actual sisyphus/p7 builds still require
adding custom repositories (this ought to change for
sisyphus but not for p7):

http://git.altlinux.org/tasks/138496/ for sisyphus
http://git.altlinux.org/tasks/132256/ for p7
2015-06-29 20:37:02 +03:00
Michael Shigorin
5b6a8f96d7 regular.mk: rescue uses sysvinit
...now explicitly.

The problem started with systemd being tossed in but was ignored
for some time -- until systemd-221-alt1 gained X11 dependency
through /etc/X11/xinit.d/ script and triggered the libX11 test
that breaks regular-rescue.iso build.

pam_systemd and systemd-services still get in (and can be removed
by hand with nothing else requiring those).
2015-06-29 20:26:34 +03:00
Michael Shigorin
30d38381a3 init: rework de-systemd-ization
It's the very same problem that must be solved within mkimage:
some package lists get expanded early and some late thus having
no chance to influence apt's choices of alternatives made early
(in fact, too early).

Until that, here's another kludge...

PS: turns out that ^systemd- is not "drop ^systemd" but rather:
    systemd-analyze
    systemd-coredump
    systemd-journal-gateway
    systemd-networkd
    systemd-sysvinit
    -- thus one /really/ wants something else.
2015-06-29 20:26:33 +03:00
Michael Shigorin
93c3fbf79b conf.d: further note on SYSTEM_PACKAGES
These _do not_ go into rescue images unlike COMMON_PACKAGES.
2015-06-29 16:35:05 +03:00
Dmitriy Khanzhin
7884fe3bc2 regular+icewm: removed icewm-startup-delay again 2015-06-29 16:31:39 +03:00
Michael Shigorin
db6f0da9fb gear-store-tags 2015-06-22 23:20:09 +03:00
Michael Shigorin
d2fe19c577 1.1.68-alt1
- LIVE_CLEANUP_KDRIVERS actually works
2015-06-22 23:19:32 +03:00
Michael Shigorin
1345c6e041 syslinux: dropped netinstall snippet (useless)
This one was an experimental but the server is long
offline and isn't going back up; remove the obsolete
config snippet, if/when it's done again it's the easiest
part to be restored (the implementation should provide
HTTP/FTP/NFS-publishable deliverables without the need
to extract those from ISO images).
2015-06-22 23:16:50 +03:00
Michael Shigorin
932ba1e24a regular.mk: change xfce-sysv back to std-def
Speccyfighter was upset with backlight breakage:
http://forum.altlinux.org/index.php/topic,34428.msg257036.html#msg257036
-- it's a bug to be sorted out separately, let's not insist.

This reverts commit f02fc7ac1e.
2015-06-22 23:16:49 +03:00
Michael Shigorin
7e549243ef regular.mk: use sysv/polkit for xfce-sysv
See also http://forum.altlinux.org/index.php/topic,34428.0.html
2015-06-16 14:50:26 +03:00
Michael Shigorin
47c1639618 init: added experimental polkit "support"
This one relies on the controversial polkit-sysvinit package
that subverts policykit using well known groups to make it
"work" for things like NM and shutdown helpers.

See also http://altlinux.org/sysvinit and feel free to improve.
2015-06-16 14:49:59 +03:00
Michael Shigorin
f02fc7ac1e regular.mk: change xfce-sysv to un-def
Let's provide some kernel versatility as well
since there are two distinct Xfce-based images.
2015-06-16 14:29:38 +03:00
Michael Shigorin
dc470a58cc regular.mk: added liberation fonts to xfce*
Both Xfce-based images have been falling back to
a completely wrong Monospace font alias implementation
at least for ASCII part which resulted in hard to read
Serif font in Terminal (even if e.g. Cyrillics are OK);
adding Liberation seems to work around this.

Too bad this commit didn't hit the recent starterkits.
2015-06-16 14:25:32 +03:00
Michael Shigorin
b44e602802 deflogin: added sudoers security note
/etc/sudoers is persistent with regard to userdel(8)
so removing a LiveCD user isn't going to drop this kind
of the added privilege and might result in an unintended
grant of those by adding a user with the same name after
permanent LiveCD installation.

This has been spotted by Speccyfighter:
https://bugzilla.altlinux.org/31071
2015-06-16 13:10:41 +03:00
Michael Shigorin
0dfab0cede regular.mk: added a few packages to xfce-sysv
These have been asked for by Speccyfighter:
http://forum.altlinux.org/index.php/topic,34428.msg256990.html#msg256990
2015-06-16 12:45:09 +03:00
Michael Shigorin
3cd7f9832a regular.mk: added xcalib to gnome3
This flavour is known to behave the best on touchscreen
based devices at the moment, let's fit it with the
calibration tool.
2015-06-15 17:03:03 +03:00
Michael Shigorin
b76aa22729 live: implemented kernel driver cleanup
This one is alike to install2's one; it's not a shared rootfs
script/variable though as contexts differ a lot, let's be careful.

The commit has been missing from 1.1.64 somehow, found in patch
series while figuring out why LIVE_CLEANUP_KDRIVERS seems to be
just ignored in live-privacy *after* the massive rebase of that
branch...
2015-06-12 20:39:43 +03:00
Michael Shigorin
7f5d8b8a18 gear-store-tags 2015-06-08 22:51:12 +03:00
Michael Shigorin
5529041fba 1.1.67-alt1
- minor post-tweaks
2015-06-08 22:50:23 +03:00
Dmitriy Khanzhin
3ce162db18 regular+icewm: added icewm-startup-delay 2015-06-08 10:12:23 +03:00
Michael Shigorin
5095b0c40d live.mk: initial rescue-remote
This one has formed off the recent addition to regular-rescue.iso,
namely the feature starting network and sshd upon generating some
random password and setting it as the root one for the (remotely
started) livecd session so that a person operating an IP-KVM/iKVM
would be able to boot off the ISO file via virtual media and then
look up an IP obtained via DHCP and the root password.
2015-06-05 15:17:02 +03:00
Michael Shigorin
18dbadd81c syslinux: introduce SYSLINUX_DIRECT
There's a convention that syslinux configuration snippets
carrying the names of subprofiles involved are picked up
automatically; there were a few special cases already
when this is actually inconvenient, and there's another
one at hand so let's just step up and do it.

NB: this is a sort of a hacky hook though, wish an elegant
    interface would come to mind some day.
2015-06-05 11:13:36 +03:00
Michael Shigorin
1e84c84971 dev: added a line to predefined shell history
This one has been proposed by Oleg Ivanov again,
and more are supposed to come as people use it.
2015-06-05 11:10:53 +03:00
Michael Shigorin
8e3a2d7f0c main.mk: fix the help-related glitch
`make help/distro' would yield a needless complaint
that's been suppressed for `make help' already...

Fixes: f147927522
2015-06-03 13:31:38 +03:00
Michael Shigorin
2e131656d1 gear-store-tags 2015-06-01 23:15:05 +03:00
Michael Shigorin
a78e3b8ce1 1.1.66-alt1
- remote rescue
2015-06-01 23:12:18 +03:00
Michael Shigorin
345375f535 rescue: adjust for rescue-remote as well
The added initscript used to be purged by 98-init-rescue
which has been somewhat overlooked during vain attempts
to build an image that would actually run it!
2015-06-01 20:08:34 +03:00
Michael Shigorin
1258934e75 regular.mk: rescue with remote access and a minute
The goal of implementing rescue_remote was regular-rescue.iso
indeed; so let's both add it and bump the default boot timeout
to 600 deciseconds, that is, a minute: 20 seconds might be way
too low for some slow IP-KVM/iKVM use cases.
2015-06-01 20:08:23 +03:00
Michael Shigorin
54d19238ac syslinux: added 84rescue_remote.cfg
This one provides cmdline arguments for startup-rescue >= 0.24
which would bring up networking and sshd in its turn thus allowing
remote access to the host booted in this mode.

The feature has been asked for by many people including mithraen@
and valintinr@ (and I'd make use of it another day too).

See the appropriate startup-rescue commit description for notes
on implementation; this default set of variable values should be
both useful and illustrative though.
2015-06-01 20:07:57 +03:00
Michael Shigorin
85e9b375e5 security+extra: added pwgen too
apg(1) is already there but let's provide another
well known utility either, habits use to vary...
2015-06-01 12:05:29 +03:00
Michael Shigorin
a0062f0242 rescue+extra: added stress, winusb
These packages have been proposed by valintinr@:
- stress is included in SRCD and was found useful;
- winusb is handy when dealing with legacy OS media.
2015-06-01 10:35:58 +03:00
Dmitriy Khanzhin
f7edad7b65 regular+icewm: added icewm-startup-simple-sound, more themes 2015-06-01 08:25:34 +03:00
Dmitriy Khanzhin
ee14c5b44c regular+icewm: removed deepsolver 2015-06-01 08:25:28 +03:00
Michael Shigorin
e758b41bef server: added k-m-staging to RPMS.main
A recent commit has dropped wireless support from
regular server images; staging modules might still
come handy in some situations, let's keep those in
but not as a part of default installation.
2015-05-31 18:30:21 +03:00
Michael Shigorin
0cdc8a7d77 tar2fs: fixed broken sfdisk use
Yet another age old bug: `sfdisk -l' is mimicking what
a person does by hand but the script is rather interested
in what `sfdisk -g' provides, that is, geometry.

And it's stupid enough to only grok C locale.
2015-05-31 18:08:19 +03:00
Michael Shigorin
1d0d1ceaef regular.mk: shuffle +wireless along
It's all started with glebfm@ wondering why
kernel-modules-v4l-std-def ends up installed
with altlinux-p7-server-ovz.iso; this has been
tossed in by kernel-modules-staging-std-def
which has been requested by +wireless.

WiFi support is nice to have handy when one hits
a wifi-only device and no means to bring networking
up (the infamous "unzip.zip" situation) but it's
a bit too much to force a bunch of extra drivers
specifically known for sub-par or unknown quality
onto everyone installing an ALT Linux based server.

So let's contain that feature to desktop/rescue images
and exclude it from their common base with server ones.
2015-05-31 18:07:01 +03:00
Michael Shigorin
80c34ffad8 regular.mk: moved openscada to regular-tde
It's been added to al of tde-based images
but it looks like LiveCDs make more sense,
and it's the regular-tde.iso that hits both
regular builds and starterkits; let's put it
there and hope it gets spotted appropriately.
2015-05-31 16:52:40 +03:00
Michael Shigorin
c17370daa0 dev: add proposed commands to shell history
This has been suggested by Oleg Ivanov:

http://lists.altlinux.org/pipermail/antique/2015-May/002353.html

...and does make sense; additions are welcome.

Ah, and fix that silly thinko with ~/.zshrc perms while at that.
2015-05-31 16:40:58 +03:00
Michael Shigorin
d75db52aa0 regular+tde: dropped asoundconf-gtk
It pulls in a huge pile of dependencies including
libopenblas -- this should be fixed in repositories
of course but let's do something on our end too...
2015-05-31 15:32:56 +03:00
Michael Shigorin
73c8b983ae base+regular: added openssh-blacklist
It's still recommended unfortunately.
2015-05-31 15:31:17 +03:00
Michael Shigorin
b08f351ff9 regular.mk: disable upower, bluez for tde images
These make no sense as kdebluetooth is officially broken
in TDE 3.5.13 and hal is used for power management.
2015-05-31 15:26:50 +03:00
Michael Shigorin
e007cf958f regular.mk: removed plymouth from tde/sysv images
It's been both somewhat problematic as of plymouth-0.9.x
due to broken rendering and explicitly asked for by asy@
regarding sysv-tde starterkit which makes sense for an
image targeting low-resource systems as well.
2015-05-31 15:19:25 +03:00
Michael Shigorin
8ab5ee5f7f regular.mk: added anacron to regular-sysv-tde
It's been asked for by asy@ and added to available packages,
not to base installation.
2015-05-31 15:16:31 +03:00
Michael Shigorin
6496bcf38d regular.mk: added upower, bluez to desktops
It's been noted by aris@ that the experimental
regular-leechcraft.iso lacks both upower and bluez;
let's try and add those missing to all of regular
desktop images.
2015-05-31 15:04:55 +03:00
Michael Shigorin
283eed21f5 regular.mk: added PA to LCDE
LiveCD would hang with "Initializing Azoth: first stage"
during startup otherwise; see ~/.leechcraft/warning.log
2015-05-31 14:54:20 +03:00
Michael Shigorin
c771420e90 regular.mk: added vzstats group to server-ovz
This is our answer to this VZstats FAQ entry:

  Q: Why is it opt-out rather than opt-in?
  A: We just don't have a good place
     (such as installer or some GUI)
     to ask you for opt-in.

Well ALT Linux got one. :)
2015-05-31 14:49:02 +03:00
Michael Shigorin
3b5217534c vzstats package list/group
This one adds vzstats(8) reporting utility,
see also http://openvz.org/vzstats; it's only
relevant for hosts running OpenVZ, obviously.
2015-05-31 14:47:19 +03:00
Michael Shigorin
2853fd312c desktop+lxqt+extra: added easypaint
A minimalistic paint application, just in case.
2015-05-13 22:30:17 +03:00
Michael Shigorin
f1704f27dd mkimage-profiles.asciidoc: index optimization
The new archdep part has been initially included into
"The Basics" chapter which it doesn't really belong to,
let's move it into Addendum.

NB: I'd better try building a package and skimming over
    at least the index upon having modified docs next time.
2015-05-05 15:58:43 +03:00
Michael Shigorin
c407a89947 gear-store-tags 2015-05-04 23:56:42 +03:00
Michael Shigorin
243d5e373f 1.1.65-alt1
- archdep pkglists
2015-05-04 23:55:11 +03:00
Michael Shigorin
15c75c1092 archdep.txt: these are quotes
Build process would choke on "unescaped" stuff otherwise,
and these blocks should be blockquotes in the first place.
2015-05-04 23:55:11 +03:00
Michael Shigorin
9baf84fa32 regular.mk: initial kde5 flavour
This is known to work using 5.2.2/5.3.0 packages
but is still pretty basic regarding functionality.
2015-05-04 23:20:11 +03:00
Michael Shigorin
86426a0dce x11: initial use/x11/kde5 target
This one relies on kde5-*/kf5-* packages still in heavy
development but the results are starting to work now.
2015-05-04 23:19:54 +03:00
Michael Shigorin
c9c5d4f2cb regular.mk: added regular-leechcraft
An initial draft.
2015-05-02 19:49:40 +03:00
Michael Shigorin
3a155f00da x11: added leechcraft support
This is a single-package DE by now, might change
towards the whole bunch of modules (but then again
might not); see http://leechcraft.org for details.
2015-05-02 19:30:02 +03:00
Michael Shigorin
ac10ec6de0 rescue+misc: added hwinfo, inxi
hwinfo has evaded the lists so far [fixed];
inxi has just been packaged by cas@ [thanks].
2015-04-27 14:02:56 +03:00
Michael Shigorin
ac5dbb4bba pkg.in/lists: archdep suffices for pkglists
This is an initial implementation of architecture dependent
contents handling for package lists more or less in the vein
of mkimage-profiles-desktop's one *but* using suffix part to
filter words in or out *not* prefix part to replace it with
a comment marker (thus filtering out lines).

The syntax should be pretty obvious:

  a b@i586 c@x86_64

will get "a b" given ARCH=i586 and "a c" given ARCH=x86_64;
please see doc/archdep.txt for a more elaborate description
and a conversion script.
2015-04-20 23:09:55 +03:00
Michael Shigorin
f6d2790423 gear-store-tags 2015-04-20 22:54:39 +03:00
Michael Shigorin
50c053fb19 1.1.64-alt1
- modularized stage1 modules list
2015-04-20 22:34:47 +03:00
Michael Shigorin
f9f1437bfe stage1: added ext4.ko to modules
It's been found out that live_rw isn't going to work
without ext4 module being available; let's ensure that.
2015-04-20 22:34:46 +03:00
Michael Shigorin
96574fce54 live.mk: initial live-privacy image
This one has been brewing since last autumn but the need
to cut down the stage1 (propagator) modules has been stopping
the code from showing up in master branch; now that the proper
infrastructure is in place it's there too.
2015-04-20 22:34:01 +03:00
Michael Shigorin
e63c5e9333 live: added use/live/privacy
This target is responsible for providing isolation
of local hard drives and networking from the system
running off the LiveCD/Flash.
2015-04-20 13:35:34 +03:00
Michael Shigorin
71caf44aa3 memclean: new feature
This one is likely to get just a single user right now
but the future potential is clearly higher.

Please do review libzmalloc implementation if concerned.
2015-04-20 13:35:32 +03:00
Michael Shigorin
111ec1d044 stage2: make use of finer-grained module lists
This is sort of laying the ground for the future dismantling
of 10-stage2 (which was sub.in/stage1/modules just recently);
things look like tagged lists might become due some day, e.g.
"net+usb" or "scsi+raid" -- time will tell.
2015-04-20 13:35:31 +03:00
Michael Shigorin
559f80adf3 a few modules.d test drives
These are aimed to test the modules.d/ and auto-pickup
implementation as well as to present an example.

At least 50-net might change (or just get renamed to avoid
auto-pickup) some day as the "net" feature's meaning is
to provide networking upon bootup and these modules are
only needed within stage1 if we're going to netboot;
and that's quite different thing.

armh-cubox bits are prone to get renamed/generalized too
since e.g. ArmadaXP based server images are going to need
this as well.
2015-04-20 13:35:28 +03:00
Michael Shigorin
e139a5e091 stage2: added broken-down module lists
These were produced off the single sub.in/stage1/modules
file using this scriptlet to prefix/annotate the names:

  grep '\.ko$' modules \
  | grep -v / \
  | while read m; do \
  	echo "$(find /lib/modules/$(uname -r)/kernel/{drivers,fs} \
		-name "$m" -printf %P $m $(modinfo -d "${m%.ko}" 2>&1)"; \
    done

...with subsequent sorting and manual separation.

This is meant to be the second stage in monolithic modules
file split, so the lists themselves are largely unmolested
otherwise.  The plan is to further split those into prefix-
and module-specific ones.

Add a note clarifying 10-stage2's status, by the way.
2015-04-20 13:35:28 +03:00
Michael Shigorin
1ee01498d5 stage1, stage2: moved propagator modules file
What was a static sub.in/stage1/modules (and the only one)
is now features.in/stage2/stage1/modules.d/10-stage2
(basically a compatibility file that might go some day).

It will be auto-picked as its name corresponds to the
NN-SUFFIX pattern specified in stage1 subprofile now
with $(FEATURES) going into default STAGE1_MODLISTS.
2015-04-20 13:35:27 +03:00
Michael Shigorin
a36d0236a4 stage1, stage2: initial modlists support
stage1's got prepare-modules target collecting
modules file snippets all over stage1/modules.d/
subdirectories within individual features.

stage2 now adds names of all the features going into
a particular image as snippet file suffix list so that
individual features don't have to register themselves
twice (as a feature and as a propagator modules.d
snippet carrier).

This is going to allow both "uncommon" modules getting
included with no problem (sin@ has wanted cifs ones
for quite some time, for example, and some want e.g.
infiniband modules) *and* to reduce the actual list
below the common mark as well (which is the case with
live-privacy image, for one).

And stage1 memory consumption does matter in some cases
as it's highly critical with no chance to use swap yet.
2015-04-20 13:35:24 +03:00
Michael Shigorin
a2fbe5115a live: move deflogin from use/live to use/live/base
...and split off use/live/.base *without* use/deflogin/live.

There's need for live images without predefined logins
(like e.g. live-privacy image).

NB: this commit might break things for someone, please notify.
2015-04-20 13:35:21 +03:00
Michael Shigorin
90bf3fcaea x11-autologin: added initial sddm support
The unfortunate thing is that we have to take care
for sessions, somehow; still there are only two for now
(LXQt and KDE5 Plasma Desktop) so this doesn't look like
a disaster just yet.
2015-04-20 13:27:51 +03:00
Michael Shigorin
11be62295b x11: added sddm support
Thanks zerg@ for having packaged it finally.
2015-04-18 20:49:58 +03:00
Michael Shigorin
49382b7294 rescue+extra: added mtd-utils
Yet another "how did we miss this?" package
containing ubifs utilities, among the rest.
2015-04-14 10:02:36 +03:00
Michael Shigorin
2a0dc40857 QUICKSTART: minor tweak
It was found out during the "from scratch" walkthrough
over http://altlinux.org/m-p with a new user that the
proposed test build run isn't clear regarding the proper
current working directory (wiki refers to QUICKSTART
copy over at http://git.altlinux.org, and this file has
been written with assumption that it's being read from
within the repository's toplevel directory; the resulting
context isn't consistent in that regard).
2015-04-09 21:20:23 +03:00
Michael Shigorin
f147927522 main.mk: bail out if no image type was specified
e.g., `make distro/icewm' instead of `make distro/icewm.iso'
would be "successful" as there's a corresponding target indeed
but the "success" would just mean building the configuration
without running the actual build.

Thanks cas@ for hitting this issue and reporting it.

PS: note that the initial flagless implementation turned out
    to produce false positives for e.g. `make distclean'.
2015-04-09 21:18:40 +03:00
Michael Shigorin
3cb4d9ae6a introduce QUIET variable
This one reduces the amount of output that's only
interesting when one is actually watching the console
during builds (at least the early stage) -- these tend
to look boilerplate and be useless when inspecting the
output of a large batch build like [[regular]] one.
2015-04-02 20:48:42 +03:00
Michael Shigorin
ec3d40cc1b help.mk, clean.mk: drop __frontend for tty test
The __frontend variable was introduced to address the needs
of alterator-mkimage module: list the images available in
one column, purge the builddir.

Looks like we should consider other cases with redirected
stdout (cron builds, piped calls, etc) like fundamentally
non-interactive and behave the same.

So commit 3a8af6b55d888d25c1d97561ed2ecf37ff28ad71's
description is wrong now; the current cleanup rules are:

- if CLEAN=0 or DEBUG>1, don't do it;
- if CHECK or REPORT is set, don't do it;
- otherwise if at least one of the following conditions is true:
  + there's more than one target being built in a row;
  + stdout was redirected (cronjob, alterator-mkimage...);
  + metaprofile directory is read-only
  ...then do a distclean.

If that doesn't suit your needs, describe the particular
situation please.

Thanks cas@ for wondering aloud whether greppable output
is unsupported with `make help'.
2015-04-02 20:46:35 +03:00
Michael Shigorin
51cb7825dc regular.mk: added xfce4-mixer to regular-xfce-sysv
sem@ noted that it had to be dropped from xfce4-full metapackage
as this package is built on top of gstreamer 0.10 and the API it
uses was dropped from gstreamer 1.0 so it's gonna die some day;
upstream recommends xfce4-pulseaudio-plugin but it's not suitable
to some of us, like Speccyfighter; well let's add the good ol'
plugin to sysv based flavour for now and see how it holds.
2015-03-31 14:33:52 +03:00
Michael Shigorin
f2e77e4417 gear-store-tags 2015-03-30 22:13:53 +03:00
Michael Shigorin
ec8326e739 1.1.63-alt1
- support USB3, ACPI suspend
2015-03-30 22:01:16 +03:00
Michael Shigorin
f1af0aefa1 regular.mk, p7.mk: initial xfce-sysv flavour
This one has been requested by a user over at #altlinux
and seems working, at least when built on p7/branch.
2015-03-29 20:41:35 +03:00
Michael Shigorin
ccbbbede55 test.mk: propagator-test image
This one is a minimalistic one to test propagator
without having to add the debug stanza by hand
as well as to run stage1 build/test cycles faster
(would have helped me understand the recent thinko
with xhci-hcd vs xhci_hcd, for example).
2015-03-29 20:41:35 +03:00
Michael Shigorin
07933f3c60 syslinux: mediacheck should honour bootargs too
...just like any other stage2 based boot target,
both for consistency and specifically for propagator
test image.
2015-03-29 20:41:34 +03:00
Michael Shigorin
b2cfbc3f1f boot.mk: factor out boot/% from distro.mk
Yes these bits are related to distro/ prefixed images
still the overgeneralization in distro.mk didn't pay off
but rather hid a bug with the only boot/isolinux in use
having no dependency on use/syslinux (which is required).

Maybe this will get revisited when we have other kinds
of bootable images with other bootloaders (vm/ ones care
for themselves as of today).
2015-03-29 20:41:32 +03:00
Michael Shigorin
d0228a5380 install2: don't require bootloader just always
Commit 657c0bf has silently added use/bootloader
to the base use/install2 target thus breaking
experimental distro/netinst; it seems better to
require *a* bootloader in the target that's been
specifically designed to cover the common case
(thus linked to by +installer shortcut) but still
to have our base lightweight and flexible.

This doesn't hurt the actual distros as these use
+installer of course.
2015-03-29 20:41:29 +03:00
Michael Shigorin
08d802ab0d stage1: drop dummy.ko
Looks like it's been dumped in along with the rest but not
actually used in {make-initrd-,}propagator; the problem with it
is that snd-dummy.ko matches and pulls a bunch of unrelated
modules where these don't belong (grep -w wouldn't match
snd_dummy.ko though).
2015-03-29 20:41:29 +03:00
Michael Shigorin
bc0f8a45ee stage1: re-add a few modules
These can be found in (semi-)supported branches still:

- loop.ko:
  + 3.0.101-std-def-alt0.M60P.1
  + 3.4.96-led-ws-alt0.M70P.1
- aufs.ko:
  + 2.6.32-el-smp-alt31
  + 3.4.96-led-ws-alt0.M70P.1

ehci_marvell.ko isn't found in contemporary sisyphus/armh
kernels but let's purge it later during archdep rewrite.

NB: libusual.ko has been renamed to usb-libusual.ko as of p6
    (not to be found in p7 anymore), and nls_base.ko was in
    2.6.32 kernels as of p6 but not there in p7; purge these
    somewhere down the road.
2015-03-29 20:41:29 +03:00
Michael Shigorin
09a9255f2f stage1: purge nonexistent modules
This file has been floating around for quite some time,
and some of its contents are pure bit rot by now...

Drop the modules that don't exist as of 3.19.2-un-def-alt1
upon manual diff examination.
2015-03-29 20:41:29 +03:00
Michael Shigorin
71ad34a9bf stage1: fix module name
It wasn't sdhci_pci.ko back in 2.6.32 actually and it's
sdhci-pci.ko; so grep used by mkmodpack won't pick it up.
2015-03-29 20:41:28 +03:00
Michael Shigorin
f112a3358e stage1: add USB3 support
This has been missing for *so* long somehow, and adding some 200k
of modules for fast hardware that's widely available by now
looks like a deal.

Added USB Attached SCSI module just in case (or rather for weak
crc_t10dif symbols?).
2015-03-29 20:41:26 +03:00
Michael Shigorin
a01f4a9f91 live.mk: drop extra services from kiosks
There are a few ones that aren't needed for a one-time
environment off a LiveCD/Flash like a webkiosk; if you
happen to need a text-based kiosk some day, tell me so.
2015-03-29 20:41:24 +03:00
Michael Shigorin
3129d6efcf live.mk: live-0ad draft
This one is based on live-flightgear of course.
2015-03-29 20:41:21 +03:00
Michael Shigorin
bc3b3a2450 desktop+lxqt+extra: use metapackage
clementine-codecs-* looks more appropriate than direct
lowlevel dependency list indeed; thanks cow@.
2015-03-29 20:41:18 +03:00
Michael Shigorin
9f9f32bf4c regular.mk: make use of ACPI suspend support
There's no excuse to miss it now that it's there.
2015-03-29 20:15:31 +03:00
Michael Shigorin
072fefdf3b install2, live: implement ACPI suspend support
The corresponding installer feature had to be updated first
following blkid(8) output format changes, but that's it!
2015-03-29 19:51:17 +03:00
Michael Shigorin
2845c89b48 gear-store-tags 2015-03-16 22:36:02 +03:00
Michael Shigorin
84e514dc76 1.1.62-alt1
- starterkits-20150312
2015-03-16 22:35:53 +03:00
Michael Shigorin
86708edeaf regular.mk: move fonts from gnustep mixin to wmaker one
Shame on me, gnustep mixin is only used in gnustep flavour
while wmaker one is used in both gnustep and wmaker flavours.

So the default serif fonts in regular-wmaker.iso were still ugly.
2015-03-12 02:22:14 +03:00
Michael Shigorin
0cbc959f86 pkg/groups: slightly better names
Consistent case and LAMP the '00s buzzword!
2015-03-12 01:42:52 +03:00
Michael Shigorin
f021e19bc3 regular.mk, regular+tde: be careful with kpowersave
I don't know of [k]powersave interactions with systemd
and the rest of that ilk, let's be cautious and only provide
it for sysv-tde images which have been actually tested
by Speccyfighter who asked for this package.

Can't tell for sure but something seems to break
suspend menu option (hibernate isn't supported in
all of the regular builds/starterkits just yet).
2015-03-12 01:28:15 +03:00
Michael Shigorin
ce8f6dc3cb http-server: drop php5 modules depending on X11
These aren't going to survive use/cleanup/x11 anyways
(and weren't that generic in the first place); let root@
install whatever they actually need later.
2015-03-12 01:21:56 +03:00
Michael Shigorin
b4d704f2c1 regular.mk: rework server images a bit
This refactoring is aimed at both providing reasonable
alterator package set in server-ovz (and server-hyperv)
while purging the install-time modules from plain server
as these were useless without a frontend package like
the web-based alterator-fbi.
2015-03-12 00:39:47 +03:00
Michael Shigorin
719e1d7d0c regular.mk, regular+kde4: move to pkglist
A few more additions proposed by Sluggard:
http://www.opennet.ru/openforum/vsluhforumID3/101671.html#182

...and it seems like LIVE_PACKAGES are asking for a pkglist;
let's switch to THE_PACKAGES for remainder while at that.
2015-03-11 13:41:27 +03:00
Michael Shigorin
bacc1a1793 regular+tde: added kpowersave
...as requested by Speccyfighter:
http://forum.altlinux.org/index.php/topic,34272.msg249405.html#msg249405
2015-03-11 03:05:25 +03:00
Michael Shigorin
4bcbe44245 regular.mk: switched lxqt to connman
It used to run NM without any kind of applet which is
not exactly usable unless it's DHCP over Ethernet there;
provide connman and qconnman-ui (applets on the road).
2015-03-11 02:36:45 +03:00
Michael Shigorin
b6d37f3430 regular.mk: disable bridge service
This has been proposed for server-hyperv by lewellyn@freenode
last summer, looks like a reasonable default for all of the
server images as those interersted in bridge setup are going
to do a few more things anyways.
2015-03-10 13:48:55 +03:00
Michael Shigorin
e09e11b978 regular.mk: switch jeos to its own volumes-profile
This image has been cleaned up somewhat thoroughly
regarding its installed package base but partitioning
has remained poorly generic with swap etc; it's now
been set to use 3/4 Gb as a minimum (to fit 1Gb VMs
or USB sticks just fine) with the only partition
created being root one; those wishing something else
are welcome to go ahead and partition by hand anyways.

See also https://bugzilla.altlinux.org/30024
2015-03-10 13:31:32 +03:00
Michael Shigorin
9b42d4dc54 gear-store-tags 2015-03-10 00:01:02 +03:00
Michael Shigorin
289b292a81 1.1.61-alt1
- EFI_BOOTARGS
2015-03-10 00:00:31 +03:00
Michael Shigorin
c907a4f6e7 regular.mk: purge qt4 from installed server images
It's not use/cleanup/x11-alterator in its entirety
but qt4-core is really *really* not needed there.
2015-03-10 00:00:30 +03:00
Michael Shigorin
2b233fffda regular.mk: allow EFI boot to make/use RW overlay
propagator-20150306-alt1 and make-initrd-propagator-0.25-alt1
have made it actually possible to use resulting LiveCD images
along with USB flash media to achieve data persistence that's
been long available for BIOS boot mode (see also #28289).

This isn't perfect but let's try flipping the switch:
all desktop regular builds are now "live_rw" by default
in EFI mode.

This requires mkimage >= 0.2.17.
2015-03-10 00:00:28 +03:00
Michael Shigorin
8a859a2902 regular.mk: "quiet" down jeos flavour
This image doesn't deign to waste one's time by presenting
them with a bootloader menu and a few other things;
make it even less verbose where not neccessary.
2015-03-10 00:00:26 +03:00
Michael Shigorin
0db031823c desktop+regular: added terminus and inconsolata
Looks like we'd better provide a few really good console fonts.
2015-03-10 00:00:24 +03:00
Michael Shigorin
280efe2a94 desktop+lxqt+extra: added liberation fonts
cool-retro-term 1.0.0 exhibits a bug without these fonts around:
glyphs would be drawn higher than cursor with upper half being
cut off (found out by putting my current crop of font packages
into livecd environment and removing them until the correct
behaviour would get broken).
2015-03-10 00:00:22 +03:00
Michael Shigorin
5bfa0182c2 regular.mk: added xpra and winswitch to icewm
xpra.org and winswitch.org are wonderful applications
helping one working with X11 apps all over the place,
running those on local and remote desktops and servers
with persistent sessions.

These aren't exactly trivial to plan and use but icewm
isn't for newbies either; thus these seem like nice match
for an "X11 thin client" image.

Size addition is ca. 50 Mb as of today which is a lot
but worth it.
2015-03-10 00:00:21 +03:00
Michael Shigorin
13f23357ea regular+icewm: added lftp
This nice FTP/HTTP client has one issue that bars its inclusion
into every regular desktop image: lftp.desktop file that pops up
in menu but only offers an xterm with a CLI-based utility which
feels embarrassing for a casual user unfamiliar with its power.

IceWM users shouldn't be surprised however.
2015-03-10 00:00:20 +03:00
Michael Shigorin
cf374217cd regular.mk: added kde-gtk-config to kde4
...as suggested by Sluggard again:
http://www.opennet.ru/openforum/vsluhforumID3/101671.html#143
2015-03-10 00:00:17 +03:00
Michael Shigorin
ae5141a0ad regular.mk: add gparted to kde4 flavour
This has been suggested by Sluggard at opennet:
http://www.opennet.ru/openforum/vsluhforumID3/101671.html#91
2015-03-10 00:00:14 +03:00
Michael Shigorin
0f75f701fc efi: bridge bootargs into EFI too
It's been missing roughly from the start there :-/
2015-03-10 00:00:14 +03:00
Michael Shigorin
3e1fe68a54 syslinux: update rw to use cdrom method, not disk
The former approach to handling "LiveCD with sessions"
has been to mangle "automatic=method:cdrom" into
"automatic=method:disk,label:ALT*" within gfxboot
so that propagator and make-initrd-propagator would
try and discover/create a filesystem labelled
"alt-live-storage" on a LiveFlash's free space.

Then "live_rw" handling has been unified in
make-initrd-propagator (as of 0.18-alt1) to accept
any of "label" subparameter or "live_rw" argument
to go and create_disk_slice().

Then propagator's cdrom.c has been fixed to actually
try sdX1 before sdX (as of 20150306-alt1).

And now it's all been tested to verify that:
- flash "ro" and "rw" boot is OK
- CD-ROM "ro" boot is OK
- CD-ROM "rw" boot is fine given that there's
  a partition labeled "alt-live-storage" elsewhere

This is a can of worms indeed :-/

References
~~~~~~~~~~
* http://altlinux.org/initrd-propagator
* http://altlinux.org/make-initrd-propagator
* http://bugzilla.altlinux.org/28289
2015-03-10 00:00:14 +03:00
Michael Shigorin
de2dc3e7ab regular.mk: better fonts for gnustep/tde flavours
The problem is URW again (just as in commit ab44f80),
and the workaround is the same either.
2015-03-10 00:00:14 +03:00
Michael Shigorin
fc98316c95 desktop+lxqt+extra: added QCheckers
That's what's been found via "qt game" query with Synaptic
while running a functional testing session upon lxqt starterkit
beta as of 20150305 :)
2015-03-10 00:00:13 +03:00
Michael Shigorin
f511271917 dev: hint regarding hasher repo
It's entirely unclear to an unsuspecting curious user
where the actual results of a proposed example hasher
build end up; that's ~/hasher/repo, just state that.
2015-03-10 00:00:11 +03:00
Michael Shigorin
42a5fa8af2 rescue+extra: (re-)added nfs-server
Is it news or was it missing all the way through?..
2015-03-10 00:00:09 +03:00
Michael Shigorin
7cb477c38a stage2, install2: oops, narrow the cleanup back
The former install2-only "bloated binary" purge script
happened to hit stage2 (which is a lot more than just
install2); a kind of safety net has been stuck into it
to guard installable LiveCDs against this particular
cleanup but seems it was not enought for ildar@ who
reported this problem almost three years after it was
introduced.

This change re-places the script back into install2
section; the binaries in question amount for ca. 8 Mb
(except openssl ildar@ asked about); if these are deemed
unneccessary within any other stage2-based subprofiles,
please step up with details.
2015-03-10 00:00:09 +03:00
Michael Shigorin
0a7c57a5b1 gear-store-tags 2015-03-02 21:30:30 +03:00
Michael Shigorin
c0b74931b5 1.1.60-alt1
- vmguest, install2: refactoring
2015-03-02 21:29:08 +03:00
Michael Shigorin
8cbb7146ea vmguest: fixup vbox targets
use/vmguest/vbox/base used to pull in DRM modules
which are required for vboxvideo but useless without
xorg bits; and all of these aren't needed in jeos.

Things might break, doublecheck please.
2015-03-02 20:07:22 +03:00
Michael Shigorin
937facafab regular.mk: added bash-completion to jeos
It's half a megabyte but useful enough.
2015-03-02 19:26:13 +03:00
Michael Shigorin
c44623ded0 regular.mk: setup repo for jeos too
It's a bit sad to hit a minimalistic environment
with apt knowing no repositories at all...
2015-03-02 19:20:59 +03:00
Michael Shigorin
f611807d36 regular.mk: dedup jeos a bit
use/cleanup/x11 has been extended with commit 122c305,
a few manually specified items can be dropped now.
2015-03-01 23:26:28 +03:00
Michael Shigorin
17bcc73fc8 regular+icewm: added iftop
This nice utility is preconfigured for network monitoring
in default icewm configuration but was missing, unfortunately;
just fix this.
2015-02-27 00:11:40 +03:00
Michael Shigorin
bc2a4025d8 init: use the proper variable for i-f packages
When installer-feature-systemd-stage3 hits BASE_PACKAGES
it pulls install2-init-functions in which is wrong
(one of the consequences is that alterator-browser-qt
lands into even a very basic server installation).

And install2 doesn't even need that package as init feature
carries a script hook that does the same...
2015-02-26 17:36:31 +03:00
Michael Shigorin
b312bc35ae ve.mk: initial ve/systemd-bare
This one has also been asked for by shaba@:
http://lists.altlinux.org/pipermail/devel/2015-February/199510.html
2015-02-25 18:53:47 +03:00
Michael Shigorin
03435a70d0 drop razorqt support (see lxqt)
This project has evolved/merged into LXQt which has been
packaged for both p7/t7 and sisyphus by now, no need to
carry on deprecated bits.

NB: 0.6.x still have it as t6/p6 still bear razorqt.
2015-02-25 15:13:54 +03:00
Michael Shigorin
ec196c4497 regular.mk: re-add extended gnome3 metapackage
...the one actually meant for regular builds.
2015-02-25 12:39:44 +03:00
Michael Shigorin
f3f373b9e3 x11: rollback gnome3 metapackage
The gnome3-regular one adds quite a few megabytes,
let's keep the mid-sized -default for common targets
while moving -regular to, well, regular one.
2015-02-25 12:39:39 +03:00
Michael Shigorin
4033edf208 test.mk: smaller server-systemd
This has been asked for by shaba@:
http://lists.altlinux.org/pipermail/devel/2015-February/199506.html
2015-02-25 12:39:33 +03:00
Michael Shigorin
620c827c5f cleanup: introduce use/cleanup/libs
The installer feature added is a trivial wrapper around
apt-cache nodeps to uninstall the ^lib packages that have
no more dependencies upon those when the temporarily
installed packages like alterator-browser-qt get removed.
2015-02-25 12:39:27 +03:00
Michael Shigorin
b080d40ae9 net: added use/net/networkd
Specifically for the minimalistic systemd-based server image
suggested by shaba@.
2015-02-25 12:39:21 +03:00
Michael Shigorin
f31e392ca4 net, net-eth, regular.mk: introduce use/net/etcnet
This has been simply use/net but it looks like we've got
some people who would like to cope without etcnet, even:
http://lists.altlinux.org/pipermail/devel/2015-February/199506.html

Adjust its usage accordingly.
2015-02-25 12:39:17 +03:00
Michael Shigorin
a211aec73c install2: drop use/install2/kms
This has only been useful for plymouth feature,
and +installer shortcut included this target
for all the wrong reasons as it seems today
(thus blocking the DRM-free server installers,
for example).
2015-02-25 12:39:12 +03:00
Michael Shigorin
1ca7975520 init: add systemd debug target
This one enables a spare shell on tty9 just in case.
2015-02-25 12:39:05 +03:00
Michael Shigorin
30b7a94e9e gear-store-tags 2015-02-23 23:34:35 +03:00
Michael Shigorin
92558ac8ba 1.1.59-alt1
- regular rebase
2015-02-23 23:33:39 +03:00
Michael Shigorin
29327e2b80 features.in/Makefile: avoid spurious backups
This doesn't look like a clean solution, whitelist should be
way more reasonable; still better than dirty builddir though.
2015-02-21 20:12:11 +03:00
Michael Shigorin
aea95968ef build-vm: cleanup the leftover tarball
...unless we're debuggin'.
2015-02-20 19:08:31 +03:00
Michael Shigorin
9c7a33c093 p7.mk: add vagrant bridge
Base vagrant-compatible disk image seems good enough
to have a try at building some public stable sample...
2015-02-20 19:06:57 +03:00
Michael Shigorin
d4b3ccc0e4 vm.mk: don't be shy with thin disk image size
The resulting image size will be less than the specified maximal one
as it's thin-provided with contents taking up what they do.
2015-02-20 19:06:46 +03:00
Michael Shigorin
dee3512dd1 vagrant: oops, some junk left
This authorized_keys file has been downloaded to get incorporated
into a script hook but was looking common enough to be forgotten
during pre-commit feature cleanup unfortunately; fix that.
2015-02-19 21:33:12 +03:00
Michael Shigorin
d281e6fd71 base+regular: added apt-scripts
How did it manage to evade pkglists so far?
These are very useful:

apt-cache list-extras
apt-cache list-nodeps
2015-02-19 21:29:52 +03:00
Michael Shigorin
122c305bc0 cleanup: extend x11-related target
A few more leftover libraries tend to hang around after
purging extra alterator packages that have fired already
during installation stage3; this change might hurt someone,
please do notify if that is the case (OTOH one isn't forced
to use it or to inherit intermediate targets that do so).
2015-02-19 20:04:31 +03:00
Michael Shigorin
a90f36d220 regular.mk: drop alterator GUI from server images
The issue at hand is that some sneaky stage3 alterator modules
seem to have tossed alterator-browser-qt (thus libqt4* and friends)
into base server installations; while this must be solved in within
package base and should be worked around by server feature probably
let's start out with leaf targets.
2015-02-19 16:48:09 +03:00
Michael Shigorin
ab44f800bc regular.mk: add liberation fonts to gnome3
epiphany (or fontconfig?) insists on URW fonts for rendering
webpages like http://opennet.ru which hurts my eyes; looks like
/etc/fonts/conf.d/60-alt-post-user.conf would override these
with e.g. Liberation or Dejavu (with the latter being inferior
to the former, IMHO).
2015-02-18 18:53:39 +03:00
Michael Shigorin
57fa35d504 regular.mk: split off .regular-bare from .regular-base
...so that regular builds really have common ground again,
which is something that got broken with regular-jeos introduction;
adjusted jeos and builder flavours to make use of this.
2015-02-17 20:19:07 +03:00
Michael Shigorin
d6a4f2c7e8 regular.mk: .regular-bare -> .regular-base
...so base is base and bare is freed for a leaner entity...
2015-02-17 19:59:31 +03:00
Michael Shigorin
2c6a37d4a9 regular.mk: .regular-base -> .regular-wm
There's considerable confusion accumulated over the
expansion of regular builds with non-GUI targets:

- bare meant quite a lot including wireless;
- base meant GUI base actually,

so rescue, server, and especially jeos images had to
either cope with the bloat or start from scratch.

Let's fix "base" first...
2015-02-17 19:59:30 +03:00
Michael Shigorin
fdf8baf7a8 regular.mk: drop +vmguest from regular-builder
Looks like QEMU 2.2.0 gets surprised with some kernel module
that udev tries to load during "Populating /dev:" boot stage;
dropping *both* +vmguest and +wireless dependencies does help
while switching to un-def kernel flavour doesn't (as is or with
any single one of these two deps removed).

Thanks user who reported the problem at opennet.ru
(alias "myhand").
2015-02-17 19:11:40 +03:00
Michael Shigorin
750aaac150 gear-store-tags 2015-02-16 23:53:50 +03:00
Michael Shigorin
512411ee9e 1.1.58-alt1
- vagrant feature (closes: #28553)
2015-02-16 23:49:46 +03:00
Michael Shigorin
048c7c0834 vm.mk: initial vagrant-base
This should be built as vagrant-base.vdi (xz before publishing).
2015-02-16 23:49:27 +03:00
Michael Shigorin
451d7c012d vagrant: initial implementation
This feature adds initial vagrant-compatible box
build support as outlined in #28553.
2015-02-16 23:10:50 +03:00
Michael Shigorin
5542415e19 tar2fs: wait a bit
Looks like there's a race condition somewhere: this script
will fail to clean up after itself when considerable background
load is inflicted upon the host it's running on (e.g. LA ~16
on a 8-core, single-disk system).

Note that this commit is NOT enough to win that race
but just a step in the right direction...
2015-02-16 17:58:51 +03:00
Michael Shigorin
e238973c04 tar2fs: add ahci module
It's unwise to skip the common storage driver,
and vagrant (which uses virtualbox by default)
is likely to crash and burn as well.
2015-02-16 17:58:43 +03:00
Michael Shigorin
1823c557db base+regular, server+network: added apt-rsync
This has been suggested by cas@ and sounds quite reasonable
given that we ship rsync anyways.
2015-02-16 16:01:46 +03:00
Michael Shigorin
23cae74ab1 regular.mk: tweaked default vm profile for kde4
altlinux-p7-kde4-20141212 images had a problem:

- the generic starterkit profile is tuned
  for modest disk space consumption;
- KDE4 is quite extensive;
- kde4-regular subpackage tosses in most of KDE4 SC

...thus the livecd wouldn't autopartition enough
space for root filesystem when being installed.

volumes-profile-lite specifies 10Gb rootfs currently
which is just fine (-kdesktop one starts with 30Gb),
let's use it until vm-profile management is imported
into mkimage-profiles or things are redone completely.
2015-02-16 15:52:45 +03:00
Michael Shigorin
ea55aee5b7 live: refactored to use pkglist
This feature operates LIVE_* variables specifically
(as opposed to the more generic THE_* ones) so +alsa
isn't exactly suitable but reusing the pkglist that's
just been factored out is fine.
2015-02-10 23:10:49 +03:00
Denis Smirnov
15a3cb12e8 sound feature refactoring
Split package lists:

- base alsa packages (also needed in pulseaudio-based installations)
- additional alsa packages (needed only if not using pulseaudio)
- pulseaudio packages
2015-02-10 23:06:30 +03:00
Michael Shigorin
0da76ba29a gear-store-tags 2015-02-09 23:30:28 +03:00
Michael Shigorin
4a1af47cbf 1.1.57-alt1
- fix the lists copying fix
2015-02-09 23:29:48 +03:00
Michael Shigorin
292caede4e pkg/lists: fix the fix (handle no lists too)
cp(1) would get confusing arguments with no files to copy
if there are no lists to handle; employ xargs(1) as promised
to handle this properly.
2015-02-08 01:32:45 +03:00
Michael Shigorin
eadc204b9e x11: drop explicit gst-libav
aris@ tells that it's been specified as totem dependency since,
no need to carry this temporary duplication on.
2015-02-04 21:39:58 +03:00
Michael Shigorin
35c89b61db rescue+extra: added usbmuxd
This might come handy for those who have to deal with iDevices.
2015-02-04 21:39:45 +03:00
Michael Shigorin
c2adec79ab gear-store-tags 2015-02-02 21:50:16 +03:00
Michael Shigorin
3177c23e70 1.1.56-alt1
- fix lilo check for vm images
2015-02-02 21:47:53 +03:00
Michael Shigorin
7b0501ae2a tar2fs: fix check for lilo binary
The check introduced by commit d7689f30 while rewriting tar2vm
(which presumed x86) was subtly broken: it checked for *host*
binary before preparing *chroot* configuration file for it.

Wonder how many build servers run lilo over here that this BUG
has managed to evade attention for almost two years...
2015-02-02 21:45:57 +03:00
Michael Shigorin
b311aba13d pkg.in/lists: extended README a bit
This notice essentially duplicates the recent addition to
http://www.altlinux.org/Mkimage/Profiles/m-p/objects
(in a brief offline form).
2015-02-02 21:45:51 +03:00
Michael Shigorin
34a13fa371 live: disarm URW
It's been discussed that URW fonts' priority be lowered
and way too many direct dependencies upon those be reviewed:

http://lists.altlinux.org/pipermail/devel/2014-September/199105.html

...just not there yet.
2015-02-02 21:45:42 +03:00
Michael Shigorin
fc45abb395 live.mk: disable rpcbind for webkiosk livecds
Looks pretty superfluous there.
2015-02-02 21:45:23 +03:00
Denis Smirnov
11763010b8 xmonad extra: not include debuginfo for ghc.*-darcs 2015-02-02 21:45:10 +03:00
Denis Smirnov
8df9c40d34 Fix /etc/tcb/*/shadow* permissions
Looks like there's some issue with fakeroot as pseudousers
created with useradd during package installation have their
/etc/tcb/*/shadow files with proper permissions ($user:auth)
but shadow- and shadow.lock belong to root:root which makes
passwd(1) fail.
2015-02-02 14:01:42 +03:00
Michael Shigorin
903e52841b gear-store-tags 2015-01-26 23:59:29 +03:00
Michael Shigorin
521d837395 1.1.55-alt1
- lists copying fixed
2015-01-26 23:59:13 +03:00
Michael Shigorin
fa1089f51e x11: upgrade gnome3 metapackage
There's gnome3-regular now extending -default (thx aris@).
2015-01-26 15:44:29 +03:00
Michael Shigorin
8712c0ca44 regular.mk: update package name
There's no more livecd-gnome3-nosetup, it's been renamed
to setup-gnome3-done with no P:/O: to reduce repo spam.

Should have cherry-picked this into master back then :-/
2015-01-26 15:44:16 +03:00
Michael Shigorin
a86dd0c425 pkg/lists: uncrustify Makefile
The problem with the changed piece of code is that it would
- both call cp(1) multiple times if multiple *_LIST variables
  were non-empty (which is usually the case), and
- try to evaluate stdout of the called commands as a shell
  script (which would be empty unless someone passed e.g. -v
  to that cp(1) but it's crazy to rely on things like this).

So the functions should prepare arguments for a single copy
command that is predictable and could be made verbose.

Ouch.
2015-01-20 22:31:32 +03:00
Michael Shigorin
dc679621e2 rescue+misc: added office file format parsers
This batch deals with various Microsoft(R) Word(TM)
instilled formats like RTF/DOC/DOCX and requires nothing
but basic libraries and perl at most; might get extended
over time but please mind the extra dependencies!
2015-01-13 05:11:51 +03:00
Michael Shigorin
e02a898c59 gear-store-tags 2015-01-05 11:19:41 +03:00
Michael Shigorin
78c3cab5ad 1.1.54-alt1
- live: don't force localboot
2015-01-05 11:19:13 +03:00
Michael Shigorin
39fa788ac8 build-vm: update referenced script name
It's probably a good year to get rid of this reference practice
resulting in a known sort of misdocumentation over time :-/
2015-01-05 11:18:48 +03:00
Michael Shigorin
ec1ce73cb3 live: don't force localboot here
live-webkiosk.iso regressed into trying to boot off the local disk
immediately, the exact cause is not yet discovered but this one
has popped in build trace (distcfg.mk) already.

Desktop images are still likely to depend on it though.
2015-01-05 11:18:02 +03:00
Michael Shigorin
3744ab55b8 live.mk: force kiosk images to live boot
I've been puzzled to find current live-webkiosk.iso trying to go
localboot with no timeout; this is basically a plug, VM images
might need more effort to go in.
2014-12-31 21:30:39 +03:00
Michael Shigorin
675ec1cb4b desktop+xfce+extra: added arandr
This utility should help those operating multi-display
configurations with somewhat non-trivial requirements:
http://www.opennet.ru/openforum/vsluhforumID3/100999.html#31
2014-12-24 20:24:34 +03:00
Michael Shigorin
9c8fe80ec3 ve.mk, p7.mk: experimental ve/pgsql94
This one has been prepared for PostgreSQL 9.4 meetup in Moscow:
http://postgresmen.ru/meetup/2014-12-23-parallels
2014-12-24 20:20:54 +03:00
Michael Shigorin
e7acdd8d4b base+rescue: added servicectl
This utility manages systemd services inside chroot
while the host system runs sysvinit (systemctl will say
"Running in chroot, ignoring request" and bail out).
2014-12-23 00:08:09 +03:00
Michael Shigorin
b5da790b75 regular+tde: added k{cpu,net}load
Thanks asy@ for getting both packages back to sisyphus
and stable branches.
2014-12-20 18:07:13 +03:00
Michael Shigorin
4459f1771d server: added ftp/http clients to ovz
wget is actually required by vzctl currently
but lftp is a handy tool which is missing,
and both are better specified explicitly.
2014-12-18 18:26:46 +03:00
Michael Shigorin
1da70393de regular.mk: extend FS support for sysv-tde
This is a somewhat "advanced" flavour,
extra filesystems seem reasonable.
2014-12-16 17:12:33 +03:00
Michael Shigorin
be0dc77c5f base+regular: added system-report
george@ wondered why it's not included into regular builds;
well, here it is.
2014-12-15 20:43:19 +03:00
Michael Shigorin
22289352dd gear-store-tags 2014-12-15 19:24:05 +03:00
Michael Shigorin
ef2259afd8 1.1.53-alt1
- starterkits-20141212
2014-12-15 19:23:05 +03:00
Michael Shigorin
1121b06e9f regular.mk: there's no livecd-gnome3-nosetup in p7
There's GNOME 3.8 in p7/branch and it has no initial setup tool
thus no disabler is needed anyways; I've fixed this a while ago
but seem to have managed to lose the commit somehow :-/
2014-12-12 19:01:07 +03:00
Michael Shigorin
c1a5a22cb1 desktop+lxqt: last-minute tweaks
Replaced qxkb with axkb as it seems less unstable;
added gvfs and friends as pcmanfm-qt won't handle devices otherwise:
http://forum.altlinux.org/index.php/topic,33244.msg242391.html#msg242391
2014-12-12 18:01:30 +03:00
Michael Shigorin
e4077b2bbf live: fix broken regexp to actually enable repos
The problem with hardwired "[alt]" was that it's not going
to match "[p7]", for example.

Brown paper bag bug.
2014-12-12 15:16:05 +03:00
Michael Shigorin
574058a764 desktop+lxqt: added qxkb
Thanks dango for this proposal either:
http://forum.altlinux.org/index.php/topic,33700.msg242365.html#msg242365
2014-12-12 15:05:06 +03:00
Michael Shigorin
5ccdb5e20e desktop+lxqt+razorqt+extra: work around clementine
Specifically the seemingly missing dependencies on gstreamer:
https://bugzilla.altlinux.org/show_bug.cgi?id=30556

Thanks dango for heads-up:
http://forum.altlinux.org/index.php/topic,33700.msg242323.html#msg242323
2014-12-12 02:29:30 +03:00
Michael Shigorin
1cf1bcb87d dev: rework user setup
There were quite a few things missing:
- packager pseudo for both rpm and hasher;
- proper target (so that i686 or athlon don't confuse people);
- hasher repo for apt so that mkimage would use it too;
- last but not least, a friendly bootstrap message! ;-)
2014-12-12 01:47:35 +03:00
Michael Shigorin
5205364a6e regular.mk, p7.mk: builder image
So ALT Linux has got decent build tools but no one even knows
about those, right?  And starting to use those is somewhat tedious
as it requires ALT installation with a specially crafted user account?

live-builder.iso has been useful enough to consider including its
relative into starterkits skipping regular builds for roughly the
same reasons as those for installers: we're better off helping users
to get onto the stable platform bandwagon than having them excited
with Sisyphus just to hit some wall down the road (even if we warn
of these walls well in advance most of the time), and while packages
tend to get into branches via sisyphus repo it's still better to stay
on the safe side with what we make easily available.
2014-12-12 01:34:35 +03:00
Michael Shigorin
52a4265eab dev: tweak main subprofile to avoid extra packages
THE_* and friends are all unneeded for live builder image;
this commit makes dev feature basically incompatible with
install2 feature (which relies on the conventional behaviour
of main subprofile), will have to think it all over if the
combination of these two ever becomes needed.
2014-12-12 00:41:00 +03:00
Michael Shigorin
74126092a4 dev, live.mk: refactor live-builder bits
It feels like time to introduce regular-builder.iso,
let's help it by factoring most of the common part out
into the feature.
2014-12-12 00:37:20 +03:00
Michael Shigorin
6082b77d7d regular.mk: added NTFS support to server-hyperv installer
Might be useful for those wishing to set up additional drives
carrying NTFS at install time.
2014-12-10 13:46:43 +03:00
Michael Shigorin
be7f377b7a rescue+misc: added smartmontools
This was basically a feature request to get smartctl into
sysv-tde starterkit; it's in regular+extra which is pulled
for regular/starterkit rescue images already but it's better
to have it duplicated here than missing somewhere as the tool
is pretty requisite these days.
2014-12-09 19:28:36 +03:00
Michael Shigorin
768c78bfca efi, regular.mk: drop led-ws
It's not supported anymore:
http://git.altlinux.org/tasks/archive/done/_133/136193/
2014-12-09 18:10:55 +03:00
Michael Shigorin
ba3ded078d vm.mk: fix vm/net to handle ROOTPW
It's been ignored since the introduction of deflogin feature
and removal of build-vm specific ROOTPW variable handling;
might be adjusted to mandate this for vm/bare too, have to
think it over.
2014-12-04 21:04:49 +03:00
Michael Shigorin
1445ff423b deflogin: treat no users as a warning
There could be root-only VM appliances, for example,
and ROOTPW is now handled through this feature.
2014-12-04 21:04:43 +03:00
Michael Shigorin
4cb875cc5b gear-store-tags 2014-11-18 00:19:49 +03:00
Michael Shigorin
218b84ae09 1.1.52-alt1
- docs: "7.0+" (closes: #30474)
- l10n feature
2014-11-17 16:41:19 +03:00
Michael Shigorin
cbedb372e9 rescue+extra: added hddtemp
Thanks someone at opennet for bringing my attention to this:
http://www.opennet.ru/openforum/vsluhforumID3/100066.html#50
2014-11-16 22:01:43 +03:00
Michael Shigorin
c8a7e55cf8 QUICKSTART: it's p7/t7 or later now
0.6.3 has introduced some changes that were deemed incompatible
with t6/p6 branches; it should be possible to restore compatibility
at least for non-EFI images but the effort required hasn't been
up for grabs so far.

See also https://bugzilla.altlinux.org/30474
2014-11-16 21:34:36 +03:00
Michael Shigorin
be38098abf init: tweak to accomodate p7/t7 too
The problem with initial implementation (commit 62e7e9c)
is that there's no systemd-services package in p7/branch
thus apt complains about an attempt to remove something
that doesn't even exist in the first place.
2014-11-14 16:30:03 +03:00
Michael Shigorin
b5ff2b24b4 initial l10n feature
Aimed at live images at first but should cover installers as well.

This has been brewing for quite some time and while the proper
implementation is considerably more complex (and hard to do)
looks like there's demand for the particular important use case,
namely LiveCDs for Russian users, so this code has been shared
with a few people before merge.
2014-11-14 15:07:09 +03:00
Michael Shigorin
c293dd141c lib/functions.mk: tiny but important note
There's a particular problem with lazy evaluation
in case of BOOT_LANG: mkimage uses internal variable,
BOOT_LANG = $(GLOBAL_BOOT_LANG) (note the lack of
immediate assignment there), and if we set up

  export GLOBAL_BOOT_LANG = $(BOOT_LANG)

in the same namespace we end up with recursively
defined pair of variables; a ":=" in either place
would save the day _but_ it's not there in m-p due to
accumulator variables, e.g. USERS, which are defined
and exported by a corresponding feature and then get
populated *after* having been declared for export,
_and_ it's not in mkimage as of 0.2.16 for some reason
that might even be good (I don't know yet).
2014-11-14 15:07:09 +03:00
Gleb Fotengauer-Malinovskiy
5cede154fa x11: added use/x11/dwm target 2014-11-12 21:12:59 +03:00
Michael Shigorin
ac713ae6d7 gear-store-tags 2014-11-10 20:29:35 +03:00
Michael Shigorin
4e2e450b3a 1.1.51-alt1
- current updates
2014-11-10 20:29:03 +03:00
Michael Shigorin
3c5fe4a9f2 rescue+x11: added hardinfo
It has evaded sisyphus before but not anymore.
2014-11-06 20:00:19 +03:00
Michael Shigorin
15e79ba9fa desktop+lxqt: lxqt-appswitcher deprecated
See also https://github.com/lxde/lxde-qt/issues/302
2014-10-31 18:30:52 +03:00
Michael Shigorin
1078c61bd1 p7.mk: regular-lxqt-sysv bridge
...yet another one...
2014-10-29 18:14:17 +03:00
Michael Shigorin
de43d872b7 regular.mk: initial regular-lxqt-sysv
This has been asked for by lewellyn@freenode, why not.

NB: distro/.regular-sysv doesn't include use/net-eth/dhcp
    (as it looks like asking for) since there's still hope
    to get NM cooperating with sysvinit again.
2014-10-29 18:12:17 +03:00
Michael Shigorin
927d57d55a fonts: added google crosextra
Looks like there are more fonts out there than just croscore!
2014-10-29 16:11:52 +03:00
Michael Shigorin
9bfc92be10 gear-store-tags 2014-10-27 23:56:34 +03:00
Michael Shigorin
3261d94633 1.1.50-alt1
- minor tweaks
2014-10-27 23:54:52 +03:00
Michael Shigorin
1d7561925b regular.mk: gnome3: avoid initial setup
Both locale and keyboard have been set up already,
no use to waste time on those (which results in 'us'
keyboard layout missing out totally, ironically).

Thanks aris@ for the tip.
2014-10-27 14:25:14 +03:00
Michael Shigorin
0f7098ec2f live.mk: add shim to live-rescue
...basically giving it a chance to go with Secure Boot undisabled
which is a feature these days, unfortunately...
2014-10-27 12:45:22 +03:00
Michael Shigorin
48b29291ea power: i-f-cpufreq is no more
installer-feature-cpufreq-stage3 has been deleted from sisyphus.
2014-10-27 12:25:32 +03:00
Michael Shigorin
35841f144a server: added installer-feature-server-raid-fixup
This one adds write intent bitmaps for MD RAID;
see also #14877.
2014-10-24 16:55:39 +04:00
Michael Shigorin
9c5502b72c p7.mk: added lxqt bridge as well
It's been asked for already, let's not wait for December:
http://www.opennet.ru/openforum/vsluhforumID3/99418.html#48
2014-10-24 16:40:22 +04:00
Michael Shigorin
8ec8538be8 desktop_lxqt: dropped lxqt-config-randr
It's been obsoleted by lxqt-config in 0.8.0.
2014-10-15 01:52:32 +04:00
Michael Shigorin
35ec9f8901 regular.mk: icewm += liberation
Those URW fonts are scarey by today's standards :-(
Unfortunately these are pulled in by seamonkey & co...
2014-10-14 22:11:55 +04:00
Michael Shigorin
2c784c4a34 gear-store-tags 2014-10-13 22:26:06 +04:00
Michael Shigorin
503bb86593 1.1.49-alt1
- pkglist updates
2014-10-13 22:24:05 +04:00
Michael Shigorin
5edd7bbeee ovz-server: added openvz-etersoft
This package holds a nice collection of unofficial utilities
to deal with OpenVZ containers.
2014-10-12 19:26:52 +04:00
Michael Shigorin
c1eae11c7b rescue+extra: a bunch of FUSE-based filesystems
There are quite a few potentially useful packages
implementing FUSE based (userspace) filesystems,
these are typically lightweight and still might be
helpful to someone stuck with our rescue image...
2014-10-12 19:26:42 +04:00
Michael Shigorin
218c98ba11 rescue+extra: added shake
This one lurked under my radar so far as well.
2014-10-10 22:04:44 +04:00
Michael Shigorin
b3cc5db11c rescue+extra: added fuse-funion as well
ALT Linux LiveCD/Rescue images use AUFS currently,
some tools to access unionfs might be useful.
2014-10-10 21:34:35 +04:00
Michael Shigorin
ef1d8b77f5 rescue+extra: added iozone
Wonder how it managed to evade this list before...
2014-10-10 21:32:35 +04:00
Michael Shigorin
f24314bb00 initial desktop+xfce+extra
xfdashboard is a GNOME Shell-like window switching interface
and application runner; xfce4-whiskermenu-plugin is another
(KDE-like) menu search facility; thanks sem@ for suggestions.
2014-10-07 20:48:22 +04:00
Michael Shigorin
df583f1d45 desktop+lxqt+razorqt+extra: added qpdfview as well
It's a pretty solid PDF viewer;
pcmanfm-qt integration to be sorted out later.
2014-10-06 02:02:37 +04:00
Michael Shigorin
bdf96e4434 desktop+lxqt+razorqt+extra: added cool-retro-term
Just for the fun of it!
2014-10-06 01:58:16 +04:00
Michael Shigorin
57f9c1dff5 gear-store-tags 2014-09-29 23:49:57 +04:00
Michael Shigorin
a4d239af5e 1.1.48-alt1
- (sysv)init: exclude systemd explicitly
2014-09-29 23:47:46 +04:00
Michael Shigorin
0e0f1e065a vm.mk: added a note to bare one
It's not as bare as it should be due to interactivesystem
being slightly more than it ought to.
2014-09-29 15:59:20 +04:00
Michael Shigorin
62e7e9c152 init: ban systemd when sysvinit has been requested
The issue at hand is that interactivesystem pulls in
network-config-subsystem and that one has several providers
by now, systemd-networkd being one of them since recently
(and pulling in systemd).

Just the same problem as with systemd-journal; both might be
fixed by reworking mkimage to allow for different package name
resolution modes:

- "slap everything together and resolve with one-shot"
  to handle conflictless situations (most of those);
- "process multiple transactions to allow for conflicts"
  thus making it possible to include e.g. a few MTAs into
  the provided package base.

Ensure that systemd is outside by explicitly telling so
in the pkglist.
2014-09-29 15:59:19 +04:00
Michael Shigorin
ace7a118c0 live.mk: added live-webkiosk-qupzilla
...and factored out common gtk subtarget removing qt
(it's not exactly helpful to drop a library your browser
is based on in qupzilla case).
2014-09-29 11:05:55 +04:00
Michael Shigorin
184a52aa33 desktop+lxde+extra: added lxde-lxlauncher
This one isn't in menus even but is quite nice for semi-kiosks
it seems; well worth further attention, and let it lurk around
just in case.
2014-09-27 00:26:58 +04:00
Michael Shigorin
3fc56a10e1 x11: disable acpid for e19
E19 would ask the user if they want to shut down
when facing power button event; it won't get a chance
though as the system will hurl down immediately as per
acpid-events-power package provided configuration.
2014-09-23 19:39:52 +04:00
Michael Shigorin
1a3a6ec461 gear-store-tags 2014-09-22 20:00:37 +04:00
Michael Shigorin
e13c7fddad 1.1.47-alt1
- kpackages() argswap
2014-09-22 19:59:58 +04:00
Michael Shigorin
11d07b004b s/e18/e19/g
It has arrived to sisyphus last week silently,
thanks aris@ (#30253).
2014-09-22 15:48:47 +04:00
Michael Shigorin
4a6a88826c live.mk: tweak webkiosks regarding hybrid/efi
-mini image should be flash-friendly to be more useful,
and -flash bugtraq kitchen sink could use/efi as well.
2014-09-19 21:01:36 +04:00
Michael Shigorin
a3ddce7a81 functions.mk: allow setting to an empty value
set() is a function of two variables but the and()
check for *both* is incorrect as one might need to
override a previously set variable with empty string;
this has manifested itself with a case like this:

  @$(call set,ROOTPW_EMPTY,1)
  # ...
  @$(call set,ROOTPW_EMPTY,)
2014-09-19 21:01:08 +04:00
Michael Shigorin
2fa7259510 deflogin: more explicit ROOTPW_EMPTY handling
This should avoid ruining principle of the least surprise
with ROOTPW_EMPTY=0 or ROOTPW_EMPTY=n actually *enabling*
empty root password; overriding an already set "1" with "0"
becomes possible either.
2014-09-19 20:58:47 +04:00
Michael Shigorin
3c95cf8d8f live.mk: tweak live-builder*
That is, move use/efi/signed from basic -mini image
to the complete one; make the former isohybrid but
otherwise keep it small.
2014-09-19 20:58:03 +04:00
Michael Shigorin
4abb3688ff test.mk: several test PID 1 images
These started out with the now-classic vi and emacs ones,
elinks has been the next step, and bash helps debugging.
2014-09-19 20:54:25 +04:00
Michael Shigorin
1a7eed303d pid1: initial "run as PID 1" feature
This one has been inspired by these guys:

  http://www.informatimago.com/linux/emacs-on-user-mode-linux.html
  https://raymii.org/s/blog/Vim_as_PID_1_Boot_to_Vim.html

It's aimed at building images running their main userspace
piece instead of ramdisk's init, that means PID=1, UID=0.

Mostly fun of course but it suddenly became interesting with
kernel IP autoconfiguration and e.g. elinks running this way
(NB: requires patched make-initrd 0.8.8 at the moment to get
resolver configured).

And startup times are way better than sysvinit and systemd combined!
2014-09-19 20:53:25 +04:00
Michael Shigorin
6f452182fd fix kpackages() API
This function's got its argument order chosen for "aesthetical"
reason of $(2) following $(1) in the macros but the logical order
is exactly the opposite: we care for kernel flavour much more than
for module set (which is dependent upon it).

So while silent dropout of kernel-image if KFLAVOURS is set
but KMODULES is empty could be fixed by testing for $(2) only,
it looks like a good time to fix this discrepancy altogether.
2014-09-19 20:53:25 +04:00
Michael Shigorin
8faf140777 kernel, stage2: rearranged initrd hooks
stage2 has been thinking it's synonymous with propagator
and used to usurp kernel's belongings either; carefully
tear scripts apart so that kernel feature makes sure
initrd gets generated, and stage2 (which is still all
about propagator) cares for its bits.
2014-09-19 20:53:24 +04:00
Michael Shigorin
730e791fec stage1: fix for non-propagator stage2
It's been a given that any stage2 is propagator-based
but that's not neccessarily so; the "run X as PID 1"
sort of contest has sparkled interest in some others.
2014-09-19 20:52:19 +04:00
Michael Shigorin
5c4f116b3a vmguest: handle vmware x11 driver
xorg-drv-vmware is desirable for guests with X11
but undesirable for text-only ones; let's provide
this knob at least but ideal m-p would figure out
that an image with use/x11 and use/vmguest/vmware
should receive this intersection either.
2014-09-19 20:52:18 +04:00
Michael Shigorin
00244a0752 gear-store-tags 2014-09-15 22:22:00 +04:00
Michael Shigorin
71fba777a3 1.1.46-alt1
- regular fixes
2014-09-15 22:20:54 +04:00
Michael Shigorin
4aaba411a4 live.mk: better fonts for webkiosks
IOW URW EOL
2014-09-15 13:01:50 +04:00
Michael Shigorin
abad845978 regular.mk: added google fonts to regular-mate
This aims to work around URW fonts deficiencies combined
with the relatively high position of their standard ones
in default /etc/fonts/conf.avail/60-alt-post-user.conf;
see also #30293, #30294.
2014-09-15 13:01:45 +04:00
Michael Shigorin
bf3365a376 regular.mk: oops, sysv-tde needs better fonts too
This has missed 20140912 starterkits unfortunately,
nightly builds excluding installers didn't catch it
and beta testing hasn't uncovered this either.
2014-09-15 13:00:39 +04:00
Michael Shigorin
a51b7096fd regular.mk: make jeos isohybrid at least
It's not EFI-bootable due to the extra size penalty
with current build/boot technology, but it's also
not ISO-hybrid as most images are made hybrid by
making them EFI-capable as well since the processes
are related.

Thanks dango at the forum for asking:
http://forum.altlinux.org/index.php/topic,33094.msg236808.html#msg236808
2014-09-15 12:59:56 +04:00
Michael Shigorin
efa6188629 regular.mk: disabled alteratord for server-hyperv
Makes no sense without ahttpd anyways;
thanks lewellyn@freenode again.

Disable bridge service as well
(gotta figure out what pulls it in).
2014-09-15 12:59:00 +04:00
Michael Shigorin
c94376357e gear-store-tags 2014-09-01 20:11:22 +04:00
Michael Shigorin
e128a91075 1.1.45-alt1
- starterkits alpha
2014-09-01 20:10:51 +04:00
Michael Shigorin
195f20921f rescue+extra: added archivemount
Borders with archive+extra but that one contains standalone tools
and this is a FUSE-based one -- with more of those included in this
particular pkglist already; if we decide that it's a worthy addition
to any image requesting a bunch of archiving tools then it might move.
2014-08-31 16:23:37 +04:00
Michael Shigorin
e162e85305 desktop+wmaker+extra: note wmvolman
It's useless as of right now:
- menu file and udisks2 dependency are missing
- udisks2 itself lacks an initscript

Let's note these deficiencies at least...
2014-08-31 00:02:27 +04:00
Michael Shigorin
73c644fc28 net: backup 4.2.2.x public nameservers
Using just a single one of those tends to end up problematic
at times but any two use to suffice.
2014-08-30 21:36:24 +04:00
Michael Shigorin
84fd73e5db firmware: factored out kmodules to kernel
Maybe firmware feature should be merged into kernel feature
as the firmware binaries added by it are only used by kernel
but let's clean up a bit at a time.
2014-08-29 15:38:43 +04:00
Michael Shigorin
851b441378 profile.mk: defer RC expansion
Just spotted that .disk/profile.tgz would hold
distcfg.mk with pre-expanded $(HOME) from build
host which is both info leak (user account that
was used to build the particular image) and just
wrong given that the in-image profile archive was
conceived as a means to pass that part of build
environment over instead of tying it to vendor.

Morale: premature optimization is premature.
2014-08-27 22:30:59 +04:00
Michael Shigorin
d804203bc7 rootfs: README update
It should state clearly both the positive and negative examples
of rootfs concept use (its name is not consiceenough unfortunately,
and I haven't come up with a better one yet).
2014-08-27 22:30:14 +04:00
Michael Shigorin
ca34287e85 server.mk: amend net-eth usage either
+net-eth covers both stage2 and base installation parts
while use/stage2/net-eth would result in an inobvious
catch when udev-rule-generator-net would hit install2
but not the installed system, and interface bindings
would be carried over from installer to the installation
but would *not* be updated in case of changed network
card(s) configuration.
2014-08-26 23:12:02 +04:00
Michael Shigorin
559714a271 desktop.mk: refactor net-eth usage with +net-eth
It was spilled over an intermediate target and a mixin
for what looks like no good reason; let's factor these
in by means of +net-eth as *both* are really needed
for an installer anyways, and if/when we do installers
with those new and crippled ethernet interface names
this addition can be dropped to be used where required.
2014-08-26 22:38:45 +04:00
Michael Shigorin
7c9794a827 regular.mk: +net-eth for consistency
The bare intermediate target did use/stage2/net-eth but it
was found out by sem@ that an installed server would lack
udev-rule-generator-net package so its ethernet interface
naming would be inherited from install2 stage only; fix it
by adding use/net-eth and reduce the churn with +net-eth.
2014-08-26 22:36:21 +04:00
Michael Shigorin
8533f7e2b7 net-eth: added plus-shortcut
"use/stage2/net-eth use/net-eth" would be common enough
for installers or livecd images to just get these pulled in
together by a convenient shortcut thus reducing confusion
and chances to just forget one of these counterparts.
2014-08-26 22:24:45 +04:00
Michael Shigorin
2a0482ceee regular.mk: use/net/nm/mmgui in a few images
Namely cinnamon, tde and kde4 flavours for the starters.
2014-08-20 17:30:15 +04:00
Michael Shigorin
2897fe80ce net: added modem-manager-gui provider target
sem@ says it works at the moment, the utility is useful
to look up account status or handle SMS.
2014-08-20 17:26:55 +04:00
Michael Shigorin
3b35a8f4b3 exterminate fonts-ttf-dejavu all over the place
It looks *ugly* on-screen, at least within regular builds,
even if the screen is 166dpi.

Based on a quick experiment this morning I'd suggest using
fonts-otf-adobe-source-{code,sans}-pro instead -- and it's
available as use/fonts/otf/adobe now, incidentally.

The documentation is still built with it though as a2x/fop look
unhappy otherwise (as in replacing Cyrillic glyphs with "#"s).
2014-08-19 20:42:45 +04:00
Michael Shigorin
362fd3f048 fonts: add a few font collection targets
Font packages are sprinkled all over the metaprofiles,
let's try and help make their use more systematic.

This is a sort of a feature abuse as it was conceived
for fontconfig setup originally but spawning features
with confusing names looks grim; so let all things fonts
live within a feature named "fonts" for the time being.
2014-08-19 20:42:21 +04:00
Michael Shigorin
f16bd1e1ca gear-store-tags 2014-08-18 23:52:45 +04:00
Michael Shigorin
0e2faed186 1.1.44-alt1
- connman fixup
2014-08-18 23:51:34 +04:00
Michael Shigorin
29818ff05a regular.mk: added mnt to regular-icewm
Thanks mithraen@ for creating a universal frontend script
for udisksctl/pmount/hmount user mount tools; let's try it
within the minimalistic GUI image for the starters.
2014-08-18 23:51:34 +04:00
Michael Shigorin
36f51401d7 desktop+tde: drop obsolete cruft
These packages have been sitting there commented out
long enough to consider them for cleanup.
2014-08-18 22:41:01 +04:00
Michael Shigorin
5b0697393d stage1: READMEdability fix
Kernel modules come as both *.ko and kernel-modules-*.rpm
and it wasn't clear enough whether to mention "ahci" or "v4l".
2014-08-18 22:30:53 +04:00
Michael Shigorin
3171d693a3 main, metadata: README update
There's not much sense in overduplication of documentation
(tends to get stale faster then), still it's not good to
just refer to the code as the PDF/HTML book is less useful
then; maybe drifting towards "recommended" bits with more
"advanced" things being impleentation-defined is better.
2014-08-12 14:34:14 +04:00
Michael Shigorin
1eda19cff8 doc: better clean target
A bunch of intermediate files would be sitting around otherwise.
2014-08-12 13:15:08 +04:00
Michael Shigorin
24cee06517 net: enable connman service either
Stupid systemd will shadow connmand initscript with
connman.service but will not enable connman.service
when told to enable connmand initscript.  Sigh.
2014-08-12 12:18:55 +04:00
Michael Shigorin
38b153e20c rescue+extra: added lsmount
An udisks2-based removable device listing utility
courtesy of Speccyfighter and mithraen@:

http://lists.altlinux.org/pipermail/community/2014-August/682294.html
http://lists.altlinux.org/pipermail/community/2014-August/682326.html
http://lists.altlinux.org/pipermail/community/2014-August/682342.html
2014-08-11 14:15:44 +04:00
Michael Shigorin
428dafc2ab gear-store-tags 2014-08-04 20:58:35 +04:00
Michael Shigorin
c5f0493b33 1.1.43-alt1
- fixed package build
2014-08-04 20:57:21 +04:00
Michael Shigorin
18367944f0 rescue+extra: added screen, tmux
Wonder how these have been missing so far.
Thanks george@ for categorization. :)
2014-07-30 17:04:56 +04:00
Michael Shigorin
a44e3d5050 rescue+extra: added lsblk
Thanks mithraen@ for the hint:
http://lists.altlinux.org/pipermail/community/2014-July/682262.html
2014-07-30 13:21:06 +04:00
Michael Shigorin
a891a8e7e2 spec: tweaked BR for doc subpackage
fop doesn't pull any java virtual machine in anymore:
http://lists.altlinux.org/pipermail/sisyphus/2014-July/362665.html
2014-07-29 20:38:45 +04:00
Michael Shigorin
6077989527 gear-store-tags 2014-07-28 23:53:45 +04:00
Michael Shigorin
eace7a459f 1.1.42-alt1
- current bits
2014-07-28 23:52:27 +04:00
Michael Shigorin
41d537fb60 init: added tty12 log setup for systemd case
That's a part of ALT Linux conveniences: system log
messages at tty12 (helps immensely in case of disk crash
or cable problems as running anything, including utilities
to view logs, becomes painful to impossible in such cases).

systemd lacks this kind of setup out-of-box for sure
so zerg@ hacked a substitute together; just pull that in.
2014-07-28 20:11:24 +04:00
Michael Shigorin
e45fa5b090 desktop+wmaker: added basic bitmap fonts
vkni@ removed fonts-bitmap-cyr_rfx-iso10646-0400
from WindowMaker dependencies; I think that's wrong
but life is short so let's compensate that here as
at least regular-gnustep.iso degrades (GNUstep menus
are rendered in fixed bitmap font then).
2014-07-28 20:10:58 +04:00
Michael Shigorin
df042e7609 rescue+extra: added wdfs
Nice lil' WebDAV userspace filesystem; example:

wdfs https://webdav.yandex.ru /mnt/ydisk -o accept_sslcert,username=me@yandex.ru
2014-07-19 20:35:00 +04:00
Michael Shigorin
f6d895fcef rescue+fs: added cv
A nice little hack that looks up running instances of cp/mv/tar/gzip/...
in /proc and comes up with job completion percentage.  Useful when one
didn't bother to use pv(1) or the process has been running for quite
some time already.
2014-07-19 20:34:39 +04:00
Michael Shigorin
4f4dc888b4 gear-store-tags 2014-07-07 23:10:53 +04:00
765 changed files with 8954 additions and 1995 deletions

View File

@@ -1,8 +1,8 @@
Name: mkimage-profiles
Version: 1.1.41
Version: 1.3.11.1
Release: alt1
Summary: ALT Linux based distribution metaprofile
Summary: ALT based distribution metaprofile
License: GPLv2+
Group: Development/Other
@@ -11,8 +11,7 @@ Source: %name-%version.tar
Packager: Michael Shigorin <mike@altlinux.org>
BuildArch: noarch
BuildRequires: rsync asciidoc-a2x xmlgraphics-fop fonts-ttf-dejavu
BuildRequires: /proc
BuildRequires: rsync
Requires: rsync git-core
Requires: time schedutils sfdisk
@@ -24,11 +23,10 @@ Requires: mkimage-preinstall
%define mpdir %_datadir/%name
%add_findreq_skiplist %mpdir/*.in/*
%def_with doc
%define docs $HOME/docs
%package doc
Summary: %name documentation
Group: Development/Documentation
Summary(ru_RU.UTF-8): метапрофиль дистрибутивов на базе Альт
%description
mkimage-profiles is a collection of bits and pieces useful for
@@ -39,12 +37,13 @@ to choose from, and some ready-made image recipes as well.
Make no mistake: constructing distributions isn't just fun, it takes
a lot of passion and knowledge to produce a non-trivial one. So m-p
(the short alias for mkimage-profiles) is complex too. If you need
-- or want -- to make just a few tweaks to an existing recipe, it might
-- or want -- to make a few tweaks to an existing recipe, it might
be easier to comprehend the generated profile (aka builddir) which
contains only the needed subprofiles, script hooks and package lists
and is way more compact.
Virtual environment template caches (OpenVZ/LXC) can be made either.
The main deliverable form for x86 is a (hybrid) ISO; virtual environment
template caches (OpenVZ/LXC) can be made either as well as VM disk images.
In short, setup hasher (http://en.altlinux.org/hasher) and here we go:
cd %mpdir
@@ -54,31 +53,419 @@ In short, setup hasher (http://en.altlinux.org/hasher) and here we go:
But if you're into regular distro hacking and are not afraid of make
and modest metaprogramming (some code generation and introspection),
welcome to the metaprofile itself; read the docs and get the git:
%url (NB: these are mostly in Russian with translation on demand).
%description -l ru_RU.UTF-8
mkimage-profiles является собранием всего необходимого для
построения дистрибутивов и содержит списки пакетов, особенности
и целые субпрофили (вроде "кирпичика" rescue), из которых можно
выбирать требуемое; также включены и описания готовых образов.
Поймите правильно: создание дистрибутивов является занятием
не только интересным, но и требующим вдохновения и знаний
для получения нетривиального результата. Если хочется или же
необходимо чуток поправить уже существующий "рецепт", может
быть проще разобраться в сгенерированном профиле (builddir),
который содержит только необходимые субпрофили, скрипты
и списки пакетов, являясь намного более компактным.
Основной формой результата на x86 является (гибридный) ISO-образ;
также возможно создавать шаблоны контейнеров OpenVZ/LXC и образы
дисков виртуальных машин.
Короче говоря, настройте hasher (http://altlinux.org/hasher) и:
cd %mpdir
head README
make syslinux.iso
Но если разработка дистрибутивов становится обыденным делом
и не страшитесь make и чуточки метапрограммирования (немного
генерирования кода и интроспекции), добро пожаловать в сам
метапрофиль; гляньте документацию и забирайте git:
%url
%package doc
Summary: %name documentation
Group: Development/Documentation
%{?_with_doc:BuildRequires: java /proc}
%{?_with_doc:BuildRequires: asciidoc-a2x fop fonts-ttf-dejavu}
Summary(ru_RU.UTF-8): документация %name
%description doc
This package holds developer docs for %name
as a book in HTML and PDF formats.
%description -l ru_RU.UTF-8 doc
Этот пакет содержит документацию разработчика
для %name в форме книжки (HTML, PDF).
%prep
%setup
%build
%if_with doc
make BUILDDIR=%docs docs
%endif
%install
mkdir -p %buildroot%mpdir
mkdir -p %buildroot{%mpdir,%_man7dir}
cp -a * %buildroot%mpdir
%if_with doc
mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
%endif
%files
%mpdir/
%if_with doc
%_man7dir/*
%endif
%if_with doc
%files doc
%doc README
%doc QUICKSTART
%doc %docs/*
%endif
%changelog
* Tue Jul 09 2019 Michael Shigorin <mike@altlinux.org> 1.3.11.1-alt1
- x11: reverted vulkan changes (need more testing)
* Mon Jul 08 2019 Michael Shigorin <mike@altlinux.org> 1.3.11-alt1
- pkg.in/profiles subdirs support (shaba@)
- repo fixup regarding target arch (obirvalger@)
- switch back to yandex mirror by default,
portability fixes, refactoring, cleanups (antohami@)
- x11 amdgpu/radeon and dm fixups, vmguest refactoring (me)
* Mon Jun 17 2019 Michael Shigorin <mike@altlinux.org> 1.3.10-alt1
- add server-v profile, drop groups/openstack (shaba@)
* Mon Jun 10 2019 Michael Shigorin <mike@altlinux.org> 1.3.9-alt1
- uboot feature, bootloader refactoring, etc (antohami@)
- cleanlog factored out from reports.mk (me)
* Mon Jun 03 2019 Michael Shigorin <mike@altlinux.org> 1.3.8-alt1
- p9.mk, office feature and other enhancements/fixes (antohami@)
- education (cas@)
- simply (sem@)
- minor tidbits and major merge-up (me)
* Mon May 06 2019 Michael Shigorin <mike@altlinux.org> 1.3.7-alt1
- docker, vm, browser fixups (obirvalger@)
- elogind support, refactoring, cleanups (antohami@)
- a couple more improvements (me)
* Mon Apr 01 2019 Michael Shigorin <mike@altlinux.org> 1.3.6-alt1
- no joke!
* Mon Mar 04 2019 Michael Shigorin <mike@altlinux.org> 1.3.5-alt1
- Spring 2019 patch queue cleanup
+ antohami@, jqt4@, iv@, obirvalger@, zerg@, me
+ tar2fs fixes for mipsel, qemu etc
+ lots of pkglist updates
* Mon Jan 14 2019 Michael Shigorin <mike@altlinux.org> 1.3.4-alt1
- new 2019 year release ;-)
- tar2fs related security fix (iv@) iff sudo's been configured
- use/x11/dm rework (antohami@)
- archfixes (antohami@, iv@)
- pre-p8 bits cleanup (me)
* Mon Dec 24 2018 Michael Shigorin <mike@altlinux.org> 1.3.3-alt1
- aarch64/armh portability fixups (antohami@)
- grub-based vm images (shaba@)
- even smaller images (glebfm@)
- lxc/lxd lists/feature/image (dans@)
- updated robotics lists/image (dd@)
- e2k: 801/101/jeos tweaks (me)
* Mon Dec 10 2018 Michael Shigorin <mike@altlinux.org> 1.3.2-alt1
- sisyphus drops
* Mon Nov 05 2018 Michael Shigorin <mike@altlinux.org> 1.3.1-alt1
- current fixes and tweaks
* Mon Oct 15 2018 Michael Shigorin <mike@altlinux.org> 1.3.0-alt1
- pre-p9 sisyphus: fixes, drops and just two kludges
* Mon Aug 13 2018 Michael Shigorin <mike@altlinux.org> 1.2.21-alt1
- volumes feature; fixups
* Mon Aug 06 2018 Michael Shigorin <mike@altlinux.org> 1.2.20-alt1
- isoboot/isodata; apt-conf feature; dual-seat e801
* Mon Jul 23 2018 Michael Shigorin <mike@altlinux.org> 1.2.19-alt1
- alt-workstation: x86 (sem@), e2k (me)
* Mon Jul 16 2018 Michael Shigorin <mike@altlinux.org> 1.2.18-alt1
- ldm feature (lakostis@)
* Mon Jun 25 2018 Michael Shigorin <mike@altlinux.org> 1.2.17-alt1
- e2k & profiles
* Mon Jun 11 2018 Michael Shigorin <mike@altlinux.org> 1.2.16-alt1
- starterkits-20180612
* Mon May 28 2018 Michael Shigorin <mike@altlinux.org> 1.2.15-alt1
- fixup release
* Mon May 21 2018 Michael Shigorin <mike@altlinux.org> 1.2.14-alt1
- pkgpriorities feature (manowar@)
- extended e2k support
* Mon Apr 23 2018 Michael Shigorin <mike@altlinux.org> 1.2.13-alt1
- antohami@'s improvements
* Mon Mar 19 2018 Michael Shigorin <mike@altlinux.org> 1.2.12-alt1
- @IA32, @X86
* Mon Mar 12 2018 Michael Shigorin <mike@altlinux.org> 1.2.11-alt1
- starterkits-20180312
* Mon Feb 19 2018 Michael Shigorin <mike@altlinux.org> 1.2.10-alt1
- antohami@'s fixups
* Mon Feb 12 2018 Michael Shigorin <mike@altlinux.org> 1.2.9-alt1
- antohami@'s release
* Mon Feb 05 2018 Michael Shigorin <mike@altlinux.org> 1.2.8-alt1
- regular fixes
* Mon Jan 22 2018 Michael Shigorin <mike@altlinux.org> 1.2.7-alt1
- 2018: better sound feature (antohami@)
* Mon Dec 11 2017 Michael Shigorin <mike@altlinux.org> 1.2.6-alt1
- starterkits-20171212
* Mon Dec 04 2017 Michael Shigorin <mike@altlinux.org> 1.2.5-alt1
- qcow2c
* Mon Nov 20 2017 Michael Shigorin <mike@altlinux.org> 1.2.4-alt1
- opennebula-systemd
* Mon Sep 25 2017 Michael Shigorin <mike@altlinux.org> 1.2.3-alt1
- p8+
* Mon Sep 11 2017 Michael Shigorin <mike@altlinux.org> 1.2.2-alt1
- regular-engineering
* Mon Aug 21 2017 Michael Shigorin <mike@altlinux.org> 1.2.1-alt1
- seven years ago...
* Mon Aug 07 2017 Michael Shigorin <mike@altlinux.org> 1.2.0-alt1
- e2k
* Mon Jul 31 2017 Michael Shigorin <mike@altlinux.org> 1.1.110-alt1
- lxde-sysv
* Mon Jun 12 2017 Michael Shigorin <mike@altlinux.org> 1.1.109-alt1
- starterkits-20170612
* Mon Apr 24 2017 Michael Shigorin <mike@altlinux.org> 1.1.108-alt1
- yandex.mirror
* Mon Apr 03 2017 Michael Shigorin <mike@altlinux.org> 1.1.107-alt1
- serial improvements
* Mon Mar 13 2017 Michael Shigorin <mike@altlinux.org> 1.1.106-alt1
- starterkits-20170312
* Mon Feb 27 2017 Michael Shigorin <mike@altlinux.org> 1.1.105-alt1
- disable git hooks (glebfm@)
* Mon Feb 06 2017 Michael Shigorin <mike@altlinux.org> 1.1.104-alt1
- [[vncinst]] fixed
* Mon Jan 30 2017 Michael Shigorin <mike@altlinux.org> 1.1.103-alt1
- rescue -= bootsplash
* Mon Jan 09 2017 Michael Shigorin <mike@altlinux.org> 1.1.102-alt1
- 2017
* Mon Dec 12 2016 Michael Shigorin <mike@altlinux.org> 1.1.101-alt1
- starterkits-20161212
* Mon Dec 05 2016 Michael Shigorin <mike@altlinux.org> 1.1.100-alt1
- preparing for starterkits
* Mon Nov 14 2016 Michael Shigorin <mike@altlinux.org> 1.1.99-alt1
- xfce-sysv
- preparing...
* Mon Oct 31 2016 Michael Shigorin <mike@altlinux.org> 1.1.98-alt1
- preparing for workstation 8.1
* Mon Oct 03 2016 Michael Shigorin <mike@altlinux.org> 1.1.97-alt1
- regular tweaks
* Mon Sep 12 2016 Michael Shigorin <mike@altlinux.org> 1.1.96-alt1
- starterkits-20160912
* Mon Aug 15 2016 Michael Shigorin <mike@altlinux.org> 1.1.95-alt1
- s/basealt/alt/g
* Mon Jun 27 2016 Michael Shigorin <mike@altlinux.org> 1.1.94-alt1
- workstation
* Mon Jun 13 2016 Michael Shigorin <mike@altlinux.org> 1.1.93-alt1
- starterkits-20160612
* Mon May 30 2016 Michael Shigorin <mike@altlinux.org> 1.1.92-alt1
- server-openstack
* Mon May 23 2016 Michael Shigorin <mike@altlinux.org> 1.1.91-alt1
- nvidia/nouveau rehash
- overlayfs support (lakostis@)
* Tue May 03 2016 Michael Shigorin <mike@altlinux.org> 1.1.90-alt1
- starterkits-20160429
* Mon Apr 25 2016 Michael Shigorin <mike@altlinux.org> 1.1.89-alt1
- preparing for p8 starterkits
* Mon Apr 11 2016 Michael Shigorin <mike@altlinux.org> 1.1.88-alt1
- pkg.in/profiles
* Mon Mar 14 2016 Michael Shigorin <mike@altlinux.org> 1.1.87-alt1
- starterkits-20160312
* Mon Feb 29 2016 Michael Shigorin <mike@altlinux.org> 1.1.86-alt1
- junior
* Mon Feb 15 2016 Michael Shigorin <mike@altlinux.org> 1.1.85-alt1
- regular-jeos-ovz
* Mon Feb 08 2016 Michael Shigorin <mike@altlinux.org> 1.1.84-alt1
- %name(7) :)
* Mon Jan 25 2016 Michael Shigorin <mike@altlinux.org> 1.1.83-alt1
- openssh 7.x (see also #31716)
* Mon Jan 11 2016 Michael Shigorin <mike@altlinux.org> 1.1.82-alt1
- firmwarez
* Mon Dec 07 2015 Michael Shigorin <mike@altlinux.org> 1.1.81-alt1
- regular fixes
* Mon Nov 30 2015 Michael Shigorin <mike@altlinux.org> 1.1.80-alt1
- pre-starterkit cleanups
* Mon Nov 16 2015 Michael Shigorin <mike@altlinux.org> 1.1.79-alt1
- faked workaround
* Mon Nov 09 2015 Michael Shigorin <mike@altlinux.org> 1.1.78-alt1
- regular-enlightenment
* Mon Oct 19 2015 Michael Shigorin <mike@altlinux.org> 1.1.77-alt1
- webkiosk improvements
* Mon Oct 12 2015 Michael Shigorin <mike@altlinux.org> 1.1.76-alt1
- no more GREP_OPTIONS
* Mon Sep 28 2015 Michael Shigorin <mike@altlinux.org> 1.1.75-alt1
- systemd-specific hook for installer (solo@)
* Mon Sep 14 2015 Michael Shigorin <mike@altlinux.org> 1.1.74-alt1
- starterkits-20150912
* Mon Sep 07 2015 Michael Shigorin <mike@altlinux.org> 1.1.73-alt1
- im feature
* Mon Aug 31 2015 Michael Shigorin <mike@altlinux.org> 1.1.72-alt1
- starterkits alpha
* Mon Aug 10 2015 Michael Shigorin <mike@altlinux.org> 1.1.71-alt1
- docs feature
* Mon Jul 20 2015 Michael Shigorin <mike@altlinux.org> 1.1.70-alt1
- check KFLAVOURS
* Mon Jun 29 2015 Michael Shigorin <mike@altlinux.org> 1.1.69-alt1
- yet another systemd- tweak
* Mon Jun 22 2015 Michael Shigorin <mike@altlinux.org> 1.1.68-alt1
- LIVE_CLEANUP_KDRIVERS actually works
* Mon Jun 08 2015 Michael Shigorin <mike@altlinux.org> 1.1.67-alt1
- minor post-tweaks
* Mon Jun 01 2015 Michael Shigorin <mike@altlinux.org> 1.1.66-alt1
- remote rescue
* Mon May 04 2015 Michael Shigorin <mike@altlinux.org> 1.1.65-alt1
- archdep pkglists
* Mon Apr 20 2015 Michael Shigorin <mike@altlinux.org> 1.1.64-alt1
- modularized stage1 modules list
* Mon Mar 30 2015 Michael Shigorin <mike@altlinux.org> 1.1.63-alt1
- support USB3, ACPI suspend
* Mon Mar 16 2015 Michael Shigorin <mike@altlinux.org> 1.1.62-alt1
- starterkits-20150312
* Mon Mar 09 2015 Michael Shigorin <mike@altlinux.org> 1.1.61-alt1
- EFI_BOOTARGS
* Mon Mar 02 2015 Michael Shigorin <mike@altlinux.org> 1.1.60-alt1
- vmguest, install2: refactoring
* Mon Feb 23 2015 Michael Shigorin <mike@altlinux.org> 1.1.59-alt1
- regular rebase
* Mon Feb 16 2015 Michael Shigorin <mike@altlinux.org> 1.1.58-alt1
- vagrant feature (closes: #28553)
* Mon Feb 09 2015 Michael Shigorin <mike@altlinux.org> 1.1.57-alt1
- fix the lists copying fix
* Mon Feb 02 2015 Michael Shigorin <mike@altlinux.org> 1.1.56-alt1
- fix lilo check for vm images
* Mon Jan 26 2015 Michael Shigorin <mike@altlinux.org> 1.1.55-alt1
- lists copying fixed
* Mon Jan 05 2015 Michael Shigorin <mike@altlinux.org> 1.1.54-alt1
- live: don't force localboot
* Mon Dec 15 2014 Michael Shigorin <mike@altlinux.org> 1.1.53-alt1
- starterkits-20141212
* Mon Nov 17 2014 Michael Shigorin <mike@altlinux.org> 1.1.52-alt1
- docs: "7.0+" (closes: #30474)
- l10n feature
* Mon Nov 10 2014 Michael Shigorin <mike@altlinux.org> 1.1.51-alt1
- current updates
* Mon Oct 27 2014 Michael Shigorin <mike@altlinux.org> 1.1.50-alt1
- minor tweaks
* Mon Oct 13 2014 Michael Shigorin <mike@altlinux.org> 1.1.49-alt1
- pkglist updates
* Mon Sep 29 2014 Michael Shigorin <mike@altlinux.org> 1.1.48-alt1
- (sysv)init: exclude systemd explicitly
* Mon Sep 22 2014 Michael Shigorin <mike@altlinux.org> 1.1.47-alt1
- kpackages() argswap
* Mon Sep 15 2014 Michael Shigorin <mike@altlinux.org> 1.1.46-alt1
- regular fixes
* Mon Sep 01 2014 Michael Shigorin <mike@altlinux.org> 1.1.45-alt1
- starterkits alpha
* Mon Aug 18 2014 Michael Shigorin <mike@altlinux.org> 1.1.44-alt1
- connman fixup
* Mon Aug 04 2014 Michael Shigorin <mike@altlinux.org> 1.1.43-alt1
- fixed package build
* Mon Jul 28 2014 Michael Shigorin <mike@altlinux.org> 1.1.42-alt1
- current bits
* Mon Jul 07 2014 Michael Shigorin <mike@altlinux.org> 1.1.41-alt1
- post-214 fixups

View File

@@ -0,0 +1,6 @@
object d8e050dc5902f958613c638d3b3e775ff0a82b9e
type commit
tag v1.3.11.1
tagger Michael Shigorin <mike@altlinux.org> 1562654313 +0300
v1.3.11.1

View File

@@ -1,6 +0,0 @@
object 730303bbe8f73be74d24491a56daa8d7435ca736
type commit
tag v1.1.40
tagger Michael Shigorin <mike@altlinux.org> 1404158399 +0400
systemd-214

View File

@@ -1 +1 @@
14a23f8501d02930d95515124059efd6f757bcaf v1.1.40
0ad4cdedf0a3aafca1a5bb95fb645aef85d4c088 v1.3.11.1

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
*~
.*.swp
build
image.in/files/*

View File

@@ -8,7 +8,7 @@
# for immediate assignment
ifndef ARCH
ARCH := $(shell arch \
| sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/; s/ppc.*/ppc/')
| sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/')
endif
ifndef ARCHES
@@ -56,8 +56,12 @@ SHELL = /bin/bash
say "** goal: $@ [$$n/$(NUM_TARGETS)]"; \
fi; \
for ARCH in $(ARCHES); do \
if [ "$$ARCH" != "$(firstword $(ARCHES))" ]; then say; fi; \
say "** ARCH: $$ARCH"; \
if [ -z "$(QUIET)" ]; then \
if [ "$$ARCH" != "$(firstword $(ARCHES))" ]; then \
say; \
fi; \
say "** ARCH: $$ARCH"; \
fi; \
if $(MAKE) -f main.mk ARCH=$$ARCH $@ $(POSTPROC); then \
if [ -n "$$REPORT" ]; then \
$(MAKE) -f reports.mk ARCH=$$ARCH; \

View File

@@ -3,17 +3,16 @@ http://en.altlinux.org/Hasher; large tmpfs helps a lot).
требуется
~~~~~~~~~
- ALT Linux 6.0 или выше (возможна адаптация "вниз")
- ALT 8.0 или выше (возможна адаптация "вниз", см. ветки)
- установленный mkimage (свежий, как и hasher)
- пользователь с правом запуска hasher
- пользователь с правом запуска hasher и подключения /proc к нему
полезно
~~~~~~~
- смонтированный tmpfs на несколько гигабайт
- смонтированный tmpfs на несколько гигабайт (или укажите BUILDDIR)
* например, в /tmp или /home/USER/hasher
* каталог из prefix в /etc/hasher-priv/system
- установленный git-core
- настроенный ~/.gitconfig
- установленный git-core и настроенный ~/.gitconfig
команды
~~~~~~~
@@ -30,7 +29,7 @@ $ git config --global user.name "My Name"
$ mkdir -p ~/out ~/tmp
----
тестовая сборка::
тестовая сборка (в каталоге mkimage-profiles)::
----
$ make syslinux.iso
----
@@ -52,3 +51,4 @@ $ make ARCH=i586 APTCONF=~/apt/apt.conf.i586 REPORT=1 ve/generic.tar
- http://www.altlinux.org/mkimage
- http://www.altlinux.org/m-p
- http://www.altlinux.org/m-p-howto ("как поправить под себя")
- http://www.altlinux.org/starterkits/builder (сборочный LiveCD)

5
README
View File

@@ -40,18 +40,23 @@
** могут основываться на предшественниках, расширяя их
** дистрибутивы также включают один или более субпрофилей по надобности
** желательно избегать множественного наследования, см. тж. фичи
* субпрофили:
** список собирается в $(SUBPROFILES)
** базовые комплекты помещены в подкаталогах под sub.in/;
их наборы скриптов могут расширяться фичами
* фичи:
** законченные блоки функциональности (или наборы таковых)
** описываются в индивидуальных features.in/*/config.mk
** могут требовать другие фичи, а также субпрофили
** накопительный список собирается в $(FEATURES)
** при сборке $(BUILDDIR) содержимое фич добавляется в профиль
* списки пакетов (*_LISTS):
** _внимание_: не надо создавать фичу, если достаточно списка пакетов!
** просьба по возможности избегать дублирования (см. bin/pkgdups)
* индивидуальные пакеты (*_PACKAGES): см. тж. conf.d/README
Результат:

14
bin/check-recipe Executable file
View File

@@ -0,0 +1,14 @@
#!/bin/sh
# missing "; @:" for recipeless rules makes SHELL payload useless
# (see also ../lib/report.mk); this results in broken target graphs
# (so REPORT=1 gets crippled)
sed 's/^[a-z]\+\/.*:.*$/\n&/' "$@" \
| grep -vE '^(#|export|if|else|endif|define|endef)' \
| sed ':loop /^[^#].*[^\\]\\$/N; s/\\\n//; t loop' \
| grep -vE ':=| = | ?= | += |^\$' \
| sed ':loop /^[a-z]\+\/.*:.*$/N; s/\n\t\+@*/\; /; t loop' \
| grep -vE ';|^$' && exit 1 ||:
# see also http://unix.stackexchange.com/questions/228547

24
bin/cleanlog Executable file
View File

@@ -0,0 +1,24 @@
#!/bin/sh
# try making build logs more diffable
# see also reports.mk
[ -n "$BUILDDIR" ] || exit 1
sed -r \
-e "s,$BUILDDIR,,g" \
-e '/\/var\/lib\/apt\/lists/d' \
-e 's/... .. ..:..:..//g' \
-e 's/\[[0-9]+\]//g' \
-e '/^(Reading Package Lists|Building Dependency Tree)/d' \
-e '/^(Fetched|Need to get|After unpacking) /d' \
-e '/^(Preparing packages for installation|Done\.)/d' \
-e '/^hsh(|-(initroot|install|fakedev|(mk|rm)chroot|run)): /d' \
-e '/^(hasher-priv|mkaptbox|(mk|rm)dir): /d' \
-e '/^mki-((invalidate-|)cache|check-obsolete|prepare): /d' \
-e '/^(mode of|changed (group|ownership)|removed) /d' \
-e '/^chroot\/.in\//d' \
-e '/ has started executing\.$/d' \
-e '/\/var\/log\/apt\.log$/d' \
-e '/\/usr\/share\/apt\/scripts\/log\.lua/d' \
-e '/\.rpm$/d' \
-e "/' -> '/d"

View File

@@ -2,10 +2,20 @@
# analyze free space, preferring tmpfs over really many gigaz
# and taking into account configured hasher workdir prefices
# NB: use BUILDDIR to override autodetection (see ../QUICKSTART)
# hope there aren't spaces in RM's $HOME are they?
DIRS="$TMP $TMPDIR $HOME/hasher /tmp /var/tmp .."
MINSIZE=262144 # face control criterion
# mkimage needs /proc among those, be clear about that
check_allowed_mountpoints()
{
grep -wqs "^allowed_mountpoints=[^#]*/proc" \
/etc/hasher-priv/system \
`/usr/libexec/hasher-priv/getconf.sh`
}
# poor man's SourceIfExists()
try_source() { [ -f "$1" ] && . "$1"; }
@@ -45,7 +55,7 @@ choose_tmpdir() {
echo -n "$i "
df -PT "$i" | tail -1
done \
| sort -unk6 \
| sort -unk5 \
| while read dir dev fstype size used free percent mnt; do
check_options "$dev" "$mnt" || continue
[ "$free" -gt "$MINSIZE" ] || continue
@@ -59,6 +69,12 @@ choose_tmpdir() {
}
# bringing it all together
if ! check_allowed_mountpoints; then
echo "error: hasher's allowed_mountpoints do not include /proc;"
echo "please check hasher docs and /etc/hasher-priv/system"
exit 1
fi >&2
TMPDIRS="`contemplate_dirs $DIRS`"
if [ -z "$TMPDIRS" ]; then
echo "error: no suitable directories found;"

View File

@@ -20,7 +20,7 @@ if type -t git >&/dev/null && pushd "$1" >/dev/null; then
fi
if [ -n "$(git status -s)" ]; then
git add . \
&& git commit -qam "$2" \
&& git commit -anq -m "$2" \
|| fatal "git add/commit failed"
fi
popd >/dev/null

View File

@@ -21,10 +21,10 @@ while read first second third rest; do
for to in $TO; do
out=" \"$FROM\" -> \"$to\""
case $to in
*distro/*|*vm/*)
*distro/*|*vm/*|*ve/*)
echo "$out [weight=10];";;
*)
echo "$out";;
echo "$out;";;
esac
done
done

View File

@@ -3,6 +3,7 @@
# tar2fs chroot.tar image.raw [size_in_bytes [fstype]]
. shell-error
export LANG=C
if [ $# -lt 2 ]; then
fatal "error: tar2fs needs at least two arguments"
@@ -23,26 +24,33 @@ MB=1048576 # a parted's "megabyte" in bytes is *broken*
SIZE_FACTOR=2 # multiply the sizes found by this value
BOOT_SIZE_FACTOR=2 # multiply /boot size by this value additionally
BOOTLOADERPARTSIZEM=0 # PReP partition size (ppc*)
CUR_BOUNDARY=0 # align first partition at 1MB for performance (+1)
INITRD_MODULES=
BOOTFSTYPE=
BOOTPART=
case "`arch`" in # NB: sudo => no GLOBAL_ will do either; mind qemu-*
*86*)
# NB: different storage modules might be needed for non-kvm
INITRD_MODULES="sd_mod ata_piix"
BLOCKDEV="/dev/sda" # might be /dev/vda for virtio
ROOTPART="1"
;;
arm*)
BOOTFSTYPE="ext2" # support expected in every sane target uboot
BLOCKDEV="/dev/mmcblk0p" # ...hopefully...
ARCH="$(arch)" # NB: sudo => no GLOBAL_ will do either; mind qemu-*
case "$ARCH" in
e2k)
BOOTFSTYPE="ext2" # firmware knows it
BLOCKDEV="/dev/sda" # ...hopefully...
BOOTPART="1"
ROOTPART="2"
;;
ppc*)
BOOTFSTYPE="ext4"
BLOCKDEV="/dev/sda"
BOOTLOADERPART="1"
BOOTLOADERPARTSIZEM="8"
ROOTPART="2"
;;
*)
ROOTPART="1"
BLOCKDEV="/dev/sda"
;;
esac
# figure out the part taken by /boot in the given tarball
@@ -125,11 +133,15 @@ fi
exit_handler() {
rc=$?
cd /
if [ -n "$ROOTFS" ]; then
umount ${BOOTFS:+"$BOOTFS"} "$ROOTFS"{/dev,/proc,/sys,}
if [ -n "$LOOPDEV" ]; then
kpartx -d "$LOOPDEV"
kpartx -d -s "$LOOPDEV" || {
sleep 10
kpartx -d -s -v "$LOOPDEV"
}
losetup --detach "$LOOPDEV"
fi
rm -r -- "$ROOTFS"
@@ -143,12 +155,24 @@ trap exit_handler EXIT ERR
# prepare disk image and a filesystem inside it
rm -f -- "$IMG"
OFFSET="$(($CUR_BOUNDARY + $BOOTSIZEM + $ROOTSIZEM - 1))"
OFFSET="$(($CUR_BOUNDARY + $BOOTLOADERPARTSIZEM + $BOOTSIZEM + $ROOTSIZEM - 1))"
dd if=/dev/zero of="$IMG" conv=notrunc bs=$MB count=1 seek="$OFFSET"
losetup "$LOOPDEV" "$IMG"
parting mklabel msdos
if [ -n "$BOOTLOADERPART" ] && [ -n "$BOOTLOADERPARTSIZEM" ]; then
case "$ARCH" in
ppc*)
parting mkpart primary ext2 2048s ${BOOTLOADERPARTSIZEM}M
CUR_BOUNDARY="$(($CUR_BOUNDARY + $BOOTLOADERPARTSIZEM))"
parting set 1 prep on
parting set 1 boot on
;;
esac
fi
if [ -n "$BOOTPART" ]; then
BOOTDEV="$BLOCKDEV$BOOTPART"
mkpart "$BOOTSIZEM"
@@ -167,6 +191,10 @@ if [ -n "$BOOTPART" ]; then
mkfs."$BOOTFSTYPE" "$LOOPBOOT"
fi
if [ -n "$BOOTLOADERPART" ] && [ -n "$BOOTLOADERPARTSIZEM" ]; then
LOOPBOOTLOADER="/dev/mapper/$(basename "$LOOPDEV")p$BOOTLOADERPART"
fi
ROOTUUID="$(blkid -s UUID -o value -c /dev/null "$LOOPROOT")"
if [ -n "$ROOTUUID" ]; then
ROOTDEV="UUID=$ROOTUUID"
@@ -201,25 +229,76 @@ if [ -n "$BOOTPART" ]; then
echo "$BOOTDEV /boot $BOOTFSTYPE defaults 1 2" >> "$ROOTFS/etc/fstab"
fi
echo "MODULES_PRELOAD += $INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
# Query ARCH in chroot and redefine arch-dependent variable
ARCH="$(chroot "$ROOTFS" rpm --eval '%_host_cpu')"
KERNEL="$(readlink $ROOTFS/boot/vmlinuz | sed 's,vmlinuz-,,')"
chroot "$ROOTFS" make-initrd -k "$KERNEL"
# NB: don't stick BOOTFS here, it has slightly different semantics
pushd $ROOTFS/boot
# 4.9.76-elbrus-def-alt1.11.1 -> def
get_label() { echo "${1# *}" | sed -r 's,.*elbrus-([0-9a-z]+)-.*$,\1,'; }
KVERSIONS=
if [ -s .origver ]; then
while read kver; do
KVERSIONS="$KVERSIONS $kver"
done < .origver
fi
[ -n "$KVERSIONS" ] || fatal "unable to deduce kernel version"
rm -f .origver
BOOTLOADER=
if [ -s .bootloader ]; then
read -r BOOTLOADER<.bootloader
fi
rm -f .bootloader
# ...target device too
sed -i "s,$LOOPROOT,$ROOTDEV," "$ROOTFS/etc/fstab"
if [ -x /sbin/lilo ]; then
echo "** KVERSIONS=[$KVERSIONS]" >&2
if [ "`echo $KVERSIONS | wc -w`" = 1 ]; then # 2+ labels
echo -e "default=`get_label $KVERSIONS`\n" >> boot.conf
fi
# FIXME: relies on particular (current) kernel package naming scheme
for v in $KVERSIONS; do
l="`get_label "$v"`"
cat >> boot.conf <<EOF
label=$l
partition=0
image=/image-$v
initrd=/initrd-$v.img
cmdline=console=ttyS0,115200 console=tty0 consoleblank=0 hardreset root=UUID=$ROOTUUID
EOF
done
echo "** start of boot.conf"
cat boot.conf
echo "** end of boot.conf"
popd
# Setup bootloader
case "$BOOTLOADER" in
uboot)
EXTLINUX_CONF="$ROOTFS/boot/extlinux/extlinux.conf"
sed -i "/LABEL=ROOT/d" "$ROOTFS/etc/fstab"
sed -i "s/LABEL=ROOT/$ROOTDEV/g" "$EXTLINUX_CONF"
;;
lilo)
# configure and install bootloader
REGEXP='^Disk .*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
set -- $(sfdisk -l "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
REGEXP='^.*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
set -- $(sfdisk -g "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
LILO_COMMON="lba32
delay=1
vga=0
image=/boot/vmlinuz
initrd=/boot/initrd.img
append=\"root=$ROOTDEV rootdelay=3 quiet\"
append=\"root=$ROOTDEV rootdelay=3 console=tty1 console=ttyS0,115200n8\"
label=linux"
cat > "$ROOTFS"/etc/lilo-loop.conf <<-EOF
@@ -240,8 +319,29 @@ image=/boot/vmlinuz
boot=$BLOCKDEV
$LILO_COMMON
EOF
fi
;;
grub-efi)
chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
chroot "$ROOTFS" grub-install
;;
grub)
chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
case "$ARCH" in
*86*)
chroot "$ROOTFS" grub-install --target=i386-pc "$LOOPDEV"
;;
ppc*)
[ -z "$LOOPBOOTLOADER" ] ||
chroot "$ROOTFS" grub-install --target=powerpc-ieee1275 \
--no-nvram "$LOOPBOOTLOADER"
;;
esac
;;
esac
if [ -n "$SUDO_USER" ]; then
chown "$SUDO_USER" "$IMG" "$ROOTFS" "$WORKDIR"
chown "$SUDO_USER:$(id -g "$SUDO_USER")" "$IMG" ||:
fi
# maybe qemu interpreter was copied to chroot;
# this is no longer necessary, remove
rm -rf "$ROOTFS"/.host ||:

2
conf.d/Makefile Normal file
View File

@@ -0,0 +1,2 @@
check:
@../bin/check-recipe *.mk

View File

@@ -29,7 +29,7 @@
* SYSTEM_PACKAGES стоит применять крайне осторожно -- эти пакеты попадут
во все стадии, в том числе в образ чувствительной к объёму install2
(в stage1 -- только в инструментальный чрут); применяйте для того,
что обязано быть и в инсталяторе, и в готовой системе
что обязано быть и в инсталяторе, и в готовой системе (но не в rescue)
* для направленного действия служат:
** STAGE1_PACKAGES, STAGE1_PACKAGES_REGEXP (первая стадия загрузки)
@@ -39,7 +39,7 @@
** MAIN_PACKAGES, MAIN_LISTS, MAIN_PACKAGES_REGEXP (дополнительные пакеты)
** LIVE_PACKAGES, LIVE_LISTS, LIVE_PACKAGES_REGEXP ("живая" система)
* аналогично по модулям ядра:
* аналогично по kernel-modules-*:
** THE_KMODULES попадут в "пользовательскую" среду (live, main)
** STAGE1_KMODULES доступны в производных от stage2 (install2, live, rescue)
** BASE_KMODULES попадут в установку по умолчанию

View File

@@ -45,14 +45,13 @@ vm/.cubox-bare: vm/.arm-base use/armh-cubox use/net-ssh use/repo use/tty/S0
@$(call add,BASE_PACKAGES,glibc-locales vim-console rsync)
vm/.cubox-desktop: vm/.cubox-bare use/armh-dovefb +systemd +pulse \
use/armh-cubox use/branding use/xdg-user-dirs/deep
use/armh-cubox use/branding use/xdg-user-dirs/deep \
use/fonts/otf/adobe use/fonts/ttf/redhat use/fonts/ttf/ubuntu
@$(call set,BRANDING,altlinux-kdesktop)
@$(call add,THE_BRANDING,alterator graphics indexhtml menu notes)
@$(call add,BASE_PACKAGES,parole gst-ffmpeg gst-plugins-vmeta)
@$(call add,BASE_PACKAGES,gst-plugins-good gst-plugins-nice)
@$(call add,BASE_PACKAGES,gst-plugins-bad gst-plugins-ugly)
@$(call add,BASE_PACKAGES,fonts-ttf-droid fonts-ttf-ubuntu-font-family)
@$(call add,BASE_PACKAGES,fonts-ttf-liberation fonts-ttf-dejavu)
@$(call add,BASE_PACKAGES,LibreOffice4-full LibreOffice4-langpack-ru)
@$(call add,BASE_LISTS,$(call tags,(base || desktop) && regular))

57
conf.d/basealt.mk Normal file
View File

@@ -0,0 +1,57 @@
ifeq (distro,$(IMAGE_CLASS))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\
3rdparty blender clamav cloud-clients freecad \
gtk-dictionary kvm smartcard virtualbox voip-clients)
distro/alt-workstation: distro/.base +power +vmguest +wireless +efi \
mixin/desktop-installer mixin/alt-workstation \
use/memtest use/rescue/base use/bootloader/grub use/luks \
use/efi/refind use/efi/memtest86 use/efi/shell \
use/install2/repo use/install2/suspend use/live/suspend \
use/live/install use/live/x11 use/live/repo use/live/rw \
use/branding/complete use/docs/license \
use/domain-client/full use/x11/amdgpu use/x11/lightdm/gtk
@$(call add,INSTALL2_PACKAGES,open-iscsi)
@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
@$(call add,MAIN_PACKAGES,solaar)
@$(call add,MAIN_GROUPS,$(workstation_groups_x86))
@$(call add,MAIN_LISTS,workstation/extras)
@$(call add,MAIN_LISTS,$(call tags,xorg vaapi))
@$(call add,THE_LISTS,$(call tags,archive extra))
@$(call add,THE_LISTS,$(call tags,mobile mate))
@$(call add,BASE_KMODULES,kvm virtualbox)
@$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power)
@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
@$(call add,EFI_BOOTARGS,lang=ru_RU)
endif
ifeq (,$(filter-out e2k%,$(ARCH)))
distro/.alt-workstation-base: distro/.e2k-installer mixin/alt-workstation
@$(call add,THE_PACKAGES,setup-mate-terminal)
@$(call add,THE_PACKAGES,setup-mate-nocomposite)
@$(call add,THE_PACKAGES,setup-libgl-dri3-disable)
@$(call add,THE_PACKAGES,setup-pulseaudio-plain-module-detect)
@$(call add,THE_PACKAGES,firmware-linux)
@$(call add,THE_BRANDING,graphics)
@$(call set,META_APP_ID,ALT Workstation/$(ARCH))
distro/.alt-workstation: distro/.alt-workstation-base use/x11/lightdm/gtk; @:
distro/alt-workstation-101: distro/.alt-workstation use/e2k/101
@$(call set,META_VOL_ID,ALT Workstation 101)
@$(call add,MAIN_GROUPS,workstation/e101-modesetting)
@$(call add,MAIN_GROUPS,workstation/e101-mga2)
distro/alt-workstation-401: distro/.alt-workstation use/e2k/401; @:
@$(call set,META_VOL_ID,ALT Workstation 401)
# avoid lightdm; NB: mate-settings pulls it in (hence the dummy)
distro/alt-workstation-801: distro/.alt-workstation-base use/e2k/install2/801
@$(call set,META_VOL_ID,ALT Workstation 801)
@$(call add,MAIN_GROUPS,workstation/e801-1seat workstation/e801-2seat)
@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-801-dualseat)
endif
endif

View File

@@ -6,26 +6,9 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
mixin/desktop-installer: use/x11-autostart use/net-eth use/sound +vmguest
@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
@$(call add,BASE_LISTS, \
$(call tags,(base || desktop) && (l10n || network)))
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,BASE_PACKAGES,os-prober)
distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:
distro/.desktop-network: distro/.desktop-mini \
mixin/desktop-installer use/stage2/net-eth; @:
distro/.desktop-extra:
@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))
distro/kde4-lite: distro/.desktop-mini \
distro/.desktop-network distro/.desktop-extra +kde4-lite
@$(call set,KFLAVOURS,std-def)
distro/tde: distro/.desktop-network +tde; @:
distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
distro/ltsp-tde: distro/tde +ltsp; @:
distro/ltsp-icewm: distro/icewm +ltsp; @:
endif

105
conf.d/e2k.mk Normal file
View File

@@ -0,0 +1,105 @@
ifeq (vm,$(IMAGE_CLASS))
vm/.e2k-bare: vm/.bare use/e2k
@$(call add,BASE_PACKAGES,apt)
vm/e2k-live: vm/.e2k-bare use/deflogin/live use/net-ssh use/control/sudo-su
@$(call add,THE_LISTS,$(call tags,ve tools))
vm/.e2k-rescue: vm/e2k-live \
mixin/e2k-base use/net/etcnet use/services/lvm2-disable
@$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
@$(call add,THE_PACKAGES,make-initrd dhcpcd hdparm nfs-clients)
@$(call add,THE_LISTS,$(call tags,server && (network || extra)))
@$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd)
vm/alt-rescue: vm/.e2k-rescue +sysvinit
@$(call add,KFLAVOURS,elbrus-def)
vm/e2k-xfce: vm/.e2k-rescue mixin/e2k-desktop use/x11/xfce
@$(call add,THE_PACKAGES,pnmixer)
vm/e2k-mate: vm/.e2k-rescue use/deflogin/live use/x11/mate use/x11/lightdm/gtk \
mixin/e2k-base mixin/e2k-desktop mixin/e2k-livecd-install
@$(call add,THE_PACKAGES,LibreOffice-integrated LibreOffice-gnome)
@$(call add,THE_PACKAGES,LibreOffice-langpack-ru)
vm/e2k-lxqt: vm/.e2k-rescue mixin/e2k-desktop
@$(call add,THE_LISTS,$(call tags,desktop && lxqt && !extra))
vm/e2k-builder: vm/.e2k-rescue use/dev/builder/base
@$(call add,KFLAVOURS,elbrus-8c elbrus-4c)
vm/e2k-samba-DC: vm/.e2k-rescue
@$(call add,BASE_PACKAGES,task-samba-dc glibc-locales net-tools)
endif
ifeq (ve,$(IMAGE_CLASS))
ve/.e2k-bare: ve/.base use/e2k +sysvinit
@$(call add,BASE_PACKAGES,apt)
ve/e2k-installer: ve/.e2k-bare use/repo/main
@$(call add,MAIN_PACKAGES,hello)
ve/e2k-git: ve/.e2k-bare use/e2k use/net-ssh use/net-dns/yandex
@$(call add,BASE_PACKAGES,git-server nginx)
@$(call add,DEFAULT_SERVICES_ENABLE,xinetd git nginx)
endif
ifeq (distro,$(IMAGE_CLASS))
distro/.e2k-rescue: distro/.base mixin/e2k-base use/rescue/.base +net-eth
@$(call set,META_VOL_ID,ALT Rescue for Elbrus)
distro/e2k-101-rescue: distro/.e2k-rescue
@$(call add,KFLAVOURS,elbrus-1cp)
# NB: this one is NOT suited for a particular processor yet!
# (that's to be done downstream)
distro/.e2k-installer-base: distro/.base mixin/e2k-base \
use/install2 use/install2/packages use/e2k/install2 \
use/volumes/regular use/net-ssh +net-eth
@$(call set,INSTALLER,altlinux-generic)
@$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_VOL_SET,ALT)
@$(call set,META_VOL_ID,ALT for Elbrus)
@$(call set,META_APP_ID,ALT/$(ARCH))
@$(call add,INSTALL2_PACKAGES,agetty)
@$(call add,INSTALL2_PACKAGES,ifplugd) ### for net-eth link status
@$(call add,INSTALL2_BRANDING,alterator)
@$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
@$(call add,THE_PACKAGES,make-initrd dhcpcd hdparm nfs-clients vim-console)
@$(call add,THE_PACKAGES,python-module-serial)
@$(call add,THE_LISTS,$(call tags,server && (network || extra)))
@$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd)
@$(call add,THE_BRANDING,alterator)
@$(call set,BRANDING,alt-workstation) ### conflicts w/alt-sisyphus
distro/.e2k-installer-sysv: distro/.e2k-installer-base +sysvinit; @:
distro/.e2k-installer: distro/.e2k-installer-base +systemd; @:
distro/e2k-801-builder: distro/.e2k-installer-sysv \
use/e2k/install2/801 use/dev/groups/builder; @:
distro/alt-jeos-401: distro/.e2k-installer-sysv use/e2k/install2/401
@$(call set,META_VOL_ID,ALT JeOS 401)
distro/alt-jeos-801: distro/.e2k-installer-sysv use/e2k/install2/801
@$(call set,META_VOL_ID,ALT JeOS 801)
distro/alt-jeos-101: distro/.e2k-installer-sysv use/e2k/install2/101
@$(call set,META_VOL_ID,ALT JeOS 101)
distro/e2k-101-mate: distro/.e2k-installer use/e2k/101 \
mixin/e2k-desktop mixin/e2k-mate
@$(call add,THE_PACKAGES,LibreOffice-integrated LibreOffice-gnome)
@$(call add,THE_PACKAGES,LibreOffice-langpack-ru)
distro/e2k-4xx-installer: distro/.e2k-installer-sysv use/e2k/install2/4xx
@$(call set,INSTALLER,altlinux-server)
@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
distro/.e2k-installer-mate: distro/.e2k-installer \
mixin/e2k-desktop mixin/e2k-mate; @:
endif

70
conf.d/education.mk Normal file
View File

@@ -0,0 +1,70 @@
# ALT Education
ifeq (distro,$(IMAGE_CLASS))
distro/education: distro/alt-education
distro/alt-education: distro/.installer \
+systemd \
use/memtest \
use/services \
use/live/install use/live/suspend \
use/live/repo use/live/x11 use/live/rw \
use/install2/vnc use/install2/full \
use/l10n/default/ru_RU +vmguest \
+efi use/efi/refind use/efi/shell \
use/ntp/chrony \
use/isohybrid use/x11/xorg use/x11/lightdm/gtk +pulse use/luks \
+plymouth +nm use/x11/gtk/nm +wireless \
use/xdg-user-dirs/deep use/install2/fonts \
use/branding/complete
@$(call set,INSTALLER,junior)
@$(call set,BRANDING,alt-education)
@$(call add,THE_BRANDING,menu xfce-settings system-settings)
@$(call set,META_APP_ID,$(DISTRO_VERSION)/$(ARCH))
@$(call set,META_VOL_SET,ALT Education 8.2)
@$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call add,INSTALL2_PACKAGES,disable-usb-autosuspend)
@$(call add,INSTALL2_PACKAGES,installer-feature-samba-usershares-stage2)
@$(call add,THE_LISTS,slinux/xfce-base)
@$(call add,THE_LISTS,slinux/misc-base)
@$(call add,THE_LISTS,gnome-p2p)
@$(call add,THE_LISTS,$(call tags,base l10n))
@$(call add,MAIN_LISTS,slinux/not-install-full)
@$(call add,BASE_LISTS,education/base)
@$(call add,BASE_LISTS,workstation/3rdparty)
@$(call add,THE_LISTS,education/misc)
@$(call add,MAIN_GROUPS,education/01_preschool)
@$(call add,MAIN_GROUPS,education/02_gradeschool)
@$(call add,MAIN_GROUPS,education/03_highschool)
@$(call add,MAIN_GROUPS,education/04_secondary_vocational)
@$(call add,MAIN_GROUPS,education/05_university)
@$(call add,MAIN_GROUPS,education/teacher)
@$(call add,MAIN_GROUPS,education/kde5)
@$(call add,MAIN_GROUPS,education/server-apps-edu)
@$(call set,KFLAVOURS,std-def)
@$(call add,THE_KMODULES,virtualbox)
@$(call add,THE_KMODULES,nvidia)
@$(call add,THE_KMODULES,lsadrv bbswitch)
@$(call add,THE_KMODULES,staging)
@$(call add,MAIN_KMODULES,bbswitch)
@$(call add,THE_PACKAGES,usbutils pv syslinux lftp links2 openssh-server xinput xorg-drv-libinput)
@$(call add,THE_PACKAGES,net-tools fdisk gdisk parted partclone)
@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse disable-usb-autosuspend)
@$(call add,THE_PACKAGES,bluez pulseaudio-bluez)
@$(call add,THE_PACKAGES,alterator-fbi)
@$(call add,BASE_PACKAGES,os-prober)
@$(call add,BASE_PACKAGES,guest-account)
@$(call add,BASE_PACKAGES,nextcloud-client)
@$(call add,MAIN_PACKAGES,iperf3 owamp-server)
@$(call add,MAIN_PACKAGES,stellarium)
@$(call add,MAIN_PACKAGES,lmms)
@$(call add,THE_LISTS,$(call tags,base regular))
@$(call add,STAGE1_MODLISTS,stage2-mmc)
@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
@$(call add,LIVE_PACKAGES,livecd-timezone)
@$(call add,LIVE_LISTS,slinux/network-base)
@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
@$(call add,STAGE2_PACKAGES,chrony)
@$(call add,STAGE1_MODLISTS,stage2-mmc)
@$(call add,SERVICES_ENABLE,bluetoothd sshd bind crond alteratord cups ahttpd)
endif

View File

@@ -1,12 +1,18 @@
# live images
ifeq (distro,$(IMAGE_CLASS))
distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
distro/dos: distro/.boot use/dos use/syslinux/ui/menu
@$(call set,RELNAME,ALT FreeDOS)
distro/rescue: distro/.base use/rescue use/syslinux/ui/menu \
distro/rescue: distro/.base use/rescue use/syslinux/ui/menu use/stage2/cifs \
use/efi/signed use/efi/refind use/efi/shell; @:
distro/syslinux: distro/.init \
distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
@$(call set,SYSLINUX_CFG,rescue_remote)
@$(call set,SYSLINUX_DIRECT,1)
@$(call add,RESCUE_PACKAGES,livecd-net-eth)
distro/syslinux: distro/.boot \
use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
@@ -16,45 +22,46 @@ distro/.live-desktop: distro/.base +live use/live/install use/stage2/net-eth \
use/plymouth/live; @:
distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:
distro/.live-kiosk: distro/.base use/live/base use/live/autologin +power \
use/syslinux/timeout/1 use/cleanup use/stage2/net-eth
@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu)
distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
use/syslinux/timeout/1 use/cleanup use/stage2/net-eth \
use/fonts/otf/adobe +power
@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
@$(call set,SYSLINUX_UI,none)
@$(call set,SYSLINUX_CFG,live)
@$(call add,STAGE2_BOOTARGS,quiet)
@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind klogd syslogd)
@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver fbsetfont keytable)
distro/live-builder-mini: distro/.live-base use/dev/mkimage use/dev \
use/stage2/net-eth use/net-eth/dhcp use/syslinux/timeout/30 \
use/efi/signed
@$(call set,KFLAVOURS,$(BIGRAM))
@$(call add,LIVE_LISTS,\
$(call tags,(base || live) && (server || builder)))
@$(call add,LIVE_PACKAGES,livecd-qemu-arch strace)
@$(call add,LIVE_PACKAGES,qemu-user-binfmt_misc)
@$(call add,LIVE_PACKAGES,zsh sudo)
distro/live-builder-mini: distro/.live-base use/dev/builder/base \
use/syslinux/timeout/30 use/isohybrid \
use/stage2/net-eth use/net-eth/dhcp; @:
distro/live-builder: distro/live-builder-mini \
use/live/rw use/live/repo use/dev/repo
@$(call add,MAIN_LISTS,$(call tags,live builder))
@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ mkisofs)
use/dev/builder/full use/live/rw +efi; @:
distro/live-install: distro/.live-base use/live/textinstall; @:
distro/.livecd-install: distro/.live-base use/live/install; @:
distro/live-icewm: distro/.live-desktop use/x11/lightdm/gtk +icewm; @:
distro/live-razorqt: distro/.live-desktop +razorqt; @:
distro/live-tde: distro/.live-desktop-ru use/live/install +tde; @:
distro/live-fvwm: distro/.live-desktop-ru use/x11/lightdm/gtk use/x11/fvwm; @:
distro/live-rescue: distro/live-icewm use/efi
distro/live-rescue: distro/live-icewm +efi
@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
@$(call add,LIVE_LISTS,openssh \
$(call tags,(base || extra) && (archive || rescue || network)))
# NB: this one doesn't include the browser, needs to be chosen downstream
distro/.live-webkiosk: distro/.live-kiosk use/live/hooks use/live/ru use/sound
distro/.live-webkiosk: distro/.live-kiosk \
use/isohybrid use/live/hooks use/live/ru use/sound \
use/stage2/kms use/x11/xorg
@$(call add,LIVE_LISTS,$(call tags,live desktop))
distro/.live-webkiosk-gtk: distro/.live-webkiosk
@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
distro/live-webkiosk-mini: distro/.live-webkiosk
# kiosk users rather prefer stability to latest bling
distro/live-webkiosk-mini: distro/.live-webkiosk-gtk \
use/browser/firefox use/browser/firefox/esr use/fonts/otf/mozilla
@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)
# NB: flash/java plugins are predictable security holes
@@ -63,36 +70,73 @@ distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live \
distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:
distro/live-webkiosk-chromium: distro/.live-webkiosk
distro/live-webkiosk-chromium: distro/.live-webkiosk use/fonts/ttf/google +efi
@$(call add,LIVE_PACKAGES,livecd-webkiosk-chromium)
distro/live-webkiosk-seamonkey: distro/.live-webkiosk use/fonts/ttf/google
@$(call add,LIVE_PACKAGES,livecd-webkiosk-seamonkey)
distro/live-webkiosk-qupzilla: distro/.live-webkiosk use/fonts/otf/mozilla
@$(call add,LIVE_PACKAGES,livecd-webkiosk-qupzilla)
distro/.live-3d: distro/.live-x11 use/x11/3d \
use/x11/lightdm/gtk +icewm +sysvinit
@$(call add,LIVE_PACKAGES,glxgears glxinfo)
distro/live-glxgears: distro/.live-3d; @:
distro/live-flightgear: distro/.live-kiosk use/x11/3d use/sound \
distro/.live-games: distro/.live-kiosk use/x11/3d use/sound \
use/stage2/net-eth use/net-eth/dhcp use/services +efi +sysvinit
@$(call set,KFLAVOURS,un-def)
@$(call add,LIVE_LISTS,$(call tags,xorg misc))
@$(call add,LIVE_PACKAGES,FlightGear FlightGear-tu154b)
@$(call add,LIVE_PACKAGES,fgo input-utils livecd-fgfs)
@$(call add,LIVE_PACKAGES,glxgears glxinfo)
@$(call add,LIVE_PACKAGES,pciutils input-utils glxgears glxinfo)
@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind alteratord messagebus)
@$(call add,SERVICES_DISABLE,livecd-net-eth)
distro/live-flightgear: distro/.live-games
@$(call add,LIVE_PACKAGES,FlightGear)
@$(call add,LIVE_PACKAGES,fgo livecd-fgfs)
@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
distro/live-e17: distro/.live-desktop-ru use/x11/e17 use/x11/lightdm/gtk; @:
distro/live-flightgear-tu154: distro/.live-games
@$(call add,LIVE_PACKAGES,FlightGear-tu154b)
distro/live-0ad: distro/.live-games
@$(call add,STAGE2_BOOTARGS,quiet)
@$(call add,LIVE_PACKAGES,0ad livecd-0ad)
@$(call try,HOMEPAGE,http://play0ad.com/)
distro/live-gimp: distro/live-icewm use/live/ru
@$(call add,LIVE_LISTS,$(call tags,desktop sane))
@$(call add,LIVE_PACKAGES,gimp tintii immix fim)
@$(call add,LIVE_PACKAGES,sane sane-frontends xsane)
@$(call add,LIVE_PACKAGES,darktable geeqie rawstudio ufraw)
@$(call add,LIVE_PACKAGES,macrofusion python-module-pygtk-libglade)
@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync usbutils)
@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)
distro/live-robo: distro/live-icewm +robotics use/live/ru; @:
# NB: use/browser won't do as it provides a *single* browser ATM
distro/live-privacy: distro/.base +power +efi +systemd +vmguest \
use/live/base use/live/privacy use/live/ru \
use/x11/xorg use/x11/lightdm/gtk use/x11/mate use/x11-autologin \
use/browser/firefox/esr use/browser/firefox/i18n use/sound \
use/fonts/otf/adobe use/fonts/otf/mozilla \
use/fonts/ttf/google use/fonts/ttf/redhat
@$(call set,KFLAVOURS,un-def)
@$(call add,LIVE_LISTS,$(call tags,base l10n))
@$(call add,LIVE_LISTS,$(call tags,archive extra))
@$(call add,LIVE_PACKAGES,chromium gedit mc-full pinta xchm livecd-ru)
@$(call add,LIVE_PACKAGES,LibreOffice-langpack-ru java-1.8.0-openjdk)
@$(call add,LIVE_PACKAGES,mate-document-viewer-caja)
@$(call add,LIVE_PACKAGES,mate-document-viewer-djvu)
@$(call add,LIVE_PACKAGES,cups system-config-printer livecd-admin-cups)
@$(call add,LIVE_KMODULES,staging)
@$(call add,DEFAULT_SERVICES_ENABLE,cups)
@$(call add,EFI_BOOTARGS,live_rw)
distro/live-privacy-dev: distro/live-privacy use/live/rw use/live/repo \
use/dev/repo use/dev/mkimage use/dev use/control/sudo-su
@$(call add,LIVE_LISTS,$(call tags,(base || live) && builder))
@$(call add,MAIN_LISTS,$(call tags,live builder))
@$(call add,MAIN_PACKAGES,syslinux mkisofs)
endif

53
conf.d/mixin-basealt.mk Normal file
View File

@@ -0,0 +1,53 @@
# shared across all supported arches, can be complemented per arch
mixin/alt-workstation: workstation_groups = $(addprefix workstation/,\
10-office 20-networking 30-multimedia 40-virtualization 50-publishing \
agents emulators ganttproject gnome-peer-to-peer graphics-editing \
libreoffice mate-usershare pidgin raccess scanning scribus \
sound-editing thunderbird vlc freeipa-client)
mixin/alt-workstation: +installer +systemd +pulse +nm \
use/kernel/net use/l10n/default/ru_RU \
use/x11/xorg use/x11-autostart use/x11/gtk/nm \
use/install2/fs use/install2/fat use/install2/vnc \
use/apt-conf/branch use/volumes/regular \
use/fonts/install2 \
use/fonts/otf/adobe use/fonts/otf/mozilla \
use/fonts/ttf/google use/fonts/ttf/google/extra \
use/fonts/ttf/redhat use/fonts/ttf/ubuntu \
use/branding use/control use/services \
use/sound use/xdg-user-dirs \
use/docs/manual use/docs/indexhtml \
use/browser/firefox use/browser/firefox/esr
@$(call set,BRANDING,alt-workstation)
@$(call add,THE_BRANDING,mate-settings)
@$(call add,STAGE1_MODLISTS,stage2-mmc)
@$(call set,INSTALLER,altlinux-desktop)
@$(call add,INSTALL2_PACKAGES,alterator-notes)
@$(call add,INSTALL2_PACKAGES,fdisk)
@$(call add,COMMON_PACKAGES,vim-console)
@$(call add,MAIN_GROUPS,$(workstation_groups))
@$(call add,BASE_LISTS,workstation/base.pkgs)
@$(call add,BASE_LISTS,$(call tags,desktop cups))
@$(call add,LIVE_LISTS,workstation/live.pkgs)
@$(call add,LIVE_LISTS,$(call tags,desktop sane))
@$(call add,LIVE_LISTS,$(call tags,desktop office))
@$(call add,THE_LISTS,workstation/mate)
@$(call add,THE_LISTS,workstation/the.pkgs)
@$(call add,THE_LISTS,$(call tags,regular desktop))
@$(call add,THE_LISTS,$(call tags,base regular))
@$(call add,THE_LISTS,$(call tags,base l10n))
@$(call add,THE_LISTS,$(call tags,base desktop))
@$(call add,THE_KMODULES,staging)
@$(call add,CLEANUP_PACKAGES,xterm)
@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
@$(call add,CONTROL,xdg-user-dirs:enabled)
@$(call add,SERVICES_ENABLE,sshd)
@$(call add,SERVICES_ENABLE,cups smb nmb httpd2 bluetoothd libvirtd)
@$(call add,DEFAULT_SERVICES_ENABLE,fstrim.timer)
@$(call add,DEFAULT_SERVICES_DISABLE,powertop bridge gpm)
@$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_VOL_SET,ALT)
@$(call set,META_VOL_ID,ALT Workstation)
@$(call set,META_APP_ID,$(DISTRO_VERSION)/$(ARCH))
@$(call set,DOCS,alt-workstation)

147
conf.d/mixin.mk Normal file
View File

@@ -0,0 +1,147 @@
### various mixins with their origin
### desktop.mk
mixin/desktop-installer: +net-eth +vmguest \
use/bootloader/os-prober use/x11-autostart use/fonts/install2 use/sound
@$(call add,BASE_LISTS, \
$(call tags,(base || desktop) && (l10n || network)))
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
### e2k.mk
mixin/e2k-base: use/tty/S0 use/net-eth/dhcp; @:
mixin/e2k-desktop: use/e2k/x11 use/l10n/default/ru_RU \
use/browser/firefox/esr use/browser/firefox/i18n \
use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call add,THE_PACKAGES,xinit xterm mc)
@$(call add,THE_PACKAGES,fonts-bitmap-terminus)
mixin/e2k-livecd-install: use/e2k/x11
@$(call add,THE_PACKAGES,livecd-install alterator-notes)
@$(call add,THE_PACKAGES,fdisk hdparm rsync openssh vim-console)
@$(call add,THE_PACKAGES,apt-repo)
mixin/e2k-mate: use/e2k/x11 use/x11/xorg use/fonts/install2 \
use/deflogin/live use/deflogin/xgrp \
use/x11/mate use/x11/lightdm/slick \
use/fonts/otf/adobe use/fonts/otf/mozilla \
use/fonts/ttf/google use/fonts/ttf/redhat
@$(call set,INSTALLER,altlinux-desktop)
@$(call add,THE_BRANDING,mate-settings)
@$(call add,THE_BRANDING,alterator)
@$(call add,THE_BRANDING,graphics)
@$(call add,THE_PACKAGES,setup-mate-terminal)
@$(call add,THE_PACKAGES,setup-mate-nocomposite)
@$(call add,THE_PACKAGES,alterator-standalone)
@$(call add,THE_PACKAGES,terminfo-extra)
@$(call add,THE_PACKAGES,ethtool net-tools ifplugd)
@$(call add,THE_PACKAGES,zsh bash-completion)
### regular.mk
mixin/regular-x11: use/luks use/volumes/regular \
use/browser/firefox/i18n use/browser/firefox/h264 \
use/branding use/ntp/chrony use/services/lvm2-disable
@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular))
@$(call add,THE_PACKAGES,disable-usb-autosuspend)
@$(call add,THE_PACKAGES,btrfs-progs)
@$(call add,THE_PACKAGES,gpm)
@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
# common WM live/installer bits
mixin/regular-desktop: use/x11/xorg +alsa use/xdg-user-dirs
@$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit)
@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
@$(call set,THE_IMAGEWRITER,imagewriter)
@$(call add,THE_PACKAGES,upower bluez)
@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
@$(call add,DEFAULT_SERVICES_ENABLE,cups)
mixin/desktop-extra:
@$(call add,BASE_LISTS,$(call tags,(archive || base) && extra))
mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
use/fonts/ttf/redhat use/x11/wmaker
@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
@$(call add,THE_PACKAGES,wmaker-autostart-polkit-gnome)
mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm
@$(call add,THE_LISTS,$(call tags,regular icewm))
@$(call add,THE_LISTS,$(call tags,desktop nm))
@$(call add,THE_PACKAGES,icewm-startup-networkmanager)
@$(call add,THE_PACKAGES,mnt polkit-gnome)
# gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck
@$(call add,THE_BRANDING,graphics)
mixin/regular-cinnamon: use/x11/cinnamon \
use/fonts/ttf/google use/net/nm/mmgui use/im
@$(call add,THE_PACKAGES,thunderbird-ru) ### l10n
mixin/regular-kde5: use/x11/kde5 use/browser/falkon \
use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
+nm +pulse
@$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5)
@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
mixin/regular-xfce: use/x11/xfce use/x11/gtk/nm +nm \
use/fonts/ttf/redhat use/fonts/ttf/google/extra
@$(call add,THE_PACKAGES,xfce-polkit)
@$(call add,THE_BRANDING,xfce-settings)
mixin/regular-xfce-sysv: \
use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123)
@$(call add,THE_PACKAGES,alsa-oss ossp whdd wget cdrkit)
@$(call add,THE_PACKAGES,qasmixer)
@$(call add,THE_PACKAGES,xfce4-screensaver)
@$(call add,THE_PACKAGES,sysstat leafpad)
@$(call add,THE_PACKAGES,nload)
@$(call add,THE_PACKAGES,NetworkManager-l2tp-gtk)
@$(call add,THE_PACKAGES,NetworkManager-tui)
mixin/regular-lxde: use/x11/lxde use/x11/gtk/nm use/im +nm
@$(call add,THE_LISTS,$(call tags,desktop gvfs))
@$(call add,THE_PACKAGES,qasmixer qpdfview)
@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
mixin/regular-lxqt: use/x11/lxqt use/x11/gtk/nm +nm
@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
mixin/regular-mate: use/x11/mate use/fonts/ttf/google use/x11/gtk/nm +nm
@$(call add,THE_LISTS,$(call tags,mobile mate))
mixin/office: use/fonts/ttf/google use/fonts/ttf/xo
@$(call add,THE_LISTS,$(call tags,desktop && (cups || office)))
@$(call add,THE_PACKAGES,apt-indicator)
# NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
# kernel cmdline resulting in method:disk instead of method:cdrom
# which will change propagator's behaviour to probe additional
# filesystems (ro but no loop) thus potentially writing to
# an unrecovered filesystem's journal
mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
use/syslinux/ui/menu use/syslinux/timeout/600 \
use/firmware/qlogic test/rescue/no-x11 +sysvinit; @:
mixin/regular-builder: use/dev/builder/base use/net-eth/dhcp
@$(call add,THE_PACKAGES,bash-completion elinks gpm lftp openssh)
@$(call add,THE_PACKAGES,rpm-utils screen tmux wget zsh)
@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
### vm.mk
mixin/cloud-init:
@$(call add,BASE_PACKAGES,cloud-init)
@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final)
@$(call add,DEFAULT_SERVICES_ENABLE,cloud-init cloud-init-local)
mixin/opennebula-context:
@$(call add,BASE_PACKAGES,opennebula-context)
@$(call add,DEFAULT_SERVICES_ENABLE,one-context-local one-context)
mixin/icewm: use/x11/lightdm/gtk +icewm; @:

View File

@@ -1,39 +0,0 @@
# p7 base kits
mixin/p7:
@$(call set,BRANDING,altlinux-starterkit)
ifeq (distro,$(IMAGE_CLASS))
### kludge compatibility: introspection stub for main.mk :-/
distro/altlinux-p7-cinnamon: distro/regular-cinnamon mixin/p7; @:
distro/altlinux-p7-e17: distro/regular-e17 mixin/p7; @:
distro/altlinux-p7-icewm: distro/regular-icewm mixin/p7; @:
distro/altlinux-p7-gnome3: distro/regular-gnome3 mixin/p7; @:
distro/altlinux-p7-gnustep: distro/regular-gnustep mixin/p7; @:
distro/altlinux-p7-kde4: distro/regular-kde4 mixin/p7; @:
distro/altlinux-p7-lxde: distro/regular-lxde mixin/p7; @:
distro/altlinux-p7-mate: distro/regular-mate mixin/p7; @:
distro/altlinux-p7-razorqt: distro/regular-razorqt mixin/p7; @:
distro/altlinux-p7-rescue: distro/regular-rescue mixin/p7; @:
distro/altlinux-p7-tde: distro/regular-tde mixin/p7; @:
distro/altlinux-p7-tde-sysv: distro/regular-tde-sysv mixin/p7; @:
distro/altlinux-p7-wmaker: distro/regular-wmaker mixin/p7; @:
distro/altlinux-p7-xfce: distro/regular-xfce mixin/p7; @:
distro/altlinux-p7-sysv-tde: distro/regular-sysv-tde mixin/p7; @:
distro/altlinux-p7-jeos: distro/regular-jeos mixin/p7; @:
distro/altlinux-p7-server: distro/regular-server mixin/p7; @:
distro/altlinux-p7-server-ovz: distro/regular-server-ovz mixin/p7; @:
distro/altlinux-p7-server-hyperv: distro/regular-server-hyperv mixin/p7; @:
endif
ifeq (ve,$(IMAGE_CLASS))
ve/altlinux-p7-ovz-generic: ve/generic mixin/p7; @:
endif
ifeq (vm,$(IMAGE_CLASS))
vm/altlinux-p7-vm-net: vm/net mixin/p7; @:
endif

59
conf.d/p8.mk Normal file
View File

@@ -0,0 +1,59 @@
# p8 base kits
mixin/p8: use/browser/firefox/esr
@$(call set,BRANDING,alt-starterkit)
@$(call set,IMAGE_FLAVOUR,$(subst alt-p8-,,$(IMAGE_NAME)))
@$(call set,META_VOL_ID,ALT p8 $$(IMAGE_FLAVOUR)/$(ARCH))
# missing in sisyphus but not in p8
mixin/p8/unikey:
@$(call add,THE_PACKAGES,ibus-unikey)
ifeq (distro,$(IMAGE_CLASS))
distro/alt-p8-cinnamon: distro/regular-cinnamon mixin/p8 mixin/p8/unikey; @:
distro/alt-p8-icewm: distro/regular-icewm mixin/p8; @:
distro/alt-p8-gnome3: distro/regular-gnome3 mixin/p8; @:
distro/alt-p8-gnustep: distro/regular-gnustep mixin/p8; @:
distro/alt-p8-kde4: distro/regular-kde4 mixin/p8; @:
distro/alt-p8-kde5: distro/regular-kde5 mixin/p8; @:
distro/alt-p8-lxde: distro/regular-lxde mixin/p8 mixin/p8/unikey; @:
distro/alt-p8-lxde-sysv: distro/regular-lxde-sysv mixin/p8; @:
distro/alt-p8-lxqt: distro/regular-lxqt mixin/p8; @:
distro/alt-p8-lxqt-sysv: distro/regular-lxqt-sysv mixin/p8; @:
distro/alt-p8-mate: distro/regular-mate mixin/p8; @:
distro/alt-p8-rescue: distro/regular-rescue mixin/p8; @:
distro/alt-p8-tde: distro/regular-tde mixin/p8; @:
distro/alt-p8-tde-sysv: distro/regular-tde-sysv mixin/p8; @:
distro/alt-p8-wmaker: distro/regular-wmaker mixin/p8; @:
distro/alt-p8-xfce: distro/regular-xfce mixin/p8; @:
distro/alt-p8-xfce-sysv: distro/regular-xfce-sysv mixin/p8; @:
distro/alt-p8-enlightenment: distro/regular-enlightenment mixin/p8; @:
distro/alt-p8-sysv-tde: distro/regular-sysv-tde mixin/p8; @:
distro/alt-p8-sysv-xfce: distro/regular-sysv-xfce mixin/p8; @:
distro/alt-p8-jeos: distro/regular-jeos mixin/p8; @:
distro/alt-p8-jeos-ovz: distro/regular-jeos-ovz mixin/p8; @:
distro/alt-p8-server: distro/regular-server mixin/p8; @:
distro/alt-p8-server-ovz: distro/regular-server-ovz mixin/p8; @:
distro/alt-p8-server-hyperv: distro/regular-server-hyperv mixin/p8; @:
distro/alt-p8-server-samba4: distro/regular-server-samba4 mixin/p8; @:
distro/alt-p8-server-pve: distro/regular-server-pve mixin/p8; @:
distro/alt-p8-builder: distro/regular-builder mixin/p8; @:
distro/alt-p8-engineering: distro/regular-engineering mixin/p8; @:
endif
ifeq (ve,$(IMAGE_CLASS))
ve/alt-p8-ovz-generic: ve/generic mixin/p8; @:
ve/docker-p8: ve/docker; @:
@$(call set,BRANDING,alt-starterkit)
endif
ifeq (vm,$(IMAGE_CLASS))
vm/alt-p8-vm-net: vm/net mixin/p8; @:
vm/alt-p8-cloud: vm/cloud-systemd mixin/p8; @:
vm/alt-p8-opennebula: vm/opennebula-systemd mixin/p8; @:
endif

62
conf.d/p9.mk Normal file
View File

@@ -0,0 +1,62 @@
# p9 base kits
mixin/p9: use/browser/firefox/esr
@$(call set,BRANDING,alt-starterkit)
@$(call set,IMAGE_FLAVOUR,$(subst alt-p9-,,$(IMAGE_NAME)))
@$(call set,META_VOL_ID,ALT p9 $$(IMAGE_FLAVOUR)/$(ARCH))
ifeq (distro,$(IMAGE_CLASS))
distro/alt-p9-cinnamon: distro/regular-cinnamon mixin/p9; @:
distro/alt-p9-icewm: distro/regular-icewm mixin/p9; @:
distro/alt-p9-gnome3: distro/regular-gnome3 mixin/p9; @:
distro/alt-p9-gnustep: distro/regular-gnustep mixin/p9; @:
distro/alt-p9-kde5: distro/regular-kde5 mixin/p9; @:
distro/alt-p9-lxde: distro/regular-lxde mixin/p9; @:
distro/alt-p9-lxde-sysv: distro/regular-lxde-sysv mixin/p9; @:
distro/alt-p9-lxqt: distro/regular-lxqt mixin/p9; @:
distro/alt-p9-lxqt-sysv: distro/regular-lxqt-sysv mixin/p9; @:
distro/alt-p9-mate: distro/regular-mate mixin/p9; @:
distro/alt-p9-rescue: distro/regular-rescue mixin/p9; @:
distro/alt-p9-wmaker: distro/regular-wmaker mixin/p9; @:
distro/alt-p9-xfce: distro/regular-xfce mixin/p9; @:
distro/alt-p9-xfce-sysv: distro/regular-xfce-sysv mixin/p9; @:
distro/alt-p9-enlightenment: distro/regular-enlightenment mixin/p9; @:
distro/alt-p9-sysv-xfce: distro/regular-sysv-xfce mixin/p9; @:
distro/alt-p9-jeos: distro/regular-jeos mixin/p9; @:
distro/alt-p9-jeos-ovz: distro/regular-jeos-ovz mixin/p9; @:
distro/alt-p9-server: distro/regular-server mixin/p9; @:
distro/alt-p9-server-ovz: distro/regular-server-ovz mixin/p9; @:
distro/alt-p9-server-hyperv: distro/regular-server-hyperv mixin/p9; @:
distro/alt-p9-server-samba4: distro/regular-server-samba4 mixin/p9; @:
distro/alt-p9-server-pve: distro/regular-server-pve mixin/p9; @:
distro/alt-p9-server-lxd: distro/regular-server-lxd mixin/p9; @:
distro/alt-p9-builder: distro/regular-builder mixin/p9; @:
distro/alt-p9-engineering: distro/regular-engineering mixin/p9; @:
endif
ifeq (ve,$(IMAGE_CLASS))
ve/alt-p9-ovz-generic: ve/generic mixin/p9; @:
ve/docker-p9: ve/docker; @:
@$(call set,BRANDING,alt-starterkit)
endif
ifeq (vm,$(IMAGE_CLASS))
vm/alt-p9-vm-net: vm/net mixin/p9; @:
vm/alt-p9-cloud: vm/cloud-systemd mixin/p9; @:
vm/alt-p9-opennebula: vm/opennebula-systemd mixin/p9; @:
# universal builds rootfs and image for all platforms
vm/alt-p9-jeos-systemd: vm/regular-jeos-systemd mixin/p9
vm/alt-p9-jeos-sysv: vm/regular-jeos-sysv mixin/p9
vm/alt-p9-icewm: vm/regular-icewm mixin/p9
vm/alt-p9-lxde: vm/regular-lxde mixin/p9
vm/alt-p9-lxqt: vm/regular-lxqt mixin/p9
vm/alt-p9-mate: vm/regular-mate mixin/p9
vm/alt-p9-xfce: vm/regular-xfce mixin/p9
endif

View File

@@ -1,198 +1,277 @@
# regular build/usage images
ifeq (distro,$(IMAGE_CLASS))
# common ground
distro/.regular-bare: distro/.base +wireless use/efi/signed \
use/memtest use/stage2/net-eth use/kernel/net
# common ground (really lowlevel)
distro/.regular-bare: distro/.base +net-eth use/kernel/net use/docs/license
@$(call try,SAVE_PROFILE,yes)
# base target (for most images)
distro/.regular-base: distro/.regular-bare use/vmguest use/memtest +efi
@$(call add,STAGE1_MODLISTS,stage2-mmc)
# graphical target (not enforcing xorg drivers or blobs)
distro/.regular-x11: distro/.regular-bare use/x11/wacom +vmguest \
use/live/x11 use/live/install use/live/repo use/live/rw \
use/luks use/branding use/browser/firefox/live use/browser/firefox/i18n
@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
distro/.regular-x11: distro/.regular-base \
use/x11/wacom use/x11/amdgpu +vmguest +wireless \
use/stage2/cifs use/live/rw use/live/x11 use/live/repo \
use/live/install use/live/suspend use/browser/firefox/live
@$(call add,LIVE_PACKAGES,livecd-install-apt-cache)
@$(call add,LIVE_LISTS,$(call tags,base rescue))
@$(call add,LIVE_PACKAGES,gpm livecd-install-apt-cache)
@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
# common WM live/installer bits
mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
@$(call add,THE_PACKAGES,alterator-notes)
@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
@$(call add,EFI_BOOTARGS,live_rw)
# WM base target
distro/.regular-base: distro/.regular-x11 mixin/regular-desktop
distro/.regular-wm: distro/.regular-x11 mixin/regular-x11 \
mixin/regular-desktop use/efi/refind
@$(call add,THE_BRANDING,bootloader)
# DE base target
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
distro/.regular-desktop: distro/.regular-base \
use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind +systemd
@$(call add,LIVE_LISTS,domain-client)
distro/.regular-desktop: distro/.regular-wm \
use/syslinux/ui/gfxboot use/firmware/laptop +systemd
@$(call add,THE_BRANDING,bootloader)
@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
@$(call set,KFLAVOURS,std-def)
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
distro/.regular-sysv: distro/.regular-base +sysvinit; @:
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/slick +plymouth; @:
distro/.regular-sysv: distro/.regular-wm +elogind; @:
distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
use/x11/gdm2.20; @:
distro/.regular-install: distro/.regular-bare +installer +sysvinit +power \
distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
use/branding use/bootloader/grub use/luks \
use/install2/fs use/install2/vnc use/install2/repo
use/install2/fs use/install2/vnc use/install2/repo \
use/efi/refind
@$(call add,INSTALL2_PACKAGES,fdisk)
@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
@$(call add,THE_LISTS,$(call tags,base regular))
@$(call add,INSTALL2_BRANDING,alterator notes)
@$(call add,THE_BRANDING,alterator)
# NB:
# - no +power or even use/power/acpi/button on intent
# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
distro/regular-jeos: distro/.base +sysvinit \
use/install2/packages use/install2/vmguest use/vmguest/base \
use/branding use/bootloader/lilo use/syslinux/lateboot.cfg \
use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
use/cleanup/x11-alterator use/net use/kernel/net use/stage2/net-eth \
use/power/acpi/button
@$(call set,KFLAVOURS,led-ws) # led-vs might be nice here
@$(call add,BASE_KMODULES,guest scsi vboxguest)
# common base for the very bare distros
distro/.regular-jeos-base: distro/.regular-bare +sysvinit \
use/isohybrid use/branding use/bootloader/grub \
use/install2/repo use/install2/packages \
use/net/etcnet use/power/acpi/button
@$(call set,BOOTVGA,)
@$(call set,INSTALLER,altlinux-generic)
@$(call add,INSTALL2_BRANDING,alterator notes)
@$(call add,THE_BRANDING,alterator) # just to be cleaned up later on
@$(call add,THE_PACKAGES,apt basesystem dhcpcd openssh vim-console)
@# a *lot* of stray things get pulled in by alterator modules
@$(call add,CLEANUP_PACKAGES,libICE 'libX*' libxcb libfreetype)
@$(call add,CLEANUP_PACKAGES,fontconfig 'glib2*' libffi 'libltdl*')
@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libpng*' 'libtiff*')
@$(call add,CLEANUP_PACKAGES,avahi-autoipd bridge-utils) # i-c-stage3
@$(call add,CLEANUP_PACKAGES,iw wpa_supplicant)
@$(call add,CLEANUP_PACKAGES,openssl libpcsclite)
@# fully fledged interactivesystem isn't needed here either
@$(call add,CLEANUP_PACKAGES,interactivesystem 'groff*' man stmpclean)
@$(call add,CLEANUP_PACKAGES,glibc-gconv-modules gettext)
@$(call add,CLEANUP_PACKAGES,console-scripts console-vt-tools 'kbd*')
@$(call add,CLEANUP_PACKAGES,libsystemd-journal libsystemd-login)
@$(call add,CLEANUP_PACKAGES,dbus libdbus libcap-ng)
@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console)
@$(call add,THE_LISTS,openssh)
distro/.regular-install-x11: distro/.regular-install \
mixin/regular-desktop +vmguest
@$(call set,INSTALLER,altlinux-desktop)
@$(call add,THE_LISTS,$(call tags,regular desktop))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
distro/.regular-jeos-bootloader: use/bootloader/lilo ; @:
else
ifeq (,$(filter-out $(GRUB_ARCHES),$(ARCH)))
distro/.regular-jeos-bootloader: use/bootloader/grub ; @:
else
distro/.regular-jeos-bootloader: ; @:
endif
endif
distro/regular-icewm: distro/.regular-sysv-gtk use/browser/seamonkey/i18n +icewm
@$(call add,LIVE_LISTS,$(call tags,regular icewm))
@$(call add,LIVE_PACKAGES,gparted)
# ...and for somewhat bare distros
distro/.regular-jeos: distro/.regular-jeos-base \
distro/.regular-jeos-bootloader use/syslinux/lateboot.cfg \
use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
use/cleanup/jeos
@$(call add,BASE_KMODULES,guest scsi vboxguest)
@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
# NB:
# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
distro/regular-jeos: distro/.regular-jeos use/cleanup/jeos/full \
use/volumes/jeos use/install2/vmguest use/vmguest/bare
@$(call add,BASE_PACKAGES,nfs-utils gdisk)
@$(call add,MAIN_PACKAGES,firmware-linux)
@$(call add,CLEANUP_PACKAGES,libffi 'libltdl*')
@$(call add,CLEANUP_PACKAGES,bridge-utils)
@$(call add,DEFAULT_SERVICES_DISABLE,fbsetfont)
@$(call add,STAGE2_BOOTARGS,quiet)
@$(call set,KFLAVOURS,un-def)
mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot use/x11/wmaker
@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
# NB: no +efi as it brings in grub2 (no ELILO support for system boot)
distro/regular-jeos-ovz: distro/.regular-jeos \
use/server/ovz-base use/control/server/ldv use/firmware
@$(call add,THE_PACKAGES,ipmitool lm_sensors3 mailx)
distro/.regular-install-x11: distro/.regular-install +vmguest +wireless \
use/install2/suspend mixin/regular-desktop mixin/regular-x11
@$(call set,INSTALLER,altlinux-desktop)
# assumes somewhat more experienced user, mostly for sysv variants
distro/.regular-install-x11-full: distro/.regular-install-x11 \
mixin/desktop-installer mixin/regular-desktop use/install2/fs \
use/fonts/otf/adobe use/fonts/otf/mozilla use/fonts/chinese \
use/branding/complete use/branding/slideshow/once \
use/net-eth/dhcp use/efi/shell use/rescue/base \
use/init/sysv/elogind
@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
@$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
distro/regular-icewm: distro/.regular-sysv-gtk mixin/regular-icewm \
use/browser/chromium
@$(call set,KFLAVOURS,un-def)
# wdm can't do autologin so add standalone one for livecd
distro/regular-wmaker: distro/.regular-sysv \
mixin/regular-wmaker use/live/autologin use/browser/seamonkey/i18n
@$(call add,LIVE_PACKAGES,wdm)
@$(call set,KFLAVOURS,led-ws)
# gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \
use/browser/firefox/classic +plymouth
@$(call add,THE_BRANDING,graphics)
mixin/regular-wmaker use/live/autologin use/browser/palemoon/i18n
@$(call add,LIVE_PACKAGES,wdm wmxkbru)
distro/regular-gnustep: distro/.regular-sysv \
mixin/regular-wmaker mixin/regular-gnustep; @:
distro/regular-gnustep-systemd: distro/.regular-base +systemd \
distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
mixin/regular-wmaker mixin/regular-gnustep; @:
distro/regular-xfce: distro/.regular-gtk \
use/x11/xfce use/domain-client/full use/browser/firefox/classic \
use/x11/gtk/nm +nm; @:
distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \
use/x11/xfce/full use/domain-client
@$(call set,KFLAVOURS,un-def)
distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality \
use/x11/gtk/nm +nm
@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
mixin/regular-xfce mixin/regular-xfce-sysv; @:
distro/regular-sysv-xfce: distro/.regular-install-x11-full \
mixin/regular-xfce mixin/regular-xfce-sysv; @:
distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde; @:
distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde; @:
distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
@$(call add,LIVE_PACKAGES,livecd-regular-xmonad)
distro/regular-mate: distro/.regular-gtk use/x11/mate use/domain-client/full +nm
@$(call add,LIVE_LISTS,$(call tags,mobile mate))
distro/regular-mate: distro/.regular-gtk mixin/regular-mate use/domain-client
@$(call add,LIVE_LISTS,$(call tags,base smartcard))
distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @:
distro/regular-e18: distro/.regular-gtk use/x11/e18 use/fonts/infinality; @:
distro/regular-e18-sysv: distro/.regular-sysv-gtk use/x11/e18; @:
distro/regular-mate-sysv: distro/.regular-sysv-gtk mixin/regular-mate; @:
distro/regular-cinnamon: distro/.regular-gtk \
use/x11/cinnamon use/fonts/infinality +nm
@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
@$(call set,KFLAVOURS,un-def)
distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment; @:
distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \
use/x11/enlightenment
@$(call set,META_VOL_ID,ALT regular-E-SysV/$(ARCH)) # see also #28271
distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
# not .regular-gtk due to gdm vs lightdm
distro/regular-gnome3: distro/.regular-desktop \
use/x11/gnome3 use/browser/epiphany +plymouth +nm; @:
# reusable bits
mixin/regular-tde: use/syslinux/ui/gfxboot use/browser/firefox/classic \
+tde +plymouth
@$(call add,THE_PACKAGES,kdeedu)
@$(call add,THE_LISTS,openscada)
distro/regular-tde: distro/.regular-desktop mixin/regular-tde \
use/x11/gtk/nm +nm; @:
distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
use/net-eth/dhcp use/efi/refind; @:
distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
use/browser/konqueror4 use/fonts/zerg use/domain-client/full \
+pulse +plymouth +nm
@$(call add,LIVE_LISTS,$(call tags,regular kde4))
@$(call add,LIVE_PACKAGES,rosa-imagewriter)
@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)
distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @:
distro/regular-lxqt: distro/.regular-desktop \
use/x11/lxqt use/x11/lightdm/lxqt use/browser/qupzilla +plymouth +nm; @:
distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
# NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
# kernel cmdline resulting in method:disk instead of method:cdrom
# which will change propagator's behaviour to probe additional
# filesystems (ro but no loop) thus potentially writing to
# an unrecovered filesystem's journal
distro/regular-rescue: distro/.regular-bare use/rescue/rw use/luks \
use/branding use/efi/refind use/efi/shell use/efi/memtest86 \
use/hdt use/syslinux/ui/menu use/syslinux/rescue_fm.cfg \
use/syslinux/timeout/200 use/mediacheck test/rescue/no-x11
distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
use/x11/gnome3 use/browser/epiphany use/fonts/ttf/redhat
@$(call set,KFLAVOURS,un-def)
@$(call add,RESCUE_PACKAGES,gpm)
@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
@$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates)
@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)
distro/regular-sysv-tde: distro/.regular-install-x11 \
mixin/desktop-installer mixin/regular-tde \
use/branding/complete use/branding/slideshow/once \
use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base
@$(call set,KFLAVOURS,led-ws)
@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@$(call add,THE_LISTS,$(call tags,base desktop))
@$(call add,THE_LISTS,$(call tags,regular tde))
@$(call add,MAIN_PACKAGES,man-whatis usb-modeswitch)
distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \
use/browser/falkon use/x11/sddm
@$(call add,THE_LISTS,$(call tags,lxqt desktop))
distro/regular-server: distro/.regular-install use/server/mini use/rescue/base
@$(call add,THE_LISTS,$(call tags,regular server))
@$(call add,MAIN_PACKAGES,aptitude)
distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
use/net-eth/dhcp; @:
distro/regular-kde5: distro/.regular-desktop \
mixin/regular-kde5 use/domain-client use/x11/sddm +plymouth; @:
distro/regular-robo: distro/regular-mate +robotics use/live/ru; @:
distro/regular-rescue: distro/.regular-base mixin/regular-rescue \
use/rescue/rw use/efi/refind use/efi/shell use/efi/memtest86 \
use/hdt use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \
use/mediacheck +wireless
@$(call set,KFLAVOURS,un-def)
@$(call add,RESCUE_PACKAGES,gpm livecd-net-eth)
@$(call add,RESCUE_LISTS,$(call tags,base bench))
@$(call add,RESCUE_LISTS,$(call tags,network security))
distro/regular-rescue-netbootxyz: distro/.regular-bare mixin/regular-rescue
@$(call set,RELNAME,en.altlinux.org/rescue (netboot.xyz edition))
@$(call set,META_VOL_ID,ALT Rescue)
@$(call set,META_APP_ID,$(ARCH))
distro/.regular-server-base: distro/.regular-install \
use/server/base use/stage2/kms
@$(call add,THE_LISTS,$(call tags,server && (regular || network)))
@$(call set,INSTALLER,altlinux-server)
@$(call add,SYSTEM_PACKAGES,multipath-tools)
@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
distro/regular-server-ovz: distro/regular-server \
use/server/ovz use/server/groups/base; @:
distro/.regular-server-systemd: distro/.regular-server-base +systemd; @:
distro/regular-server-hyperv: distro/regular-server
@$(call set,KFLAVOURS,un-def)
@$(call add,THE_PACKAGES,hyperv-daemons)
distro/.regular-server: distro/.regular-server-base \
use/server/mini use/firmware/qlogic use/rescue/base \
use/ntp/client use/cleanup/libs
@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@$(call add,MAIN_PACKAGES,aptitude)
@$(call add,CLEANUP_PACKAGES,qt4-common qt5-base-common)
@$(call add,DEFAULT_SERVICES_DISABLE,bridge)
distro/.regular-server-managed: distro/.regular-server
@$(call add,THE_PACKAGES,alterator-fbi)
@$(call add,THE_LISTS,$(call tags,server alterator))
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd cpufreq-simple)
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
distro/regular-server: distro/.regular-server-managed \
use/server/groups/base use/dev/groups/builder use/install2/vnc/full
@$(call add,MAIN_GROUPS,server/sambaDC)
@$(call add,MAIN_GROUPS,tools/hyperv)
distro/regular-server-ovz: distro/.regular-server \
use/server/ovz use/server/groups/tools use/cleanup/x11-alterator
@$(call add,MAIN_GROUPS,tools/vzstats)
distro/regular-server-hyperv: distro/.regular-server-managed
@$(call set,KFLAVOURS,un-def)
@$(call add,THE_PACKAGES,hyperv-daemons)
@$(call add,DEFAULT_SERVICES_DISABLE,bridge smartd)
@$(call add,DEFAULT_SERVICES_DISABLE,cpufreq-simple powertop)
distro/regular-server-pve: distro/.regular-server-systemd \
use/kernel/server use/firmware/qlogic +efi
@$(call set,BASE_BOOTLOADER,grub)
@$(call set,INSTALLER,altlinux-server)
@$(call add,INSTALL2_PACKAGES,installer-feature-pve)
@$(call add,THE_PACKAGES,pve-manager nfs-clients su)
@$(call add,THE_PACKAGES,bridge-utils dhcpcd faketime tzdata postfix)
@$(call add,DEFAULT_SERVICES_DISABLE,pve-manager pve-cluster \
pve-firewall pve-ha-crm pve-manager pveproxy pvedaemon \
pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy)
distro/regular-builder: distro/.regular-bare mixin/regular-builder \
use/dev/builder/full +sysvinit +efi +power \
use/live/base use/live/rw use/live/repo/online use/live/textinstall \
use/isohybrid use/syslinux/timeout/30 use/stage2/net-eth
@$(call add,THE_PACKAGES,ccache cifs-utils wodim)
distro/regular-server-samba4: distro/.regular-server-managed
@$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator)))
@$(call add,THE_PACKAGES,alterator-dhcp)
@$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind)
distro/regular-server-lxd: distro/.regular-bare \
use/isohybrid +power \
use/live/base use/live/rw use/live/repo/online use/live/textinstall \
use/lxc/lxd use/tty/S0 \
use/init/systemd/multiuser
@$(call set,KFLAVOURS,un-def)
@$(call add,DEFAULT_SERVICES_ENABLE,sshd)
@$(call add,DEFAULT_SERVICES_ENABLE,lxd-startup lxd-bridge lxcfs cgmanager)
@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 getty@ttyS0)
@$(call add,DEFAULT_SERVICES_ENABLE,livecd-net-eth)
distro/regular-engineering: distro/regular-lxde use/live/ru
@$(call add,THE_LISTS,$(call tags,engineering desktop))
@$(call add,THE_LISTS,$(call tags,desktop sane))
@$(call add,THE_LISTS,$(call tags,cups desktop))
@$(call add,THE_PACKAGES,libreofficekit LibreOffice-gnome LibreOffice-langpack-ru)
@$(call add,THE_PACKAGES,LibreOffice-mimetypes java)
@$(call add,THE_PACKAGES,gnome-disk-utility)
@$(call add,THE_KMODULES,staging)
@$(call add,DEFAULT_SERVICES_ENABLE,cups)
@$(call add,DEFAULT_SERVICES_ENABLE,ModemManager)
endif
ifeq (ve,$(IMAGE_CLASS))
ve/docker-sisyphus: ve/docker; @:
endif

146
conf.d/server-v.mk Normal file
View File

@@ -0,0 +1,146 @@
# server distributions
ifeq (distro,$(IMAGE_CLASS))
distro/server-v: cockpit = $(addprefix server-v/cockpit/,\
docker kvm web)
distro/server-v: ceph = $(addprefix server-v/ceph/,\
client mgr mon osd radosgw)
distro/server-v: glusterfs = $(addprefix server-v/glusterfs/,\
client server)
distro/server-v: iscsi = $(addprefix server-v/iscsi/,\
initiator scsitarget targetcli)
distro/server-v: moosefs = $(addprefix server-v/moosefs/,\
cgiserv chunkserver client master metalogger)
distro/server-v: lizardfs = $(addprefix server-v/lizardfs/,\
cgiserv chunkserver client master metalogger)
distro/server-v: nfs = $(addprefix server-v/,\
nfs nfs-ganesha)
distro/server-v: opennebula = $(addprefix server-v/opennebula/,\
flow gate gui node-kvm node-lxd server)
distro/server-v: openstack = $(addprefix server-v/openstack/,\
block compute controller network)
# storage
distro/server-v: container = $(addprefix server-v/,\
docker kubernetes podman lxd)
distro/server-v: network = $(addprefix server-v/,\
apache2 nginx bird dhcp dns haproxy keepalived openvswitch freeipa-client)
distro/server-v: monitoring = $(addprefix server-v/,\
zabbix-agent telegraf prometheus-node_exporter monit collectd nagios-nrpe)
# zabbix prometheus influxdb grafana
distro/server-v: backup = $(addprefix server-v/,\
bacula urbackup-client)
distro/server-v: logging = $(addprefix server-v/,\
rsyslog-classic systemd-journal-remote)
distro/server-v: profiles = $(addprefix server-v/,\
111-opennebula-node 112-opennebula-server 140-basic 201-docker)
#121-openstack-node 122-openstack-controller
ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
distro/server-v: profiles_arch = $(addprefix server-v/,\
130-pve)
# 211-openvz
endif
distro/.server-v-base: distro/.base distro/.installer \
use/efi/shell use/efi/grub use/efi/signed use/bootloader/grub \
use/memtest use/rescue/base \
use/init/systemd use/init/systemd/settings/optimal \
use/services use/control \
use/l10n/default/ru_RU \
use/isohybrid \
use/install2/vnc/full \
use/install2/xfs use/install2/fat use/install2/stage3 \
use/kernel/server use/kernel/drm \
use/firmware use/firmware/cpu \
use/net/etcnet use/net-ssh \
use/stage2/fs use/stage2/hid use/stage2/md \
use/stage2/mmc use/stage2/net use/stage2/net-nfs \
use/stage2/rtc use/stage2/scsi use/stage2/usb \
use/stage2/kms \
use/server/virt use/docs/license
@$(call add,BASE_LISTS,server-base openssh)
@$(call add,EFI_BOOTARGS,lang=ru_RU)
@$(call set,BRANDING,alt-server-v)
@$(call set,INSTALLER,alt-server-v)
@$(call add,INSTALL2_PACKAGES,alterator-notes)
@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
@$(call add,INSTALL2_PACKAGES,installer-feature-server-raid-fixup-stage2)
@$(call add,INSTALL2_PACKAGES,installer-feature-quota-stage2)
@$(call add,INSTALL2_PACKAGES,fonts-ttf-google-croscore-arimo)
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,INSTALL2_BRANDING,bootloader bootsplash notes slideshow)
@$(call add,THE_BRANDING,alterator graphics)
@$(call add,THE_BRANDING,indexhtml slideshow)
@$(call add,PINNED_PACKAGES,branding-alt-server-v-alterator:Essential)
@$(call add,THE_PACKAGES,alterator-fbi alterator-notes)
@$(call add,THE_LISTS,$(call tags,basesystem alterator))
@$(call add,THE_LISTS,$(call tags,server alterator))
@$(call add,THE_LISTS,$(call tags,server network))
@$(call add,COMMON_PACKAGES,vim-console)
@$(call add,SYSTEM_PACKAGES,mdadm-tool lvm2 multipath-tools fdisk xfsprogs btrfs-progs file)
distro/server-v: distro/.server-v-base +installer \
use/ntp/chrony \
use/install2/net use/install2/autoinstall \
use/apt-conf/branch use/install2/repo
@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
@$(call set,IMAGE_FLAVOUR,$(subst alt-9-,,$(IMAGE_NAME)))
@$(call set,META_VOL_ID,ALT Server-V 9.0.0 $(ARCH))
@$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_VOL_SET,ALT)
@$(call set,META_APP_ID,ALT Server-V 9.0.0 $(ARCH) $(shell date +%F))
@$(call set,DOCS,alt-server-v)
@$(call add,BASE_LISTS,virt/base.pkgs)
@$(call add,MAIN_LISTS,virt/extra.pkgs)
@$(call add,MAIN_GROUPS,server-v/110-opennebula $(opennebula))
ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
@$(call add,MAIN_GROUPS,server-v/130-pve server-v/pve)
endif
@$(call add,MAIN_GROUPS,server-v/140-basic server-v/kvm)
@$(call add,MAIN_GROUPS,server-v/200-container $(container))
@$(call add,MAIN_GROUPS,server-v/300-cluster server-v/corosync_pacemaker)
@$(call add,MAIN_GROUPS,server-v/400-storage)
@$(call add,MAIN_GROUPS,server-v/410-ceph $(ceph))
@$(call add,MAIN_GROUPS,server-v/420-glusterfs $(glusterfs))
@$(call add,MAIN_GROUPS,server-v/450-nfs $(nfs))
@$(call add,MAIN_GROUPS,server-v/460-iscsi $(iscsi))
@$(call add,MAIN_GROUPS,server-v/500-network $(network))
@$(call add,MAIN_GROUPS,server-v/600-monitoring $(monitoring))
@$(call add,MAIN_GROUPS,server-v/700-backup $(backup))
@$(call add,MAIN_GROUPS,server-v/800-logging $(logging))
@$(call add,THE_PROFILES,$(profiles) $(profiles_arch) minimal)
@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 getty@ttyS0)
@$(call add,DEFAULT_SERVICES_ENABLE,fstrim.timer)
@$(call add,DEFAULT_SERVICES_ENABLE,libvirtd)
@$(call add,DEFAULT_SERVICES_ENABLE,docker lxd)
@$(call add,DEFAULT_SERVICES_ENABLE,bind mysqld openvswitch)
@$(call add,DEFAULT_SERVICES_ENABLE,rsyslogd systemd-journal-gatewayd)
@$(call add,DEFAULT_SERVICES_DISABLE,powertop bridge gpm)
@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
@$(call add,DEFAULT_SERVICES_DISABLE,systemd-networkd systemd-resolved)
# @$(call set,BOOTVGA,)
# @$(call add,MAIN_GROUPS,server-v/141-cockpit $(cockpit))
# @$(call add,MAIN_GROUPS,server-v/430-moosefs $(moosefs))
# @$(call add,MAIN_GROUPS,server-v/ocfs2)
# @$(call add,MAIN_GROUPS,server-v/120-openstack $(openstack))
#ifeq (,$(filter-out x86_64,$(ARCH)))
# @$(call add,MAIN_GROUPS,server-v/openvz)
#endif
endif

View File

@@ -10,11 +10,16 @@ distro/server-nano: distro/.server-base use/bootloader/lilo +power \
@$(call add,BASE_LISTS,$(call tags,server network))
@$(call add,BASE_PACKAGES,dhcpcd cpio)
distro/server-mini: distro/.server-base use/server/mini use/kernel/net \
use/efi use/stage2/net-eth use/power/acpi/button
distro/server-mini: distro/.server-base +net-eth \
use/server/mini use/kernel/net use/efi use/power/acpi/button
@$(call set,INSTALLER,altlinux-server)
@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
distro/server-mini-systemd-networkd: distro/.server-base \
use/net/networkd +systemd \
use/server/mini use/efi use/firmware
@$(call set,INSTALLER,altlinux-server)
distro/server-ovz: distro/server-mini use/server/ovz use/server/groups/base \
use/install2/net use/hdt use/rescue \
use/firmware/server use/firmware/cpu +wireless; @:

View File

@@ -1,12 +0,0 @@
# simply images
ifeq (distro,$(IMAGE_CLASS))
distro/live-simply: distro/.livecd-install use/slinux/full
@$(call add,THE_LISTS,slinux/live-install)
distro/simply: distro/.installer use/slinux/full
@$(call set,INSTALLER,simply-linux)
@$(call add,INSTALL2_PACKAGES,sysvinit)
endif

16
conf.d/slinux.mk Normal file
View File

@@ -0,0 +1,16 @@
# Simply Linux images
ifeq (distro,$(IMAGE_CLASS))
distro/slinux-live: distro/.livecd-install use/slinux/base
@$(call add,THE_LISTS,slinux/live-install)
@$(call set,META_VOL_SET,Simply Linux live)
@$(call set,META_VOL_ID,Simply Linux live/$(ARCH))
distro/slinux: distro/.installer use/slinux/full use/rescue/base
@$(call set,INSTALLER,simply-linux)
@$(call add,MAIN_GROUPS,slinux/dropbox slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics-full-blender slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/graphics-full-synfigstudio slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-pitivi slinux/multimedia-full-sound-juicer slinux/network-base)
@$(call set,META_VOL_SET,Simply Linux)
@$(call set,META_VOL_ID,Simply Linux/$(ARCH))
endif

View File

@@ -1,13 +0,0 @@
# t7 base kits
mixin/t7:
@$(call set,BRANDING,altlinux-starterkit) ### needs changing
ifeq (distro,$(IMAGE_CLASS))
distro/altlinux-t7-gnustep: distro/regular-gnustep mixin/t7; @:
distro/altlinux-t7-gnustep-systemd: distro/regular-gnustep-systemd mixin/t7; @:
distro/altlinux-t7-tde: distro/regular-tde mixin/t7; @:
distro/altlinux-t7-sysv-tde: distro/regular-sysv-tde mixin/t7; @:
endif

View File

@@ -3,12 +3,12 @@ ifneq (,$(DEBUG))
ifeq (distro,$(IMAGE_CLASS))
distro/syslinux-auto: distro/.init use/hdt use/syslinux/timeout/1; @:
distro/syslinux-auto: distro/.boot use/hdt use/syslinux/timeout/1; @:
distro/syslinux-noescape: distro/syslinux-auto use/syslinux/noescape.cfg; @:
distro/live-systemd: distro/.base use/live/base +systemd; @:
distro/live-plymouth: distro/.live-base use/plymouth/live; @:
distro/live-mediacheck: distro/.base use/mediacheck; @:
distro/live-mediacheck: distro/.base use/mediacheck +plymouth; @:
distro/live-testserver: distro/live-install use/server/mini
@$(call set,KFLAVOURS,std-def el-smp)
@@ -25,12 +25,14 @@ distro/live-zabbix: distro/live-icewm use/net-eth
distro/icewm-efi: distro/icewm use/efi/debug use/firmware
@$(call add,INSTALL2_PACKAGES,strace)
distro/razorqt-kz: distro/regular-razorqt
distro/mate-kz: distro/regular-mate
@$(call set,GLOBAL_BOOT_LANG,kk_KZ)
@$(call add,LIVE_PACKAGES,hunspell-kk)
distro/server-systemd: distro/server-mini +systemd
@$(call set,KFLAVOURS,std-def)
# a minimalistic systemd-based server installer
distro/server-systemd: distro/server-nano \
use/install2/repo use/cleanup/x11-alterator use/net/networkd +systemd
@$(call add,CLEANUP_PACKAGES,glib2 iw libpython libwireless)
distro/server-test: distro/server-mini use/relname
@$(call set,RELNAME,Test-Server)
@@ -39,10 +41,8 @@ distro/server-test: distro/server-mini use/relname
# NB: doesn't carry stage3 thus cannot use/bootloader
distro/netinst: distro/.base use/install2/net; @:
# tiny network-only server-ovz installer (stage2 comes over net too)
distro/server-ovz-netinst: distro/.base sub/stage1 use/stage2 \
use/syslinux/ui/menu use/syslinux/localboot.cfg use/memtest
@$(call add,SYSLINUX_CFG,netinstall2)
distro/propagator-test: distro/.base use/mediacheck
@$(call add,STAGE2_BOOTARGS,propagator-debug)
distro/desktop-luks: distro/icewm use/luks; @:
distro/desktop-systemd: distro/icewm +systemd; @:
@@ -51,30 +51,25 @@ distro/server-efi: distro/server-mini use/efi/debug; @:
distro/server-zabbix: distro/server-mini use/server/zabbix use/net-eth
# a crop of images running stuff as PID 1
distro/bash: distro/.base use/pid1
@$(call add,STAGE1_PACKAGES,bash)
@$(call set,PID1_BIN,/bin/bash)
distro/vi: distro/.base use/pid1
@$(call add,STAGE1_PACKAGES,vim-minimal)
@$(call set,PID1_BIN,/bin/vi)
distro/emacs: distro/.base use/pid1
@$(call add,STAGE1_PACKAGES,mg)
@$(call set,PID1_BIN,/usr/bin/mg)
distro/elinks: distro/.base use/pid1/net
@$(call add,STAGE1_PACKAGES,elinks)
@$(call set,PID1_BIN,/usr/bin/elinks)
endif # IMAGE_CLASS: distro
ifeq (ve,$(IMAGE_CLASS))
ifeq (centos,$(REPO))
ve/.centos-base: ve/.bare
@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
ve/centos: ve/.centos-base
@$(call add,BASE_PACKAGES,openssh-server)
endif # REPO: centos
ifeq (opensuse,$(REPO))
ve/.opensuse-base: ve/.bare
@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
@$(call add,BASE_PACKAGES,aaa_base)
endif # REPO: opensuse
endif # IMAGE_CLASS: ve
ifeq (vm,$(IMAGE_CLASS))
vm/net-static: vm/bare use/net-eth use/net-ssh

View File

@@ -1,24 +1,29 @@
ifeq (ve,$(IMAGE_CLASS))
# no "vzctl enter"
ve/bare: ve/.base use/init/sysv; @:
ve/bare: ve/.base +sysvinit; @:
# /dev/pty and friends start here
ve/base: ve/bare
ve/base: ve/bare use/net-dns/level3
@$(call add,BASE_PACKAGES,interactivesystem)
# a particular package list
ve/ldv: ve/bare
ve/ldv: ve/bare use/control/server/ldv
@$(call add,BASE_PACKAGES,xz bzip2 glibc hostinfo less)
@$(call add,BASE_PACKAGES,vim-console netlist rsync time)
@$(call add,BASE_PACKAGES,openssh-blacklist openssh-server)
@$(call add,BASE_PACKAGES,shadow-edit shadow-groups)
ve/docker: ve/.base use/repo; @:
ve/docker: ve/.apt use/repo
@$(call add,BASE_PACKAGES,iproute2)
# build environment
ve/builder: ve/base use/dev/builder/base use/repo
@$(call add,BASE_LISTS,openssh)
# this should be more or less convenient
ve/generic: ve/base use/repo
@$(call add,BASE_PACKAGES,vim-console etckeeper)
@$(call add,BASE_PACKAGES,vim-console etckeeper apt-rsync)
@$(call add,BASE_LISTS,openssh \
$(call tags,base && (server || network || security || pkg)))
@@ -26,4 +31,17 @@ ve/generic: ve/base use/repo
ve/openvpn: ve/bare
@$(call add,BASE_LISTS,$(call tags,server openvpn))
ve/pgsql94: ve/generic
@$(call add,BASE_PACKAGES,postgresql9.4-server)
ve/samba-DC: ve/generic
@$(call add,BASE_PACKAGES,task-samba-dc glibc-locales net-tools)
ve/systemd-bare: ve/.apt use/net/networkd +systemd \
use/control/sudo-su use/repo use/net-ssh
@$(call add,BASE_PACKAGES,interactivesystem su)
ve/systemd-base: ve/systemd-bare
@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata)
endif

View File

@@ -1,10 +1,33 @@
# virtual machines
ifeq (vm,$(IMAGE_CLASS))
vm/bare: vm/.bare +sysvinit
# NB: interactivesystem pulls in network-config-subsystem anyways
vm/bare: vm/.base-lilo +sysvinit
@$(call add,BASE_PACKAGES,apt)
vm/net: vm/bare use/net-eth/dhcp use/net-ssh use/repo use/control/sudo-su
vm/systemd: vm/.base-grub +systemd
@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata)
@$(call add,BASE_PACKAGES,apt)
# handle ROOTPW (through deflogin)
vm/net: vm/bare use/net-eth/dhcp use/net-ssh \
use/repo use/control/sudo-su use/deflogin
@$(call add,BASE_PACKAGES,su)
vm/systemd-net: vm/systemd use/net-eth/networkd-dhcp use/net-ssh \
use/repo use/control/sudo-su use/deflogin
@$(call add,BASE_PACKAGES,su)
# vm/net or vm/systemd-net
vm/cloud-systemd: vm/systemd-net mixin/cloud-init use/vmguest/kvm
@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
vm/cloud-sysv: vm/net mixin/cloud-init use/vmguest/kvm use/power/acpi/button; @:
# vm with OpenNebula contextualization package (with empty network config)
vm/opennebula-systemd: vm/systemd use/net/networkd use/net-ssh \
use/vmguest/kvm mixin/opennebula-context \
use/repo use/control/sudo-su use/deflogin
@$(call add,BASE_PACKAGES,su)
# NB: use/x11 employs some installer-feature packages
@@ -13,8 +36,6 @@ vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
vm/.desktop-base: vm/.desktop-bare \
use/deflogin/altlinuxroot use/x11-autologin; @:
mixin/icewm: use/x11/lightdm/gtk +icewm; @:
vm/icewm: vm/.desktop-base mixin/icewm; @:
vm/icewm-setup: vm/.desktop-bare mixin/icewm use/oem use/x11-autostart
@@ -22,4 +43,8 @@ vm/icewm-setup: vm/.desktop-bare mixin/icewm use/oem use/x11-autostart
@$(call add,THE_BRANDING,graphics)
@$(call add,THE_LISTS,$(call tags,base l10n))
# some arbitrary gigabyte
vm/vagrant-base: vm/net use/vagrant
@$(call set,VM_SIZE,10737418240)
endif

View File

@@ -28,11 +28,14 @@ HTML_ARGS = -a data-uri --icons -r $(RESOURCE_FILES) -r . \
--xsltproc-opts='$(XSLT_ARGS)' $(COMMON_ARGS)
# most convenient deliverables
DOCS_OUT = $(PROJECT).pdf $(PROJECT).html docbook-xsl.css
DOCS_OUT = mkimage-profiles.7 $(PROJECT).pdf $(PROJECT).html docbook-xsl.css
# intermediate files
DOCS_TMP = $(PROJECT).fo $(PROJECT).xml
.PHONY: all prep chunked xhtml pdf clean
all: chunked xhtml pdf
all: man chunked xhtml pdf
# NB: destination defined externally
publish: all
@@ -43,6 +46,13 @@ publish: all
prep:
@if [ -n "$(BUILDDIR)" ]; then mkdir -p "$(BUILDDIR)"; fi
man:
@VERSION="$$(sed -rn 's/^Version: ([0-9.]+).*$$/\1/p' \
../.gear/mkimage-profiles.spec)"; \
sed -e "s,@VERSION@,$$VERSION,g" \
< mkimage-profiles.7.in \
> mkimage-profiles.7
chunked xhtml: prep
@echo "** building $@ book"
@$(A2X) -f $@ $(HTML_ARGS)
@@ -58,4 +68,4 @@ pdf: prep
clean:
@echo "** cleaning up"
@if [ -d "$(BUILDDIR)" ]; then cd "$(BUILDDIR)"; fi; \
rm -rf $(DOCS_OUT) $(PROJECT).chunked/
rm -rf $(DOCS_OUT) $(DOCS_TMP) $(PROJECT).chunked/ .fop.xconf

63
doc/archdep.txt Normal file
View File

@@ -0,0 +1,63 @@
== Архитектурно-зависимые фрагменты ==
=== Makefile ===
Достаточно воспользоваться ifeq/ifneq, сравнивая $(ARCH) с нужным:
ifeq (x86_64,$(ARCH))
EFI_LISTS := $(call tags,base efi)
endif
При необходимости сравнить со списком ("любой x86") можно сделать так:
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
use/x11/xorg: use/x11 use/x11/intel use/firmware
else
use/x11/xorg: use/x11
endif
В рецептах (shell-часть Makefile) используйте $(ARCH) или $$ARCH.
=== скрипты ===
В скриптовых хуках ({image-,}scripts.d/*) проверяйте $GLOBAL_ARCH.
=== списки пакетов, профили групп ===
Бывает так, что в списке пакетов есть смысл упоминать какой-либо из них
только для определённой архитектуры (например, wine или steam); в таких
случаях можно воспользоваться механизмом подстановки, который пословно
обрабатывает списки и в случае наличия суффикса @ARCH оставляет только
слова, в которых этот суффикс соответствует заданной архитектуре сборки.
Например, для Simply Linux в mkimage-profiles-desktop есть строчки:
@I586_ONLY@haspd
@X86_64_ONLY@i586-haspd
В случае mkimage-profiles они должны выглядеть так:
haspd@i586
i586-haspd@x86_64
или упрощённо (с версии 1.2.12):
haspd@IA32
Для преобразования можно воспользоваться следующей командой:
sed -r -e 's/@I586_ONLY@([^\t ]+)/\1@i586/g' \
-e 's/@X86_64_ONLY@([^\t ]+)/\1@x86_64/g'
При необходимости добавить пакет только на x86-архитектурах (неважно,
i586 или x86_64) можно воспользоваться макросом X86 (с версии 1.2.12):
xorg-drv-intel@X86
Аналогичная функциональность реализована для профилей установки.
=== загрузчики ===
Как правило, сперва понадобится доработка mkimage -- см. скрипты
tools/mki-pack-*boot -- и лишь затем профиля; см. тж. lib/boot.mk
и фичу pack.

View File

@@ -4,7 +4,7 @@
других частей mkimage-profiles либо содержание переменных.
NB: пути приводятся от верхнего уровня; проект в целом предполагает
ALT Linux 6.0+ и GNU make 3.81+ (на которых и разрабатывается),
наличие ALT 8.0+ и GNU make 3.82+ (на которых и разрабатывается),
но может быть портирован вместе с mkimage. Если что-либо не работает
или не собирается, стоит проверить на Sisyphus (mkimage, make, hasher,
собственно пакетная база), поскольку именно на нём происходит основная
@@ -16,18 +16,20 @@ ALT Linux 6.0+ и GNU make 3.81+ (на которых и разрабатыва
** ожидает, что каждая подлежащая трассированию цель каждого
makefile при сборке конфигурации образа содержит непустой
recipe -- хотя бы "; @:" -- т.к. зависит от запуска $(SHELL)
** трассировка выполняется при REPORT=1 для формирования графа
зависимостей между промежуточными целями сборки конечного образа
** характерный признак пропуска -- разрыв графа (report-targets.png)
* pkg.in/lists/Makefile
** ожидает, что названия пакаджлистов указываются в переменных
** ожидает, что названия списков пакетов указываются в переменных
вида *_LISTS, и копирует в генерируемый профиль только их
** если задать имя файла пакаджлиста непосредственно в Makefile
** если задать имя файла списка пакетов непосредственно в Makefile
субпрофиля, он не будет скопирован
** характерное сообщение об ошибке:
E: Couldn't find package
* features.in/stage2/stage1/scripts.d/02-kdefault
* features.in/kernel/stage1/scripts.d/80-make-initrd
* features.in/stage2/stage1/scripts.d/03-test-kernel
* sub.in/stage1/Makefile
** ожидают, что в stage1 попадёт строго одно ядро сообразно
@@ -35,6 +37,7 @@ ALT Linux 6.0+ и GNU make 3.81+ (на которых и разрабатыва
в KFLAVOURS)
** если добавить какой-либо kernel-image в STAGE1_PACKAGES*,
результат может быть неожиданным
** обратите внимание: bin/tar2fs умеет несколько ядер
** вероятная ошибка: незагрузка полученного squashfs
* features.in/install2/install2/stage2cfg.mk

View File

@@ -1,4 +1,4 @@
== Ловля плюх ==
== Ловля блох ==
При отладке сборки конфигурации или самого дистрибутива
могут оказаться полезными следующие средства:
@@ -16,6 +16,7 @@
этого коммита;
** содержит список конфигурационных переменных и их конечных значений,
созданный на основании distcfg.mk (см. тж. build/vars.mk)
* REPORT=1 включает генерацию дополнительного вывода:
** build/reports/targets.png -- граф зависимостей между целями
** build/reports/scripts.log -- порядок запуска скриптовых хуков

View File

@@ -14,7 +14,8 @@
удобно для анализа и обновления (и в отличие от _m-p-d_ -- нет
вынужденной необходимости либо контролировать включение нужных
фич "вручную" в скриптах по косвенным признакам, либо выносить
их в пакеты installer-feature-*).
их в пакеты installer-feature-*); также возможно добиться большей
степени интеграции по данным (например, язык gfxboot и LiveCD).
Создание и упаковку installer-feature-* можно рекомендовать, если:

141
doc/mkimage-profiles.7.in Normal file
View File

@@ -0,0 +1,141 @@
.\" Copyright (C) 2010-2016 Michael Shigorin <mike@altlinux.org>
.\"
.\" Documentation for mkimage-profiles project.
.\"
.\" This file is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
.\" the Free Software Foundation; either version 2 of the License, or
.\" (at your option) any later version.
.\"
.\" This program is distributed in the hope that it will be useful,
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
.\" GNU General Public License for more details.
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with this program; if not, write to the Free Software
.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
.\"
.TH "MKIMAGE-PROFILES" "9" "June 2017" "mkimage-profiles @VERSION@" "ALT"
.SH "NAME"
mkimage-profiles \- ALT distribution family metaprofile
.SH "SYNOPSIS"
.B make
.IR "" [ options ]
.I "" [ <goal> ... ]
.SH "DESCRIPTION"
.BR mkimage-profiles
builds operating environment images based on ALT package repositories.
Run
.BR make\ help
to obtain list of available goals.
.SH "PREREQUISITES"
mkimage-profiles only needs
.BR make(1)
and
.BR rsync(1)
to generate the build profile;
.BR mkimage
is used to actually run the build (which involves
.BR hasher(7)
quite a few times).
.BR git(1)
will be used if available so that the generated profile is an annotated
git repository;
.BR graphviz(1)
can be used to obtain build dependency graphs.
.SH "RATIONALE"
Long time ago when Linux distribution images were worked upon by hand
there was little need for generalization and sharing the common base.
Building several "generic" ALT{, Linux} distros in a team and maintaining
their educational flavours at the same time proved the need to be able
to describe what's common and what's different in a way that doesn't
resemble more or less complete forks.
Enter mkimage-profiles: choose what's closest to your dream image
and add what's missing, or roll on your own using the rich library
of existing parts and bits.
.SH "REQUIREMENTS"
The next-generation image build system for ALT must:
.TP
1.
provide reasonable means to describe common/differing aspects within
image families;
.TP
2.
ensure reproducible build results;
.TP
3.
support distribution family maintenance workflows
observed in the wild (e.g., with
.BR mkimage-profiles-desktop
or earlier);
.TP
4.
help out with diagnosing build problems.
.SH "ARCHITECTURE"
.BR mkimage-profiles
implements four steps to achieve the above goals:
.TP
1.
initialize the off-tree mkimage profile (BUILDDIR);
.TP
2.
build up distribution's configuration there;
.TP
3.
copy over the needed subprofiles/features/lists/groups;
.TP
4.
build the ISO/VE/VM image.
.PP
This results in a compact "as-needed" style per-image profile that can
be actually studied in a short amount of time and might get included
into the generated image as a tarball for better reproducibility.
.SH "EXAMPLES"
.BR make\ syslinux.iso
should result in a minimal bootable ISO image.
Another example is Regular Builds project yielding weekly images:
.BR http://en.altlinux.org/regular
.SH "AUTHOR"
Written by Michael Shigorin <mike@altlinux.org>
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.altlinux.org
.br
(Sisyphus project, mkimage-profiles component).
.SH "COPYRIGHT"
Copyright \(co) 2010-2017 Michael Shigorin <mike@altlinux.org>
.br
This is free software; see the source for copying conditions.
There is NO WARRANTY; not even for MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE.
.SH "FURTHER READING"
First and foremost:
.BR /usr/share/mkimage-profiles/QUICKSTART
Please refer to
.BR README
files in the tree starting with the toplevel one for more
information; these can be assembled into a handbook using
.BR asciidoc(1)
(available at
.BR http://nightly.altlinux.org/docs/
as weekly HTML/PDF updates).
Specific topics are covered within
.BR doc/
subdirectory; e.g.
.BR make
options are described in
.BR doc/params.txt
file.
.SH "SEE ALSO"
.br
.BR hsh(1),
.BR mkimage,
.br
.BR http://www.vimeo.com/23522095

View File

@@ -80,3 +80,4 @@ include::vm.txt[]
include::qemu.txt[]
include::archdep.txt[]

View File

@@ -10,7 +10,7 @@
* ARCH
** задаёт целевую архитектуру образов
** значение: пусто (по умолчанию авто), i586, x86_64, arm, ppc
** значение: пусто (по умолчанию авто), i586, x86_64, arm, ppc, e2k
** см. lib/build.mk
* ARCHES
@@ -18,6 +18,11 @@
** значение: пусто (по умолчанию авто) либо список через пробел
** см. Makefile, doc/profiles.mk.sample
* AUTOCLEAN
** включает уборку (distclean) после успешной сборки образа
** значение: пусто (по умолчанию нет) либо любая строка
** см. lib/build.mk
* BELL
** подаёт сигнал после завершения сборки
** значение: пусто (по умолчанию нет) либо любая строка
@@ -55,6 +60,11 @@
** значение: пусто (по умолчанию), 1 или 2
** см. lib/log.mk, lib/clean.mk
* DISTRO_VERSION
** задаёт версию дистрибутива, если применимо
** значение: пусто (по умолчанию) либо любая строка
** см. image.in/Makefile
* HOMEPAGE, HOMENAME, HOMEWAIT
** указывают адрес, название и таймаут перехода для домашней страницы
** значение: корректный URL, строка, целое неотрицательное число
@@ -70,6 +80,11 @@
** значение: пусто (по умолчанию) либо любая строка
** см. lib/build.mk
* QUIET
** отключает поясняющие сообщения при сборке (например, под cron)
** значение: пусто (по умолчанию) либо любая строка
** см. Makefile, lib/build.mk, lib/clean.mk, lib/profile.mk
* REPORT
** запрашивает создание отчётов о собранном образе
** значение: пусто (по умолчанию) либо любая строка

View File

@@ -1,11 +1,10 @@
== Списки пакетов ==
Состав пакетной базы субпрофилей определяется значениями
следующих переменных профиля (см. тж. conf.d/README;
некоторые "*" ниже заэкранированы ради парсера asciidoc):
следующих переменных профиля (см. тж. conf.d/README):
* main: пакетная база для установки
** sub.in/main/Makefile, features.in/\*/main/lib/*.mk
** sub.in/main/Makefile, features.in/*/main/lib/
** THE_LISTS, BASE_LISTS, MAIN_LISTS
** THE_GROUPS, MAIN_GROUPS
** THE_PACKAGES, BASE_PACKAGES, MAIN_PACKAGES,
@@ -15,7 +14,7 @@
*** KFLAVOURS
* stage2: общая часть install2, live, rescue
** sub.in/stage2/Makefile, features.in/\*/stage2/lib/*.mk
** sub.in/stage2/Makefile, features.in/*/stage2/lib/
** SYSTEM_PACKAGES, STAGE2_PACKAGES
** STAGE1_KMODULES, STAGE1_KMODULES_REGEXP,
STAGE2_KMODULES, STAGE2_KMODULES_REGEXP
@@ -24,13 +23,13 @@
* install2: компактная "живая" система, содержащая только инсталятор
** см. stage2
*** features.in/install2/install2/stage2cfg.mk,
features.in/\*/install2/lib/*.mk
features.in/*/install2/lib/
*** INSTALL2_PACKAGES
* live: пользовательский LiveCD (может содержать также инсталятор)
** см. stage2
** features.in/live/live/stage2cfg.mk,
features.in/\*/live/lib/*.mk
features.in/*/live/lib/
** THE_LISTS, LIVE_LISTS
** THE_GROUPS, LIVE_GROUPS
** THE_PACKAGES, LIVE_PACKAGES, COMMON_PACKAGES
@@ -44,7 +43,7 @@
** RESCUE_LISTS
* stage1: ядро и загрузчик второй стадии
** sub.in/stage1/Makefile, features.in/\*/stage1/lib/*.mk
** sub.in/stage1/Makefile, features.in/*/stage1/lib/
** STAGE1_PACKAGES, SYSTEM_PACKAGES
** STAGE1_PACKAGES_REGEXP
** STAGE1_KMODULES_REGEXP

View File

@@ -2,10 +2,12 @@
Для сборки на "неродной" архитектуре с применением трансляции
посредством QEMU установите пакет livecd-qemu-arch и выполните
команду register-qemu-arm от имени root (также предоставляется
команду register-qemu-armh от имени root (также предоставляется
register-qemu-ppc, но как минимум при сборке под ppc32 на x86_64
известны проблемы эмуляции).
Пример запуска:
make ARCH=arm APTCONF=/etc/apt/apt.conf.sisyphus.arm ve/bare.tar
make ARCH=armh APTCONF=/etc/apt/apt.conf.sisyphus.arm ve/bare.tar
Обратите также внимание на http://bugzilla.altlinux.org/34638

View File

@@ -9,7 +9,11 @@
порой могут выясниться непредвиденные последствия;
* документируйте на русском (README) или английском (README.en) языке
то, что написали или изменили.
то, что написали или изменили, если бы сами хотели прочесть описание
сделанного на месте другого человека; в любом случае старайтесь
внятно описывать коммиты, при необходимости также спрашивайте
совета: документация кода порой не менее важна, чем сам код,
и призвана не повторять его, но пояснять намерения и неочевидности.
[float]
=== рекомендации ===
@@ -29,7 +33,11 @@
* предпочтительно применение $() вместо `` (особенно при вложенности);
* постарайтесь не вылазить за 80 колонок.
* постарайтесь не вылезать за 80 колонок;
* избегайте merge-коммитов в коде, который предлагаете для включения
в основную ветку: поддерживается линейная история для удобства
работы с промежуточными состояниями.
[float]

View File

@@ -14,7 +14,9 @@
При работе с локальной копией mkimage-profiles.git следует иметь
в виду, что предоставлять недоверенному пользователю право выполнять
от имени root доступный ему по записи скрипт равнозначно предоставлению
полных привилегий root.
полных привилегий root (поэтому фича build-vm сперва проверяет наличие
системно установленного пакета и по возможности старается запустить
под sudo скрипт из него, доступный по записи только root).
Для работы с более специфичными форматами, чем raw ("буквальный"
образ диска), потребуется утилита qemu-img из одноименного пакета;

View File

@@ -25,6 +25,9 @@ define grepper_body
done
endef
check:
@../bin/check-recipe */config.mk
%:
$(error BUILDDIR not defined)
@@ -65,6 +68,8 @@ prep:
# - "rootfs@/": copy feature's rootfs parts into BUILDDIR toplevel
$(FEATURES):
@feat=$@; \
args="-qab --exclude README --exclude config.mk"; \
args="$$args --exclude generate.mk --exclude generate.sh"; \
if [ -n "$(GLOBAL_DEBUG)" ]; then \
echo "** adding $$feat feature"; \
fi; \
@@ -92,7 +97,7 @@ $(FEATURES):
fi; \
: "why this overduplication was done? (still needed)"; \
for srcdir in $$srcdirs; do \
rsync -qab "$$srcdir/" "$(BUILDDIR)/$$dst/"; \
rsync $$args "$$srcdir/" "$(BUILDDIR)/$$dst/"; \
done; \
fi; \
if [ -n "$(GLOBAL_DEBUG)" ]; then \
@@ -105,7 +110,7 @@ $(FEATURES):
destdir="$(BUILDDIR)/$$dst/$$part"; \
[ -d "$$destdir" ] || continue; \
if [ "$$sub" = / -a -d "$$part" ]; then \
rsync -qab "$$part/" "$$destdir/"; \
rsync $$args "$$part/" "$$destdir/"; \
fi; \
done; \
popd >&/dev/null; \

View File

@@ -0,0 +1 @@
Данная фича определяет то, какая конфигурация apt попадёт в образ.

View File

@@ -0,0 +1,8 @@
use/apt-conf:
@$(call add_feature)
@$(call add,THE_PACKAGES,apt-conf-$$(THE_APT_CONF))
@$(call add,IMAGE_INIT_LIST,apt-conf-$$(THE_APT_CONF))
@$(call try,THE_APT_CONF,sisyphus)
use/apt-conf/branch: use/apt-conf
@$(call set,THE_APT_CONF,branch)

View File

@@ -0,0 +1 @@
ehci_marvell

View File

@@ -1,2 +1,2 @@
use/armh: use/control/sudo-su
use/armh: use/control/sudo-su use/net-dns/google
@$(call add_feature)

View File

@@ -1,40 +0,0 @@
#!/bin/sh
# DESCRIPTION
#
# Setup network settings
# 1. Truncate /etc/resolv.conf
# 2. Init /etc/hosts with "127.0.0.1 localhost"
# 3. Set hostname, domainname
# 4. Set defaults for NetworkManager.
# REQUIRES
#
# Nothing
# INFO
# At startup time hostname may be changed by live-hostname package.
. shell-config
NAME="init3-network"
verbose()
{
if [ -n "$GLOBAL_VERBOSE" ]; then
echo "HOOK: $NAME: $@"
fi
}
verbose "has started"
DOMAINNAME="localdomain"
HOSTNAME="localhost.localdomain"
verbose "Init /etc/hosts with 127.0.0.1 localhost"
echo "127.0.0.1 localhost localhost.localdomain" > /etc/hosts
verbose "Truncate /etc/resolv.conf"
echo nameserver 8.8.8.8 >/etc/resolv.conf

View File

@@ -1,9 +1,12 @@
Добавление установки загрузчика основной системы, затребованного
посредством указания "grub" или "lilo" в BASE_BOOTLOADER.
посредством указания "grub", "lilo" или "uboot" в BASE_BOOTLOADER.
Соответствующий модуль alterator добавляется в устанавливаемую
систему (он НЕ должен требоваться пакету installer-distro-*)
и требует пакет выбранного загрузчика.
и требует пакет выбранного загрузчика. Так как для uboot такого
модуля нет и в тоже время uboot не используется в установочных
дистрибутивах, то установка модуля alterator была ограничена
целями distro/*, формирующими ISO-образы.
Обратите внимание: в процессе конфигурирования дистрибутива
"переключение" загрузчика может происходить только в одну сторону

View File

@@ -4,9 +4,38 @@
# the last different one wins
# - remember .base if adding yet another *_PACKAGES
use/bootloader:
@$(call add_feature)
@$(call add,BASE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
# NB: "mysterious" conflicts if BASE_BOOTLOADER is empty
use/bootloader/grub use/bootloader/lilo: use/bootloader/%: use/bootloader
GRUB_ARCHES := i586 x86_64 aarch64 ppc64le
use/bootloader: use/pkgpriorities
@$(call add_feature)
@$(call try,BASE_BOOTLOADER,grub)
@$(call xport,BASE_BOOTLOADER)
@$(call add,BASE_LISTS,$$(BASE_BOOTLOADER))
ifeq (distro,$(IMAGE_CLASS))
@$(call add,BASE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
@$(call add,PINNED_PACKAGES,alterator-$$(BASE_BOOTLOADER))
@$(call add,PINNED_PACKAGES,installer-bootloader-$$(BASE_BOOTLOADER)-stage2)
endif
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
use/bootloader/lilo: \
use/bootloader/%: use/bootloader
@$(call set,BASE_BOOTLOADER,$*)
endif
ifeq (,$(filter-out $(GRUB_ARCHES),$(ARCH)))
use/bootloader/grub: \
use/bootloader/%: use/bootloader
@$(call set,BASE_BOOTLOADER,$*)
endif
use/bootloader/uboot: use/bootloader use/uboot
@$(call set,BASE_BOOTLOADER,uboot)
use/bootloader/live: use/bootloader
@$(call add,LIVE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
use/bootloader/os-prober: use/bootloader
@$(call add,BASE_PACKAGES,os-prober)

View File

@@ -2,13 +2,26 @@
use/branding:
@$(call add_feature)
# license notes, if any
use/branding/notes: use/branding
@$(call add,THE_BRANDING,notes)
# NB: not every distro might have all the branding of its own
use/branding/full: use/branding use/syslinux/ui/gfxboot
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
use/branding/full: use/branding/notes use/syslinux/ui/gfxboot
@$(call add,THE_BRANDING,alterator bootloader bootsplash graphics)
@$(call add,THE_BRANDING,indexhtml notes slideshow)
@$(call add,THE_BRANDING,indexhtml slideshow)
use/branding/complete: use/branding/full use/plymouth/full
@$(call add,INSTALL2_BRANDING,notes slideshow)
else
use/branding/full: use/branding/notes
@$(call add,THE_BRANDING,alterator graphics)
@$(call add,THE_BRANDING,indexhtml slideshow)
use/branding/complete: use/branding/full
@$(call add,INSTALL2_BRANDING,notes slideshow)
endif
# http://altlinux.org/branding/slideshow
use/branding/slideshow/once: use/branding

View File

@@ -1,7 +1,6 @@
# step 4: build the distribution image
# NB: this comes just before build-distro.mk
DOT_BASE += $(call branding,$(THE_BRANDING))
DOT_BASE += $(call branding,notes)
CHROOT_PACKAGES_REGEXP += $(call branding,bootloader)
CHROOT_PACKAGES += ImageMagick-tools

View File

@@ -1,31 +1,46 @@
use/browser:
@$(call add_feature)
@$(call add,THE_PACKAGES_REGEXP,$$(THE_BROWSER))
@$(call try,THE_BROWSER,webclient) # fallback
@$(call add,THE_PACKAGES,$$(THE_BROWSER))
@$(call try,THE_BROWSER,elinks) # X11-less fallback
use/browser/firefox use/browser/seamonkey \
# support both firefox and firefox-esr
use/browser/firefox: use/browser
@$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR))
use/browser/seamonkey use/browser/netsurf \
use/browser/chromium use/browser/epiphany \
use/browser/qupzilla use/browser/rekonq \
use/browser/falkon use/browser/otter-browser \
use/browser/elinks use/browser/links2: \
use/browser/%: use/browser
@$(call set,THE_BROWSER,$*)
use/browser/konqueror: use/browser
@$(call set,THE_BROWSER,kdebase-konqueror)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
use/browser/palemoon: use/browser
@$(call set,THE_BROWSER,$*)
use/browser/konqueror4: use/browser
@$(call set,THE_BROWSER,kde4base-konqueror)
use/browser/palemoon/i18n: use/browser/palemoon
@$(call add,THE_BROWSER,palemoon-ru)
else
use/browser/palemoon: use/browser/firefox; @:
use/browser/palemoon/i18n: use/browser/palemoon; @:
endif
# the complete lack of dependencies is intentional
use/browser/firefox/esr:
@$(call set,FX_FLAVOUR,-esr)
use/browser/firefox/h264: use/browser/firefox
@$(call add,THE_BROWSER,gst-libav)
@$(call add,THE_BROWSER,gst-plugins-base1.0 gst-plugins-good1.0)
use/browser/firefox/live: use/browser/firefox
@$(call add,THE_BROWSER,livecd-firefox)
# scarey, and will have to be done otherwise when l10n feature is there
use/browser/firefox/i18n: use/browser/firefox
@$(call add,THE_BROWSER,firefox-be firefox-kk firefox-ru firefox-uk)
# fx29+
use/browser/firefox/classic: use/browser/firefox
@$(call add,THE_BROWSER,firefox-classic_theme_restorer.*)
@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-kk)
@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-ru)
@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-uk)
use/browser/seamonkey/i18n: use/browser/seamonkey
@$(call add,THE_BROWSER,seamonkey-ru)
@@ -35,4 +50,4 @@ use/browser/plugin/flash: use/browser
@$(call add,THE_PACKAGES,mozilla-plugin-adobe-flash)
use/browser/plugin/java: use/browser
@$(call add,THE_PACKAGES,mozilla-plugin-java-1.6.0-sun)
@$(call add,THE_PACKAGES,mozilla-plugin-java-1.8.0-openjdk)

View File

@@ -9,3 +9,6 @@
META_SYSTEM_ID, META_PUBLISHER, META_PREPARER, META_APP_ID,
META_VOL_ID, META_VOL_SET, META_BIBLIO, META_ABSTRACT;
см. тж. genisoimagerc(5) из пакета genisoimage.
При необходимости задать своё содержимое файла .disk/info,
который также используется propagator, см. META_DISK_INFO.

View File

@@ -1,9 +1,5 @@
# step 4: build the distribution image
# take the latter part for complex-specified subprofiles like stage2@live;
# care to exclude non-directories holding no makefiles like rootfs
SUBDIRS = $(sort $(dir $(wildcard $(addsuffix /Makefile,$(SUBPROFILE_DIRS)))))
# proxy over the ISO metadata collected; see also genisoimagerc(5)
BOOT_SYSI := $(META_SYSTEM_ID)
BOOT_PUBL := $(META_PUBLISHER)
@@ -13,19 +9,50 @@ BOOT_VOLI := $(shell echo $(META_VOL_ID) | cut -c1-32)
BOOT_VOLS := $(META_VOL_SET)
BOOT_BIBL := $(META_BIBLIO)
BOOT_ABST := $(META_ABSTRACT)
BOOT_COPY := $(META_LICENSE_FILE)
ISODATA_SYSI = $(BOOT_SYSI)
ISODATA_PUBL = $(BOOT_PUBL)
ISODATA_PREP = $(BOOT_PREP)
ISODATA_APPI = $(BOOT_APPI)
ISODATA_VOLI = $(BOOT_VOLI)
ISODATA_VOLS = $(BOOT_VOLS)
ISODATA_BIBL = $(BOOT_BIBL)
ISODATA_ABST = $(BOOT_ABST)
ISODATA_COPY = $(BOOT_COPY)
DATE_F := $(shell date +%F)
ifeq (isodata,$(IMAGE_PACKTYPE))
BOOT_TYPE :=
else
ifeq (,$(filter-out e2k%,$(ARCH)))
BOOT_TYPE := e2kboot
endif
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
BOOT_TYPE := isolinux
endif
ifeq (,$(filter-out ppc64le,$(ARCH)))
BOOT_TYPE := ieee1275boot
endif
ifeq (,$(filter-out aarch64,$(ARCH)))
BOOT_TYPE := grubaa64boot
endif
endif
all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
all: | $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
postprocess $(GLOBAL_CLEAN_WORKDIR)
prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER)
prep: | $(GLOBAL_DEBUG) dot-disk $(WHATEVER)
# can't use mp-showref which belongs to the metaprofile
dot-disk:
@mkdir -p files/.disk
@echo "$(META_VOL_ID) $(DATE_F)" >files/.disk/info
@if [ -n "$(META_DISK_INFO)" ]; then \
echo "$(META_DISK_INFO)" >files/.disk/info; \
else \
echo "$(META_VOL_ID) build $(DATE_F)" >files/.disk/info; \
fi
@echo "$(ARCH)" >files/.disk/arch
@echo "$(DATE)" >files/.disk/date
@if type -t git >&/dev/null; then \

View File

@@ -8,6 +8,7 @@
[ -x /sbin/chkconfig ] || exit 0
for i in network random syslogd; do chkconfig $i on; done
chkconfig syslogd on 2>&1
for i in network random; do chkconfig $i on; done
for i in fbsetfont netfs rawdevices; do chkconfig $i off; done
:

View File

@@ -1,9 +0,0 @@
#!/bin/sh
# by default hasher copy resolv.conf and /etc/hosts from host system
# we need to change it to useful defaults
echo 'nameserver 8.8.8.8' > /etc/resolv.conf
echo 'nameserver 8.8.4.4' > /etc/resolv.conf
#echo 'nameserver 2001:4860:4860::8888' > /etc/resolv.conf
#echo 'nameserver 2001:4860:4860::8844' > /etc/resolv.conf
echo '127.0.0.1 localhost.localdomain localhost' > /etc/hosts

View File

@@ -17,5 +17,9 @@ IMAGE_PACKAGES = $(DOT_BASE) \
$(THE_PACKAGES) \
$(call list,$(BASE_LISTS) $(THE_LISTS))
all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
$(BASE_PACKAGES_REGEXP)
all: $(GLOBAL_DEBUG) \
build-image copy-subdirs copy-tree run-image-scripts pack-image \
postprocess $(GLOBAL_CLEAN_WORKDIR)

View File

@@ -4,6 +4,7 @@
[ -x /sbin/chkconfig ] || exit 0
for i in network random syslogd; do chkconfig $i on; done
chkconfig syslogd on 2>&1
for i in network random; do chkconfig $i on; done
for i in fbsetfont netfs rawdevices; do chkconfig $i off; done
:

View File

@@ -1,4 +1,6 @@
#!/bin/sh -e
# we don't need no extra gettys in VMs
[ -s /etc/inittab ] || exit 0
# ...except when it's a real disk image, not a VM for sure
[ `arch` = e2k ] && exit 0
sed -i 's,^[3-9]\+:[0-9]\+:respawn:/sbin/mingetty.*,#&,' /etc/inittab

View File

@@ -1,13 +1,27 @@
#!/bin/sh
# predictable file locations make bootloader configuration simple;
# this script relates to features.in/stage2/stage1/scripts.d/80-make-initfs
# this script relates to features.in/stage2/stage1/scripts.d/81-make-initfs
kver="$(rpm -qa 'kernel-image*' \
--qf '%{installtime} %{version}-%{name}-%{release}\n' \
| sort -n \
| tail -n 1 \
| cut -f 2 -d ' ' \
| sed 's/kernel-image-//')"
ln -s vmlinuz-$kver /boot/vmlinuz
ln -s initrd-$kver.img /boot/initrd.img
[ -n "$kver" ] || { echo "** unable to deduce kernel version" >&2; exit 1; }
cd /boot
echo "$kver" > .origver # for tar2fs
if [ -n "$GLOBAL_EFI_BOOTLOADER" ]; then
echo "$GLOBAL_EFI_BOOTLOADER" > .bootloader # for tar2fs
elif [ -n "$GLOBAL_BASE_BOOTLOADER" ]; then
echo "$GLOBAL_BASE_BOOTLOADER" > .bootloader # for tar2fs
fi
make-initrd -N -k "$kver" AUTODETECT=
# NB: e2k kernel builds "image" instead of "vmlinuz"
[ -f vmlinuz-$kver ] && ln -s vmlinuz-$kver vmlinuz ||:
ln -s initrd-$kver.img initrd.img # missing at this stage
:

View File

@@ -7,6 +7,9 @@ IMAGE_PACKAGES = $(DOT_BASE) \
$(THE_PACKAGES) \
$(call list,$(BASE_LISTS) $(THE_LISTS))
IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
$(BASE_PACKAGES_REGEXP)
# intermediate chroot archive
VM_TARBALL := $(IMAGE_OUTDIR)/$(IMAGE_NAME).tar
VM_RAWDISK := $(IMAGE_OUTDIR)/$(IMAGE_NAME).raw
@@ -20,24 +23,38 @@ check-sudo:
fi
prepare-image: check-sudo
@if ! sudo $(TOPDIR)/bin/tar2fs \
"$(VM_TARBALL)" "$(VM_RAWDISK)" $(VM_SIZE) $(VM_FSTYPE); then \
echo "** error: sudo tar2fs failed, see also doc/vm.txt" >&2; \
@# need to copy $(BUILDDIR)/.work/chroot/.host/qemu* into chroot
@#if qemu is used
@(cd "$(BUILDDIR)/.work/chroot/"; \
tar -rf "$(VM_TARBALL)" ./.host/qemu*) ||:; \
if [ -x /usr/share/mkimage-profiles/bin/tar2fs ]; then \
TOPDIR=/usr/share/mkimage-profiles; \
fi; \
if ! sudo $$TOPDIR/bin/tar2fs \
"$(VM_TARBALL)" "$(VM_RAWDISK)" $(VM_SIZE) $(VM_FSTYPE); then \
echo "** error: sudo tar2fs failed, see build log" >&2; \
exit 1; \
fi
convert-image: prepare-image
@case "$(IMAGE_TYPE)" in \
"img") mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; exit 0;; \
@VM_COMPRESS=; \
case "$(IMAGE_TYPE)" in \
"img") \
mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
if [ "0$(DEBUG)" -le 1 ]; then rm "$(VM_TARBALL)"; fi; \
exit 0;; \
"vhd") VM_FORMAT="vpc";; \
"qcow2c") VM_FORMAT="qcow2"; VM_COMPRESS="-c";; \
*) VM_FORMAT="$(IMAGE_TYPE)"; \
esac; \
if ! type -t qemu-img >&/dev/null; then \
echo "** warning: qemu-img not available" >&2; \
echo "** error: qemu-img not available" >&2; \
exit 1; \
else \
qemu-img convert -O "$$VM_FORMAT" \
qemu-img convert $$VM_COMPRESS -O "$$VM_FORMAT" \
"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
rm "$(VM_RAWDISK)"; \
if [ "0$(DEBUG)" -le 1 ]; then rm "$(VM_TARBALL)"; fi; \
fi
run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
@@ -45,5 +62,6 @@ run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
# override
pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL)
all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
all: $(GLOBAL_DEBUG) \
build-image copy-subdirs copy-tree run-image-scripts pack-image \
convert-image postprocess $(GLOBAL_CLEAN_WORKDIR)

View File

@@ -4,3 +4,10 @@
По возможности стоит работать над дизайном инфраструктуры
и пакетной базой так, чтобы ставить-удалять приходилось как
можно меньше. В идеале такой антифичи не должно быть вовсе :)
Для пакетов, которые следует удалять из установленной классическим
инсталятором системы, но не из livecd, применяйте переменную
CLEANUP_BASE_PACKAGES.
ВНИМАНИЕ: также удаляет rpm, apt и базу по пакетам из livecd,
если в него не был добавлен инсталятор!

View File

@@ -1,20 +1,44 @@
use/cleanup:
@$(call add_feature)
@$(call xport,GLOBAL_LIVE_NO_CLEANUPDB)
@$(call xport,CLEANUP_PACKAGES)
@$(call xport,CLEANUP_BASE_PACKAGES)
use/cleanup/libs:
@$(call add,BASE_PACKAGES,apt-scripts)
@$(call add,INSTALL2_PACKAGES,installer-feature-cleanup-libs-stage3)
use/cleanup/installer: use/cleanup
@$(call add,CLEANUP_PACKAGES,'installer-*')
@$(call add,CLEANUP_BASE_PACKAGES,'installer-*')
use/cleanup/x11: use/cleanup
@$(call add,CLEANUP_PACKAGES,libSM libXext libXmu libXi)
use/cleanup/x11: use/cleanup use/cleanup/libs
@$(call add,CLEANUP_PACKAGES,libICE libSM libxcb 'libX*')
# as some alterator modules are installed into stage3 (the destination
# root filesystem) to perform actions like bootloader setup, we might
# have to remove them (contrary to the usual build-up)...
use/cleanup/alterator: use/cleanup
@$(call add,CLEANUP_PACKAGES,'alterator*' rpm-macros-alterator)
@$(call add,CLEANUP_PACKAGES,'guile*' libvhttpd)
@$(call add,CLEANUP_PACKAGES,'guile*' libvhttpd autologin-sh-functions)
# for lightweight server distros
use/cleanup/x11-alterator: use/cleanup/x11 use/cleanup/alterator
@$(call add,CLEANUP_PACKAGES,libmng qt4-common)
# "basically everything else"; this *will* change with branches and distros
use/cleanup/jeos: use/cleanup/x11-alterator
@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libpng*' 'libtiff*')
@$(call add,CLEANUP_PACKAGES,avahi-autoipd iw wpa_supplicant)
@$(call add,CLEANUP_PACKAGES,openssl libpcsclite)
@# a *lot* of stray things get pulled in by alterator modules
@$(call add,CLEANUP_PACKAGES,libfreetype fontconfig)
@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libpng*' 'libtiff*')
@$(call add,CLEANUP_PACKAGES,openssl libpcsclite)
# mostly non-interactive system
use/cleanup/jeos/full: use/cleanup/jeos
@$(call add,CLEANUP_PACKAGES,interactivesystem 'groff*' man stmpclean)
@$(call add,CLEANUP_PACKAGES,gettext)
@$(call add,CLEANUP_PACKAGES,console-scripts console-vt-tools 'kbd*')
@$(call add,CLEANUP_PACKAGES,libsystemd-journal libsystemd-login)
@$(call add,CLEANUP_PACKAGES,dbus libdbus)

View File

@@ -3,9 +3,14 @@
if [ -n "$GLOBAL_VERBOSE" ]; then
echo "** GLOBAL_CLEANUP_PACKAGES: $GLOBAL_CLEANUP_PACKAGES"
echo "** GLOBAL_CLEANUP_BASE_PACKAGES: $GLOBAL_CLEANUP_BASE_PACKAGES"
fi >&2
export GLOBAL_CLEANUP_PACKAGES="$GLOBAL_CLEANUP_PACKAGES \
$GLOBAL_CLEANUP_BASE_PACKAGES"
SCRIPT="/usr/share/install2/postinstall.d/01-remove-pkgs"
cat > "$SCRIPT" << EOF
#!/bin/sh -efu

View File

@@ -1,5 +1,8 @@
#!/bin/sh
# remove all docs
# don't cripple the image to be copied over
[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
rpmquery -ad |grep ^/ |xargs -r rm -f --
rm -rf /usr/share/{doc,man,info,license,gfxboot}

View File

@@ -1,6 +1,7 @@
#!/bin/sh -efu
# remove extra packages from a bare livecd
[ -n "$GLOBAL_CLEANUP_PACKAGES" ] || exit 0
list="$(rpmquery -a --qf='%{NAME}\n' $GLOBAL_CLEANUP_PACKAGES)"
[ -z "$list" ] || apt-get remove -f -y -- $list
:

View File

@@ -1,4 +1,11 @@
#!/bin/sh
# don't cripple the image to be copied over or explicitly requested
# not to do this
[ -n "$GLOBAL_LIVE_NO_CLEANUPDB" ] || \
[ -x /usr/sbin/live-install ] || \
[ -x /usr/sbin/livecd-install ] && exit 0
# dump what's here by this point
echo "** live packages before rpmdb purge:"
rpmquery -a --qf='%{NAME} %{VERSION}-%{RELEASE}\n'

View File

@@ -6,3 +6,18 @@ use/control:
# some presets
use/control/sudo-su: use/control
@$(call add,CONTROL,su:public sudo:public)
# recommended by ldv@ ;-)
# note that:
# - sshd-allow-groups results in "AllowGroups wheel users"
# - unprivileged su is used to drop privileges, not gain those
use/control/server/ldv: use/control
@$(call add,CONTROL,mount:unprivileged)
@$(call add,CONTROL,passwdqc-enforce:everyone)
@$(call add,CONTROL,ping:netadmin)
@$(call add,CONTROL,ping6:restricted)
@$(call add,CONTROL,postqueue:mailadm)
@$(call add,CONTROL,sftp:disabled)
@$(call add,CONTROL,sshd-allow-groups:enabled)
@$(call add,CONTROL,sshd-password-auth:disabled)
@$(call add,CONTROL,su:restricted)

View File

@@ -0,0 +1,7 @@
#!/bin/sh
# setup control(8) states for the installed system
# FIXME: drop this when rootfs scripts/data get installer support
[ -z "$GLOBAL_CONTROL" ] ||
echo "$GLOBAL_CONTROL" |
tr ' :' '\n ' > /usr/share/install2/control

View File

@@ -2,7 +2,7 @@
Если ROOTPW не задан, то подходящий пароль не существует.
При необходимости задать пустой пароль root (например, на LiveCD)
выставьте переменную ROOTPW_EMPTY.
выставьте переменную ROOTPW_EMPTY в значение "1".
ВНИМАНИЕ: применяйте разумно, т.к. крайне легко создать и оставить
дыру в безопасности!

View File

@@ -28,6 +28,9 @@ use/deflogin/root: use/deflogin
use/deflogin/altlinuxroot: use/deflogin/root use/deflogin/xgrp
@$(call add,USERS,altlinux:root:1:1)
use/deflogin/altroot: use/deflogin/root use/deflogin/xgrp
@$(call add,USERS,alt:root:1:1)
# peripherals
use/deflogin/hardware: use/deflogin
@$(call add,GROUPS,cdwriter radio scanner uucp)
@@ -39,3 +42,8 @@ use/deflogin/xgrp: use/deflogin
# potentially elevated privileges (NB: _not_ wheel)
use/deflogin/privileges: use/deflogin
@$(call add,GROUPS,fuse netadmin proc users)
# NM with sysvinit
use/deflogin/sysv/nm: use/deflogin
@$(call add,GROUPS,_nmconnect)
@$(call add,THE_PACKAGES,nm-sysvinit)

View File

@@ -2,7 +2,10 @@
# issue welcome message if there's a guest user
# (the first one configured with empty password)
[ -n "$GLOBAL_USERS" ] || exit 1
[ -n "$GLOBAL_USERS" ] || {
echo "** 50-issue: warning, no users created" >&1
exit 0
}
guest=
for u in $GLOBAL_USERS; do

View File

@@ -1,10 +1,12 @@
#!/bin/sh
# explicitly requested empty root password
if [ -n "$GLOBAL_ROOTPW_EMPTY" ]; then
case "$GLOBAL_ROOTPW_EMPTY" in
1|y|Y|yes)
usermod -p "" root
exit 0
fi
;;
esac
# set root password if any; no-op if it is empty
if [ -z "$GLOBAL_ROOTPW" ]; then

View File

@@ -18,6 +18,7 @@ set_password() { echo "$1:$2" | chpasswd; }
set_admin() { usermod -a --groups "wheel" "$1"; }
# NB: one must care to purge this from LiveCD if it's installed permanently
set_sudo() {
[ ! -w "/etc/sudoers" ] ||
echo "$1 ALL=(ALL) ALL" >> "/etc/sudoers"

View File

@@ -1,5 +1,10 @@
Эта фича служит для создания образов, предназначающихся для разработки.
В первую очередь обеспечивается развёртывание hasher и mkimage.
Реализована поддержка LiveCD, возможно приспособление для образов
сборочных VM/VE.
Реализованы поддержка LiveCD, VM, VE и добавление группы в инсталятор.
Обратите внимание: эта фича достаточно серьёзно изменяет поведение
субпрофиля main, оставляя из всего обычного множества обрабатываемых
переменных только MAIN_PACKAGES, MAIN_PACKAGES_REGEXP и MAIN_LISTS
во избежание дублирования не требующихся для сборки минимальных
образов пакетов.

View File

@@ -3,11 +3,27 @@ use/dev: use/control
@$(call add,THE_PACKAGES,git-core hasher gear)
@$(call add,CONTROL,pam_mktemp:enabled)
# use/dev intentionally missing
use/dev/repo: use/repo/main
@$(call add,THE_PACKAGES,apt-repo)
@$(call add,MAIN_LISTS,$(call tags,main builder))
use/dev/mkimage: use/dev
@$(call add,THE_PACKAGES,mkimage shadow-change su)
use/dev/repo: use/dev use/repo/main
@$(call add,THE_PACKAGES,apt-repo)
@$(call add,MAIN_PACKAGES,rpm-build basesystem)
@$(call add,MAIN_PACKAGES,fakeroot sisyphus_check)
@$(call add,MAIN_PACKAGES,file make-initrd make-initrd-propagator)
use/dev/builder/base: use/dev/mkimage
@$(call add,THE_LISTS,$(call tags,builder && (base || extra)))
use/dev/builder/live: use/dev/builder/base
@$(call add,LIVE_LISTS,$(call tags,live builder))
@$(call add,LIVE_PACKAGES,livecd-qemu-arch qemu-user-binfmt_misc)
use/dev/builder/full: use/dev use/dev/builder/live use/dev/repo
@$(call set,KFLAVOURS,$(BIGRAM))
@$(call add,THE_LISTS,$(call tags,server extra))
@$(call add,MAIN_LISTS,$(call tags,live builder))
@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ xorriso)
@$(call add,LIVE_PACKAGES,sudo perl-Gear-Remotes)
use/dev/groups/builder: use/dev/repo
@$(call add,MAIN_GROUPS,dev/builder)

View File

@@ -1,6 +1,33 @@
#!/bin/sh -efu
# configure hasher (implies that 30-users has been run already)
ARCH="$(rpm --eval '%_host_cpu')"
[ -n "$ARCH" ] || exit 2
gray="$(echo -ne "\\033[0;37m")"
white="$(echo -ne "\\033[1;37m")"
cyan="$(echo -ne "\\033[1;36m")"
# root
cat >> /root/.bash_profile << EOF
ram="\$(awk '/^MemTotal/ { print int(\$2/1024+0.5) }' /proc/meminfo)"
swap="\$(awk '/^SwapTotal/ { print int(\$2/1024+0.5) }' /proc/meminfo)"
tmpfs="\$(df -kT /tmp 2>/dev/null \\
| awk '/^[a-zA-Z_0-9/-]+[[:space:]]+tmpfs/ { print int(\$3/1024); }')"
cat << EOH
Welcome to live builder host system!
Memory: $cyan\${ram}M$gray, swap: $cyan\${swap}M$gray
Autoconfigured tmpfs on /tmp: $cyan\${tmpfs}M$gray
Run ${white}swapon${gray}(8) on any local swaps you might like to employ
followed by ${white}service livecd-tmpfs restart${gray} to reconfigure tmpfs
EOH
EOF
# predefined passwordless livecd user
USER="altlinux"
if ! id "$USER" >&/dev/null; then
@@ -12,6 +39,9 @@ fi
HOME="/home/$USER"
install -dm750 -o "$USER" -g "$USER" "$HOME"
# http://altlinux.org/tmpfs
TMP="/tmp/.private/$USER"
# we honestly don't know much more
if type -t git && type -t su; then
su - -c "git config --global user.email $USER@localhost" "$USER"
@@ -22,18 +52,62 @@ fi >&/dev/null
ZSHELL="/bin/zsh"
if [ -x "$ZSHELL" ]; then
chsh -s "$ZSHELL" "$USER"
install -m755 -o "$USER" -g "$USER" /dev/null "$HOME/.zshrc"
echo "mkdir -p \"\$TMP/hasher\"" >> "$HOME/.zshrc"
install -m644 -o "$USER" -g "$USER" /dev/null "$HOME/.zshrc"
cat >> "$HOME/.zsh_history" <<-EOF
git clone git://git.altlinux.org/gears/m/mkimage-profiles.git && cd mkimage-profiles && make help/distro
make -C /usr/share/mkimage-profiles syslinux.iso
git clone git://git.altlinux.org/gears/h/hello.git && cd hello && gear-hsh
EOF
fi
# $TMP
TMP="/tmp/.private/$USER"
sed -i '/^%_tmppath.*tmp$/d' "$HOME/.rpmmacros"
echo "%_tmppath $TMP" >> "$HOME/.rpmmacros"
if type -t screen; then
cat >> "$HOME/.screenrc" <<-EOF
caption always "%{+b rk}%H%{gk} |%c %{yk}%d.%m.%Y | %72=Load: %l %{wk}"
defscrollback 1000
EOF
fi >&/dev/null
# ~/hasher
cat >> "$HOME/.profile" << EOF
alias l='ls -l'
alias m='cd /usr/share/mkimage-profiles'
clear
cat << EOH
Welcome to live builder environment!
Here are some ALT package/image build tools prepared for you:
* ${white}gear${gray}(1) -- see ${cyan}http://en.altlinux.org/gear${gray};
* ${white}hsh${gray}(1) -- see ${cyan}http://en.altlinux.org/hasher${gray};
* ${white}mkimage${gray} -- see ${cyan}http://en.altlinux.org/mkimage${gray};
* ${white}mkimage-profiles${gray} described in Russian at ${cyan}http://altlinux.org/m-p${gray}
Examples (use right/middle mouse button to paste; see ~/hasher/repo/):
* ${white}git clone git://git.altlinux.org/gears/h/hello.git && cd hello && gear-hsh${gray}
* ${white}make -C /usr/share/mkimage-profiles syslinux.iso${gray}
EOH
EOF
# rpm
sed -i '/^%_tmppath.*tmp$/d' "$HOME/.rpmmacros"
cat << EOF >> "$HOME/.rpmmacros"
%packager Unknown <nobody@altlinux.org>
%_target_cpu $ARCH
%_tmppath $TMP
%_sourcedir %{_topsrcdir}/SOURCES/%name
EOF
# hasher
WORKDIR="$TMP/hasher"
ln -s "$TMP/hasher" "$HOME/hasher"
ln -s "$WORKDIR" "$HOME/hasher"
echo "rpm-dir file://$HOME/hasher/repo $ARCH hasher" \
>> /etc/apt/sources.list.d/hasher.list
mkdir "$HOME/.hasher"
cat >> "$HOME/.hasher/config" << EOF
packager="\$(rpm --eval %packager)"
def_target=$ARCH
export GCC_USE_CCACHE=1
mkdir -p "$WORKDIR"
EOF
# online repo needs network not isolation
echo "export share_network=1" >> /etc/profile.d/hasher.sh

View File

@@ -0,0 +1,4 @@
# only MAIN_* should go in this time
IMAGE_PACKAGES_REGEXP = $(MAIN_PACKAGES_REGEXP)
IMAGE_PACKAGES = $(MAIN_PACKAGES) $(call map,list,$(MAIN_LISTS))

12
features.in/docs/README Normal file
View File

@@ -0,0 +1,12 @@
Эта фича добавляет в образ распакованную документацию дистрибутива,
а именно вводную страничку (входит в пакет branding-*-indexhtml),
и/или специфичное для данного продукта руководство из пакета docs-*
(вариант задаётся отдельно выставлением переменной DOCS),
и/или тексты лицензионных соглашений.
Обратите внимание, что для indexhtml создаётся переброска с учётом
языка (при наличии index-LL.html), поэтому ожидается задействование
фичи l10n с соответствующим указанием языка по умолчанию.
NB: предполагается применение при формировании ISO-образов,
другие случаи наверняка потребуют доработки.

View File

@@ -0,0 +1,21 @@
# copy the packaged docs to image root
# packaged documentation sources:
# 1) branding-*-indexhtml
# 2) docs-* (should be installed elsewhere)
+docs: use/docs; @:
use/docs:
@$(call add_feature)
use/docs/indexhtml: use/docs use/branding
@$(call add,THE_BRANDING,indexhtml)
use/docs/manual: use/docs
@$(call xport,DOCS)
@$(call add,THE_PACKAGES,docs-$$(DOCS))
use/docs/license: use/docs use/branding/notes
@$(call set,META_LICENSE_FILE,license.all.html)
use/docs/full: use/docs/indexhtml use/docs/manual use/docs/license; @:

View File

@@ -0,0 +1,14 @@
# step 4: build the distribution image
ifneq (,$(DOCS))
DOT_BASE += docs-$(DOCS)
CHROOT_PACKAGES += docs-$(DOCS)
endif
ifneq (,$(findstring notes,$(THE_BRANDING) $(INSTALL2_BRANDING)))
CHROOT_PACKAGES_REGEXP += $(call branding,notes)
endif
ifneq (,$(findstring indexhtml,$(THE_BRANDING)))
CHROOT_PACKAGES_REGEXP += $(call branding,indexhtml)
endif

View File

@@ -0,0 +1,46 @@
#!/bin/sh -e
# trailing slash is important here
dest="docs/"
mkdir -p "$WORKDIR/$dest"
cd $WORKDIR
nonfatal() { echo "** $*" >&2; exit 0; }
indexdir="/usr/share/doc/indexhtml"
indexfile="$indexdir/index.html"
[ -s "$indexfile" ] || nonfatal "$indexfile not found"
[ -n "$GLOBAL_LOCALE" ] ||
echo "** warning: GLOBAL_LOCALE empty, fallback to en_US (use/l10n?)">&2
LANG="${GLOBAL_LOCALE:-en_US}" indexhtml-update
# http://unix.stackexchange.com/questions/94185/convert-soft-to-hardlinks
cp -aH "$indexdir" "$dest"
mkredir() {
cat >"${1}index.html" <<-EOF
<html>
<head>
<meta http-equiv="refresh" content="0;url=${2}indexhtml/index.html">
<title>Redirecting...</title>
</head>
<body>
<h1>Redirecting...</h1>
</body>
</html>
EOF
}
mkredir "" "$dest" # /index.html -> docs/indexhtml/index.html
mkredir "$dest" "" # docs//index.html -> indexhtml/index.html
docdir="/usr/share/doc/documentation"
[ -d "$docdir" ] || nonfatal "$docdir not found"
cp -aH "$docdir" "$dest"
### no need to replace symlinks with hardlinks by now? (-aH)

View File

@@ -0,0 +1,9 @@
#!/bin/sh
# copy distro's licenses into image's rootdir
cd /usr/share/alt-notes || exit 0
find -maxdepth 1 -type f -name "license*.html" -print |
while read FILE; do
cp -av "$FILE" $WORKDIR/
done

View File

@@ -5,3 +5,4 @@ use/domain-client: use/net/dhcp
use/domain-client/full: use/domain-client
@$(call add,THE_PACKAGES,krb5-ticket-watcher)
@$(call add,DEFAULT_SERVICES_ENABLE,avahi-daemon)
@$(call add,BASE_LISTS,domain-client-i) # i-f-* shouldn't hit live

1
features.in/e2k/README Normal file
View File

@@ -0,0 +1 @@
Эта фича содержит необходимое для поддержки систем архитектуры "Эльбрус".

60
features.in/e2k/config.mk Normal file
View File

@@ -0,0 +1,60 @@
use/e2k:
@$(call add_feature)
@$(call add,BASE_PACKAGES,installer-feature-e2k-fix-clock-stage3)
# at least one of these is requisite
use/e2k/1cp use/e2k/4c use/e2k/8c: use/e2k/%: use/e2k
@$(call set,KFLAVOURS,elbrus-$*)
use/e2k/x11: use/e2k use/x11
@$(call add,THE_PACKAGES,xorg-server xinit)
use/e2k/x11/401: use/e2k/x11 use/e2k/4c
@$(call add,THE_PACKAGES,xorg-conf-e401-radeon)
@$(call add,THE_PACKAGES,xorg-drv-ati)
use/e2k/x11/801: use/e2k/x11 use/e2k/8c
@$(call add,THE_PACKAGES,xorg-conf-e801-radeon)
@$(call add,THE_PACKAGES,xorg-drv-ati)
use/e2k/x11/.101: use/e2k/x11 use/e2k/1cp; @:
use/e2k/x11/101/modesetting: use/e2k/x11/.101
@$(call add,THE_PACKAGES,xorg-conf-e101-modesetting)
@$(call add,THE_PACKAGES,dummy-xorg-drv-vivante)
use/e2k/x11/101/mga2: use/e2k/x11/.101
@$(call add,THE_PACKAGES,xorg-conf-e101-mga2)
@$(call add,THE_PACKAGES,xorg-drv-mga2 vivante_glx)
use/e2k/x11/101: use/e2k/x11/101/modesetting
@$(call add,MAIN_PACKAGES,xorg-conf-e101-mga2)
@$(call add,MAIN_PACKAGES,xorg-drv-mga2 vivante_glx)
use/e2k/install2: use/e2k
@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-fix-boot-stage2)
@$(call add,INSTALL2_PACKAGES,installer-feature-fstrim-stage2)
@$(call add,INSTALL2_CLEANUP_PACKAGES,llvm)
use/e2k/install2/desktop: use/e2k/install2
@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-ignore-cf-stage2)
use/e2k/install2/4xx: use/e2k/install2 use/e2k/4c
@$(call add,INSTALL2_PACKAGES,xorg-conf-e4xx-fbdev)
use/e2k/install2/401: use/e2k/install2/desktop use/e2k/4c
@$(call add,INSTALL2_PACKAGES,xorg-conf-e401-modesetting)
use/e2k/install2/801: use/e2k/install2/desktop use/e2k/8c
@$(call add,INSTALL2_PACKAGES,xorg-conf-e801-modesetting)
use/e2k/install2/101: use/e2k/install2/desktop use/e2k/1cp
@$(call add,INSTALL2_PACKAGES,xorg-conf-e101-modesetting)
@$(call add,INSTALL2_PACKAGES,dummy-xorg-drv-vivante)
use/e2k/sound/401:
@$(call add,THE_PACKAGES,setup-alsa-elbrus-401)
use/e2k/401: use/e2k/install2/401 use/e2k/x11/401 use/e2k/sound/401; @:
use/e2k/801: use/e2k/install2/801 use/e2k/x11/801; @:
use/e2k/101: use/e2k/install2/101 use/e2k/x11/101; @:

View File

@@ -0,0 +1,4 @@
#!/bin/sh
# e2k images are distributed through MCST now with a separate agreement
sed -i '/license/d' /usr/share/install2/installer-steps ||:

View File

@@ -0,0 +1,14 @@
#!/bin/sh
CFG="/boot/boot.conf"
[ -s "$CFG" ] || {
echo "50-e2k-serial: $CFG missing, exiting" >&2
exit 0
}
[ -n "$GLOBAL_TTY_DEV" -a -n "$GLOBAL_TTY_RATE" ] || exit 0
# tty0 first
sed -i "s/console=tty0 /console=$GLOBAL_TTY_DEV,$GLOBAL_TTY_RATE &/" "$CFG"
### NB: there's no boot.conf yet! could only be the sample one

View File

@@ -0,0 +1,6 @@
#!/bin/sh
echo "#LANG=ru_RU.KOI8-R" >> /etc/sysconfig/i18n
echo "#SYSFONTACM=koi8-r" >> /etc/sysconfig/consolefont
echo "#KBCHARSET=koi8-r" >> /etc/sysconfig/keyboard
echo "#KEYTABLE=ru_cplk-KOI8-R" >> /etc/sysconfig/keyboard

View File

@@ -0,0 +1,8 @@
#!/bin/sh
echo "LANG=ru_RU.UTF-8" >> /etc/sysconfig/i18n
echo "SYSFONT=UniCyr_8x16" >> /etc/sysconfig/consolefont
echo "KEYTABLE=ruwin_cplk-UTF-8" >> /etc/sysconfig/keyboard
[ ! -f /etc/locale.conf ] ||
echo "LANG=ru_RU.UTF-8" >> /etc/locale.conf

View File

@@ -1,42 +1,74 @@
EFI_ARCHES := x86_64 aarch64
+efi: use/efi/signed; @:
ifeq (x86_64,$(ARCH))
ifeq (,$(filter-out $(EFI_ARCHES),$(ARCH)))
EFI_LISTS := $(call tags,base efi)
use/efi:
@$(call add_feature)
@$(call set,MKI_VER_MINIMAL,0.2.12) # it's official now
@$(call add,THE_LISTS,$(EFI_LISTS))
@$(call add,RESCUE_LISTS,$(EFI_LISTS))
@$(call add,THE_PACKAGES,$$(EFI_SHELL))
@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL))
@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
@$(call set,MKI_VER_OPTIMAL,0.2.17) # for EFI_BOOTARGS
ifeq (x86_64,$(ARCH))
@$(call try,EFI_BOOTLOADER,elilo) # default one
else
@$(call try,EFI_BOOTLOADER,grub-efi) # default one
endif
@$(call add,THE_PACKAGES,$$(EFI_BOOTLOADER))
@$(call xport,EFI_BOOTLOADER)
@$(call add,THE_LISTS,$(EFI_LISTS))
ifeq (distro,$(IMAGE_CLASS))
@$(call add,THE_PACKAGES,installer-feature-efi-stage3)
@$(call add,RESCUE_LISTS,$(EFI_LISTS))
@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
@$(call add,STAGE1_KCONFIG,EFI EFI_PARTITION EFI_VARS FB_EFI)
@$(call add,EFI_BOOTARGS,$$(STAGE2_BOOTARGS))
ifeq (x86_64,$(ARCH))
@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL) $$(EFI_BOOTLOADER))
endif
endif
use/efi/grub: use/efi use/bootloader/grub
@$(call set,EFI_BOOTLOADER,grub-efi)
ifeq (x86_64,$(ARCH))
use/efi/shell: use/efi
@$(call try,EFI_SHELL,efi-shell)
@$(call add,THE_PACKAGES,$$(EFI_SHELL))
use/efi/signed: use/efi
@$(call set,EFI_CERT,altlinux)
@$(call add,COMMON_PACKAGES,shim-signed)
@$(call add,RESCUE_PACKAGES,openssl pesign)
use/efi/lilo: use/efi use/bootloader/lilo
@$(call set,EFI_BOOTLOADER,elilo)
use/efi/refind: use/efi
@$(call set,EFI_BOOTLOADER,refind)
use/efi/signed: use/efi
@$(call set,EFI_CERT,altlinux)
@$(call add,THE_PACKAGES,shim-signed)
@$(call add,RESCUE_PACKAGES,openssl pesign sbsigntools)
use/efi/shell: use/efi
@$(call try,EFI_SHELL,efi-shell)
use/efi/memtest86: use/efi/refind
@$(call set,EFI_MEMTEST86,efi-memtest86)
else
use/efi/shell use/efi/signed use/efi/refind use/efi/memtest86 use/efi/lilo: use/efi; @:
endif
ifeq (distro,$(IMAGE_CLASS))
use/efi/debug: use/efi
@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
@$(call set,KFLAVOURS,led-ws)
else
use/efi/debug: use/efi; @:
endif
else
# ignore on an unsupported target arch but make it hybrid at least
use/efi use/efi/signed use/efi/debug \
use/efi/refind use/efi/shell use/efi/memtest86: use/isohybrid
use/efi/refind use/efi/shell use/efi/memtest86 use/efi/lilo use/efi/grub: use/isohybrid; @:
endif

View File

@@ -6,28 +6,30 @@ use/firmware:
@$(call add_feature)
@$(call add,SYSTEM_PACKAGES,firmware-linux)
use/firmware/full: use/firmware/server use/firmware/laptop
use/firmware/full: use/firmware/server use/firmware/laptop; @:
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
use/firmware/cpu: use/firmware
@$(call add,THE_PACKAGES,microcode-data-intel microcode_ctl)
@$(call add,THE_PACKAGES,firmware-intel-ucode iucode_tool)
else
use/firmware/cpu: use/firmware; @:
endif
use/firmware/server: use/firmware
@$(call add,SYSTEM_PACKAGES,firmware-aic94xx-seq)
@$(call add,THE_PACKAGES_REGEXP,firmware-ql.*)
use/firmware/qlogic: use/firmware
@$(call add,SYSTEM_PACKAGES,firmware-ql6312)
# NB: individual firmwarez would sometimes conflict
# with ones newly merged into firmware-linux
# FIXME: kernel modules rather belong to use/hardware
use/firmware/wireless: use/firmware
@$(call add,THE_KMODULES,bcmwl ndiswrapper)
@$(call add,THE_PACKAGES,firmware-acx100)
@#$(call add,THE_PACKAGES,firmware-i2400m)
@#$(call add,THE_PACKAGES_REGEXP,firmware-carl9170.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
@#$(call add,THE_PACKAGES_REGEXP,firmware-iwl.*)
@#$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)
use/firmware/laptop: use/firmware/wireless use/firmware/cpu
@$(call add,KMODULES,acpi_call)
use/firmware/laptop: use/firmware/cpu
@$(call add,THE_KMODULES,acpi_call)

View File

@@ -1,8 +1,13 @@
# fontconfig setup
use/fonts:
@$(call add_feature)
@$(call xport,FONT_FEATURES_ENABLE)
@$(call xport,FONT_FEATURES_DISABLE)
# standalone target to specify non-bitmap installer fonts
use/fonts/install2:
@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
# just stating that kernels and font habits are pretty individual
use/fonts/zerg: use/fonts
@$(call set,FONT_FEATURES_ENABLE,antialias lcdfilter-default \
@@ -13,3 +18,42 @@ use/fonts/zerg: use/fonts
# nothing configured to add_feature but let's not skip that for consistency
use/fonts/infinality: use/fonts
@$(call add,THE_PACKAGES,libfreetype-infinality fontconfig-infinality)
# #34142
use/fonts/chinese: use/fonts
@$(call add,THE_PACKAGES,fonts-bitmap-wqy)
# a few typical font collections
# NB: dejavu is ugly thus missing
# NB: not depending on use/fonts intentionally,
# the scripts are unneeded to add packages
use/fonts/otf/adobe:
@$(call add,THE_PACKAGES,fonts-otf-adobe-source-code-pro)
@$(call add,THE_PACKAGES,fonts-otf-adobe-source-sans-pro)
use/fonts/otf/mozilla:
@$(call add,THE_PACKAGES,fonts-otf-mozilla-fira)
use/fonts/ttf/google:
@$(call add,THE_PACKAGES,fonts-ttf-google-droid-sans)
@$(call add,THE_PACKAGES,fonts-ttf-google-droid-sans-mono)
@$(call add,THE_PACKAGES,fonts-ttf-google-droid-serif)
@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-arimo)
@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-cousine)
@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-tinos)
use/fonts/ttf/google/extra: use/fonts/ttf/google
@$(call add,THE_PACKAGES,fonts-ttf-google-crosextra-caladea)
@$(call add,THE_PACKAGES,fonts-ttf-google-crosextra-carlito)
use/fonts/ttf/redhat:
@$(call add,THE_PACKAGES,fonts-ttf-liberation)
use/fonts/ttf/ubuntu:
@$(call add,THE_PACKAGES,fonts-ttf-ubuntu-font-family)
use/fonts/ttf/xo:
@$(call add,THE_PACKAGES,fonts-ttf-XO)
@$(call add,THE_PACKAGES,fonts-ttf-PT)
@$(call add,THE_PACKAGES,fonts-ttf-Cormorant)
@$(call add,THE_PACKAGES,fonts-ttf-open-sans)

Some files were not shown because too many files have changed in this diff Show More