Commit Graph

3807 Commits

Author SHA1 Message Date
Michael Shigorin
7c60d4d587 centaurus/mate: drop the unneeded kludge
DRI3 is fine on e2k now.
2020-08-31 14:32:59 +03:00
Michael Shigorin
bd04f9a8af centaurus/xorg: fix arch support
There's no std-def kernel on e2k and mipsel so far, and there are
different kernels for some aarch64 machines as well;  we'll have to
deal with this problem that's been solved in m-p-d the other way
around (@KFLAVOUR@ substitution in pkglists among the rest).

Also add graphics branding part: must be there regardless of platform,
otherwise an arbitrary one gets pulled in, this time it was
"xalt-kworkstation".  This is another case of the same problem,
m-p-d would solve it with @BRANDING@ substitution where m-p does
generation of variable contents but not file-based pkglists to
be put into the image for runtime selection during install process.

Restrict plymouth support to @X86 as well, just as bootsplash
branding component has already been.
2020-08-31 14:32:28 +03:00
Michael Shigorin
38f8d2acdd centaurus/base: skip i-f-repo-add on e2k
Not much use, and spoils postinstall.d messages with
FAILED (to mount the already-mounted flash drive).
2020-08-31 14:32:24 +03:00
Michael Shigorin
c013c47c7b centaurus/xorg: add xorg-drv-smi on e2k
Should help those interested in using servers as workstations
as well (SM718 would only do 800x600 with vesa driver).
2020-08-31 14:32:14 +03:00
Michael Shigorin
db77e5dcb4 centaurus/disk-server-light: adapt for e2k 2020-08-31 14:31:33 +03:00
Michael Shigorin
33436b6b1b alt-server.mk: generalize distro/alt-server
This commit includes summary of the work done within RELENG-alt-server
branch, and goes over the existing bits regarding architecture support.

It was somewhat hard to keep separate so I finally chose to lump these
parts together.
2020-08-31 14:31:02 +03:00
Michael Shigorin
cb222bb806 mixin-alt-server.mk: merged e2k bits
These have been brewing in RELENG-alt-server branch for a while;
with ALT Server 9.0 for Elbrus release as the immediate result.

NB: plymouth is still strangely broken there.
2020-08-31 14:25:13 +03:00
Michael Shigorin
d734fa12a9 workstation/base.pkgs: added terminfo-extra
...so those willing to use e.g. 256-colour terminal variants
can do so without extra access to the repository.

Suggested-by: Andrey Savchenko <bircoph@altlinux.org>
2020-08-31 14:25:12 +03:00
Michael Shigorin
e9c42d63a5 basealt.mk: added new parent groups on e2k
...or the friendly alterator-pkg bails out silently.
2020-08-31 14:25:11 +03:00
Michael Shigorin
1f681e5921 workstation: organize machine-specific groups
Four checkboxes with "Elbrus 801-PC" prefix look a bit too much,
let's put these under a parent one; the counter-argument is that
selecting that parent checkbox is going to provide message telling
that there are conflicts within -- the proper widget would be a
dropbox with the number of seats but we don't do that just yet
in alterator-pkg.

The autologin group goes there too; still a hack that should be
replaced by proper alterator-users multiseat support.
2020-08-31 14:25:09 +03:00
Michael Shigorin
4e5cb00c56 basealt.mk: add alterator-web pkggroup
...as suggested; enable if installed.
2020-08-31 14:25:02 +03:00
Michael Shigorin
ccdc82ee82 pkg.in: add workstation/alterator-web
This has been suggested by a customer.
2020-08-31 14:25:01 +03:00
Michael Shigorin
010fc44482 {workstation,centaurus}/emulators: add rtc on e2k
The MCST's binary translator allows running x86 code
on e2k architecture; see also http://altlinux.org/e2k-rtc
2020-08-31 14:24:59 +03:00
Michael Shigorin
b7ed438fab branding: avoid bootloader on non-grub arches
SYSLINUX happens where GRUB happens too, just in case.

The problem at hand is that some branding-*-bootloader tend to
*create* /etc/sysconfig/grub2 without bothering to check that it
existed, thus confusing the subsequent scripts (e.g. 65-serial.sh
tries to run update-grub that's just absent then).
2020-08-31 14:24:59 +03:00
Michael Shigorin
0225b2549f grub: ignore all targets if not available
Otherwise it might e.g. add branding-*-bootloader
for no good reason, poisoning $destdir with an
existing and non-empty /etc/sysconfig/grub2
regardless of the actual grub availability
on the platform.
2020-08-31 14:24:58 +03:00
Michael Shigorin
5285c0a832 basealt.mk: generalize distro/alt-workstation
The point is that it's common between the rest of the arches,
no need to keep making my old mistake of growing configuration
trees based on very different "roots" (.e2k-installer this time
which was good for early experiments but not for production).

Also get rid of long-unused distro/alt-workstation-?01 targets,
unified kernel made those obsolete.

And last but not least: *drop* that setup-libgl-dri3-disable,
makes Radeon RX lag (half-recent AMD GPUs seem to lack 2D part
rather altogether, it's emulated through 3D).
2020-08-31 14:24:56 +03:00
Michael Shigorin
8db77d6462 browsers: rewrote with per-arch browser lists
There are arches with many browsers available
and there are those with elinks; let's provide
relevant targets to use at the very least.
2020-08-31 14:24:53 +03:00
Michael Shigorin
c9c83be408 alt-server.mk: do not override targets on e2k
Looks like aarch64 addition was done in haste,
the targets were split by architecture families
before commit c06f875.
2020-08-31 14:24:52 +03:00
Michael Shigorin
1cf05b639c bootloader: just skip on e2k
There's no need for bootloader on Elbrus platform
since firmware boots Linux just fine; note that
the whole feature is betted omitted since its
script checks for the case when the feature
is requested but not configured properly.
2020-08-31 14:24:50 +03:00
Michael Shigorin
425a9ddb32 office lists: handle e2k properly
As the previous commit stated, there's no LibreOffice-still
built for e2k currently.
2020-08-31 14:24:50 +03:00
Michael Shigorin
7574335d81 office: initial arch handling
There's no LibreOffice-still on e2k (no 6.x for now,
just a single production 5.x build); and there's no
office (neither LO nor abiword/gnumeric) at all on
riscv64 as of today.  These nuances shouldn't bother
release managers each time but should lurk under
this feature's cover.
2020-08-31 14:24:50 +03:00
Michael Shigorin
85218f9ce8 tagged/archive+extra: avoid star on e2k
(ftbfs)
2020-08-31 14:24:49 +03:00
Michael Shigorin
fb0273d6cd vmguest: more dummies for non-kvm cases
There are a few more targets used for Workstation
and Simply images that are rather better plugged
here than patched there.
2020-08-31 14:24:47 +03:00
Michael Shigorin
293ec5dccc pack: ensure e2k support on e2k
The culprit is that e2k has exactly one kernel flavour
available at the moment, elbrus-def (there used to be
per-CPU flavours in p8 times -- elbrus-{4c,8c,1cp} --
but these aren't needed anymore), but there are no
std-def/un-def kernels or provides available.
There's more to it, but lacking a kernel is critical.

Maybe other arches might do similar things when needed,
or maybe this gets reverted in favour of a more generic
approach; but patching all starterkits or messing with
p9.mk per-arch (while leaving out regular builds or
any other image that might just build) looks worse.
2020-08-31 14:24:41 +03:00
Michael Shigorin
2918748cce tagged/desktop+lxqt+extra: no clementine for e2k
...at least so far.
2020-08-31 14:24:36 +03:00
Michael Shigorin
45e7fdd213 slinux/*: updated for e2k
A few remaining tidbits lingering in RELENG-e2k-workstation.
2020-08-31 14:24:33 +03:00
Michael Shigorin
83ee45e0ff education/*: updated for e2k
This commit is actually a rework of what's been done
in RELENG-e2k-workstation private branch (along with
a few more generic fixups).
2020-08-31 14:24:30 +03:00
Michael Shigorin
44f00ed0b4 workstation/e801-?seat*: 1/2/3/6-seat support
This started as a three-seater 801-PC support for
ALT Education 9.0 for Elbrus.
2020-08-31 14:24:24 +03:00
Michael Shigorin
48f212718e workstation/e[18]*: disable everything by default
...and leave the choice up to runtime scripts and the user.
2020-08-31 14:24:21 +03:00
Michael Shigorin
c4a135ca94 mixin-basealt.mk: add power to workstation too
This is required on e2k, please tell if it hurts.
2020-08-31 14:24:20 +03:00
Michael Shigorin
cfe494cbd0 mixin.mk: add power to regular desktop images
This is required on e2k (regardless of DE), please tell if it hurts.
2020-08-31 14:24:07 +03:00
Michael Shigorin
403625fef4 mixin-basealt.mk: avoid things broken/missing on e2k
Wonder if installer-feature-quota-stage2 was a problem
on other arches but having it in LIVE_PACKAGES fails
image build for me:

  livecd-installer-features: Conflicts: installer-common-stage2

and having it INSTALL2_PACKAGES results in another startup
problem (seems like quotas try to start a bit too early);
not that this one is a blocker but spoils the party nevertheless.

NB: relevant package versions are the same.

Also avoid workstation/extras pkglist: it's strongly hardwired,
seems like last-minute implementation :-/
2020-08-31 14:24:03 +03:00
Michael Shigorin
f31f305f8e {mixin-,}basealt.mk: move common bits into mixin
These have been added to the image description
that was x86-specific initially -- we're lucky
that ARM-related bits are quite minor here but
let's keep the mixin away for the sake of e2k
for now: it's built in a different enough way
at the moment.
2020-08-31 14:24:02 +03:00
Michael Shigorin
240c8fbf14 x11: add e2k-specific bits
xorg-drv-mga2 is MCST Graphics Array driver for 2D part
of videochip found in Elbrus-1C+ APU (also to be a part
of Elbrus-2C3).

xorg-drv-smi is another fork of xorg-drv-siliconmotion
that's absent in p9/sisyphus; *might* be of some interest
to mipsel folks (they've got yet another fork it seems).

Ah, and do not override targets on e2k.
2020-08-31 14:23:58 +03:00
Michael Shigorin
ef05303be2 power: don't mess up e2k's /etc/modules
button.ko isn't compiled within elbrus kernel (or used in any way).
2020-08-31 14:23:57 +03:00
Michael Shigorin
01bdf28b47 power: avoid button.ko on e2k
Done differently, no "button/power" event at the moment.
2020-08-31 14:23:52 +03:00
Michael Shigorin
a852b1d0b8 power: avoid acpid-events-power on e2k
(turns off upon boot)
2020-08-31 14:23:51 +03:00
Michael Shigorin
5fe4fa416f tagged/desktop+lx{de,qt}+extra: tag the missing bits
Some packages are still not available on some arches yet;
this time it's a e2k starterkits related fixup.
2020-08-31 14:23:48 +03:00
Michael Shigorin
25e82a2ca2 vmguest: cosmetic fix
(still preferring 80-char wide xterm for proofreading)
2020-08-31 14:23:44 +03:00
Michael Shigorin
3d883a5978 mixin.mk: specifically use/branding/notes
...so that these can be handled by the feature.
2020-08-31 14:23:36 +03:00
Michael Shigorin
efef25e395 branding, docs: drop notes on e2k
Have to refer to MCST instead at the moment.
2020-08-31 14:23:35 +03:00
Michael Shigorin
22912d889a e2k: stay with acpid
Make sure acpid will be running as acpid-events-e2k relies on it
(and power button handling relies on this one).

NB: need to do that before 10-services.
2020-08-31 14:23:32 +03:00
Michael Shigorin
525b5badd2 e2k: stay with UTC
There's just no need to keep Windows-style local clock in RTC
on Elbrus.
2020-08-31 14:23:28 +03:00
Michael Shigorin
c6af4a43a9 e2k: cover livecd with no-notes as well
ALT p9_e2k starterkits have turned this one up either...
2020-08-31 14:23:27 +03:00
Michael Shigorin
6354c1c28e e2k: generalize 50-e2k-no-notes
Belongs to live as well now since we've got starterkits;
hopefully PDK publication project is done soonish
so we can just be back to normal.
2020-08-31 14:23:24 +03:00
Michael Shigorin
f47e09cff1 e2k, e2k.mk: merge boot, fixup and x11 bits
This commit is packing a bunch of changes that went
into RELENG-e2k-workstation during its forked
development; it covers three distinct things:

- boot.conf preparation for firmware to load the image;
- fixup of packages common for e2k images;
- major cleanup of obsolete/unused cruft
  (unified kernel and reliable xorg autodetection
  allow us to move away from canned machine-specific
  configurations for the most part).
2020-08-31 14:23:22 +03:00
Anton Midyukov
daf939f71c alt-server.mk: Not setup plymoth for not X86 Arches
installer-feature-setup-plymouth needed make-initrd-plymouth.
make-initrd-plymouth missing for not X86 Arches in alt-server.
This resulted in a make-initrd error when installing on non-X86 Arches.
2020-08-30 21:30:05 +07:00
Anton Midyukov
a6b46b2125 x11: Added DISPLAY_MANAGER into package priorities 2020-08-27 23:42:07 +07:00
Anton Midyukov
ffac3c6f10 main.mk: Added vm/, ve/ targets into everything target
For check all targets.
2020-08-27 23:39:54 +07:00
Anton Midyukov
a2122b6943 vm.mk: vagrant available for i586, x86_64 only 2020-08-27 23:38:36 +07:00