Commit Graph

1158 Commits

Author SHA1 Message Date
Anton Midyukov
30af48c871 vm.mk: Simplified conditions for choosing a bootloader depending on arch 2020-09-18 12:45:09 +07:00
Michael Shigorin
984aded5dd mixin.mk: drop notes on e2k yet again
Still have to refer to MCST instead at the moment....
2020-09-07 20:25:55 +03:00
Michael Shigorin
338f8db64d regular.mk: adapted for e2k
As discussed while tweaking power feature, e2k's powerbutton
handling scheme differs slightly at the moment so it does
need some special handling.

No need to toss firmware-linux around if it's not there though.
2020-09-07 20:25:50 +03:00
Michael Shigorin
43433e2518 regular.mk: use/kernel/latest
...instead of hardwiring un-def; this should help building
starterkits for secondary arches.
2020-09-07 20:25:45 +03:00
Michael Shigorin
14538502b2 mixin-basealt.mk: install vaapi by default
MAIN_LISTS resulted in packages being available on the media
but having on effect on the actual user systems...
2020-09-07 20:22:18 +03:00
Michael Shigorin
7d48ee9847 alt-server.mk: add +power +net-eth on e2k
These would have been lost as compared to 9.0 release otherwise,
and e2k's power button handling differs slightly so acpid is a must.
2020-09-07 20:22:14 +03:00
Michael Shigorin
1aec6cee40 alt-server.mk: put the horse before the tug
There was something wrong about that order of additives
and the base configuration; let's make it straight,
putting the foundation first and architecture-dependent
additions on top of it.

Note that double-colon syntax is specifically allowing
for multiple rules adding up their recipes (and prereqs),
but all of those rules must be specified as double-colon
(this was violated in the previous state of alt-server.mk).

See-also: http://www.gnu.org/software/make/manual/make.html#Double_002dColon
Fixes: 33436b6b1b
Fixes: c06f87539d
2020-08-31 19:30:25 +03:00
Michael Shigorin
4d3f64818d basealt.mk: generalize e2k machine support
Finalize the move to shared multiseat support on e2k
following education.mk; should have been done properly
in the first place but I couldn't manage that for 9.0,
let's at least fix this now.
2020-08-31 14:34:11 +03:00
Michael Shigorin
2ab3cffe6c education.mk: generalize distro/alt-education
This includes merge of RELENG-e2k-edu private branch current state
along with the move to shared multiseat support on e2k and assorted
updates following pkg.in/.
2020-08-31 14:34:08 +03:00
Anton Midyukov
49a82d70c2 mixin-alt-server.mk: Added centaurus-30-desktop profile for aarch64 2020-08-31 14:33:06 +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
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
4e5cb00c56 basealt.mk: add alterator-web pkggroup
...as suggested; enable if installed.
2020-08-31 14:25:02 +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
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
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
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
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
a2122b6943 vm.mk: vagrant available for i586, x86_64 only 2020-08-27 23:38:36 +07:00
Anton Midyukov
55f4227dc5 armh.mk: Drop broken targets 2020-08-27 15:06:49 +07:00
Anton Midyukov
2973952d00 p9.mk: Drop target vm/alt-p9-lxde-tegra (vm/regular-lxde-tegra not exist) 2020-08-27 15:06:49 +07:00
Anton Midyukov
91708f4bf3 regular-vm.mk: Fix availability vm profile for ARCHES 2020-08-27 15:06:49 +07:00
Anton Midyukov
fde9366ca0 basealt.mk: Fix availability vm profile for ARCHES 2020-08-27 15:06:49 +07:00
Anton Midyukov
d74e1c4a78 slinux.mk: Fix availability vm profile for ARCHES
Also drop use/build-vm, not needed.
2020-08-27 15:06:49 +07:00
Anton Midyukov
82aebfb968 education.mk: Fix availability vm profile for ARCHES, added installer-features 2020-08-27 15:06:49 +07:00
Anton Midyukov
c18380e24d slinux.mk: Use arm-rpi4/full feature for RPi4
The rpi-un kernel for armh does not exist at the moment.
2020-08-26 18:35:17 +07:00
Anton Midyukov
21582420aa education.mk: Use arm-rpi4/full feature for RPi4
The rpi-un kernel for armh does not exist at the moment.
2020-08-26 18:33:21 +07:00
Dmitriy Terekhin
2d45a8e8d2 basealt.mk: Use arm-rpi4/full feature for RPi4
The rpi-un kernel for armh does not exist at the moment
2020-08-26 18:31:26 +07:00
Anton Midyukov
c505b9c97e regular.mk: Fix build regular-server-hyperv
Typo again...
2020-08-26 17:03:32 +07:00
Anton Midyukov
655db94e0d Revert "alt-server.mk, basealt.mk, centaurus/70-dev: Added support Baikal-M"
This parts reverts commit cff3291c2a.
Upstream mkimage has not yet take patches to support packaging
multiple kernels to ISO image. In order to avoid problems, have
to revert this commit.

See-also: 01a1581b71
2020-08-23 21:19:02 +07:00
384957b138 server-v: move pve-storage-linstor to arch condition 2020-08-23 21:00:27 +07:00
fe9edddcc7 server-v: add Linstor storage support 2020-08-23 21:00:27 +07:00
8629688af1 server-v: version up 2020-08-23 21:00:27 +07:00
Andrew A. Vasilyev
506d33bba1 Add 3 templates for OpenVZ 7 containers:
- sysvinit-etcnet: System V init with etcnet
  - systemd-etcnet: systemd with etcnet
  - systemd-networkd: systemd with networkd
2020-08-23 21:00:27 +07:00
Andrew A. Vasilyev
d93831ce20 enable PVE services 2020-08-23 21:00:27 +07:00
Anton Midyukov
e84a2fbb2d p9.mk, regular-vm.mk: Rename targets *-rpi4 to *-rpi
these targets support all Raspberry Pi.
2020-08-21 19:39:57 +07:00
Anton Midyukov
9fb7eafc62 regular-vm.mk: Set VM_SIZE=10G for builder 2020-08-15 08:42:28 +07:00
Anton Midyukov
54da0a1697 regular-vm.mk: use/ttyAMA0 for jeos-rpi4 2020-08-15 08:42:28 +07:00
Anton Midyukov
1e8376852b regular-vm.mk: rpi4 target allowed for armh 2020-08-05 19:21:37 +07:00
Anton Midyukov
259bca3acb mixin.mk: Added apt-repo, eepm into regular-builder 2020-08-05 19:17:32 +07:00
Anton Midyukov
d3a2364056 p9.mk: rpi4 targets allowed for armh 2020-08-05 19:16:10 +07:00
Anton Midyukov
a2e06a2086 regular-vm.mk: Update rpi4 targets 2020-08-05 17:05:23 +07:00
Anton Midyukov
37a1ae781a p9.mk: Added starterkit builder for Raspberry Pi 4 2020-08-05 15:38:16 +07:00
Anton Midyukov
9827b93ed9 regular-vm.mk: Added regular-builder for Raspberry Pi 4 2020-08-05 15:38:16 +07:00
Anton Midyukov
7201c2cb0d slinux.mk: Add Raspberry Pi 4 support 2020-08-04 00:47:55 +07:00