Compare commits

..

469 Commits

Author SHA1 Message Date
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
242 changed files with 1978 additions and 980 deletions

View File

@@ -1,5 +1,5 @@
Name: mkimage-profiles
Version: 1.2.1
Version: 1.3.7
Release: alt1
Summary: ALT based distribution metaprofile
@@ -128,6 +128,105 @@ mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
%endif
%changelog
* 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...

View File

@@ -1,6 +0,0 @@
object f1c4c6027238c2886573efc2aadfa443fe427a17
type commit
tag v1.2.0
tagger Michael Shigorin <mike@altlinux.org> 1502132060 +0300
v1.2.0

View File

@@ -0,0 +1,6 @@
object a60b082ae37f5f22dd22eee19bd1cd50b76a0a8b
type commit
tag v1.3.6
tagger Michael Shigorin <mike@altlinux.org> 1554142876 +0300
no joke :]

View File

@@ -1 +1 @@
70aa8a363909d5cc70bf00fd7c2f679a452de4f7 v1.2.0
d24262de3536fb1b1e85cb54d36007dfde8447a5 v1.3.6

View File

@@ -52,6 +52,10 @@ e2k)
BOOTPART="1"
ROOTPART="2"
;;
mips*)
ROOTPART="1"
BLOCKDEV="/dev/sda"
;;
esac
# figure out the part taken by /boot in the given tarball
@@ -134,6 +138,7 @@ fi
exit_handler() {
rc=$?
cd /
if [ -n "$ROOTFS" ]; then
umount ${BOOTFS:+"$BOOTFS"} "$ROOTFS"{/dev,/proc,/sys,}
@@ -213,6 +218,16 @@ if [ -n "$BOOTPART" ]; then
echo "$BOOTDEV /boot $BOOTFSTYPE defaults 1 2" >> "$ROOTFS/etc/fstab"
fi
# Query ARCH in chroot and redefine arch-dependent variable
ARCH="$(chroot "$ROOTFS" rpm --eval '%_host_cpu')"
if [[ $ARCH = *86* ]]
then # NB: different storage modules might be needed for non-kvm
INITRD_MODULES="sd_mod ata_piix ahci virtio-scsi virtio-blk"
else
INITRD_MODULES=
fi
echo "MODULES_PRELOAD += $INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
case "$ARCH" in
@@ -226,19 +241,46 @@ esac
# 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
read KVER < .origver
while read kver; do
chroot "$ROOTFS" make-initrd -k "$kver"
KVERSIONS="$KVERSIONS $kver"
done < .origver
fi
[ -n "$KVER" ] || fatal "unable to deduce kernel version"
chroot "$ROOTFS" make-initrd -k "$KVER"
[ -n "$KVERSIONS" ] || fatal "unable to deduce kernel version"
rm -f .origver
# ...target device too
sed -i "s,$LOOPROOT,$ROOTDEV," "$ROOTFS/etc/fstab"
if [ -f boot.conf ]; then
sed -i -e "s,@ROOTUUID@,$ROOTUUID,g" -e "s,@KVER@,$KVER,g" boot.conf
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
if [ -x "$ROOTFS"/sbin/lilo ]; then
@@ -272,8 +314,17 @@ image=/boot/vmlinuz
boot=$BLOCKDEV
$LILO_COMMON
EOF
elif [ -x "$ROOTFS"/usr/sbin/grub-efi-autoupdate ]; then
chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
chroot "$ROOTFS" grub-install
elif [ -x "$ROOTFS"/usr/sbin/grub-autoupdate ]; then
chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
chroot "$ROOTFS" grub-install --target=i386-pc "$LOOPDEV"
fi
if [ -n "$SUDO_USER" ]; then
chown "$SUDO_USER:$(id -g "$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 ||:

View File

@@ -1,72 +1,57 @@
ifeq (distro,$(IMAGE_CLASS))
distro/alt-workstation: workstation_groups = $(addprefix workstation/,\
10-office 20-networking 30-multimedia 40-virtualization 50-publishing \
3rdparty agents blender clamav cloud-clients emulators freecad \
ganttproject gnome-peer-to-peer graphics-editing gtk-dictionary \
kvm libreoffice mate-usershare pidgin raccess \
scanning scribus smartcard sound-editing thunderbird virtualbox \
vlc voip-clients)
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 use/luks \
+installer +power +systemd +pulse +vmguest +wireless +efi \
use/kernel/net use/docs/license \
use/memtest use/bootloader/grub \
use/install2/fs use/install2/vnc use/install2/repo \
use/install2/suspend use/x11/xorg use/sound use/xdg-user-dirs \
mixin/desktop-installer \
use/efi/refind use/efi/memtest86 use/efi/shell use/rescue/base \
use/branding/complete \
use/fonts/install2 use/install2/fs \
use/fonts/otf/adobe use/fonts/otf/mozilla \
use/fonts/ttf/google/extra use/fonts/ttf/redhat use/fonts/ttf/ubuntu \
use/l10n/default/ru_RU \
use/control use/services \
use/live/install use/live/suspend use/live/x11 use/live/repo \
use/live/rw \
use/x11/lightdm/gtk use/docs/manual use/x11/gtk/nm +nm \
use/fonts/ttf/google use/domain-client/full \
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,volumes-profile-regular)
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,COMMON_PACKAGES,vim-console)
@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
@$(call add,MAIN_PACKAGES,solaar)
@$(call add,MAIN_GROUPS,$(workstation_groups))
@$(call add,MAIN_GROUPS,$(workstation_groups_x86))
@$(call add,MAIN_LISTS,workstation/extras)
@$(call add,MAIN_LISTS,$(call tags,xorg vaapi))
@$(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_LISTS,$(call tags,archive extra))
@$(call add,THE_LISTS,$(call tags,mobile mate))
@$(call add,THE_KMODULES,staging)
@$(call add,BASE_KMODULES,kvm virtualbox)
@$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power)
@$(call add,CLEANUP_PACKAGES,xterm)
@$(call add,EFI_BOOTARGS,lang=ru_RU)
@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
@$(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,8.1/$(ARCH))
@$(call set,DOCS,alt-workstation)
@$(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,25 +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: +net-eth +vmguest \
use/x11-autostart use/fonts/install2 use/sound
@$(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-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

View File

@@ -1,20 +1,105 @@
ifeq (vm,$(IMAGE_CLASS))
vm/e2k-live: vm/bare use/e2k use/deflogin/live use/control/sudo-su
@$(call add,THE_PACKAGES,openssh)
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 use/tty/S0 use/net-eth/dhcp use/services/lvm2-disable
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/e2k-xfce: vm/e2k-rescue use/e2k/sound use/e2k/x11 use/x11/xfce \
use/browser/firefox use/browser/firefox/esr use/browser/firefox/i18n \
use/l10n/default/ru_RU use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call add,THE_PACKAGES,xinit xterm mc)
@$(call add,THE_PACKAGES,fonts-bitmap-terminus pnmixer)
vm/alt-rescue: vm/.e2k-rescue +sysvinit
@$(call add,KFLAVOURS,elbrus-def)
vm/e2k-builder: vm/e2k-rescue use/dev/builder/base; @:
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

View File

@@ -1,10 +1,10 @@
# 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/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
@@ -12,7 +12,7 @@ distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
@$(call set,SYSLINUX_DIRECT,1)
@$(call add,RESCUE_PACKAGES,livecd-net-eth)
distro/syslinux: distro/.init \
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; @:
@@ -43,7 +43,6 @@ 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-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 +efi
@@ -107,8 +106,6 @@ distro/live-0ad: distro/.live-games
@$(call add,LIVE_PACKAGES,0ad livecd-0ad)
@$(call try,HOMEPAGE,http://play0ad.com/)
distro/live-e17: distro/.live-desktop-ru use/x11/e17 use/x11/lightdm/gtk; @:
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)
@@ -117,8 +114,6 @@ distro/live-gimp: distro/live-icewm use/live/ru
@$(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 \

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)

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

@@ -0,0 +1,130 @@
### 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)
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-xfce: use/x11/xfce use/x11/gtk/nm +nm \
use/fonts/ttf/redhat use/fonts/ttf/google/extra
@$(call add,THE_PACKAGES,xfce-polkit)
mixin/regular-xfce-sysv: use/x11/lightdm/gtk use/browser/palemoon/i18n \
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,xfce4-screensaver)
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/sddm 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,49 +0,0 @@
# p7 base kits
mixin/p7: use/browser/firefox/esr
@$(call set,BRANDING,altlinux-starterkit)
@$(call set,IMAGE_FLAVOUR,$(subst altlinux-p7-,,$(IMAGE_NAME)))
@$(call set,META_VOL_ID,ALT Linux p7 $$(IMAGE_FLAVOUR)/$(ARCH))
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-lxqt: distro/regular-lxqt mixin/p7; @:
distro/altlinux-p7-lxqt-sysv: distro/regular-lxqt-sysv mixin/p7; @:
distro/altlinux-p7-mate: distro/regular-mate 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-xfce-sysv: distro/regular-xfce-sysv 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-jeos-ovz: distro/regular-jeos-ovz 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; @:
distro/altlinux-p7-server-samba4: distro/regular-server-samba4 mixin/p7; @:
distro/altlinux-p7-builder: distro/regular-builder mixin/p7; @:
endif
ifeq (ve,$(IMAGE_CLASS))
ve/altlinux-p7-ovz-generic: ve/generic mixin/p7; @:
ve/altlinux-p7-ovz-pgsql94: ve/pgsql94 mixin/p7; @:
endif
ifeq (vm,$(IMAGE_CLASS))
vm/altlinux-p7-vm-net: vm/net mixin/p7; @:
vm/altlinux-p7-vagrant: vm/vagrant-base mixin/p7; @:
endif

View File

@@ -5,15 +5,19 @@ mixin/p8: use/browser/firefox/esr
@$(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; @:
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; @:
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; @:
@@ -39,13 +43,18 @@ 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

View File

@@ -6,53 +6,44 @@ 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; @:
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-base +vmguest +wireless \
use/live/x11 use/live/install use/live/suspend \
use/live/repo use/live/rw use/luks use/x11/wacom use/ntp/client \
use/branding use/browser/firefox/live use/browser/firefox/i18n \
use/browser/firefox/h264 use/services/lvm2-disable
@$(call add,LIVE_PACKAGES,volumes-profile-regular)
@$(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_DISABLE,gpm powertop)
@$(call add,EFI_BOOTARGS,live_rw)
# common WM live/installer bits
mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
@$(call add,THE_PACKAGES,pam-limits-desktop)
@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
@$(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)
# WM base target
distro/.regular-wm: distro/.regular-x11 mixin/regular-desktop; @:
distro/.regular-wm: distro/.regular-x11 mixin/regular-x11 \
mixin/regular-desktop use/efi/refind; @:
# DE base target
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
distro/.regular-desktop: distro/.regular-wm \
use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind +systemd
use/syslinux/ui/gfxboot use/firmware/laptop +systemd
@$(call add,THE_BRANDING,bootloader)
@$(call add,THE_PACKAGES,upower bluez)
@$(call add,THE_PACKAGES,disable-usb-autosuspend)
@$(call add,THE_PACKAGES,vconsole-setup-kludge) #28805
@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
@$(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-wm +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-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)
@@ -80,11 +71,12 @@ distro/.regular-jeos: distro/.regular-jeos-base \
# NB:
# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
distro/regular-jeos: distro/.regular-jeos use/cleanup/jeos/full \
use/install2/vmguest use/vmguest/base
use/volumes/jeos use/install2/vmguest use/vmguest/base
@$(call add,BASE_PACKAGES,nfs-utils gdisk)
@$(call add,MAIN_PACKAGES,firmware-linux)
@$(call add,INSTALL2_PACKAGES,volumes-profile-jeos)
@$(call add,CLEANUP_PACKAGES,'glib2*' libffi 'libltdl*')
@$(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)
@@ -93,97 +85,62 @@ 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 \
use/install2/suspend mixin/regular-desktop +vmguest +wireless
distro/.regular-install-x11: distro/.regular-install +vmguest +wireless \
use/install2/suspend mixin/regular-desktop mixin/regular-x11
@$(call set,INSTALLER,altlinux-desktop)
@$(call add,THE_LISTS,$(call tags,regular 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/otf/adobe use/fonts/otf/mozilla use/fonts/chinese \
use/branding/complete use/branding/slideshow/once \
use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base
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 +icewm +nm \
use/x11/lightdm/gtk use/init/sysv/polkit use/deflogin/sysv/nm \
use/browser/chromium use/fonts/ttf/redhat
@$(call add,LIVE_LISTS,$(call tags,desktop nm))
@$(call add,LIVE_LISTS,$(call tags,regular icewm))
@$(call add,LIVE_PACKAGES,mnt winswitch xpra)
@$(call add,LIVE_PACKAGES,icewm-startup-networkmanager)
distro/regular-icewm: distro/.regular-sysv-gtk mixin/regular-icewm \
use/browser/chromium
@$(call set,KFLAVOURS,un-def)
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)
# 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/palemoon/i18n
@$(call add,LIVE_PACKAGES,wdm wmxkbru)
# 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
@$(call add,THE_BRANDING,graphics)
distro/regular-gnustep: distro/.regular-sysv \
mixin/regular-wmaker mixin/regular-gnustep; @:
distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
mixin/regular-wmaker mixin/regular-gnustep; @:
mixin/regular-xfce: use/x11/xfce use/fonts/ttf/redhat 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)
mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
use/x11/lightdm/gtk \
use/browser/firefox use/browser/firefox/classic \
use/browser/firefox/i18n use/browser/firefox/h264 \
use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call add,THE_PACKAGES,xfce4-mixer pm-utils elinks mpg123)
distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
mixin/regular-xfce mixin/regular-xfce-sysv; @:
mixin/regular-lxde: use/x11/lxde use/fonts/infinality \
use/x11/gtk/nm use/im +nm
@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde
@$(call add,THE_PACKAGES,lxde)
distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde
@$(call add,THE_PACKAGES,lxde-sysvinit)
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 +nm \
use/x11/mate use/fonts/ttf/google use/domain-client
@$(call add,LIVE_LISTS,$(call tags,mobile mate))
@$(call add,LIVE_LISTS,$(call tags,desktop sane))
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-mate-sysv: distro/.regular-sysv-gtk mixin/regular-mate; @:
distro/regular-enlightenment: distro/.regular-gtk \
use/x11/enlightenment use/fonts/infinality; @:
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 \
use/x11/cinnamon use/fonts/infinality use/fonts/ttf/google \
use/net/nm/mmgui use/im; @:
distro/regular-cinnamon: distro/.regular-gtk use/x11/cinnamon \
use/fonts/ttf/google use/net/nm/mmgui use/im
@$(call add,THE_PACKAGES,thunderbird-ru) ### l10n
# not .regular-gtk due to gdm vs lightdm
distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
@@ -191,57 +148,24 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
@$(call set,KFLAVOURS,un-def)
@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
@$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates)
@$(call add,LIVE_PACKAGES,gnome-flashback)
@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)
@$(call add,DEFAULT_SERVICES_ENABLE,gdm)
# reusable bits
mixin/regular-tde: +tde \
use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
@$(call add,THE_PACKAGES,kdeedu)
@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
use/x11/gtk/nm use/net/nm/mmgui
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 \
use/net/nm/mmgui +pulse +plymouth
@$(call add,THE_LISTS,$(call tags,regular kde4))
@$(call add,THE_PACKAGES,fonts-ttf-levien-inconsolata)
@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)
mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
use/browser/qupzilla use/x11/gtk/nm +nm +plymouth
@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:
distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \
use/browser/falkon
@$(call add,THE_LISTS,$(call tags,lxqt desktop))
distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
use/net-eth/dhcp use/efi/refind; @:
use/net-eth/dhcp; @:
distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
distro/regular-leechcraft: distro/.regular-desktop \
use/x11/leechcraft use/x11/lightdm/lxqt +pulse; @:
distro/regular-kde5: distro/.regular-desktop \
distro/regular-kde5: distro/.regular-desktop use/browser/falkon \
use/x11/kde5 use/x11/sddm use/domain-client \
use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
+nm +pulse +plymouth
@$(call add,THE_PACKAGES,kde5-telepathy)
@$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5)
@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
# 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; @:
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 \
@@ -257,13 +181,10 @@ distro/regular-rescue-netbootxyz: distro/.regular-bare mixin/regular-rescue
@$(call set,META_VOL_ID,ALT Rescue)
@$(call set,META_APP_ID,$(ARCH))
distro/regular-sysv-tde: distro/.regular-install-x11-full mixin/regular-tde
@$(call add,THE_LISTS,$(call tags,base desktop))
@$(call add,THE_LISTS,$(call tags,regular tde))
@$(call add,THE_PACKAGES,kpowersave)
distro/regular-sysv-xfce: distro/.regular-install-x11-full \
mixin/regular-xfce mixin/regular-xfce-sysv; @:
mixin/regular-xfce mixin/regular-xfce-sysv
@$(call add,THE_PACKAGES,nload)
@$(call add,MAIN_PACKAGES,caffeine-ng sysstat leafpad)
distro/.regular-server-base: distro/.regular-install \
use/server/base use/stage2/kms
@@ -272,8 +193,11 @@ distro/.regular-server-base: distro/.regular-install \
@$(call add,SYSTEM_PACKAGES,multipath-tools)
@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
distro/.regular-server-systemd: distro/.regular-server-base +systemd; @:
distro/.regular-server: distro/.regular-server-base \
use/server/mini use/firmware/qlogic use/rescue/base use/cleanup/libs
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)
@@ -286,7 +210,7 @@ distro/.regular-server-managed: distro/.regular-server
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
distro/regular-server: distro/.regular-server-managed \
use/server/groups/base use/install2/vnc/full
use/server/groups/base use/dev/groups/builder use/install2/vnc/full
@$(call add,MAIN_GROUPS,server/sambaDC)
@$(call add,MAIN_GROUPS,tools/hyperv)
@@ -305,35 +229,57 @@ distro/.regular-server-openstack: distro/.regular-server-base \
@$(call add,MAIN_GROUPS,tools/ipmi tools/monitoring)
distro/regular-server-openstack: distro/.regular-server-openstack +systemd; @:
@$(call add,THE_PACKAGES,dhcpcd)
distro/regular-server-openstack-sysv: distro/.regular-server-openstack +sysvinit
@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmetad)
distro/regular-server-pve: distro/.regular-server-base \
use/firmware/qlogic +efi +systemd
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,THE_KMODULES,ipset kvm)
@$(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 \
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 use/net-eth/dhcp
@$(call add,LIVE_PACKAGES,cifs-utils elinks lftp openssh wget)
@$(call add,LIVE_PACKAGES,bash-completion gpm screen tmux zsh)
@$(call add,LIVE_PACKAGES,ccache rpm-utils wodim)
@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
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

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,7 +3,7 @@ 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; @:
@@ -70,28 +70,6 @@ distro/elinks: distro/.base use/pid1/net
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

@@ -14,7 +14,8 @@ ve/ldv: ve/bare use/control/server/ldv
@$(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
@@ -22,7 +23,7 @@ ve/builder: ve/base use/dev/builder/base use/repo
# 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)))
@@ -36,8 +37,11 @@ ve/pgsql94: ve/generic
ve/samba-DC: ve/generic
@$(call add,BASE_PACKAGES,task-samba-dc glibc-locales net-tools)
ve/systemd-bare: ve/.base use/net/networkd +systemd \
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

@@ -2,10 +2,11 @@
ifeq (vm,$(IMAGE_CLASS))
# NB: interactivesystem pulls in network-config-subsystem anyways
vm/bare: vm/.bare +sysvinit
vm/bare: vm/.base-lilo +sysvinit
@$(call add,BASE_PACKAGES,apt)
vm/systemd: vm/.bare +systemd
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)
@@ -18,16 +19,16 @@ vm/systemd-net: vm/systemd use/net-eth/networkd-dhcp use/net-ssh \
@$(call add,BASE_PACKAGES,su)
# vm/net or vm/systemd-net
vm/cloud-systemd: vm/systemd-net use/vmguest/kvm
@$(call add,BASE_PACKAGES,cloud-init)
@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
vm/cloud-systemd: vm/systemd-net mixin/cloud-init use/vmguest/kvm
@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
@$(call set,KFLAVOURS,un-def)
@$(call add,THE_KMODULES,kdbus)
vm/cloud-sysv: vm/net use/vmguest/kvm use/power/acpi/button
@$(call add,BASE_PACKAGES,cloud-init)
@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
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
vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
@@ -35,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

View File

@@ -22,7 +22,7 @@
В скриптовых хуках ({image-,}scripts.d/*) проверяйте $GLOBAL_ARCH.
=== списки пакетов ===
=== списки пакетов, профили групп ===
Бывает так, что в списке пакетов есть смысл упоминать какой-либо из них
только для определённой архитектуры (например, wine или steam); в таких
@@ -40,7 +40,24 @@
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

@@ -21,9 +21,9 @@ NB: пути приводятся от верхнего уровня; проек
** характерный признак пропуска -- разрыв графа (report-targets.png)
* pkg.in/lists/Makefile
** ожидает, что названия пакаджлистов указываются в переменных
** ожидает, что названия списков пакетов указываются в переменных
вида *_LISTS, и копирует в генерируемый профиль только их
** если задать имя файла пакаджлиста непосредственно в Makefile
** если задать имя файла списка пакетов непосредственно в Makefile
субпрофиля, он не будет скопирован
** характерное сообщение об ошибке:
@@ -37,6 +37,7 @@ NB: пути приводятся от верхнего уровня; проек
в KFLAVOURS)
** если добавить какой-либо kernel-image в STAGE1_PACKAGES*,
результат может быть неожиданным
** обратите внимание: bin/tar2fs умеет несколько ядер
** вероятная ошибка: незагрузка полученного squashfs
* features.in/install2/install2/stage2cfg.mk

View File

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

View File

@@ -60,6 +60,11 @@
** значение: пусто (по умолчанию), 1 или 2
** см. lib/log.mk, lib/clean.mk
* DISTRO_VERSION
** задаёт версию дистрибутива, если применимо
** значение: пусто (по умолчанию) либо любая строка
** см. image.in/Makefile
* HOMEPAGE, HOMENAME, HOMEWAIT
** указывают адрес, название и таймаут перехода для домашней страницы
** значение: корректный URL, строка, целое неотрицательное число

View File

@@ -1,8 +1,7 @@
== Списки пакетов ==
Состав пакетной базы субпрофилей определяется значениями
следующих переменных профиля (см. тж. conf.d/README;
некоторые "*" ниже заэкранированы ради парсера asciidoc):
следующих переменных профиля (см. тж. conf.d/README):
* main: пакетная база для установки
** sub.in/main/Makefile, features.in/*/main/lib/

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

@@ -33,7 +33,7 @@
* предпочтительно применение $() вместо `` (особенно при вложенности);
* постарайтесь не вылазить за 80 колонок;
* постарайтесь не вылезать за 80 колонок;
* избегайте merge-коммитов в коде, который предлагаете для включения
в основную ветку: поддерживается линейная история для удобства

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

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

View File

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

View File

@@ -2,10 +2,15 @@
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
# FIXME: syslinux is x86-specific
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)

View File

@@ -7,21 +7,26 @@ use/browser:
use/browser/firefox: use/browser
@$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR))
use/browser/seamonkey use/browser/palemoon \
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: use/browser
use/browser/firefox/esr:
@$(call set,FX_FLAVOUR,-esr)
use/browser/firefox/h264: use/browser/firefox
@@ -33,21 +38,13 @@ use/browser/firefox/live: use/browser/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$$(FX_FLAVOUR)-be)
@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-kk)
@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-ru)
@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-uk)
# fx29+
use/browser/firefox/classic: use/browser/firefox
@$(call add,THE_BROWSER,firefox-classic_theme_restorer)
use/browser/seamonkey/i18n: use/browser/seamonkey
@$(call add,THE_BROWSER,seamonkey-ru)
use/browser/palemoon/i18n: use/browser/palemoon
@$(call add,THE_BROWSER,palemoon-ru)
# inherently insecure, NPAPI only
use/browser/plugin/flash: use/browser
@$(call add,THE_PACKAGES,mozilla-plugin-adobe-flash)

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,9 +9,30 @@ 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
endif
all: | $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
postprocess $(GLOBAL_CLEAN_WORKDIR)
@@ -25,7 +42,11 @@ 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

@@ -20,5 +20,6 @@ IMAGE_PACKAGES = $(DOT_BASE) \
IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
$(BASE_PACKAGES_REGEXP)
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 \
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

@@ -5,7 +5,6 @@
kver="$(rpm -qa 'kernel-image*' \
--qf '%{installtime} %{version}-%{name}-%{release}\n' \
| sort -n \
| tail -n 1 \
| cut -f 2 -d ' ' \
| sed 's/kernel-image-//')"

View File

@@ -8,7 +8,7 @@ IMAGE_PACKAGES = $(DOT_BASE) \
$(call list,$(BASE_LISTS) $(THE_LISTS))
IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
$(BASE_PACKAGES_REGEXP)
$(BASE_PACKAGES_REGEXP)
# intermediate chroot archive
VM_TARBALL := $(IMAGE_OUTDIR)/$(IMAGE_NAME).tar
@@ -23,25 +23,35 @@ check-sudo:
fi
prepare-image: check-sudo
@if [ -x $(MKIMAGE_PREFIX)/bin/tar2fs ]; then \
TOPDIR=$(MKIMAGE_PREFIX); \
@# 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 \
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; \
@@ -52,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

@@ -1,5 +1,6 @@
use/cleanup:
@$(call add_feature)
@$(call xport,GLOBAL_LIVE_NO_CLEANUPDB)
@$(call xport,CLEANUP_PACKAGES)
@$(call xport,CLEANUP_BASE_PACKAGES)

View File

@@ -1,7 +1,10 @@
#!/bin/sh
# don't cripple the image to be copied over
[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
# 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:"

View File

@@ -43,3 +43,4 @@ use/deflogin/privileges: use/deflogin
# NM with sysvinit
use/deflogin/sysv/nm: use/deflogin
@$(call add,GROUPS,_nmconnect)
@$(call add,THE_PACKAGES,nm-sysvinit)

View File

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

View File

@@ -3,11 +3,10 @@ use/dev: use/control
@$(call add,THE_PACKAGES,git-core hasher gear)
@$(call add,CONTROL,pam_mktemp:enabled)
use/dev/repo: use/dev use/repo/main
# use/dev intentionally missing
use/dev/repo: 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)
@$(call add,MAIN_LISTS,$(call tags,main builder))
use/dev/mkimage: use/dev
@$(call add,THE_PACKAGES,mkimage shadow-change su)
@@ -19,9 +18,12 @@ 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/builder/live use/dev/repo
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

@@ -15,7 +15,7 @@ use/docs/manual: use/docs
@$(call xport,DOCS)
@$(call add,THE_PACKAGES,docs-$$(DOCS))
use/docs/license: use/docs use/branding
@$(call add,THE_BRANDING,notes)
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

@@ -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

View File

@@ -1,10 +1,60 @@
use/e2k:
@$(call add_feature)
@$(call set,KFLAVOURS,mcst-def)
@$(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/sound:
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

@@ -1,7 +0,0 @@
default=auto
label=auto
partition=0
image=/image-@KVER@
initrd=/initrd-@KVER@.img
cmdline=console=tty0 consoleblank=0 hardreset root=UUID=@ROOTUUID@

View File

@@ -1,9 +1,14 @@
#!/bin/sh
CFG="/boot/boot.conf"
[ -s "$CFG" ] || {
echo "50-e2k-serial: $CFG missing, exiting" >&2
exit 0
}
[ -f "$CFG" ] || exit 1
[ -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

@@ -23,7 +23,7 @@ use/efi/refind: use/efi
use/efi/signed: use/efi
@$(call set,EFI_CERT,altlinux)
@$(call add,COMMON_PACKAGES,shim-signed)
@$(call add,RESCUE_PACKAGES,openssl pesign sbsigntools)
@$(call add,RESCUE_PACKAGES,openssl pesign)
use/efi/shell: use/efi
@$(call try,EFI_SHELL,efi-shell)

View File

@@ -31,6 +31,7 @@ use/firmware/wireless: use/firmware
@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)
use/firmware/laptop: use/firmware/cpu
@$(call add,KMODULES,acpi_call)
@$(call add,THE_KMODULES,acpi_call)

View File

@@ -19,6 +19,10 @@ use/fonts/zerg: use/fonts
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,
@@ -47,3 +51,9 @@ use/fonts/ttf/redhat:
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)

View File

@@ -1,26 +1,39 @@
+sysvinit: use/init/sysv; @:
+systemd: use/init/systemd/full; @:
+elogind: use/init/sysv/elogind; @:
use/init:
# NB: the list name MUST be identical to init package name
use/init: use/pkgpriorities
@$(call add_feature)
@$(call add,THE_LISTS,$$(INIT_TYPE))
@$(call add,PINNED_PACKAGES,$$(INIT_TYPE))
# THE_LISTS is too late when BASE_PACKAGES have pulled in
# the wrong syslogd-daemon provider already
use/init/sysv: use/init
@$(call set,INIT_TYPE,sysvinit)
@$(call add,BASE_PACKAGES,syslogd)
@$(call add,BASE_PACKAGES,rsyslog-classic)
use/init/sysv/polkit: use/init/sysv
@$(call add,THE_PACKAGES,polkit-sysvinit)
use/init/sysv/consolekit: use/init/sysv
@$(call add,THE_PACKAGES,ConsoleKit2-service ConsoleKit2-x11)
use/init/sysv/elogind: use/init/sysv
@$(call add,THE_PACKAGES,elogind bash-completion-elogind)
@$(call add,DEFAULT_SERVICES_ENABLE,elogind)
### i-f should be dropped as soon as rootfs scripts are effective there
use/init/systemd: use/init
@$(call set,INIT_TYPE,systemd)
@$(call add,INSTALL2_PACKAGES,installer-feature-journald-tty)
use/init/systemd/full: use/init/systemd
@$(call add,THE_PACKAGES,bash-completion-systemd)
@$(call add,THE_PACKAGES,bash-completion-systemd chkconfig)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,THE_PACKAGES,vconsole-setup-kludge)
endif
# http://www.freedesktop.org/wiki/Software/systemd/Debugging
use/init/systemd/debug: use/init/systemd use/services
@@ -29,3 +42,7 @@ use/init/systemd/debug: use/init/systemd use/services
@$(call add,STAGE2_BOOTARGS,systemd.log_level=debug)
@$(call add,STAGE2_BOOTARGS,systemd.log_target=kmsg)
@$(call add,STAGE2_BOOTARGS,log_buf_len=1M enforcing=0)
# set multi-user target by default
use/init/systemd/multiuser: use/init/systemd
@$(call add,STAGE2_BOOTARGS,systemd.unit=multi-user.target)

View File

@@ -0,0 +1,16 @@
#!/bin/sh
# the part below relates to sysvinit specifically
rpm -q sysvinit || exit 0
# this was a bunch of dirty complaints
sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||:
# https://bugzilla.altlinux.org/35350
# this FAILS: no symlinks...
#rm -rf /var/run /var/lock
# ...so just revert what's been broken in failsystem package
mkdir -p /var/run /var/lock/{serial,subsys,uucp}
chmod 0770 /var/lock/subsys
chmod 0770 /var/lock/{serial,uucp}
chgrp uucp /var/lock/{serial,uucp}

View File

@@ -0,0 +1,29 @@
#!/bin/sh
# 40: should run before 50-users in deflogin
# the part below relates to sysvinit specifically
rpm -q sysvinit || exit 0
# NM-specific group
case "$GLOBAL_GROUPS" in
*_nmconnect*) groupadd -r _nmconnect ||:;;
esac
# this was a bunch of dirty complaints
sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||:
# https://bugzilla.altlinux.org/35350
# this FAILS: no symlinks...
#rm -rf /var/run /var/lock
# ...so just revert what's been broken in failsystem package
mkdir -p /var/run /var/lock/{serial,subsys,uucp}
chmod 0770 /var/lock/subsys
chmod 0770 /var/lock/{serial,uucp}
chgrp uucp /var/lock/{serial,uucp}
# Workaround for run elogind
if [ ! -L /var/run -a ! -e /var/run/dbus ]; then
ln -s /run/dbus /var/run/dbus
else
echo "symlink /run/dbus -> /var/run/dbus not created"
fi

View File

@@ -15,11 +15,7 @@ sub() {
}
# tune make-initrd
sub /etc/initrd.mk 'FEATURES += systemd' 'MODULES_PRELOAD += autofs4'
sub /etc/initrd.mk 'MODULES_PRELOAD += autofs4'
# don't allow systemd to set LANG (see also #27408)
sub /etc/locale.conf 'LANG='
# aufs2 root is rw in reality; but don't bother if there's a record already
grep -q '[[:space:]]/[[:space:]]' /etc/fstab ||
sub /etc/fstab '/dev/root / auto defaults 0 0'

View File

@@ -0,0 +1,16 @@
#!/bin/sh
# the part below relates to systemd as init specifically
rpm -q systemd-sysvinit || exit 0
sub() {
local file="$1"
shift
for i in "$@"; do
grep -q "^$i" "$file" || echo "$i" >> "$file"
done
}
# aufs2 root is rw in reality; but don't bother if there's a record already
grep -q '[[:space:]]/[[:space:]]' /etc/fstab ||
sub /etc/fstab '/dev/root / auto defaults 0 0'

View File

@@ -1,6 +1,10 @@
# alterator-based installer, second (livecd) stage
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+installer: use/install2/full; @:
else
+installer: use/install2/packages; @:
endif
use/install2: use/stage2 sub/stage2@install2 use/metadata \
use/cleanup/installer
@@ -8,6 +12,7 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
@$(call try,INSTALLER,altlinux-generic) # might be replaced later
@$(call add,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
@$(call add,INSTALL2_PACKAGES,installer-feature-create-ghost-directories)
@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
@$(call add,BASE_PACKAGES,installer-common-stage3)
@$(call add,BASE_PACKAGES,glibc-gconv-modules) # for guile22
@@ -86,6 +91,9 @@ use/install2/jfs:
use/install2/reiserfs:
@$(call add,SYSTEM_PACKAGES,reiserfsprogs)
use/install2/fat:
@$(call add,SYSTEM_PACKAGES,dosfstools fatresize)
# prepare bootloader for software suspend (see also live)
use/install2/suspend:
@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-suspend-stage2)
@@ -108,7 +116,7 @@ use/install2/cleanup/x11-hwdrivers:
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-ati xorg-drv-intel)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-glamor)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-mach64 xorg-drv-mga)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-nouveau xorg-drv-nv)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-nouveau)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-openchrome)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-r128 xorg-drv-radeon)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-s3virge xorg-drv-savage)

View File

@@ -0,0 +1,4 @@
#!/bin/sh
echo -n "*** vm-profile.scm provided by: "
rpm -qf /var/cache/alterator/vm-profile.scm ||:

View File

@@ -7,7 +7,15 @@ endif
use/kernel:
@$(call add_feature)
ifeq (,$(filter-out e2k%,$(ARCH)))
@$(call try,KFLAVOURS,elbrus-def)
else
ifeq (,$(filter-out aarch64 armh,$(ARCH)))
@$(call try,KFLAVOURS,mp)
else
@$(call try,KFLAVOURS,std-def)
endif
endif
# r8168 is a kludge, never install it by default
use/kernel/net:
@@ -18,7 +26,10 @@ use/kernel/wireless: use/firmware/wireless
@$(call add,THE_KMODULES,bcmwl ndiswrapper)
use/kernel/laptop: use/firmware/laptop
@$(call add,KMODULES,omnibook tp_smapi)
@$(call add,THE_KMODULES,omnibook tp_smapi)
use/kernel/desktop:
@$(call add,KMODULES,lirc v4l)
@$(call add,THE_KMODULES,lirc v4l)
use/kernel/server:
@$(call add,THE_KMODULES,ipset kvm)

View File

@@ -28,8 +28,15 @@ fi
make-initrd $MAKE_INITRD_OPTS ||
fatal "make-initrd failed"
case `arch` in
e2k)
kname=image;;
*)
kname=vmlinuz;;
esac
[ -h /boot/vmlinuz ] ||
ln -s vmlinuz-$kver /boot/vmlinuz
ln -s $kname-$kver /boot/$kname
[ -h /boot/initrd.img ] ||
ln -s initrd-$kver.img /boot/initrd.img

View File

@@ -7,7 +7,6 @@
# TODO: KEYMAP for default keymap?
use/l10n:
@$(call add_feature)
@$(call add,STAGE2_BOOTARGS,lang=$$(LOCALE))
@$(call add,THE_PACKAGES,glibc-locales)
@$(call add,LOCALES,en_US)
@$(call add,XKB_KEYMAPS,us)

9
features.in/ldm/README Normal file
View File

@@ -0,0 +1,9 @@
Simple hook to run Linux Driver Management tools to configure hybrid graphics
(aka Optimus/PRIME) for different DM's.
Currently supported:
+ LightDM
+ GDM
+ SDDM
See https://github.com/solus-project/linux-driver-management

23
features.in/ldm/config.mk Normal file
View File

@@ -0,0 +1,23 @@
+ldm: use/ldm/session; @:
# common
use/ldm: sub/rootfs use/services
@$(call add_feature)
@$(call add,COMMON_PACKAGES,ldm-tools)
# configure X11 session
use/ldm/session: use/ldm
@$(call add,COMMON_PACKAGES,ldm-session-init)
@$(call add,DEFAULT_SERVICES_ENABLE,ldm)
# configure lightdm session
use/ldm/session/lightdm: use/ldm/session
@$(call add,COMMON_PACKAGES,ldm-session-init-lightdm)
# configure sddm session
use/ldm/session/sddm: use/ldm/session
@$(call add,COMMON_PACKAGES,ldm-session-init-sddm)
# configure gdm session
use/ldm/session/gdm: use/ldm/session
@$(call add,COMMON_PACKAGES,ldm-session-init-gdm)

View File

@@ -0,0 +1,17 @@
#!/bin/sh -efu
# initiate LDM hook on boot
cat << EOF > /etc/systemd/system/ldm.service
[Unit]
Description=Runs LDM configuration hooks
[Service]
ExecStart=/usr/bin/linux-driver-management configure gpu
Type=oneshot
RemainAfterExit=yes
[Install]
WantedBy=default.target
EOF
systemctl enable ldm.service

View File

@@ -3,7 +3,7 @@
# service defaults
_ON = alteratord cpufreq-simple \
livecd-evms livecd-fstab livecd-hostname \
livecd-setauth livecd-setlocale livecd-net-eth livecd-install-wmaker \
livecd-setauth livecd-setlocale livecd-timezone livecd-net-eth livecd-install-wmaker \
random rpcbind plymouth avahi-daemon \
_OFF = anacron blk-availability bridge clamd crond dhcpd dmeventd dnsmasq \
@@ -58,7 +58,8 @@ use/live/repo/online:
@$(call add,LIVE_PACKAGES,livecd-online-repo)
# alterator-based permanent installation
use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg
use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg \
use/bootloader/live use/bootloader/grub
@$(call add,LIVE_PACKAGES,livecd-install)
@$(call add,LIVE_PACKAGES,livecd-installer-features)

View File

@@ -0,0 +1,7 @@
#!/bin/sh
# Install /etc/*-release files on live if needed
if [ -d /usr/share/branding-data-current ] && \
! [ -e /etc/altlinux-release ] && \
! [ -e /etc/os-release ]; then
cp -a /usr/share/branding-data-current/release/*-release /etc/
fi

View File

@@ -1,14 +1,13 @@
# stage2 mod: livecd
STAGE2_KMODULES = $(THE_KMODULES) $(LIVE_KMODULES)
STAGE2_KMODULES = $(LIVE_KMODULES) $(THE_KMODULES)
IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
$(LIVE_PACKAGES_REGEXP)
IMAGE_PACKAGES_REGEXP = $(LIVE_PACKAGES_REGEXP) $(THE_PACKAGES_REGEXP)
IMAGE_PACKAGES = $(call map,list, \
$(THE_LISTS) $(THE_GROUPS) \
$(LIVE_LISTS) $(LIVE_GROUPS)) \
$(COMMON_PACKAGES) $(THE_PACKAGES) $(LIVE_PACKAGES) \
IMAGE_PACKAGES = $(COMMON_PACKAGES) $(LIVE_PACKAGES) $(THE_PACKAGES) \
$(call map,list, \
$(LIVE_LISTS) $(LIVE_GROUPS) \
$(THE_LISTS) $(THE_GROUPS)) \
interactivesystem
MKI_PACK_RESULTS = squash:live

0
features.in/lxc/README Normal file
View File

12
features.in/lxc/config.mk Normal file
View File

@@ -0,0 +1,12 @@
use/lxc:
@$(call add_feature)
@$(call add,CONTROL,fusermount:public)
@$(call add,GROUPS,tun)
use/lxc/lxd: use/lxc
@$(call add,GROUPS,netadmin lxd)
@$(call add,LIVE_LISTS,lxd)
@$(call add,LIVE_LISTS,openssh)
@$(call add,LIVE_PACKAGES,su)
@$(call add,LIVE_PACKAGES,livecd-net-eth)
@$(call add,LIVE_PACKAGES,udev-rule-generator-net)

View File

@@ -0,0 +1,30 @@
#!/bin/sh
echo LXD configuration
# Setup subordinate ID's for root
usermod -v 1000000-1065535 -w 1000000-1065535 root
# Configuration of LXD
cat <<E_O_F >/etc/sysconfig/lxd-bridge
# The values below are defaults
USE_LXD_BRIDGE="true"
LXD_BRIDGE="lxdbr0"
LXD_CONFILE="/etc/lxd/dnsmasq.conf"
LXD_DOMAIN="lxd"
# IPv4
LXD_IPV4_ADDR="192.168.202.1"
LXD_IPV4_NETMASK="255.255.255.0"
LXD_IPV4_NETWORK="192.168.202.0/24"
LXD_IPV4_DHCP_RANGE="192.168.202.100,192.168.202.199"
LXD_IPV4_DHCP_MAX="100"
LXD_IPV4_NAT="true"
# IPv6
#LXD_IPV6_ADDR=""
#LXD_IPV6_MASK=""
#LXD_IPV6_NETWORK=""
#LXD_IPV6_NAT="false"
LXD_IPV6_PROXY="true"
E_O_F

View File

@@ -42,5 +42,5 @@ metadata: metadata-.base
tar -C $(PKGDIR) -cvf - \
$(call rlist,.base $(call groups2lists)) \
$(call rgroup,$(THE_GROUPS) $(MAIN_GROUPS)) \
$(call rprofile,$(PKG_PROFILES)) \
$(call rprofile,$(THE_PROFILES)) \
> $(METADIR)/pkg-groups.tar

View File

@@ -1,3 +1,17 @@
#!/bin/sh
# set default nameserver, if any
for i in $GLOBAL_NAMESERVERS; do echo "nameserver $i"; done >> /etc/resolv.conf
if [ $GLOBAL_NAMESERVERS = "example" ]; then
echo "# yandex"
echo "#nameserver 77.88.8.1"
echo "# google"
echo "#nameserver 8.8.8.8"
echo "# level3"
echo "#nameserver 4.2.2.1"
echo "#nameserver 4.2.2.2"
echo "#nameserver 4.2.2.3"
else
for i in $GLOBAL_NAMESERVERS; do
echo "nameserver $i"
done
fi >> /etc/resolv.conf

View File

@@ -1,34 +1,38 @@
+nm: use/net/nm/nodelay; @:
+nm: use/net/nm; @:
use/net: use/services
@$(call add_feature)
@$(call add,THE_PACKAGES,network-config-subsystem)
@$(call add,THE_PACKAGES,$$(THE_NET_SUBSYS))
@$(call set,THE_NET_SUBSYS,network-config-subsystem)
use/net/etcnet: use/net
@$(call add,THE_PACKAGES,etcnet)
@$(call set,THE_NET_SUBSYS,etcnet)
@$(call add,DEFAULT_SERVICES_ENABLE,network)
use/net/dhcp: use/net
@$(call add,THE_PACKAGES,dhcpcd)
# base service, no GUI
# base service, no GUI; see x11 feature for those
use/net/nm: use/net
@$(call add,THE_LISTS,$(call tags,base nm))
@$(call set,THE_NET_SUBSYS,NetworkManager)
@$(call add,THE_LISTS,$(call tags,base nm)) # NB: won't get overridden
@$(call add,LIVE_PACKAGES,livecd-save-nfs)
@$(call add,DEFAULT_SERVICES_ENABLE,network) # need for NM?
@$(call add,DEFAULT_SERVICES_ENABLE,network) # need for NM?
@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)
@$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs) # keep interface up
# NOT recommended unless you know what you're doing
# (e.g. dnsmasq can win a race against dhcpcd)
use/net/nm/nodelay: use/net/nm
@$(call add,DEFAULT_SERVICES_DISABLE,NetworkManager-wait-online)
use/net/nm/mmgui: use/net/nm
@$(call add,THE_PACKAGES,modem-manager-gui)
@$(call set,THE_NET_SUBSYS,modem-manager-gui)
use/net/connman: use/net
@$(call add,THE_PACKAGES,connman)
@$(call set,THE_NET_SUBSYS,connman)
@$(call add,DEFAULT_SERVICES_ENABLE,connmand connman)
use/net/networkd: use/net
@$(call add,THE_PACKAGES,systemd-networkd)
@$(call set,THE_NET_SUBSYS,systemd-networkd)
@$(call add,DEFAULT_SERVICES_ENABLE,systemd-networkd)

View File

@@ -1,12 +0,0 @@
#!/bin/sh
. shell-config
defcfg=/etc/net/ifaces/default/options-eth
if [ -x /usr/sbin/NetworkManager -o -x /usr/sbin/connmand ]; then
shell_config_set "$defcfg" NM_CONTROLLED yes
if [ -x /sbin/dhcpcd -o -x /sbin/dhclient ]; then
shell_config_set "$defcfg" BOOTPROTO dhcp
fi
fi

View File

@@ -1,19 +1,8 @@
#!/bin/sh
# see also net-dns feature for actual nameserver control
# offer some convenient servers for static configuration cases
# (see also net-dns feature)
if [ -d /etc/net/ifaces/lo ]; then
{
echo "# yandex"
echo "#nameserver 77.88.8.1"
echo "# google"
echo "#nameserver 8.8.8.8"
echo "# level3"
echo "#nameserver 4.2.2.1"
echo "#nameserver 4.2.2.2"
echo "#nameserver 4.2.2.3"
} >> /etc/net/ifaces/lo/resolv.conf
fi
# purge hasher-provided files potentially disclosing
# build host's network configuration bits
find /var -name resolv.conf -or -name nsswitch.conf -delete
# hasher might have carried host /etc/hosts over, need to overwrite

View File

@@ -1,8 +1,18 @@
use/ntp: use/services
use/ntp: use/services use/pkgpriorities
@$(call add_feature)
@$(call add,THE_PACKAGES,openntpd)
@$(call add,DEFAULT_SERVICES_ENABLE,ntpd)
@$(call add,THE_PACKAGES,$$(THE_NTPD))
@$(call add,PINNED_PACKAGES,$$(THE_NTPD))
@$(call add,DEFAULT_SERVICES_ENABLE,$$(THE_NTPD_SERVICE))
@$(call try,THE_PACKAGES,openntpd)
@$(call try,PINNED_PACKAGES,openntpd)
@$(call try,DEFAULT_SERVICES_ENABLE,ntpd)
use/ntp/client: use/ntp
@$(call set,THE_NTPD,openntpd)
@$(call set,THE_NTPD_SERVICE,ntpd)
@$(call add,NTP_SERVERS,pool.ntp.org)
@$(call xport,NTP_SERVERS)
use/ntp/chrony: use/ntp
@$(call set,THE_NTPD,chrony)
@$(call set,THE_NTPD_SERVICE,chronyd)

View File

@@ -6,14 +6,9 @@ DISTRO_EXTS := .iso
use/pack:
@$(call add_feature)
# conventional ISO9660 image hybridization
# for direct bootable usbflash imaging
use/pack/iso: use/pack boot/isolinux $(ISOHYBRID:%=use/isohybrid)
ifeq (distro,$(IMAGE_CLASS))
@$(call set,IMAGE_PACKTYPE,boot)
else
@$(call set,IMAGE_PACKTYPE,isodata)
endif
# fallback type is isodata, might get set elsewhere to produce bootable iso
use/pack/iso: use/pack
@$(call try,IMAGE_PACKTYPE,isodata)
# virtual environments
VE_ARCHIVES := tar cpio ubifs
@@ -40,6 +35,6 @@ $(foreach c,$(VE_ARCHIVES), \
$(eval $(call PACK_compressors,$(c),$(z)))))
# virtual machines
VM_EXTS := .img .qcow2 .vdi .vmdk .vhd
VM_EXTS := .img .qcow2 .qcow2c .vdi .vmdk .vhd
$(VM_EXTS:.%=use/pack/%): use/pack; @:

View File

@@ -0,0 +1,28 @@
Эта фича обеспечивает добавление записей в файл
`$(PKGBOX)/aptbox/etc/apt/pkgpriorities`
после инициализации чрута, но перед установкой пакетов.
Содержимое файла `pkgpriorities` формируется на основе списка
`PINNED_PACKAGES`. Значение приоритета по умолчанию определяется
переменной `PIN_PRIORITY`, в которую при инициализации фичи
записывается `"Important"`. Список приоритетов:
Essential, Important, Required, Standard, Optional, Extra
Переопределить значение приоритета можно отдельно для каждого пакета
в списке, указав желаемый приоритет через двоеточие после имени пакета;
например:
$(call add,PINNED_PACKAGES,my-package:Essential)
Используя `PINNED_PACKAGES`, можно заранее определить выбор того
или иного пакета для удовлетворения виртуальной зависимости.
Если виртуальный пакет присутствует в основном списке пакетов для
установки, а пакет, его предоставляющий -- в этом списке, то
вероятность его установки повышается согласно приоритету. Однако
если виртуальный пакет не выбран для установки или приоритетный
пакет отсутствует в репозитории, то сборка образа продолжится без
изменений. Следовательно, с помощью списка `PINNED_PACKAGES` можно
влиять на состав дистрибутива, но его содержание, в отличие от
обыкновенных списков пакетов, имеет _рекомендательный_, а не
обязательный, характер.

View File

@@ -0,0 +1,3 @@
use/pkgpriorities:
@$(call add_feature)
@$(call set,PIN_PRIORITY,Important)

View File

@@ -0,0 +1,26 @@
_IMAGE_APTBOX_ = $(WORKDIR)/aptbox
# Add prerequisite to the copy-packages target of
# $(MKIMAGE_PREFIX)/targets.mk.
copy-packages: $(_IMAGE_APTBOX_)/etc/apt/pkgpriorities
_PINNED_PACKAGES_ = $(foreach pp,$(PINNED_PACKAGES),$(if $(findstring :,$(pp)),$(pp),$(pp):$(PIN_PRIORITY)))
_PIN_PRIORITIES_ = $(sort $(foreach pp,$(_PINNED_PACKAGES_),$(lastword $(subst :, ,$(pp)))))
_PKGPRIORITIES_ = $(subst \n ,\n,$(foreach pri,$(_PIN_PRIORITIES_),$(pri):$(patsubst %:$(pri),\n %,$(filter %:$(pri),$(_PINNED_PACKAGES_)))\n))
$(_IMAGE_APTBOX_)/etc/apt/pkgpriorities: prepare-workdir
@echo -e '$(_PKGPRIORITIES_)' | sed -e 's,[[:space:]]\+$$,,' >$@
@if [ -s $@ ]; then \
if grep -q '^\(APT::\)\?Dir::Etc::pkgpriorities[[:space:]]' \
$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
then \
sed -i -e 's,\(Dir::Etc::pkgpriorities\)[[:space:]].*$$,\1 "$@";,g' \
$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
else \
echo 'Dir::Etc::pkgpriorities "$@";' \
>>$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
fi; \
echo "--- Package priorities ---" >&2; \
cat $@ >&2; \
echo "---" >&2; \
fi

View File

@@ -0,0 +1,26 @@
_IMAGE_APTBOX_ = $(WORKDIR)/chroot/$(WORKDIRNAME)/aptbox
# Add prerequisite to the build-image target of
# $(MKIMAGE_PREFIX)/targets.mk.
build-image: $(_IMAGE_APTBOX_)/etc/apt/pkgpriorities
_PINNED_PACKAGES_ = $(foreach pp,$(PINNED_PACKAGES),$(if $(findstring :,$(pp)),$(pp),$(pp):$(PIN_PRIORITY)))
_PIN_PRIORITIES_ = $(sort $(foreach pp,$(_PINNED_PACKAGES_),$(lastword $(subst :, ,$(pp)))))
_PKGPRIORITIES_ = $(subst \n ,\n,$(foreach pri,$(_PIN_PRIORITIES_),$(pri):$(patsubst %:$(pri),\n %,$(filter %:$(pri),$(_PINNED_PACKAGES_)))\n))
$(_IMAGE_APTBOX_)/etc/apt/pkgpriorities: prepare-image-workdir
@echo -e '$(_PKGPRIORITIES_)' | sed -e 's,[[:space:]]\+$$,,' >$@
@if [ -s $@ ]; then \
if grep -q '^\(APT::\)\?Dir::Etc::pkgpriorities[[:space:]]' \
$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
then \
sed -i -e 's,\(Dir::Etc::pkgpriorities\)[[:space:]].*$$,\1 "$@";,g' \
$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
else \
echo 'Dir::Etc::pkgpriorities "$@";' \
>>$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
fi; \
echo "--- Package priorities ---" >&2; \
cat $@ >&2; \
echo "---" >&2; \
fi

View File

@@ -25,5 +25,6 @@ use/plymouth/base: use/plymouth/stage2
@$(call add,BASE_PACKAGES_REGEXP,make-initrd-plymouth cpio)
@$(call add,BASE_KMODULES_REGEXP,drm.*)
@$(call add,THE_BRANDING,bootsplash)
@$(call add,THE_PACKAGES,make-initrd-plymouth)
use/plymouth/full: use/plymouth/stage2 use/plymouth/base; @:

View File

@@ -12,6 +12,10 @@ use/power/acpi: use/power
use/power/acpi/button: use/power/acpi
@$(call add,COMMON_PACKAGES,acpid-events-power)
ifeq (,$(filter-out e2k%,$(ARCH)))
@$(call add,COMMON_PACKAGES,acpid-events-e2k)
@$(call add,DEFAULT_SERVICES_ENABLE,sysfs)
endif
use/power/acpi/powersave: use/power/acpi
@$(call add,COMMON_PACKAGES,powersave)

View File

@@ -1,8 +1,8 @@
Эта фича предназначена для конфигурирования репозиториев
в образе, включая генерацию хэшей и подключение к LiveCD.
На данный момент единственным таким репозиторием является
RPMS.main (создаваемый sub/main), но возможно добавление
По умолчанию таким репозиторием является RPMS.main
(создаваемый sub/main), но возможно добавление
addons, updates или иных по мере необходимости.
Результат -- каталог ALTLinux/base/ для копирования в образ.

View File

@@ -3,3 +3,6 @@ use/repo:
@$(call add,STAGE1_PACKAGES,gnupg)
use/repo/main: sub/main use/repo; @:
use/repo/addon: use/repo/main
@$(call set,MAIN_SUFFIX,addon)

View File

@@ -1,7 +1,7 @@
#!/bin/sh
# enable online repos if possible, just quit if anything's wrong
repo_source='/etc/apt/sources.list.d/yandex.list'
repo_source='/etc/apt/sources.list.d/alt.list'
[ -s "$repo_source" ] || exit 0

View File

@@ -2,9 +2,10 @@
no_x11() {
if rpmquery libX11 >&/dev/null; then
echo "** rescue image contains libX11 which is prohibited" >&2
echo "** rescue image contains libX11 which is prohibited"
rpm -e --test libX11
exit 1
fi
fi >&2
}
case "${GLOBAL_TEST_RESCUE:-}" in

View File

@@ -1,4 +1,4 @@
#!/bin/sh
# enable online repository even more unconditionally
sed -i "s,^#\(rpm \[alt\] http.*\),\1," "/etc/apt/sources.list.d/yandex.list"
sed -i "s,^#\(rpm \[alt\] http.*\),\1," "/etc/apt/sources.list.d/yandex.list" || echo "** warning: unable to enable online repos" >&2

View File

@@ -1,8 +1,8 @@
# stage2 mod: rescue "live" image
IMAGE_PACKAGES = $(call list,$(RESCUE_LISTS)) \
$(COMMON_PACKAGES) \
IMAGE_PACKAGES = $(COMMON_PACKAGES) \
$(RESCUE_PACKAGES) \
$(call list,$(RESCUE_LISTS)) \
interactivesystem startup-rescue
MKI_PACK_RESULTS = squash:rescue

View File

@@ -41,9 +41,13 @@ use/server/groups/tools: use/server
@$(call add,MAIN_GROUPS,tools/tuning)
use/server/groups/services: use/server
@$(call add,MAIN_GROUPS,server/dns server/http server/ftp server/kvm)
@$(call add,MAIN_GROUPS,server/dhcp server/mail server/mysql)
@$(call add,MAIN_GROUPS,server/pgsql)
@$(call add,MAIN_GROUPS,server/dhcp server/dns server/mail)
@$(call add,MAIN_GROUPS,server/apache2 server/nginx)
@$(call add,MAIN_GROUPS,server/mariadb server/pgsql)
@$(call add,MAIN_GROUPS,server/php7)
@$(call add,MAIN_GROUPS,server/ftp server/rsync)
@$(call add,MAIN_GROUPS,server/kvm)
@$(call add,DEFAULT_SERVICES_DISABLE,php7-fpm)
use/server/groups/base: use/server/groups/tools use/server/groups/services; @:

View File

@@ -9,7 +9,5 @@
Выключение сервиса в каждой из этих пар имеет приоритет перед
включением.
Внимание: фича опирается на субпрофиль rootfs, он должен быть
задействован в каком-либо качестве, чтобы ожидаемое произошло.
На данный момент действие rootfs не распространяется на системы,
устанавливаемые при помощи install2.
Предприняты особые меры в виде скрипта для install2,
чтобы передать указание настроить службы инсталятору.

View File

@@ -7,16 +7,27 @@
# NB: install2 is not a rootfs, handling differs either
STATUS=`mktemp`
CONFDIR=/usr/share/install2
CHECK_FILES=
. shell-config
switch() {
[ -n "$CHECK_FILES" ] && \
egrep -qs "^[[:blank:]]*$1(.service|.socket)?[[:blank:]]*$" \
$CHECK_FILES && return ||:
case "$2" in
on|off)
shell_config_set "$STATUS" "$1" "$2";;
esac
}
for f in services-on services-off systemd-enabled systemd-disabled; do
[ -s "$CONFDIR/$f" ] || continue
CHECK_FILES="$CHECK_FILES $CONFDIR/$f"
done
# defaults (most likely features.in ones)
for i in $GLOBAL_DEFAULT_SERVICES_ENABLE; do switch $i on; done
for i in $GLOBAL_DEFAULT_SERVICES_DISABLE; do switch $i off; done
@@ -32,11 +43,11 @@ SERVICES="$(echo $SERVICES | sort -u)"
for i in $SERVICES; do
onoff="$(shell_config_get "$STATUS" "$i")"
[ -n "$onoff" ] || continue
echo "$i" >> /usr/share/install2/services-"$onoff"
echo "$i" >> "$CONFDIR"/services-"$onoff"
done
cp -a /usr/share/install2/{services-on,systemd-enabled}
cp -a /usr/share/install2/{services-off,systemd-disabled}
cp -a "$CONFDIR"/{services-on,systemd-enabled}
cp -a "$CONFDIR"/{services-off,systemd-disabled}
rm "$STATUS"

View File

@@ -6,11 +6,12 @@ use/sound:
@$(call add_feature)
@$(call add,THE_KMODULES,alsa sound)
@$(call add,THE_LISTS,sound/base)
@$(call add,THE_LISTS,$$(THE_SOUND))
# ALSA only sound (additional utils needed if using pulseaudio)
use/sound/alsa: use/sound
@$(call add,THE_PACKAGES,apulse)
@$(call set,THE_SOUND,sound/alsa)
# PulseAudio (useful for per-app levels, dynamic devices and networked sound)
use/sound/pulse: use/sound
@$(call add,THE_LISTS,sound/pulseaudio)
@$(call set,THE_SOUND,sound/pulseaudio)

View File

@@ -1,8 +1,10 @@
# "1" is not a typo
use/stage2: sub/stage1
@$(call add_feature)
@$(call add,STAGE1_PACKAGES,file make-initrd make-initrd-propagator propagator)
@$(call add,STAGE1_PACKAGES,make-initrd file iproute2)
@$(call add,STAGE1_PACKAGES,make-initrd-propagator propagator)
@$(call add,STAGE1_MODLISTS,$$(FEATURES))
@$(call xport,STAGE1_PACKAGES)
@$(call xport,STAGE1_KCONFIG)
# building blocks for propagator's module cove

View File

@@ -5,6 +5,7 @@ kernel/drivers/net/\([^w]\|w[^i]\).\+\.ko
8139too.ko
8390.ko
acenic.ko
af_packet.ko
amd8111e.ko
atl1.ko
atl1e.ko

View File

@@ -24,8 +24,10 @@ configured()
ls $CONFIGS >&/dev/null || fatal "no stage1 kernel config found in /boot"
# test for installer-required filesystems support
for opt in SQUASHFS AUFS_FS OVERLAY_FS $GLOBAL_STAGE1_KCONFIG; do
[ "$opt" = AUFS_FS ] && [ $(configured "OVERLAY_FS=[my]") -a $(configured "AUFS_FS=n") ] && continue
configured "OVERLAY_FS=[my]" || configured "AUFS_FS=[my]" ||
echo fatal "stage1 kernel must support overlayfs or aufs"
for opt in SQUASHFS $GLOBAL_STAGE1_KCONFIG; do
configured "$opt=[my]" || fatal "stage1 kernel must have $opt support"
done

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