Compare commits

...

944 Commits
t7 ... master

Author SHA1 Message Date
af99b8c2ee fix typo copy-paste 2019-05-17 18:35:28 +03:00
a3957991aa fix typo copy-paste 2019-05-17 18:19:47 +03:00
7e5a1eb4e1 firmware-linux included firmware-ql2* now 2019-05-17 17:57:36 +03:00
fefa7f3132 add opennebula server for regular and starterkit 2019-05-17 16:54:05 +03:00
0f988733d8 update package list for openstack 2019-05-16 19:28:24 +03:00
31f29d4dca migrate openstack server from openntpd to chrony 2019-05-16 18:53:46 +03:00
153972e765 add zabbix-agent to monitoring utils list 2019-05-16 17:30:15 +03:00
8f2d5049cc add prometheus-node_exporter to monitoring utils list 2019-05-16 17:26:31 +03:00
550037a6b0 add telegraf to monitoring utils list 2019-05-16 17:26:07 +03:00
ef413e64c1 update collectd package list 2019-05-16 17:23:48 +03:00
Michael Shigorin
f8ceaef00b gear-store-tags 2019-05-06 18:40:08 +03:00
Michael Shigorin
54d8ce33a2 1.3.7-alt1
- docker, vm, browser fixups (obirvalger@)
- elogind support, refactoring, cleanups (antohami@)
- a couple more improvements (me)
2019-05-06 18:38:13 +03:00
Michael Shigorin
c0ecc0654e {mixin-,}basealt.mk: generalize gnome-peer-to-peer
It's available for e2k too now.
2019-05-06 18:10:59 +03:00
Anton Midyukov
aee8c1721b kernel: use different default flavour for aarch64, armh 2019-05-06 16:34:10 +03:00
Michael Shigorin
ffa7919f60 kernel: use different default flavour for e2k
This might evolve into some form of per-arch logic,
or otherwise x86 might get moved into a feature of
its own instead of being the presumed one.

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

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

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

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

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

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

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

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

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

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

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

The problem:

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

The result:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Installer complained about being

  unable to install in selected configuration

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

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

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

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

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

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

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

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

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

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

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

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

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

A bit less make-tech but still better overall.

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

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

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

Adapt live and rescue features accordingly.

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

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

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

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

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

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

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

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

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

So one should not disable display-manager service!

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

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

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

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

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

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

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

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

python3 => python3-base => python3-test

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

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

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

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

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

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

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

  ICAClient-preinstall@IA32

is rather more readable than

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

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

  xorg-drv-intel@X86

is now equivalent to

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

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

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

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

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

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

This commit should be reverted then.

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

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

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

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

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

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

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

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

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

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

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

Follow these changes in server feature as well.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Feedback is welcome, of course.

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

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

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

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

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

  miniterm.py /dev/ttyUSB1 115200

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

Thanks antohami@ for his analysis and workaround suggestion.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Several ones were done from scratch.

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

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

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

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

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

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

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

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

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

How to use:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

So this _will_ be traced properly:

    a: b
	@echo "hello world"

and this will too:

    a: b; @:

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

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

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

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

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

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

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

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

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

imagewriter (the openSUSE's original one) goes to the rest of
DE builds: xdg-su would fallback to gksu if none of the desktops
got "detected", and that means several more megabytes of crap
(completely unneeded in WM-based images I think).
2015-12-04 15:38:08 +03:00
Aleksey Avdeev
58254f05eb install2: Add xorg-drv-vboxvideo
Signed-off-by: Aleksey Avdeev <avdeev@pkcc-tb.ru>
2015-12-03 19:42:46 +03:00
433 changed files with 4224 additions and 1181 deletions

View File

@ -1,8 +1,8 @@
Name: mkimage-profiles
Version: 1.1.80
Version: 1.3.7
Release: alt1
Summary: ALT Linux based distribution metaprofile
Summary: ALT based distribution metaprofile
License: GPLv2+
Group: Development/Other
@ -11,7 +11,7 @@ Source: %name-%version.tar
Packager: Michael Shigorin <mike@altlinux.org>
BuildArch: noarch
BuildRequires: rsync asciidoc-a2x xmlgraphics-fop fonts-ttf-dejavu
BuildRequires: rsync
Requires: rsync git-core
Requires: time schedutils sfdisk
@ -23,12 +23,10 @@ Requires: mkimage-preinstall
%define mpdir %_datadir/%name
%add_findreq_skiplist %mpdir/*.in/*
%def_with doc
%define docs $HOME/docs
%package doc
Summary: %name documentation
Group: Development/Documentation
BuildRequires: java /proc
Summary(ru_RU.UTF-8): метапрофиль дистрибутивов на базе Альт
%description
mkimage-profiles is a collection of bits and pieces useful for
@ -39,12 +37,13 @@ to choose from, and some ready-made image recipes as well.
Make no mistake: constructing distributions isn't just fun, it takes
a lot of passion and knowledge to produce a non-trivial one. So m-p
(the short alias for mkimage-profiles) is complex too. If you need
-- or want -- to make just a few tweaks to an existing recipe, it might
-- or want -- to make a few tweaks to an existing recipe, it might
be easier to comprehend the generated profile (aka builddir) which
contains only the needed subprofiles, script hooks and package lists
and is way more compact.
Virtual environment template caches (OpenVZ/LXC) can be made either.
The main deliverable form for x86 is a (hybrid) ISO; virtual environment
template caches (OpenVZ/LXC) can be made either as well as VM disk images.
In short, setup hasher (http://en.altlinux.org/hasher) and here we go:
cd %mpdir
@ -54,31 +53,278 @@ In short, setup hasher (http://en.altlinux.org/hasher) and here we go:
But if you're into regular distro hacking and are not afraid of make
and modest metaprogramming (some code generation and introspection),
welcome to the metaprofile itself; read the docs and get the git:
%url (NB: these are mostly in Russian with translation on demand).
%description -l ru_RU.UTF-8
mkimage-profiles является собранием всего необходимого для
построения дистрибутивов и содержит списки пакетов, особенности
и целые субпрофили (вроде "кирпичика" rescue), из которых можно
выбирать требуемое; также включены и описания готовых образов.
Поймите правильно: создание дистрибутивов является занятием
не только интересным, но и требующим вдохновения и знаний
для получения нетривиального результата. Если хочется или же
необходимо чуток поправить уже существующий "рецепт", может
быть проще разобраться в сгенерированном профиле (builddir),
который содержит только необходимые субпрофили, скрипты
и списки пакетов, являясь намного более компактным.
Основной формой результата на x86 является (гибридный) ISO-образ;
также возможно создавать шаблоны контейнеров OpenVZ/LXC и образы
дисков виртуальных машин.
Короче говоря, настройте hasher (http://altlinux.org/hasher) и:
cd %mpdir
head README
make syslinux.iso
Но если разработка дистрибутивов становится обыденным делом
и не страшитесь make и чуточки метапрограммирования (немного
генерирования кода и интроспекции), добро пожаловать в сам
метапрофиль; гляньте документацию и забирайте git:
%url
%package doc
Summary: %name documentation
Group: Development/Documentation
%{?_with_doc:BuildRequires: java /proc}
%{?_with_doc:BuildRequires: asciidoc-a2x fop fonts-ttf-dejavu}
Summary(ru_RU.UTF-8): документация %name
%description doc
This package holds developer docs for %name
as a book in HTML and PDF formats.
%description -l ru_RU.UTF-8 doc
Этот пакет содержит документацию разработчика
для %name в форме книжки (HTML, PDF).
%prep
%setup
%build
%if_with doc
make BUILDDIR=%docs docs
%endif
%install
mkdir -p %buildroot%mpdir
mkdir -p %buildroot{%mpdir,%_man7dir}
cp -a * %buildroot%mpdir
%if_with doc
mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
%endif
%files
%mpdir/
%if_with doc
%_man7dir/*
%endif
%if_with doc
%files doc
%doc README
%doc QUICKSTART
%doc %docs/*
%endif
%changelog
* Mon May 06 2019 Michael Shigorin <mike@altlinux.org> 1.3.7-alt1
- docker, vm, browser fixups (obirvalger@)
- elogind support, refactoring, cleanups (antohami@)
- a couple more improvements (me)
* Mon Apr 01 2019 Michael Shigorin <mike@altlinux.org> 1.3.6-alt1
- no joke!
* Mon Mar 04 2019 Michael Shigorin <mike@altlinux.org> 1.3.5-alt1
- Spring 2019 patch queue cleanup
+ antohami@, jqt4@, iv@, obirvalger@, zerg@, me
+ tar2fs fixes for mipsel, qemu etc
+ lots of pkglist updates
* Mon Jan 14 2019 Michael Shigorin <mike@altlinux.org> 1.3.4-alt1
- new 2019 year release ;-)
- tar2fs related security fix (iv@) iff sudo's been configured
- use/x11/dm rework (antohami@)
- archfixes (antohami@, iv@)
- pre-p8 bits cleanup (me)
* Mon Dec 24 2018 Michael Shigorin <mike@altlinux.org> 1.3.3-alt1
- aarch64/armh portability fixups (antohami@)
- grub-based vm images (shaba@)
- even smaller images (glebfm@)
- lxc/lxd lists/feature/image (dans@)
- updated robotics lists/image (dd@)
- e2k: 801/101/jeos tweaks (me)
* Mon Dec 10 2018 Michael Shigorin <mike@altlinux.org> 1.3.2-alt1
- sisyphus drops
* Mon Nov 05 2018 Michael Shigorin <mike@altlinux.org> 1.3.1-alt1
- current fixes and tweaks
* Mon Oct 15 2018 Michael Shigorin <mike@altlinux.org> 1.3.0-alt1
- pre-p9 sisyphus: fixes, drops and just two kludges
* Mon Aug 13 2018 Michael Shigorin <mike@altlinux.org> 1.2.21-alt1
- volumes feature; fixups
* Mon Aug 06 2018 Michael Shigorin <mike@altlinux.org> 1.2.20-alt1
- isoboot/isodata; apt-conf feature; dual-seat e801
* Mon Jul 23 2018 Michael Shigorin <mike@altlinux.org> 1.2.19-alt1
- alt-workstation: x86 (sem@), e2k (me)
* Mon Jul 16 2018 Michael Shigorin <mike@altlinux.org> 1.2.18-alt1
- ldm feature (lakostis@)
* Mon Jun 25 2018 Michael Shigorin <mike@altlinux.org> 1.2.17-alt1
- e2k & profiles
* Mon Jun 11 2018 Michael Shigorin <mike@altlinux.org> 1.2.16-alt1
- starterkits-20180612
* Mon May 28 2018 Michael Shigorin <mike@altlinux.org> 1.2.15-alt1
- fixup release
* Mon May 21 2018 Michael Shigorin <mike@altlinux.org> 1.2.14-alt1
- pkgpriorities feature (manowar@)
- extended e2k support
* Mon Apr 23 2018 Michael Shigorin <mike@altlinux.org> 1.2.13-alt1
- antohami@'s improvements
* Mon Mar 19 2018 Michael Shigorin <mike@altlinux.org> 1.2.12-alt1
- @IA32, @X86
* Mon Mar 12 2018 Michael Shigorin <mike@altlinux.org> 1.2.11-alt1
- starterkits-20180312
* Mon Feb 19 2018 Michael Shigorin <mike@altlinux.org> 1.2.10-alt1
- antohami@'s fixups
* Mon Feb 12 2018 Michael Shigorin <mike@altlinux.org> 1.2.9-alt1
- antohami@'s release
* Mon Feb 05 2018 Michael Shigorin <mike@altlinux.org> 1.2.8-alt1
- regular fixes
* Mon Jan 22 2018 Michael Shigorin <mike@altlinux.org> 1.2.7-alt1
- 2018: better sound feature (antohami@)
* Mon Dec 11 2017 Michael Shigorin <mike@altlinux.org> 1.2.6-alt1
- starterkits-20171212
* Mon Dec 04 2017 Michael Shigorin <mike@altlinux.org> 1.2.5-alt1
- qcow2c
* Mon Nov 20 2017 Michael Shigorin <mike@altlinux.org> 1.2.4-alt1
- opennebula-systemd
* Mon Sep 25 2017 Michael Shigorin <mike@altlinux.org> 1.2.3-alt1
- p8+
* Mon Sep 11 2017 Michael Shigorin <mike@altlinux.org> 1.2.2-alt1
- regular-engineering
* Mon Aug 21 2017 Michael Shigorin <mike@altlinux.org> 1.2.1-alt1
- seven years ago...
* Mon Aug 07 2017 Michael Shigorin <mike@altlinux.org> 1.2.0-alt1
- e2k
* Mon Jul 31 2017 Michael Shigorin <mike@altlinux.org> 1.1.110-alt1
- lxde-sysv
* Mon Jun 12 2017 Michael Shigorin <mike@altlinux.org> 1.1.109-alt1
- starterkits-20170612
* Mon Apr 24 2017 Michael Shigorin <mike@altlinux.org> 1.1.108-alt1
- yandex.mirror
* Mon Apr 03 2017 Michael Shigorin <mike@altlinux.org> 1.1.107-alt1
- serial improvements
* Mon Mar 13 2017 Michael Shigorin <mike@altlinux.org> 1.1.106-alt1
- starterkits-20170312
* Mon Feb 27 2017 Michael Shigorin <mike@altlinux.org> 1.1.105-alt1
- disable git hooks (glebfm@)
* Mon Feb 06 2017 Michael Shigorin <mike@altlinux.org> 1.1.104-alt1
- [[vncinst]] fixed
* Mon Jan 30 2017 Michael Shigorin <mike@altlinux.org> 1.1.103-alt1
- rescue -= bootsplash
* Mon Jan 09 2017 Michael Shigorin <mike@altlinux.org> 1.1.102-alt1
- 2017
* Mon Dec 12 2016 Michael Shigorin <mike@altlinux.org> 1.1.101-alt1
- starterkits-20161212
* Mon Dec 05 2016 Michael Shigorin <mike@altlinux.org> 1.1.100-alt1
- preparing for starterkits
* Mon Nov 14 2016 Michael Shigorin <mike@altlinux.org> 1.1.99-alt1
- xfce-sysv
- preparing...
* Mon Oct 31 2016 Michael Shigorin <mike@altlinux.org> 1.1.98-alt1
- preparing for workstation 8.1
* Mon Oct 03 2016 Michael Shigorin <mike@altlinux.org> 1.1.97-alt1
- regular tweaks
* Mon Sep 12 2016 Michael Shigorin <mike@altlinux.org> 1.1.96-alt1
- starterkits-20160912
* Mon Aug 15 2016 Michael Shigorin <mike@altlinux.org> 1.1.95-alt1
- s/basealt/alt/g
* Mon Jun 27 2016 Michael Shigorin <mike@altlinux.org> 1.1.94-alt1
- workstation
* Mon Jun 13 2016 Michael Shigorin <mike@altlinux.org> 1.1.93-alt1
- starterkits-20160612
* Mon May 30 2016 Michael Shigorin <mike@altlinux.org> 1.1.92-alt1
- server-openstack
* Mon May 23 2016 Michael Shigorin <mike@altlinux.org> 1.1.91-alt1
- nvidia/nouveau rehash
- overlayfs support (lakostis@)
* Tue May 03 2016 Michael Shigorin <mike@altlinux.org> 1.1.90-alt1
- starterkits-20160429
* Mon Apr 25 2016 Michael Shigorin <mike@altlinux.org> 1.1.89-alt1
- preparing for p8 starterkits
* Mon Apr 11 2016 Michael Shigorin <mike@altlinux.org> 1.1.88-alt1
- pkg.in/profiles
* Mon Mar 14 2016 Michael Shigorin <mike@altlinux.org> 1.1.87-alt1
- starterkits-20160312
* Mon Feb 29 2016 Michael Shigorin <mike@altlinux.org> 1.1.86-alt1
- junior
* Mon Feb 15 2016 Michael Shigorin <mike@altlinux.org> 1.1.85-alt1
- regular-jeos-ovz
* Mon Feb 08 2016 Michael Shigorin <mike@altlinux.org> 1.1.84-alt1
- %name(7) :)
* Mon Jan 25 2016 Michael Shigorin <mike@altlinux.org> 1.1.83-alt1
- openssh 7.x (see also #31716)
* Mon Jan 11 2016 Michael Shigorin <mike@altlinux.org> 1.1.82-alt1
- firmwarez
* Mon Dec 07 2015 Michael Shigorin <mike@altlinux.org> 1.1.81-alt1
- regular fixes
* Mon Nov 30 2015 Michael Shigorin <mike@altlinux.org> 1.1.80-alt1
- pre-starterkit cleanups

View File

@ -1,6 +0,0 @@
object 08c59ff0305c234d217ef88fe458117267e62cc4
type commit
tag v1.1.80
tagger Michael Shigorin <mike@altlinux.org> 1448916281 +0300
pre-starterkits

View File

@ -0,0 +1,6 @@
object 54d8ce33a2fca5b4bb6b8396203fd3a5fbe8832c
type commit
tag v1.3.7
tagger Michael Shigorin <mike@altlinux.org> 1557157189 +0300
v1.3.7

View File

@ -1 +1 @@
77963b8e7b819db6cf015be0927fad3a28dfa83e v1.1.80
e2429b355431f64afe4f4392be8bc239d0d40455 v1.3.7

View File

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

5
README
View File

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

14
bin/check-recipe Executable file
View File

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

View File

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

View File

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

View File

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

View File

@ -31,10 +31,12 @@ INITRD_MODULES=
BOOTFSTYPE=
BOOTPART=
case "`arch`" in # NB: sudo => no GLOBAL_ will do either; mind qemu-*
ARCH="$(arch)" # NB: sudo => no GLOBAL_ will do either; mind qemu-*
case "$ARCH" in
*86*)
# NB: different storage modules might be needed for non-kvm
INITRD_MODULES="sd_mod ata_piix ahci"
INITRD_MODULES="sd_mod ata_piix ahci virtio-scsi virtio-blk"
BLOCKDEV="/dev/sda" # might be /dev/vda for virtio
ROOTPART="1"
;;
@ -44,6 +46,16 @@ arm*)
BOOTPART="1"
ROOTPART="2"
;;
e2k)
BOOTFSTYPE="ext2" # firmware knows it
BLOCKDEV="/dev/sda" # ...hopefully...
BOOTPART="1"
ROOTPART="2"
;;
mips*)
ROOTPART="1"
BLOCKDEV="/dev/sda"
;;
esac
# figure out the part taken by /boot in the given tarball
@ -126,11 +138,15 @@ fi
exit_handler() {
rc=$?
cd /
if [ -n "$ROOTFS" ]; then
umount ${BOOTFS:+"$BOOTFS"} "$ROOTFS"{/dev,/proc,/sys,}
if [ -n "$LOOPDEV" ]; then
kpartx -d -s "$LOOPDEV"
kpartx -d -s "$LOOPDEV" || {
sleep 10
kpartx -d -s -v "$LOOPDEV"
}
losetup --detach "$LOOPDEV"
fi
rm -r -- "$ROOTFS"
@ -202,14 +218,71 @@ 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"
KERNEL="$(readlink $ROOTFS/boot/vmlinuz | sed 's,vmlinuz-,,')"
chroot "$ROOTFS" make-initrd -k "$KERNEL"
case "$ARCH" in
*86*)
echo "FEATURES += qemu" >> "$ROOTFS/etc/initrd.mk"
;;
e2k)
echo "FEATURES += usb" >> "$ROOTFS/etc/initrd.mk"
;;
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
while read kver; do
chroot "$ROOTFS" make-initrd -k "$kver"
KVERSIONS="$KVERSIONS $kver"
done < .origver
fi
[ -n "$KVERSIONS" ] || fatal "unable to deduce kernel version"
rm -f .origver
# ...target device too
sed -i "s,$LOOPROOT,$ROOTDEV," "$ROOTFS/etc/fstab"
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
# configure and install bootloader
REGEXP='^.*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
@ -220,7 +293,7 @@ delay=1
vga=0
image=/boot/vmlinuz
initrd=/boot/initrd.img
append=\"root=$ROOTDEV rootdelay=3 quiet\"
append=\"root=$ROOTDEV rootdelay=3 console=tty1 console=ttyS0,115200n8\"
label=linux"
cat > "$ROOTFS"/etc/lilo-loop.conf <<-EOF
@ -241,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" "$IMG" "$ROOTFS" "$WORKDIR"
chown "$SUDO_USER:$(id -g "$SUDO_USER")" "$IMG" ||:
fi
# maybe qemu interpreter was copied to chroot;
# this is no longer necessary, remove
rm -rf "$ROOTFS"/.host ||:

2
conf.d/Makefile Normal file
View File

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

View File

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

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

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

View File

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

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

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

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

@ -0,0 +1,12 @@
# Education Set
ifeq (distro,$(IMAGE_CLASS))
distro/education-junior: distro/.installer use/slinux/full \
use/l10n/default/ru_RU +vmguest
@$(call set,INSTALLER,junior)
@$(call set,BRANDING,school-junior)
@$(call set,META_VOL_SET,Education Junior)
@$(call add,THE_LISTS,education/desktop)
endif

View File

@ -1,9 +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
@ -11,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; @:
@ -42,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
@ -52,7 +52,8 @@ distro/live-rescue: distro/live-icewm +efi
# NB: this one doesn't include the browser, needs to be chosen downstream
distro/.live-webkiosk: distro/.live-kiosk \
use/isohybrid use/live/hooks use/live/ru use/sound
use/isohybrid use/live/hooks use/live/ru use/sound \
use/stage2/kms use/x11/xorg
@$(call add,LIVE_LISTS,$(call tags,live desktop))
distro/.live-webkiosk-gtk: distro/.live-webkiosk
@ -88,22 +89,23 @@ distro/.live-games: distro/.live-kiosk use/x11/3d use/sound \
use/stage2/net-eth use/net-eth/dhcp use/services +efi +sysvinit
@$(call set,KFLAVOURS,un-def)
@$(call add,LIVE_LISTS,$(call tags,xorg misc))
@$(call add,LIVE_PACKAGES,input-utils glxgears glxinfo)
@$(call add,LIVE_PACKAGES,pciutils input-utils glxgears glxinfo)
@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind alteratord messagebus)
@$(call add,SERVICES_DISABLE,livecd-net-eth)
distro/live-flightgear: distro/.live-games
@$(call add,LIVE_PACKAGES,FlightGear FlightGear-tu154b)
@$(call add,LIVE_PACKAGES,FlightGear)
@$(call add,LIVE_PACKAGES,fgo livecd-fgfs)
@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
distro/live-flightgear-tu154: distro/.live-games
@$(call add,LIVE_PACKAGES,FlightGear-tu154b)
distro/live-0ad: distro/.live-games
@$(call add,STAGE2_BOOTARGS,quiet)
@$(call add,LIVE_PACKAGES,0ad livecd-0ad)
@$(call try,HOMEPAGE,http://play0ad.com/)
distro/live-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)
@ -112,20 +114,18 @@ 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 \
use/x11/xorg use/x11/lightdm/gtk use/x11/mate use/x11-autologin \
use/browser/firefox/i18n use/sound \
use/browser/firefox/esr use/browser/firefox/i18n use/sound \
use/fonts/otf/adobe use/fonts/otf/mozilla \
use/fonts/ttf/google use/fonts/ttf/redhat
@$(call set,KFLAVOURS,un-def)
@$(call add,LIVE_LISTS,$(call tags,base l10n))
@$(call add,LIVE_LISTS,$(call tags,archive extra))
@$(call add,LIVE_PACKAGES,chromium gedit mc-full pinta xchm livecd-ru)
@$(call add,LIVE_PACKAGES,LibreOffice4-langpack-ru java-1.7.0-openjdk)
@$(call add,LIVE_PACKAGES,LibreOffice-langpack-ru java-1.8.0-openjdk)
@$(call add,LIVE_PACKAGES,mate-document-viewer-caja)
@$(call add,LIVE_PACKAGES,mate-document-viewer-djvu)
@$(call add,LIVE_PACKAGES,cups system-config-printer livecd-admin-cups)

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,46 +0,0 @@
# p7 base kits
mixin/p7: use/browser/firefox/esr
@$(call set,BRANDING,altlinux-starterkit)
ifeq (distro,$(IMAGE_CLASS))
### kludge compatibility: introspection stub for main.mk :-/
distro/altlinux-p7-cinnamon: distro/regular-cinnamon mixin/p7; @:
distro/altlinux-p7-e17: distro/regular-e17 mixin/p7; @:
distro/altlinux-p7-icewm: distro/regular-icewm mixin/p7; @:
distro/altlinux-p7-gnome3: distro/regular-gnome3 mixin/p7; @:
distro/altlinux-p7-gnustep: distro/regular-gnustep mixin/p7; @:
distro/altlinux-p7-kde4: distro/regular-kde4 mixin/p7; @:
distro/altlinux-p7-lxde: distro/regular-lxde mixin/p7; @:
distro/altlinux-p7-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-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

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

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

View File

@ -2,264 +2,293 @@
ifeq (distro,$(IMAGE_CLASS))
# common ground (really lowlevel)
distro/.regular-bare: distro/.base +net-eth use/kernel/net
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/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
@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
distro/.regular-x11: distro/.regular-base \
use/x11/wacom use/x11/amdgpu +vmguest +wireless \
use/stage2/cifs use/live/rw use/live/x11 use/live/repo \
use/live/install use/live/suspend use/browser/firefox/live
@$(call add,LIVE_PACKAGES,livecd-install-apt-cache)
@$(call add,LIVE_LISTS,$(call tags,base rescue))
@$(call add,LIVE_PACKAGES,gpm livecd-install-apt-cache)
@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
@$(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,installer-feature-desktop-other-fs-stage2)
@$(call add,THE_PACKAGES,alterator-notes)
@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
# 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
@$(call add,LIVE_LISTS,domain-client)
use/syslinux/ui/gfxboot use/firmware/laptop +systemd
@$(call add,THE_BRANDING,bootloader)
@$(call add,THE_PACKAGES,upower bluez)
@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
@$(call set,KFLAVOURS,std-def)
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
distro/.regular-sysv: distro/.regular-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)
# NB:
# - no +power or even use/power/acpi/button on intent
# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
distro/regular-jeos: distro/.regular-bare use/isohybrid +sysvinit \
use/branding use/bootloader/lilo use/syslinux/lateboot.cfg \
use/install2/vmguest use/vmguest/base \
# common base for the very bare distros
distro/.regular-jeos-base: distro/.regular-bare +sysvinit \
use/isohybrid use/branding use/bootloader/grub \
use/install2/repo use/install2/packages \
use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
use/cleanup/x11-alterator use/net/etcnet use/power/acpi/button
@$(call add,BASE_KMODULES,guest scsi vboxguest)
use/net/etcnet use/power/acpi/button
@$(call set,BOOTVGA,)
@$(call set,INSTALLER,altlinux-generic)
@$(call add,INSTALL2_PACKAGES,volumes-profile-jeos)
@$(call add,INSTALL2_BRANDING,alterator notes)
@$(call add,THE_BRANDING,alterator) # just to be cleaned up later on
@$(call add,THE_PACKAGES,apt basesystem dhcpcd openssh vim-console)
@$(call add,THE_PACKAGES,bash-completion)
@# a *lot* of stray things get pulled in by alterator modules
@$(call add,CLEANUP_PACKAGES,libfreetype fontconfig)
@$(call add,CLEANUP_PACKAGES,'glib2*' libffi 'libltdl*')
@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libpng*' 'libtiff*')
@$(call add,CLEANUP_PACKAGES,avahi-autoipd bridge-utils) # i-c-stage3
@$(call add,CLEANUP_PACKAGES,iw wpa_supplicant)
@$(call add,CLEANUP_PACKAGES,openssl libpcsclite)
@# fully fledged interactivesystem isn't needed here either
@$(call add,CLEANUP_PACKAGES,interactivesystem 'groff*' man stmpclean)
@$(call add,CLEANUP_PACKAGES,glibc-gconv-modules gettext)
@$(call add,CLEANUP_PACKAGES,console-scripts console-vt-tools 'kbd*')
@$(call add,CLEANUP_PACKAGES,libsystemd-journal libsystemd-login)
@$(call add,CLEANUP_PACKAGES,dbus libdbus libcap-ng)
@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console)
@$(call add,THE_LISTS,openssh)
# ...and for somewhat bare distros
distro/.regular-jeos: distro/.regular-jeos-base \
use/bootloader/lilo use/syslinux/lateboot.cfg \
use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
use/cleanup/jeos
@$(call add,BASE_KMODULES,guest scsi vboxguest)
@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
# NB:
# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
distro/regular-jeos: distro/.regular-jeos use/cleanup/jeos/full \
use/volumes/jeos use/install2/vmguest use/vmguest/base
@$(call add,BASE_PACKAGES,nfs-utils gdisk)
@$(call add,MAIN_PACKAGES,firmware-linux)
@$(call add,CLEANUP_PACKAGES,libffi 'libltdl*')
@$(call add,CLEANUP_PACKAGES,bridge-utils)
@$(call add,DEFAULT_SERVICES_DISABLE,fbsetfont)
@$(call add,STAGE2_BOOTARGS,quiet)
distro/.regular-install-x11: distro/.regular-install \
use/install2/suspend mixin/regular-desktop +vmguest +wireless
@$(call set,INSTALLER,altlinux-desktop)
@$(call add,THE_LISTS,$(call tags,regular desktop))
distro/regular-icewm: distro/.regular-sysv-gtk +icewm \
use/browser/seamonkey/i18n use/fonts/ttf/redhat
@$(call add,LIVE_LISTS,$(call tags,regular icewm))
@$(call add,LIVE_PACKAGES,mnt winswitch xpra)
@$(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)
# NB: no +efi as it brings in grub2 (no ELILO support for system boot)
distro/regular-jeos-ovz: distro/.regular-jeos \
use/server/ovz-base use/control/server/ldv use/firmware
@$(call add,THE_PACKAGES,ipmitool lm_sensors3 mailx)
distro/.regular-install-x11: distro/.regular-install +vmguest +wireless \
use/install2/suspend mixin/regular-desktop mixin/regular-x11
@$(call set,INSTALLER,altlinux-desktop)
# assumes somewhat more experienced user, mostly for sysv variants
distro/.regular-install-x11-full: distro/.regular-install-x11 \
mixin/desktop-installer mixin/regular-desktop use/install2/fs \
use/fonts/otf/adobe use/fonts/otf/mozilla use/fonts/chinese \
use/branding/complete use/branding/slideshow/once \
use/net-eth/dhcp use/efi/shell use/rescue/base \
use/init/sysv/elogind
@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
@$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
distro/regular-icewm: distro/.regular-sysv-gtk mixin/regular-icewm \
use/browser/chromium
@$(call set,KFLAVOURS,un-def)
# wdm can't do autologin so add standalone one for livecd
distro/regular-wmaker: distro/.regular-sysv \
mixin/regular-wmaker use/live/autologin use/browser/seamonkey/i18n
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; @:
distro/regular-xfce: distro/.regular-gtk \
use/x11/xfce use/domain-client/full use/browser/firefox/classic \
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)
distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
use/init/sysv/polkit use/x11/xfce \
use/fonts/ttf/redhat use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call set,KFLAVOURS,un-def)
@$(call add,LIVE_PACKAGES,xfce4-mixer pm-utils bc elinks mpg123)
mixin/regular-xfce mixin/regular-xfce-sysv; @:
distro/regular-lxde: distro/.regular-gtk 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; @:
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/full
@$(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
@$(call set,META_VOL_ID,ALT Linux regular-E/$(ARCH))
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 Linux regular-E-SysV/$(ARCH))
@$(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/net/nm/mmgui use/im
@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
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 \
use/x11/gnome3 use/browser/epiphany use/fonts/ttf/redhat
@$(call set,KFLAVOURS,un-def)
@$(call add,LIVE_PACKAGES_REGEXP,^setup-gnome3-done.*)
@$(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 bluez)
distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
use/x11/gtk/nm use/net/nm/mmgui
@$(call add,THE_LISTS,openscada)
distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
use/net-eth/dhcp use/efi/refind; @:
distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
use/browser/konqueror4 use/fonts/zerg use/domain-client/full \
use/net/nm/mmgui +pulse +plymouth
@$(call add,THE_LISTS,$(call tags,regular kde4))
@$(call add,THE_PACKAGES,volumes-profile-lite)
@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)
mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
use/net/connman use/browser/qupzilla +plymouth
@$(call add,THE_PACKAGES,qconnman-ui)
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 \
use/x11/kde5 use/x11/sddm \
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
distro/regular-rescue: distro/.regular-base use/rescue/rw use/luks \
use/branding use/efi/refind use/efi/shell use/efi/memtest86 \
use/hdt use/syslinux/ui/menu use/syslinux/timeout/600 \
use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \
use/mediacheck test/rescue/no-x11 +wireless +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 \
use/hdt use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \
use/mediacheck +wireless
@$(call set,KFLAVOURS,un-def)
@$(call add,RESCUE_PACKAGES,gpm livecd-net-eth)
@$(call add,RESCUE_LISTS,$(call tags,base smartcard))
@$(call add,RESCUE_LISTS,$(call tags,base bench))
@$(call add,RESCUE_LISTS,$(call tags,network security))
distro/regular-sysv-tde: distro/.regular-install-x11 \
mixin/desktop-installer mixin/regular-tde use/install2/fs \
use/branding/complete use/branding/slideshow/once \
use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base \
use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@$(call add,THE_LISTS,$(call tags,base desktop))
@$(call add,THE_LISTS,$(call tags,regular tde))
@$(call add,THE_PACKAGES,kpowersave)
@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
distro/regular-rescue-netbootxyz: distro/.regular-bare mixin/regular-rescue
@$(call set,RELNAME,en.altlinux.org/rescue (netboot.xyz edition))
@$(call set,META_VOL_ID,ALT Rescue)
@$(call set,META_APP_ID,$(ARCH))
distro/.regular-server: distro/.regular-install \
use/server/mini use/rescue/base use/cleanup/x11
@$(call add,THE_LISTS,$(call tags,regular server))
@$(call add,MAIN_PACKAGES,aptitude)
distro/regular-sysv-xfce: distro/.regular-install-x11-full \
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
@$(call add,THE_LISTS,$(call tags,server && (regular || network)))
@$(call set,INSTALLER,altlinux-server)
@$(call add,SYSTEM_PACKAGES,multipath-tools)
@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
distro/.regular-server-systemd: distro/.regular-server-base +systemd; @:
distro/.regular-server: distro/.regular-server-base \
use/server/mini use/firmware/qlogic use/rescue/base \
use/ntp/client use/cleanup/libs
@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@$(call add,MAIN_PACKAGES,aptitude)
@$(call add,CLEANUP_PACKAGES,qt4-common)
@$(call add,DEFAULT_SERVICES_DISABLE,bridge)
distro/regular-server: distro/.regular-server use/cleanup/x11-alterator; @:
distro/.regular-server-managed: distro/.regular-server
@$(call add,THE_PACKAGES,alterator-fbi)
@$(call add,THE_LISTS,$(call tags,server alterator))
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
distro/regular-server-ovz: distro/.regular-server-managed \
use/server/ovz use/server/groups/base
@$(call add,MAIN_GROUPS,vzstats)
distro/regular-server: distro/.regular-server-managed \
use/server/groups/base use/dev/groups/builder use/install2/vnc/full
@$(call add,MAIN_GROUPS,server/sambaDC)
@$(call add,MAIN_GROUPS,tools/hyperv)
distro/regular-server-ovz: distro/.regular-server \
use/server/ovz use/server/groups/tools use/cleanup/x11-alterator
@$(call add,MAIN_GROUPS,tools/vzstats)
distro/regular-server-hyperv: distro/.regular-server-managed
@$(call set,KFLAVOURS,un-def)
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,THE_PACKAGES,hyperv-daemons)
@$(call add,DEFAULT_SERVICES_DISABLE,bridge cpufreq-simple)
@$(call add,DEFAULT_SERVICES_DISABLE,bridge smartd)
@$(call add,DEFAULT_SERVICES_DISABLE,cpufreq-simple powertop)
distro/regular-builder: distro/.regular-bare \
distro/regular-server-opennebula: distro/.regular-server-systemd \
use/kernel/server use/ntp/chrony use/server/groups/opennebula \
use/firmware/qlogic use/control/sudo-su use/net-ssh +efi
@$(call set,BASE_BOOTLOADER,grub)
@$(call set,INSTALLER,altlinux-server)
@$(call add,MAIN_GROUPS,tools/ipmi tools/monitoring)
@$(call add,THE_PACKAGES,nfs-clients su sudo)
@$(call add,THE_PACKAGES,bridge-utils dhcpcd tzdata)
distro/.regular-server-openstack: distro/.regular-server-base \
use/ntp/chrony use/firmware/qlogic use/server/groups/openstack
@$(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-systemd \
use/kernel/server use/firmware/qlogic +efi
@$(call set,BASE_BOOTLOADER,grub)
@$(call set,INSTALLER,altlinux-server)
@$(call add,INSTALL2_PACKAGES,installer-feature-pve)
@$(call add,THE_PACKAGES,pve-manager nfs-clients su)
@$(call add,THE_PACKAGES,bridge-utils dhcpcd faketime tzdata postfix)
@$(call add,DEFAULT_SERVICES_DISABLE,pve-manager pve-cluster \
pve-firewall pve-ha-crm pve-manager pveproxy pvedaemon \
pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy)
distro/regular-builder: distro/.regular-bare mixin/regular-builder \
use/dev/builder/full +sysvinit +efi +power \
use/live/base use/live/rw use/live/repo/online use/live/textinstall \
use/isohybrid use/syslinux/timeout/30 \
use/stage2/net-eth 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
distro/regular-server-samba4: distro/.regular-server-managed
@$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator)))
@$(call add,THE_PACKAGES,alterator-fbi alterator-dhcp)
@$(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

@ -15,6 +15,11 @@ distro/server-mini: distro/.server-base +net-eth \
@$(call set,INSTALLER,altlinux-server)
@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
distro/server-mini-systemd-networkd: distro/.server-base \
use/net/networkd +systemd \
use/server/mini use/efi use/firmware
@$(call set,INSTALLER,altlinux-server)
distro/server-ovz: distro/server-mini use/server/ovz use/server/groups/base \
use/install2/net use/hdt use/rescue \
use/firmware/server use/firmware/cpu +wireless; @:

View File

@ -3,7 +3,7 @@
ifeq (distro,$(IMAGE_CLASS))
distro/live-simply: distro/.livecd-install use/slinux/full
@$(call add,THE_LISTS,slinux/live-install)
@$(call add,THE_LISTS,slinux/live-install slinux/live)
distro/simply: distro/.installer use/slinux/full
@$(call set,INSTALLER,simply-linux)

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

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

View File

@ -2,7 +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/.base-grub +systemd
@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata)
@$(call add,BASE_PACKAGES,apt)
# handle ROOTPW (through deflogin)
@ -10,14 +14,28 @@ vm/net: vm/bare use/net-eth/dhcp use/net-ssh \
use/repo use/control/sudo-su use/deflogin
@$(call add,BASE_PACKAGES,su)
vm/systemd-net: vm/systemd use/net-eth/networkd-dhcp use/net-ssh \
use/repo use/control/sudo-su use/deflogin
@$(call add,BASE_PACKAGES,su)
# vm/net or vm/systemd-net
vm/cloud-systemd: vm/systemd-net mixin/cloud-init use/vmguest/kvm
@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
vm/cloud-sysv: vm/net mixin/cloud-init use/vmguest/kvm use/power/acpi/button; @:
# vm with OpenNebula contextualization package (with empty network config)
vm/opennebula-systemd: vm/systemd use/net/networkd use/net-ssh \
use/vmguest/kvm mixin/opennebula-context \
use/repo use/control/sudo-su use/deflogin
@$(call add,BASE_PACKAGES,su)
# NB: use/x11 employs some installer-feature packages
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

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

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

@ -4,7 +4,7 @@
других частей mkimage-profiles либо содержание переменных.
NB: пути приводятся от верхнего уровня; проект в целом предполагает
ALT Linux 7.0+ и GNU make 3.82+ (на которых и разрабатывается),
наличие ALT 8.0+ и GNU make 3.82+ (на которых и разрабатывается),
но может быть портирован вместе с mkimage. Если что-либо не работает
или не собирается, стоит проверить на Sisyphus (mkimage, make, hasher,
собственно пакетная база), поскольку именно на нём происходит основная
@ -16,12 +16,14 @@ ALT Linux 7.0+ и GNU make 3.82+ (на которых и разрабатыва
** ожидает, что каждая подлежащая трассированию цель каждого
makefile при сборке конфигурации образа содержит непустой
recipe -- хотя бы "; @:" -- т.к. зависит от запуска $(SHELL)
** трассировка выполняется при REPORT=1 для формирования графа
зависимостей между промежуточными целями сборки конечного образа
** характерный признак пропуска -- разрыв графа (report-targets.png)
* pkg.in/lists/Makefile
** ожидает, что названия пакаджлистов указываются в переменных
** ожидает, что названия списков пакетов указываются в переменных
вида *_LISTS, и копирует в генерируемый профиль только их
** если задать имя файла пакаджлиста непосредственно в Makefile
** если задать имя файла списка пакетов непосредственно в Makefile
субпрофиля, он не будет скопирован
** характерное сообщение об ошибке:
@ -35,6 +37,7 @@ ALT Linux 7.0+ и GNU make 3.82+ (на которых и разрабатыва
в KFLAVOURS)
** если добавить какой-либо kernel-image в STAGE1_PACKAGES*,
результат может быть неожиданным
** обратите внимание: bin/tar2fs умеет несколько ядер
** вероятная ошибка: незагрузка полученного squashfs
* features.in/install2/install2/stage2cfg.mk

View File

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

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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -25,6 +25,9 @@ define grepper_body
done
endef
check:
@../bin/check-recipe */config.mk
%:
$(error BUILDDIR not defined)

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/armh: use/control/sudo-su use/net-dns/google
@$(call add_feature)

View File

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

View File

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

@ -1,43 +1,47 @@
use/browser:
@$(call add_feature)
@$(call add,THE_PACKAGES_REGEXP,$$(THE_BROWSER))
@$(call try,THE_BROWSER,webclient) # fallback
@$(call add,THE_PACKAGES,$$(THE_BROWSER))
@$(call try,THE_BROWSER,elinks) # X11-less fallback
# support both firefox and firefox-esr
use/browser/firefox: use/browser
@$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR))
use/browser/seamonkey \
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
@$(call add,THE_BROWSER,gst-libav)
@$(call add,THE_BROWSER,gst-plugins-base1.0 gst-plugins-good1.0)
use/browser/firefox/live: use/browser/firefox
@$(call add,THE_BROWSER,livecd-firefox)
# scarey, and will have to be done otherwise when l10n feature is there
use/browser/firefox/i18n: use/browser/firefox
@$(call add,THE_BROWSER,firefox$$(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)
@ -46,4 +50,4 @@ use/browser/plugin/flash: use/browser
@$(call add,THE_PACKAGES,mozilla-plugin-adobe-flash)
use/browser/plugin/java: use/browser
@$(call add,THE_PACKAGES,mozilla-plugin-java-1.6.0-sun)
@$(call add,THE_PACKAGES,mozilla-plugin-java-1.8.0-openjdk)

View File

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

View File

@ -1,9 +1,5 @@
# step 4: build the distribution image
# take the latter part for complex-specified subprofiles like stage2@live;
# care to exclude non-directories holding no makefiles like rootfs
SUBDIRS = $(sort $(dir $(wildcard $(addsuffix /Makefile,$(SUBPROFILE_DIRS)))))
# proxy over the ISO metadata collected; see also genisoimagerc(5)
BOOT_SYSI := $(META_SYSTEM_ID)
BOOT_PUBL := $(META_PUBLISHER)
@ -13,19 +9,44 @@ 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 \
all: | $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
postprocess $(GLOBAL_CLEAN_WORKDIR)
prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER)
prep: | $(GLOBAL_DEBUG) dot-disk $(WHATEVER)
# can't use mp-showref which belongs to the metaprofile
dot-disk:
@mkdir -p files/.disk
@echo "$(META_VOL_ID) $(DATE_F)" >files/.disk/info
@if [ -n "$(META_DISK_INFO)" ]; then \
echo "$(META_DISK_INFO)" >files/.disk/info; \
else \
echo "$(META_VOL_ID) build $(DATE_F)" >files/.disk/info; \
fi
@echo "$(ARCH)" >files/.disk/arch
@echo "$(DATE)" >files/.disk/date
@if type -t git >&/dev/null; then \

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -5,9 +5,15 @@
kver="$(rpm -qa 'kernel-image*' \
--qf '%{installtime} %{version}-%{name}-%{release}\n' \
| sort -n \
| tail -n 1 \
| cut -f 2 -d ' ' \
| sed 's/kernel-image-//')"
ln -s vmlinuz-$kver /boot/vmlinuz
ln -s initrd-$kver.img /boot/initrd.img
[ -n "$kver" ] || { echo "** unable to deduce kernel version" >&2; exit 1; }
cd /boot
echo "$kver" > .origver # for tar2fs
# NB: e2k kernel builds "image" instead of "vmlinuz"
[ -f vmlinuz-$kver ] && ln -s vmlinuz-$kver vmlinuz ||:
ln -s initrd-$kver.img initrd.img # missing at this stage
:

View File

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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -39,3 +39,8 @@ use/deflogin/xgrp: use/deflogin
# potentially elevated privileges (NB: _not_ wheel)
use/deflogin/privileges: use/deflogin
@$(call add,GROUPS,fuse netadmin proc users)
# NM with sysvinit
use/deflogin/sysv/nm: use/deflogin
@$(call add,GROUPS,_nmconnect)
@$(call add,THE_PACKAGES,nm-sysvinit)

View File

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

View File

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

View File

@ -73,7 +73,7 @@ alias m='cd /usr/share/mkimage-profiles'
clear
cat << EOH
Welcome to live builder environment!
Here are some ALT Linux package/image build tools prepared for you:
Here are some ALT package/image build tools prepared for you:
* ${white}gear${gray}(1) -- see ${cyan}http://en.altlinux.org/gear${gray};
* ${white}hsh${gray}(1) -- see ${cyan}http://en.altlinux.org/hasher${gray};
* ${white}mkimage${gray} -- see ${cyan}http://en.altlinux.org/mkimage${gray};

View File

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

View File

@ -13,6 +13,9 @@ use/docs/indexhtml: use/docs use/branding
use/docs/manual: use/docs
@$(call xport,DOCS)
@$(call add,THE_PACKAGES,docs-$(DOCS))
@$(call add,THE_PACKAGES,docs-$$(DOCS))
use/docs/full: use/docs/indexhtml use/docs/manual; @:
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,4 +5,10 @@ DOT_BASE += docs-$(DOCS)
CHROOT_PACKAGES += docs-$(DOCS)
endif
ifneq (,$(findstring notes,$(THE_BRANDING) $(INSTALL2_BRANDING)))
CHROOT_PACKAGES_REGEXP += $(call branding,notes)
endif
ifneq (,$(findstring indexhtml,$(THE_BRANDING)))
CHROOT_PACKAGES_REGEXP += $(call branding,indexhtml)
endif

View File

@ -14,9 +14,9 @@ indexfile="$indexdir/index.html"
[ -s "$indexfile" ] || nonfatal "$indexfile not found"
[ -n "$GLOBAL_LOCALE" ] ||
echo "** warning: GLOBAL_LOCALE empty, maybe use/l10n" >&2
echo "** warning: GLOBAL_LOCALE empty, fallback to en_US (use/l10n?)">&2
LANG="$GLOBAL_LOCALE" indexhtml-update
LANG="${GLOBAL_LOCALE:-en_US}" indexhtml-update
# http://unix.stackexchange.com/questions/94185/convert-soft-to-hardlinks
cp -aH "$indexdir" "$dest"

View File

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

View File

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

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

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

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

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

View File

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

View File

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

View File

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

View File

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

View File

@ -22,8 +22,8 @@ use/efi/refind: use/efi
use/efi/signed: use/efi
@$(call set,EFI_CERT,altlinux)
@$(call add,THE_PACKAGES,shim-signed)
@$(call add,RESCUE_PACKAGES,openssl pesign sbsigntools)
@$(call add,COMMON_PACKAGES,shim-signed)
@$(call add,RESCUE_PACKAGES,openssl pesign)
use/efi/shell: use/efi
@$(call try,EFI_SHELL,efi-shell)
@ -38,6 +38,6 @@ else
# ignore on an unsupported target arch but make it hybrid at least
use/efi use/efi/signed use/efi/debug \
use/efi/refind use/efi/shell use/efi/memtest86: use/isohybrid
use/efi/refind use/efi/shell use/efi/memtest86: use/isohybrid; @:
endif

View File

@ -6,23 +6,26 @@ use/firmware:
@$(call add_feature)
@$(call add,SYSTEM_PACKAGES,firmware-linux)
use/firmware/full: use/firmware/server use/firmware/laptop
use/firmware/full: use/firmware/server use/firmware/laptop; @:
use/firmware/cpu: use/firmware
@$(call add,THE_PACKAGES,microcode-data-intel microcode_ctl)
@$(call add,THE_PACKAGES,firmware-intel-ucode iucode_tool)
use/firmware/server: use/firmware
@$(call add,SYSTEM_PACKAGES,firmware-aic94xx-seq)
@$(call add,THE_PACKAGES_REGEXP,firmware-ql.*)
use/firmware/qlogic: use/firmware
@$(call add,SYSTEM_PACKAGES,firmware-ql6312)
# NB: individual firmwarez would sometimes conflict
# with ones newly merged into firmware-linux
# FIXME: kernel modules rather belong to use/hardware
use/firmware/wireless: use/firmware use/kernel/wireless
use/firmware/wireless: use/firmware
@$(call add,THE_PACKAGES,firmware-acx100)
@$(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/wireless use/firmware/cpu
@$(call add,KMODULES,acpi_call)
use/firmware/laptop: use/firmware/cpu
@$(call add,THE_KMODULES,acpi_call)

View File

@ -4,6 +4,10 @@ use/fonts:
@$(call xport,FONT_FEATURES_ENABLE)
@$(call xport,FONT_FEATURES_DISABLE)
# standalone target to specify non-bitmap installer fonts
use/fonts/install2:
@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
# just stating that kernels and font habits are pretty individual
use/fonts/zerg: use/fonts
@$(call set,FONT_FEATURES_ENABLE,antialias lcdfilter-default \
@ -15,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,
@ -27,7 +35,9 @@ use/fonts/otf/mozilla:
@$(call add,THE_PACKAGES,fonts-otf-mozilla-fira)
use/fonts/ttf/google:
@$(call add,THE_PACKAGES,fonts-ttf-droid)
@$(call add,THE_PACKAGES,fonts-ttf-google-droid-sans)
@$(call add,THE_PACKAGES,fonts-ttf-google-droid-sans-mono)
@$(call add,THE_PACKAGES,fonts-ttf-google-droid-serif)
@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-arimo)
@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-cousine)
@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-tinos)
@ -41,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,25 +1,40 @@
+sysvinit: use/init/sysv; @:
+systemd: use/init/systemd; @:
+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,RESCUE_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 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
@$(call add,THE_PACKAGES,systemd-shutdown-debug-script)
@ -27,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,10 @@
#!/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

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,16 +12,28 @@ 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
@$(call add,BASE_LISTS,$(call tags,basesystem))
@$(call xport,BASE_BOOTLOADER)
@$(call xport,INSTALL2_CLEANUP_PACKAGES)
@$(call xport,INSTALL2_CLEANUP_KDRIVERS)
# doesn't use/install2/fs on purpose (at least so far)
use/install2/full: use/install2/packages use/install2/vmguest \
use/syslinux/localboot.cfg use/syslinux/ui/menu use/bootloader; @:
use/install2/full: \
use/install2/packages use/install2/vmguest use/install2/tools \
use/syslinux/localboot.cfg use/syslinux/ui/menu use/bootloader
@$(call add,INSTALL2_PACKAGES,xorg-drv-synaptics)
@$(call add,INSTALL2_PACKAGES,xorg-drv-libinput)
# for distributions with their own -stage3 installer part
use/install2/stage3: use/install2
@$(call add,BASE_PACKAGES,installer-$$(INSTALLER)-stage3)
# just an alias, better use its endpoint directly
use/install2/fonts: use/fonts/install2; @:
# see also use/vmguest
use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @:
@ -40,16 +56,28 @@ use/install2/kvm:
# virtualbox guest support for installer
use/install2/vbox:
@$(call add,STAGE1_KMODULES,virtualbox-addition vboxguest)
@$(call add,INSTALL2_PACKAGES,xorg-drv-vboxvideo)
# see also use/vmguest/vmware
use/install2/vmware:
@$(call add,STAGE1_KMODULES,vmware)
@$(call add,STAGE1_KMODULES,scsi) # mptspi in led-ws
@$(call add,INSTALL2_PACKAGES,xorg-drv-vmware)
@$(call add,INSTALL2_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
# NB: sort of conflicts with use/install2/cleanup/vnc
use/install2/vnc:
@$(call add,INSTALL2_PACKAGES,x11vnc)
@$(call add,INSTALL2_PACKAGES,x11vnc xterm net-tools)
# this one expects external vncviewer to come
use/install2/vnc/listen: \
use/install2/vnc use/syslinux/install-vnc-listen.cfg; @:
# this one connects to a specified vncviewer --listen
use/install2/vnc/connect: \
use/install2/vnc use/syslinux/install-vnc-connect.cfg; @:
# add both bootloader items to be *that* explicit ;-)
use/install2/vnc/full: use/install2/vnc/listen use/install2/vnc/connect; @:
# filesystems handling
use/install2/fs: use/install2/xfs use/install2/jfs use/install2/reiserfs; @:
@ -63,25 +91,32 @@ 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)
# extras
use/install2/tools:
@$(call add,INSTALL2_PACKAGES,pxz)
# when VNC installation is less welcome than a few extra megs
use/install2/cleanup/vnc:
@$(call add,INSTALL2_CLEANUP_PACKAGES,x11vnc xorg-xvfb)
# conflicts with luks feature
use/install2/cleanup/crypto:
@$(call add,INSTALL2_CLEANUP_PACKAGES,gnupg libgpg-error)
@$(call add,INSTALL2_CLEANUP_PACKAGES,libgcrypt* libgnutls*)
@$(call add,INSTALL2_CLEANUP_PACKAGES,gnupg)
@$(call add,INSTALL2_CLEANUP_PACKAGES,libgnutls*)
# leave only cirrus, fbdev, qxl, vesa in vm-targeted images
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)
@ -90,7 +125,7 @@ use/install2/cleanup/x11-hwdrivers:
# massive purge of anything not critical to installer boot (l10n included!)
use/install2/cleanup/everything: use/install2/cleanup/x11-hwdrivers \
use/install2/cleanup/vnc use/install2/cleanup/crypto
@$(call add,INSTALL2_CLEANUP_PACKAGES,glibc-gconv-modules glibc-locales)
@$(call add,INSTALL2_CLEANUP_PACKAGES,glibc-locales)
@$(call add,INSTALL2_CLEANUP_PACKAGES,libX11-locales alterator-l10n)
@$(call add,INSTALL2_CLEANUP_PACKAGES,kbd-data kbd console-scripts)
@$(call add,INSTALL2_CLEANUP_PACKAGES,shadow-convert)

View File

@ -1,5 +1,5 @@
#!/bin/sh
# NB: grub is currently the default in ALT Linux
# NB: grub is currently the default in ALT
sed -ri "s/^(grub|lilo)$/$GLOBAL_BASE_BOOTLOADER/" \
/usr/share/install2/installer-steps

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

@ -12,6 +12,7 @@ rm -rf /usr/lib/qt4/plugins/codecs
rm -rf /usr/lib/qt4/plugins/bearer
rm -rf /usr/lib/qt4/plugins/inputmethods
rm -rf /usr/share/qt4/{doc,mkspecs,phrasebooks}
rm -rf /usr/lib*/qt5/plugins/{bearer,platformthemes}
rm -rf /usr/share/guile/*/{*.txt,scripts}
rm -rf /usr/share/awk/
@ -19,15 +20,18 @@ rm -rf /usr/share/awk/
# and no systemd either
[ -L /sbin/init ] || rm -rf /lib/systemd/system
# save VNC install if present
MORE=
[ -x /usr/bin/x11vnc ] || MORE="libGL libEGL libgbm libwayland\\* xterm"
### could it be handled with any grace?
rpmquery -a common-licenses \
cpp\* gcc\* perl-base file ipv6calc \
bind-utils libbind \
libmpfr\* libmpc\* \
libsoup\* \
libwayland\* libgbm \
libGL libEGL glxinfo xdriinfo \
xdg-utils xterm \
$MORE glxinfo xdriinfo \
xdg-utils \
mkfontscale mkfontdir \
make make-initrd \
| xargs -r rpmi -e --nodeps --

View File

@ -30,7 +30,8 @@ rm -rf /lib/modules/*/kernel/drivers/char/watchdog
rm -rf /lib/modules/*/kernel/drivers/cpufreq
rm -rf /lib/modules/*/kernel/drivers/edac
rm -rf /lib/modules/*/kernel/drivers/gpio
rm -rf /lib/modules/*/kernel/drivers/hwmon
# NB: leave hwmon.ko
rm -rf /lib/modules/*/kernel/drivers/hwmon/[^h]
rm -rf /lib/modules/*/kernel/drivers/infiniband ###
rm -rf /lib/modules/*/kernel/drivers/input/{gameport,joy*}
rm -rf /lib/modules/*/kernel/drivers/isdn

View File

@ -26,3 +26,10 @@ find /usr/lib/locale -mindepth 1 -maxdepth 1 -type d \! -name '*.utf8' -print0 |
# dangling symlinks
find /usr/lib/locale \! -readable -delete
find /usr/share/qt5/translations/ -type f | \
grep -v -e '/qtbase_[[:alpha:]][[:alpha:]]*\.qm$' \
-e '/alterator_browser_qt_[[:alpha:]][[:alpha:]]*\.qm$' | \
while read f; do
rm -f "$f"
done

View File

@ -7,12 +7,29 @@ endif
use/kernel:
@$(call add_feature)
@$(call set,KFLAVOURS,std-def)
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:
@$(call add,THE_KMODULES,e1000e igb)
@$(call add,MAIN_KMODULES,r8168 rtl8168)
use/kernel/wireless:
use/kernel/wireless: use/firmware/wireless
@$(call add,THE_KMODULES,bcmwl ndiswrapper)
use/kernel/laptop: use/firmware/laptop
@$(call add,THE_KMODULES,omnibook tp_smapi)
use/kernel/desktop:
@$(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)

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