Compare commits

...

302 Commits

Author SHA1 Message Date
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
250 changed files with 1554 additions and 381 deletions

View File

@@ -1,8 +1,8 @@
Name: mkimage-profiles
Version: 1.1.89
Version: 1.2.0
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 fop fonts-ttf-dejavu
BuildRequires: rsync
Requires: rsync git-core
Requires: time schedutils sfdisk
@@ -26,10 +26,7 @@ Requires: mkimage-preinstall
%def_with doc
%define docs $HOME/docs
%package doc
Summary: %name documentation
Group: Development/Documentation
%{?_with_doc:BuildRequires: java /proc}
Summary(ru_RU.UTF-8): метапрофиль дистрибутивов на базе Альт
%description
mkimage-profiles is a collection of bits and pieces useful for
@@ -40,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
@@ -55,12 +53,52 @@ 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
@@ -90,6 +128,74 @@ mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
%endif
%changelog
* 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

View File

@@ -1,6 +0,0 @@
object 178e3bf24ca4bad2a448511e12dcc0c25e67cc17
type commit
tag v1.1.89
tagger Michael Shigorin <mike@altlinux.org> 1461605403 +0300
pre-starterkits-p8

View File

@@ -0,0 +1,6 @@
object 9bb71fbbd1f51fd8053d8a42bbfa37a4fb9ad23c
type commit
tag v1.1.110
tagger Michael Shigorin <mike@altlinux.org> 1501531437 +0300
v1.1.110

View File

@@ -1 +1 @@
e32b5d8bde2c81471fd04d880c9ce520ba3cc875 v1.1.89
f35b0b48a2974939329f5ad742018ad5dd88b5f3 v1.1.110

View File

@@ -3,7 +3,7 @@ http://en.altlinux.org/Hasher; large tmpfs helps a lot).
требуется
~~~~~~~~~
- ALT Linux 7.0 или выше (возможна адаптация "вниз")
- ALT 8.0 или выше (возможна адаптация "вниз", см. ветки)
- установленный mkimage (свежий, как и hasher)
- пользователь с правом запуска hasher и подключения /proc к нему
@@ -51,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)

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,6 +2,8 @@
# 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

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,7 +31,9 @@ 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 virtio-scsi virtio-blk"
@@ -44,6 +46,12 @@ arm*)
BOOTPART="1"
ROOTPART="2"
;;
e2k)
BOOTFSTYPE="ext2" # firmware knows it
BLOCKDEV="/dev/sda" # ...hopefully...
BOOTPART="1"
ROOTPART="2"
;;
esac
# figure out the part taken by /boot in the given tarball
@@ -130,7 +138,10 @@ exit_handler() {
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"
@@ -203,14 +214,33 @@ if [ -n "$BOOTPART" ]; then
fi
echo "MODULES_PRELOAD += $INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
echo "FEATURES += qemu" >> "$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
if [ -s .origver ]; then
read KVER < .origver
fi
[ -n "$KVER" ] || fatal "unable to deduce kernel version"
chroot "$ROOTFS" make-initrd -k "$KVER"
rm -f .origver
# ...target device too
sed -i "s,$LOOPROOT,$ROOTDEV," "$ROOTFS/etc/fstab"
if [ -f boot.conf ]; then
sed -i -e "s,@ROOTUUID@,$ROOTUUID,g" -e "s,@KVER@,$KVER,g" boot.conf
fi
popd
if [ -x "$ROOTFS"/sbin/lilo ]; then
# configure and install bootloader
REGEXP='^.*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
@@ -245,5 +275,5 @@ image=/boot/vmlinuz
fi
if [ -n "$SUDO_USER" ]; then
chown "$SUDO_USER" "$IMG" "$ROOTFS" "$WORKDIR"
chown "$SUDO_USER:$(id -g "$SUDO_USER")" "$IMG" "$ROOTFS" "$WORKDIR" ||:
fi

2
conf.d/Makefile Normal file
View File

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

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

@@ -0,0 +1,72 @@
ifeq (distro,$(IMAGE_CLASS))
distro/alt-workstation: workstation_groups = $(addprefix workstation/,\
10-office 20-networking 30-multimedia 40-virtualization 50-publishing \
3rdparty agents blender clamav cloud-clients emulators freecad \
ganttproject gnome-peer-to-peer graphics-editing gtk-dictionary \
kvm libreoffice mate-usershare pidgin raccess \
scanning scribus smartcard sound-editing thunderbird virtualbox \
vlc voip-clients)
distro/alt-workstation: distro/.base use/luks \
+installer +power +systemd +pulse +vmguest +wireless +efi \
use/kernel/net use/docs/license \
use/memtest use/bootloader/grub \
use/install2/fs use/install2/vnc use/install2/repo \
use/install2/suspend use/x11/xorg use/sound use/xdg-user-dirs \
mixin/desktop-installer \
use/efi/refind use/efi/memtest86 use/efi/shell use/rescue/base \
use/branding/complete \
use/fonts/install2 use/install2/fs \
use/fonts/otf/adobe use/fonts/otf/mozilla \
use/fonts/ttf/google/extra use/fonts/ttf/redhat use/fonts/ttf/ubuntu \
use/l10n/default/ru_RU \
use/control use/services \
use/live/install use/live/suspend use/live/x11 use/live/repo \
use/live/rw \
use/x11/lightdm/gtk use/docs/manual use/x11/gtk/nm +nm \
use/fonts/ttf/google use/domain-client/full \
use/browser/firefox use/browser/firefox/esr
@$(call set,BRANDING,alt-workstation)
@$(call add,THE_BRANDING,mate-settings)
@$(call add,STAGE1_MODLISTS,stage2-mmc)
@$(call set,INSTALLER,altlinux-desktop)
@$(call add,INSTALL2_PACKAGES,alterator-notes)
@$(call add,INSTALL2_PACKAGES,volumes-profile-regular)
@$(call add,INSTALL2_PACKAGES,open-iscsi)
@$(call add,COMMON_PACKAGES,vim-console)
@$(call add,MAIN_PACKAGES,solaar)
@$(call add,MAIN_GROUPS,$(workstation_groups))
@$(call add,MAIN_LISTS,workstation/extras)
@$(call add,MAIN_LISTS,$(call tags,xorg vaapi))
@$(call add,BASE_LISTS,workstation/base.pkgs)
@$(call add,BASE_LISTS,$(call tags,desktop cups))
@$(call add,LIVE_LISTS,workstation/live.pkgs)
@$(call add,LIVE_LISTS,$(call tags,desktop sane))
@$(call add,LIVE_LISTS,$(call tags,desktop office))
@$(call add,THE_LISTS,workstation/mate)
@$(call add,THE_LISTS,workstation/the.pkgs)
@$(call add,THE_LISTS,$(call tags,regular desktop))
@$(call add,THE_LISTS,$(call tags,base regular))
@$(call add,THE_LISTS,$(call tags,base l10n))
@$(call add,THE_LISTS,$(call tags,base desktop))
@$(call add,THE_LISTS,$(call tags,archive extra))
@$(call add,THE_LISTS,$(call tags,mobile mate))
@$(call add,THE_KMODULES,staging)
@$(call add,BASE_KMODULES,kvm virtualbox)
@$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power)
@$(call add,CLEANUP_PACKAGES,xterm)
@$(call add,EFI_BOOTARGS,lang=ru_RU)
@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
@$(call add,CONTROL,xdg-user-dirs:enabled)
@$(call add,SERVICES_ENABLE,sshd)
@$(call add,SERVICES_ENABLE,cups smb nmb httpd2 bluetoothd libvirtd)
@$(call add,DEFAULT_SERVICES_ENABLE,fstrim.timer)
@$(call add,DEFAULT_SERVICES_DISABLE,powertop bridge gpm)
@$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_VOL_SET,ALT)
@$(call set,META_VOL_ID,ALT Workstation)
@$(call set,META_APP_ID,8.1/$(ARCH))
@$(call set,DOCS,alt-workstation)
endif

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

@@ -0,0 +1,16 @@
ifeq (vm,$(IMAGE_CLASS))
vm/e2k-live: vm/bare use/e2k use/deflogin/live use/control/sudo-su
@$(call add,THE_PACKAGES,openssh)
@$(call add,THE_LISTS,$(call tags,ve tools))
vm/e2k-rescue: vm/e2k-live use/tty/S0 use/net-eth/dhcp use/services/lvm2-disable
@$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
@$(call add,THE_LISTS,$(call tags,server && (network || extra)))
@$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd)
vm/e2k-xfce: vm/e2k-rescue use/e2k/x11 use/x11/xfce \
use/l10n/default/ru_RU use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call add,THE_PACKAGES,xinit xterm firefox mc)
endif

View File

@@ -1,7 +1,8 @@
# live images
ifeq (distro,$(IMAGE_CLASS))
distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
distro/dos: distro/.init use/dos use/syslinux/ui/menu
@$(call set,RELNAME,ALT FreeDOS)
distro/rescue: distro/.base use/rescue use/syslinux/ui/menu \
use/efi/signed use/efi/refind use/efi/shell; @:
@@ -52,7 +53,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
@@ -121,7 +123,7 @@ distro/live-robo: distro/live-icewm +robotics use/live/ru; @:
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)

View File

@@ -1,50 +1,51 @@
# p8 base kits
mixin/p8: use/browser/firefox/esr
@$(call set,BRANDING,basealt-starterkit)
@$(call set,IMAGE_FLAVOUR,$(subst basealt-p8-,,$(IMAGE_NAME)))
@$(call set,META_VOL_ID,BaseALT p8 $$(IMAGE_FLAVOUR)/$(ARCH))
@$(call set,BRANDING,alt-starterkit)
@$(call set,IMAGE_FLAVOUR,$(subst alt-p8-,,$(IMAGE_NAME)))
@$(call set,META_VOL_ID,ALT p8 $$(IMAGE_FLAVOUR)/$(ARCH))
ifeq (distro,$(IMAGE_CLASS))
distro/basealt-p8-cinnamon: distro/regular-cinnamon mixin/p8; @:
distro/basealt-p8-icewm: distro/regular-icewm mixin/p8; @:
distro/basealt-p8-gnome3: distro/regular-gnome3 mixin/p8; @:
distro/basealt-p8-gnustep: distro/regular-gnustep mixin/p8; @:
distro/basealt-p8-kde4: distro/regular-kde4 mixin/p8; @:
distro/basealt-p8-kde5: distro/regular-kde5 mixin/p8; @:
distro/basealt-p8-lxde: distro/regular-lxde mixin/p8; @:
distro/basealt-p8-lxqt: distro/regular-lxqt mixin/p8; @:
distro/basealt-p8-lxqt-sysv: distro/regular-lxqt-sysv mixin/p8; @:
distro/basealt-p8-mate: distro/regular-mate mixin/p8; @:
distro/basealt-p8-rescue: distro/regular-rescue mixin/p8; @:
distro/basealt-p8-tde: distro/regular-tde mixin/p8; @:
distro/basealt-p8-tde-sysv: distro/regular-tde-sysv mixin/p8; @:
distro/basealt-p8-wmaker: distro/regular-wmaker mixin/p8; @:
distro/basealt-p8-xfce: distro/regular-xfce mixin/p8; @:
distro/basealt-p8-xfce-sysv: distro/regular-xfce-sysv mixin/p8; @:
distro/alt-p8-cinnamon: distro/regular-cinnamon mixin/p8; @:
distro/alt-p8-icewm: distro/regular-icewm mixin/p8; @:
distro/alt-p8-gnome3: distro/regular-gnome3 mixin/p8; @:
distro/alt-p8-gnustep: distro/regular-gnustep mixin/p8; @:
distro/alt-p8-kde4: distro/regular-kde4 mixin/p8; @:
distro/alt-p8-kde5: distro/regular-kde5 mixin/p8; @:
distro/alt-p8-lxde: distro/regular-lxde mixin/p8; @:
distro/alt-p8-lxde-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/basealt-p8-enlightenment: distro/regular-enlightenment mixin/p8
@$(call set,META_VOL_ID,BaseALT p8 E/$(ARCH))
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-openstack: distro/regular-server-openstack mixin/p8; @:
distro/alt-p8-server-pve: distro/regular-server-pve mixin/p8; @:
distro/basealt-p8-sysv-tde: distro/regular-sysv-tde mixin/p8; @:
distro/basealt-p8-jeos: distro/regular-jeos mixin/p8; @:
distro/basealt-p8-jeos-ovz: distro/regular-jeos-ovz mixin/p8; @:
distro/basealt-p8-server: distro/regular-server mixin/p8; @:
distro/basealt-p8-server-ovz: distro/regular-server-ovz mixin/p8; @:
distro/basealt-p8-server-hyperv: distro/regular-server-hyperv mixin/p8; @:
distro/basealt-p8-server-samba4: distro/regular-server-samba4 mixin/p8; @:
distro/basealt-p8-builder: distro/regular-builder mixin/p8; @:
distro/alt-p8-builder: distro/regular-builder mixin/p8; @:
endif
ifeq (ve,$(IMAGE_CLASS))
ve/basealt-p8-ovz-generic: ve/generic mixin/p8; @:
ve/alt-p8-ovz-generic: ve/generic mixin/p8; @:
endif
ifeq (vm,$(IMAGE_CLASS))
vm/basealt-p8-vm-net: vm/net mixin/p8; @:
vm/basealt-p8-cloud: vm/cloud-systemd mixin/p8; @:
vm/alt-p8-vm-net: vm/net mixin/p8; @:
vm/alt-p8-cloud: vm/cloud-systemd mixin/p8; @:
endif

View File

@@ -13,33 +13,36 @@ distro/.regular-x11: distro/.regular-base +vmguest +wireless \
use/live/x11 use/live/install use/live/suspend \
use/live/repo use/live/rw use/luks use/x11/wacom use/ntp/client \
use/branding use/browser/firefox/live use/browser/firefox/i18n \
use/browser/firefox/h264
use/browser/firefox/h264 use/services/lvm2-disable
@$(call add,LIVE_PACKAGES,volumes-profile-regular)
@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
@$(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,pam-limits-desktop)
@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
@$(call add,THE_PACKAGES,alterator-notes)
@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
@$(call set,THE_IMAGEWRITER,imagewriter)
# WM base target
distro/.regular-wm: distro/.regular-x11 mixin/regular-desktop
distro/.regular-wm: distro/.regular-x11 mixin/regular-desktop; @:
# 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)
@$(call add,THE_BRANDING,bootloader)
@$(call add,THE_PACKAGES,upower bluez)
@$(call add,THE_PACKAGES,disable-usb-autosuspend)
@$(call add,THE_PACKAGES,vconsole-setup-kludge) #28805
@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
@$(call set,KFLAVOURS,std-def)
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
@@ -55,20 +58,25 @@ distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
@$(call add,THE_BRANDING,alterator)
# common base for the very bare distros
distro/.regular-jeos: distro/.regular-bare use/isohybrid +sysvinit \
use/branding use/bootloader/lilo use/syslinux/lateboot.cfg \
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/jeos use/net/etcnet use/power/acpi/button
@$(call add,STAGE2_BOOTARGS,vga=0)
@$(call add,BASE_KMODULES,guest scsi vboxguest)
@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
use/net/etcnet use/power/acpi/button
@$(call set,BOOTVGA,)
@$(call set,INSTALLER,altlinux-generic)
@$(call add,INSTALL2_BRANDING,alterator notes)
@$(call add,THE_BRANDING,alterator) # just to be cleaned up later on
@$(call add,THE_PACKAGES,apt basesystem dhcpcd 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 \
@@ -90,10 +98,22 @@ distro/.regular-install-x11: distro/.regular-install \
@$(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
# 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/branding/complete use/branding/slideshow/once \
use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base
@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
distro/regular-icewm: distro/.regular-sysv-gtk +icewm +nm \
use/x11/lightdm/gtk use/init/sysv/polkit use/deflogin/sysv/nm \
use/browser/chromium use/fonts/ttf/redhat
@$(call add,LIVE_LISTS,$(call tags,desktop nm))
@$(call add,LIVE_LISTS,$(call tags,regular icewm))
@$(call add,LIVE_PACKAGES,mnt winswitch xpra)
@$(call add,LIVE_PACKAGES,icewm-startup-networkmanager)
@$(call set,KFLAVOURS,un-def)
mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
@@ -104,7 +124,7 @@ mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
# 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
@@ -117,47 +137,59 @@ distro/regular-gnustep: distro/.regular-sysv \
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; @:
mixin/regular-xfce: use/x11/xfce use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:
distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \
use/x11/xfce/full use/domain-client
@$(call set,KFLAVOURS,un-def)
mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
use/x11/lightdm/gtk \
use/browser/firefox use/browser/firefox/classic \
use/browser/firefox/i18n use/browser/firefox/h264 \
use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call add,THE_PACKAGES,xfce4-mixer pm-utils elinks mpg123)
distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
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 \
mixin/regular-lxde: use/x11/lxde use/fonts/infinality \
use/x11/gtk/nm use/im +nm
@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde
@$(call add,THE_PACKAGES,lxde)
distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde
@$(call add,THE_PACKAGES,lxde-sysvinit)
distro/regular-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
use/x11/mate use/fonts/ttf/google use/domain-client
@$(call add,LIVE_LISTS,$(call tags,mobile mate))
@$(call add,LIVE_LISTS,$(call tags,desktop sane))
@$(call add,LIVE_LISTS,$(call tags,base smartcard))
distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @:
distro/regular-enlightenment: distro/.regular-gtk \
use/x11/enlightenment use/fonts/infinality
@$(call set,META_VOL_ID,ALT Linux regular-E/$(ARCH))
use/x11/enlightenment use/fonts/infinality; @:
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
use/x11/cinnamon use/fonts/infinality use/fonts/ttf/google \
use/net/nm/mmgui use/im; @:
# 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)
@@ -165,17 +197,16 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
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)
@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
use/x11/gtk/nm use/net/nm/mmgui
@$(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/browser/konqueror4 use/fonts/zerg use/domain-client \
use/net/nm/mmgui +pulse +plymouth
@$(call add,THE_LISTS,$(call tags,regular kde4))
@$(call add,THE_PACKAGES,fonts-ttf-levien-inconsolata)
@@ -183,8 +214,7 @@ distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
@$(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)
use/browser/qupzilla use/x11/gtk/nm +nm +plymouth
@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:
@@ -198,7 +228,7 @@ 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 \
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)
@@ -209,34 +239,43 @@ distro/regular-kde5: distro/.regular-desktop \
# 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/firmware/qlogic use/mediacheck test/rescue/no-x11 \
+wireless +sysvinit
mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
use/syslinux/ui/menu use/syslinux/timeout/600 \
use/firmware/qlogic test/rescue/no-x11 +sysvinit; @:
distro/regular-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 || bench)))
@$(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))
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-sysv-tde: distro/.regular-install-x11-full mixin/regular-tde
@$(call add,THE_LISTS,$(call tags,base desktop))
@$(call add,THE_LISTS,$(call tags,regular tde))
@$(call add,THE_PACKAGES,kpowersave)
@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
distro/.regular-server: distro/.regular-install \
use/server/mini use/firmware/qlogic use/rescue/base \
use/cleanup/x11 use/stage2/kms
@$(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; @:
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: distro/.regular-server-base \
use/server/mini use/firmware/qlogic use/rescue/base 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)
@@ -246,13 +285,14 @@ distro/.regular-server-managed: distro/.regular-server
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
distro/regular-server: distro/.regular-server-managed use/server/groups/base
@$(call add,MAIN_GROUPS,sambaDC-server)
@$(call add,MAIN_GROUPS,hyperv-tools)
distro/regular-server: distro/.regular-server-managed \
use/server/groups/base 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,vzstats)
@$(call add,MAIN_GROUPS,tools/vzstats)
distro/regular-server-hyperv: distro/.regular-server-managed
@$(call set,KFLAVOURS,un-def)
@@ -260,6 +300,27 @@ distro/regular-server-hyperv: distro/.regular-server-managed
@$(call add,DEFAULT_SERVICES_DISABLE,bridge smartd)
@$(call add,DEFAULT_SERVICES_DISABLE,cpufreq-simple powertop)
distro/.regular-server-openstack: distro/.regular-server-base \
use/firmware/qlogic use/server/groups/openstack
@$(call add,MAIN_GROUPS,tools/ipmi tools/monitoring)
distro/regular-server-openstack: distro/.regular-server-openstack +systemd; @:
distro/regular-server-openstack-sysv: distro/.regular-server-openstack +sysvinit
@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmetad)
distro/regular-server-pve: distro/.regular-server-base \
use/firmware/qlogic +efi +systemd
@$(call set,BASE_BOOTLOADER,grub)
@$(call set,INSTALLER,altlinux-server)
@$(call add,INSTALL2_PACKAGES,installer-feature-pve)
@$(call add,THE_PACKAGES,pve-manager nfs-clients su)
@$(call add,THE_PACKAGES,bridge-utils dhcpcd faketime tzdata postfix)
@$(call add,THE_KMODULES,ipset kvm)
@$(call add,DEFAULT_SERVICES_DISABLE,pve-manager pve-cluster \
pve-firewall pve-ha-crm pve-manager pveproxy pvedaemon \
pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy)
distro/regular-builder: distro/.regular-bare \
use/dev/builder/full +sysvinit +efi +power \
use/live/base use/live/rw use/live/repo/online use/live/textinstall \
@@ -270,9 +331,9 @@ distro/regular-builder: distro/.regular-bare \
@$(call add,LIVE_PACKAGES,ccache rpm-utils wodim)
@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
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)
endif

View File

@@ -4,11 +4,11 @@ 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)
@@ -16,6 +16,14 @@ ve/ldv: ve/bare
ve/docker: ve/.base use/repo; @:
# build environment
ve/builder: ve/base use/repo
@$(call add,BASE_PACKAGES,vim-console git-core bash-completion zsh)
@$(call add,BASE_PACKAGES,su hasher mkimage-profiles rpm-build)
@$(call add,BASE_PACKAGES,rsync screen parallel pv)
@$(call add,BASE_PACKAGES,fdisk e2fsprogs iproute2 net-tools)
@$(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)
@@ -29,8 +37,11 @@ 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/.base use/net/networkd +systemd \
use/control/sudo-su use/repo use/net-ssh
@$(call add,BASE_PACKAGES,interactivesystem su)
@$(call add,BASE_LISTS,openssh)
endif

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,6 +16,8 @@ ALT Linux 7.0+ и GNU make 3.82+ (на которых и разрабатыва
** ожидает, что каждая подлежащая трассированию цель каждого
makefile при сборке конфигурации образа содержит непустой
recipe -- хотя бы "; @:" -- т.к. зависит от запуска $(SHELL)
** трассировка выполняется при REPORT=1 для формирования графа
зависимостей между промежуточными целями сборки конечного образа
** характерный признак пропуска -- разрыв графа (report-targets.png)
* pkg.in/lists/Makefile

View File

@@ -16,16 +16,16 @@
.\" 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" "7" "February 2016" "mkimage-profiles @VERSION@" "ALT Linux"
.TH "MKIMAGE-PROFILES" "9" "June 2017" "mkimage-profiles @VERSION@" "ALT"
.SH "NAME"
mkimage-profiles \- ALT Linux distribution family metaprofile
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 Linux package repositories.
builds operating environment images based on ALT package repositories.
Run
.BR make\ help
@@ -50,7 +50,7 @@ can be used to obtain build dependency graphs.
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
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.
@@ -59,7 +59,7 @@ 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 Linux must:
The next-generation image build system for ALT must:
.TP
1.
provide reasonable means to describe common/differing aspects within
@@ -108,7 +108,7 @@ Report bugs to http://bugzilla.altlinux.org
.br
(Sisyphus project, mkimage-profiles component).
.SH "COPYRIGHT"
Copyright \(co) 2010-2016 Michael Shigorin <mike@altlinux.org>
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

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
** подаёт сигнал после завершения сборки
** значение: пусто (по умолчанию нет) либо любая строка

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

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

View File

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

View File

@@ -1,13 +1,13 @@
use/browser:
@$(call add_feature)
@$(call add,THE_PACKAGES_REGEXP,$$(THE_BROWSER))
@$(call try,THE_BROWSER,webclient) # fallback
@$(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/palemoon \
use/browser/chromium use/browser/epiphany \
use/browser/qupzilla use/browser/rekonq \
use/browser/elinks use/browser/links2: \
@@ -45,6 +45,9 @@ use/browser/firefox/classic: use/browser/firefox
use/browser/seamonkey/i18n: use/browser/seamonkey
@$(call add,THE_BROWSER,seamonkey-ru)
use/browser/palemoon/i18n: use/browser/palemoon
@$(call add,THE_BROWSER,palemoon-ru)
# inherently insecure, NPAPI only
use/browser/plugin/flash: use/browser
@$(call add,THE_PACKAGES,mozilla-plugin-adobe-flash)

View File

@@ -17,10 +17,10 @@ DATE_F := $(shell date +%F)
BOOT_TYPE := isolinux
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:

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

@@ -9,5 +9,12 @@ kver="$(rpm -qa 'kernel-image*' \
| 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

@@ -20,9 +20,12 @@ check-sudo:
fi
prepare-image: check-sudo
@if ! sudo $(TOPDIR)/bin/tar2fs \
@if [ -x $(MKIMAGE_PREFIX)/bin/tar2fs ]; then \
TOPDIR=$(MKIMAGE_PREFIX); \
fi; \
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; \
echo "** error: sudo tar2fs failed, see build log" >&2; \
exit 1; \
fi

View File

@@ -37,7 +37,7 @@ use/cleanup/jeos: use/cleanup/x11-alterator
# mostly non-interactive system
use/cleanup/jeos/full: use/cleanup/jeos
@$(call add,CLEANUP_PACKAGES,interactivesystem 'groff*' man stmpclean)
@$(call add,CLEANUP_PACKAGES,glibc-gconv-modules gettext)
@$(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

@@ -6,7 +6,7 @@ if [ -n "$GLOBAL_VERBOSE" ]; then
echo "** GLOBAL_CLEANUP_BASE_PACKAGES: $GLOBAL_CLEANUP_BASE_PACKAGES"
fi >&2
export GLOBAL_CLEANUP_PACKAGES="$GLOBAL_CLEANUP_BASE_PACKAGES \
export GLOBAL_CLEANUP_PACKAGES="$GLOBAL_CLEANUP_PACKAGES \
$GLOBAL_CLEANUP_BASE_PACKAGES"
SCRIPT="/usr/share/install2/postinstall.d/01-remove-pkgs"

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

@@ -39,3 +39,7 @@ 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)

View File

@@ -18,6 +18,7 @@ use/dev/builder/base: use/dev/mkimage use/dev
$(call tags,(base || live) && (server || builder)))
@$(call add,LIVE_PACKAGES,livecd-qemu-arch strace)
@$(call add,LIVE_PACKAGES,qemu-user-binfmt_misc)
@$(call add,LIVE_PACKAGES,perl-Gear-Remotes)
use/dev/builder/full: use/dev/builder/base use/dev/repo
@$(call add,MAIN_LISTS,$(call tags,live 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

@@ -5,8 +5,10 @@ DOT_BASE += docs-$(DOCS)
CHROOT_PACKAGES += docs-$(DOCS)
endif
ifneq (,$(BRANDING))
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"

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

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

View File

@@ -0,0 +1,7 @@
use/e2k:
@$(call add_feature)
@$(call set,KFLAVOURS,mcst-def)
use/e2k/x11: use/e2k use/x11
@$(call add,THE_PACKAGES,xorg-conf-e401-radeon)
@$(call add,THE_PACKAGES,xorg-drv-ati)

View File

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

View File

@@ -0,0 +1,9 @@
#!/bin/sh
CFG="/boot/boot.conf"
[ -f "$CFG" ] || exit 1
[ -n "$GLOBAL_TTY_DEV" -a -n "$GLOBAL_TTY_RATE" ] || exit 0
# tty0 first
sed -i "s/console=tty0 /console=$GLOBAL_TTY_DEV,$GLOBAL_TTY_RATE &/" "$CFG"

View File

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

@@ -9,7 +9,7 @@ use/firmware:
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)

View File

@@ -1,5 +1,5 @@
+sysvinit: use/init/sysv; @:
+systemd: use/init/systemd; @:
+systemd: use/init/systemd/full; @:
use/init:
@$(call add_feature)
@@ -19,6 +19,9 @@ 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)
# 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)

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

@@ -10,21 +10,25 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
@$(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
use/install2/fonts: use/fonts/install2; @:
# see also use/vmguest
use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @:
@@ -53,11 +57,22 @@ use/install2/vbox:
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; @:
@@ -75,14 +90,18 @@ use/install2/reiserfs:
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:
@@ -98,7 +117,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

@@ -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,7 +7,7 @@ endif
use/kernel:
@$(call add_feature)
@$(call set,KFLAVOURS,std-def)
@$(call try,KFLAVOURS,std-def)
# r8168 is a kludge, never install it by default
use/kernel/net:

View File

@@ -7,12 +7,12 @@ _ON = alteratord cpufreq-simple \
random rpcbind plymouth avahi-daemon \
_OFF = anacron blk-availability bridge clamd crond dhcpd dmeventd dnsmasq \
lvm2-lvmetad lvm2-monitor mdadm netfs o2cb ocfs2 openvpn postfix \
rawdevices slapd smartd sshd sysstat update_wms xinetd
mdadm netfs o2cb ocfs2 openvpn postfix rawdevices slapd smartd sshd \
sysstat update_wms xinetd
# copy stage2 as live
# NB: starts to preconfigure but doesn't use/cleanup yet
use/live: use/stage2 sub/rootfs@live sub/stage2@live use/services
use/live: use/stage2 sub/rootfs@live sub/stage2@live use/services/lvm2-disable
@$(call add_feature)
@$(call add,CLEANUP_BASE_PACKAGES,'installer*')
@$(call add,DEFAULT_SERVICES_ENABLE,$(_ON))

View File

@@ -5,11 +5,11 @@ ifdef BUILDDIR
include $(BUILDDIR)/distcfg.mk
ifndef HOMEPAGE
HOMEPAGE = http://wiki.altlinux.org/
HOMEPAGE = http://altlinux.org/
endif
ifndef HOMENAME
HOMENAME = ALT Linux
HOMENAME = ALT
endif
ifndef HOMEWAIT

View File

@@ -7,4 +7,4 @@ PROTO="${GLOBAL_LIVE_REPO%/*}" # http, ftp, rsync
MIRROR="${GLOBAL_LIVE_REPO#*/}" # alt, heanet, kiev, yandex, ...
sed -i "s,^#\(rpm \[.*\] ${PROTO:-http}.*\),\1," \
"/etc/apt/sources.list.d/${MIRROR:-alt}.list"
"/etc/apt/sources.list.d/${MIRROR:-yandex}.list"

View File

@@ -0,0 +1,7 @@
#!/bin/sh
[ -f /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml ] || exit 0
# fixup the default which broke after p8
sed -i 's,name="IconThemeName" type="empty",name="IconThemeName" type="string" value="gnome",' /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml ||:

View File

@@ -7,7 +7,7 @@ METADIR := files/Metadata
WHATEVER += metadata
# handle these too
DOT_BASE += $(BASE_PACKAGES_REGEXP)
DOT_BASE += $(BASE_PACKAGES_REGEXP) $(THE_PACKAGES_REGEXP)
# args: type, name
define dump
@@ -34,11 +34,13 @@ metadata-.base:
} | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' > .base
# see also alterator-pkg (backend3/pkg-install);
# we only tar up what's up to it
# we only tar up what's up to it (note that e.g.
# LIVE_LISTS are needed in the generated profile
# but not for alterator-pkg)
metadata: metadata-.base
@mkdir -p $(METADIR); \
tar -C $(PKGDIR) -cvf - \
$(call rlist,$(THE_GROUPS) $(MAIN_GROUPS) .base) \
$(call rlist,.base $(call groups2lists)) \
$(call rgroup,$(THE_GROUPS) $(MAIN_GROUPS)) \
$(call rprofile,$(PKG_PROFILES)) \
> $(METADIR)/pkg-groups.tar

View File

@@ -0,0 +1,9 @@
Эта фича позволяет сконфигурировать публично доступный
рекурсивный DNS-сервер для условий, когда локальный
неизвестен заранее или попросту отсутствует; следует
понимать, что это в некотором роде утечка данных,
т.е. риск безопасности.
Также возможно указать свои NAMESERVERS через пробел
у себя в фиче или конфигурации дистрибутива, которая
задействует use/net-dns.

View File

@@ -0,0 +1,22 @@
use/net-dns: use/net
@$(call add_feature)
@$(call xport,NAMESERVERS)
use/net-dns/google: use/net-dns
@$(call add,NAMESERVERS,8.8.8.8 8.8.4.4)
use/net-dns/google/v6: use/net-dns
@$(call add,NAMESERVERS,2001:4860:4860::8888)
@$(call add,NAMESERVERS,2001:4860:4860::8844)
use/net-dns/level3: use/net-dns
@$(call add,NAMESERVERS,4.2.2.1 4.2.2.2 4.2.2.3)
use/net-dns/yandex: use/net-dns
@$(call add,NAMESERVERS,77.88.8.8 77.88.8.1)
use/net-dns/yandex/safe: use/net-dns
@$(call add,NAMESERVERS,77.88.8.88 77.88.8.2)
use/net-dns/yandex/family: use/net-dns
@$(call add,NAMESERVERS,77.88.8.7 77.88.8.3)

View File

@@ -0,0 +1,3 @@
#!/bin/sh
# set default nameserver, if any
for i in $GLOBAL_NAMESERVERS; do echo "nameserver $i"; done >> /etc/resolv.conf

View File

@@ -1,5 +1,5 @@
# NB: this is aimed at LiveCD/installer images
+net-eth: use/net-eth use/stage2/net-eth
+net-eth: use/net-eth use/stage2/net-eth; @:
# see also use/stage2/net-eth; do not depend on it though
# as stage2-less images need preconfigured networking too

View File

@@ -64,6 +64,12 @@ write_systemd_iface() {
echo
echo "[Network]"
echo "DHCP=yes"
echo
echo "[DHCP]"
echo "UseMTU=yes"
echo "UseDomains=yes"
echo "UseNTP=yes"
echo
;;
static)
echo "[Match]"

View File

@@ -6,7 +6,7 @@
USERSHARES_DIR="/var/lib/samba/usershares"
USERSHARES_GROUP="sambashare"
DEFAULT_GROUPS='cdwriter cdrom audio proc radio camera floppy xgrp scanner uucp' ###
DEFAULT_GROUPS='cdwriter cdrom audio video proc radio camera floppy xgrp scanner uucp'
GROUPS_FILE="/usr/share/install3/default-groups"
mkdir -p "$USERSHARES_DIR"

View File

@@ -31,4 +31,4 @@ use/net/connman: use/net
use/net/networkd: use/net
@$(call add,THE_PACKAGES,systemd-networkd)
@$(call add,DEFAULT_SERVICES_ENABLE,systemd-networkd)
@$(call add,DEFAULT_SERVICES_ENABLE,systemd-networkd)

View File

@@ -1,6 +1,7 @@
#!/bin/sh
# offer some convenient servers for static configuration cases
# (see also net-dns feature)
if [ -d /etc/net/ifaces/lo ]; then
{
echo "# yandex"
@@ -17,3 +18,4 @@ find /var -name resolv.conf -or -name nsswitch.conf -delete
# hasher might have carried host /etc/hosts over, need to overwrite
echo "127.0.0.1 localhost.localdomain localhost" > /etc/hosts
sed -ri "/^(search|nameserver)/d" /etc/resolv.conf

View File

@@ -2,4 +2,4 @@ use/repo:
@$(call add_feature)
@$(call add,STAGE1_PACKAGES,gnupg)
use/repo/main: sub/main use/repo
use/repo/main: sub/main use/repo; @:

View File

@@ -1,14 +1,14 @@
#!/bin/sh
# enable online repos if possible, just quit if anything's wrong
repo_source='/etc/apt/sources.list.d/alt.list'
host='http://ftp.altlinux.org'
repo_source='/etc/apt/sources.list.d/yandex.list'
[ -s "$repo_source" ] || exit 0
# regexps from alterator-pkg (via installer-feature-online-repo)
prefix_re="[[:space:]]*rpm[[:space:]]\+\([^[:space:]]\+[[:space:]]\+\)\?"
updates_re="${prefix_re}http:\/\/\([^[:space:]]\+\)[[:space:]]*"
host_re="http:\/\/\([^[:space:]]\+\)[[:space:]]\+"
updates_re="${prefix_re}${host_re}\([^[:space:]]\+\/\)\?"
# architectures
host_arch="$(rpm --eval '%_host_cpu')"

View File

@@ -1,4 +1,9 @@
#!/bin/sh
# generate current plaintext rpm pubring representation
KEYDIR="/usr/lib/alt-gpgkeys"
gpg --export --armor --homedir=/usr/lib/alt-gpgkeys >$WORKDIR/RPM-GPG-KEY
if [ -d "$KEYDIR" ]; then
gpg --export --armor --homedir="$KEYDIR" >$WORKDIR/RPM-GPG-KEY
else
echo "** warning: skipping RPM-GPG-KEY generation, $KEYDIR missing" >&2
fi

View File

@@ -5,7 +5,7 @@ use/rescue/.base: use/stage2 sub/stage2@rescue
@$(call add,RESCUE_LISTS,openssh)
use/rescue/base: use/rescue/.base
@$(call add,RESCUE_PACKAGES,pciutils)
@$(call add,RESCUE_PACKAGES,pciutils nfs-utils os-prober)
@$(call add,RESCUE_LISTS,\
$(call tags,base && (rescue || network || security || archive)))

View File

@@ -1,4 +1,4 @@
#!/bin/sh
# enable online repository even more unconditionally
sed -i "s,^#\(rpm \[alt\] http.*\),\1," "/etc/apt/sources.list.d/alt.list"
sed -i "s,^#\(rpm \[alt\] http.*\),\1," "/etc/apt/sources.list.d/yandex.list"

View File

@@ -1,27 +1,31 @@
use/server: use/power/acpi/button
@$(call add_feature)
use/server/mini: use/server use/firmware/server \
use/server/base: use/server use/firmware/server \
use/net-ssh use/syslinux/timeout/600
@$(call set,BOOTVGA,)
@$(call add,THE_LISTS,server-base)
@$(call add,THE_KMODULES,e1000e igb)
@$(call add,STAGE1_KMODULES,e1000e igb)
@$(call add,INSTALL2_PACKAGES,installer-feature-server-raid-fixup-stage2)
use/server/mini: use/server/base use/services/lvm2-disable
@$(call add,THE_LISTS,\
$(call tags,base && (server || network || security || pkg)))
$(call tags,base && (network || security || pkg)))
@$(call add,THE_LISTS,$(call tags,extra && (server || network)))
@$(call add,MAIN_LISTS,osec)
@$(call add,INSTALL2_PACKAGES,installer-feature-server-raid-fixup-stage2)
@$(call add,DEFAULT_SERVICES_DISABLE,messagebus lvm2-lvmetad)
@$(call add,DEFAULT_SERVICES_DISABLE,messagebus)
use/server/ovz-base: use/server
@$(call set,STAGE1_KFLAVOUR,std-def)
@$(call set,KFLAVOURS,std-def ovz-el)
@$(call add,BASE_PACKAGES,lftp wget)
@$(call add,BASE_PACKAGES,lftp wget hdparm)
@$(call add,BASE_LISTS,$(call tags,base openvz))
use/server/ovz: use/server/ovz-base
@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring)
@$(call add,MAIN_KMODULES,xtables-addons) # t6/branch
@$(call add,MAIN_KMODULES,drbd83 kvm)
@$(call add,MAIN_KMODULES,drbd kvm)
@$(call add,MAIN_KMODULES,staging)
@$(call add,BASE_LISTS,$(call tags,server openvz))
@@ -33,11 +37,17 @@ use/server/zabbix: use/server use/services use/control
@$(call add,CONTROL,postfix:server)
use/server/groups/tools: use/server
@$(call add,MAIN_GROUPS,diag-tools ipmi monitoring)
@$(call add,MAIN_GROUPS,tools/diag tools/ipmi tools/monitoring)
@$(call add,MAIN_GROUPS,tools/tuning)
use/server/groups/services: use/server
@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
@$(call add,MAIN_GROUPS,dhcp-server mail-server mysql-server)
@$(call add,MAIN_GROUPS,pgsql-server)
@$(call add,MAIN_GROUPS,server/dns server/http server/ftp server/kvm)
@$(call add,MAIN_GROUPS,server/dhcp server/mail server/mysql)
@$(call add,MAIN_GROUPS,server/pgsql)
use/server/groups/base: use/server/groups/tools use/server/groups/services; @:
use/server/groups/openstack: use/server
@$(call add,MAIN_GROUPS,openstack/block openstack/compute)
@$(call add,MAIN_GROUPS,openstack/controller openstack/network)
@$(call add,MAIN_GROUPS,openstack/storage)

View File

@@ -4,3 +4,8 @@ use/services: sub/rootfs
@$(call xport,DEFAULT_SERVICES_DISABLE)
@$(call xport,SERVICES_ENABLE)
@$(call xport,SERVICES_DISABLE)
use/services/lvm2-disable: use/services
@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmetad)
@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmpolld)
@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-monitor)

View File

@@ -33,19 +33,11 @@ for i in $SERVICES; do
onoff="$(shell_config_get "$STATUS" "$i")"
[ -n "$onoff" ] || continue
echo "$i" >> /usr/share/install2/services-"$onoff"
# create systemd-specific hooks
case "$onoff" in
on)
action=enabled;;
off)
action=disabled;;
*)
continue;;
esac
echo "$i" >> /usr/share/install2/systemd-"$action"
done
cp -a /usr/share/install2/{services-on,systemd-enabled}
cp -a /usr/share/install2/{services-off,systemd-disabled}
rm "$STATUS"
:

View File

@@ -34,6 +34,7 @@ atl2.ko
atp870u.ko
atp.ko
aufs.ko
overlay.ko
axnet_cs.ko
b44.ko
bnx2.ko

View File

@@ -1,2 +1,6 @@
iosf_mbi.ko
mmc_block.ko
mmc_core.ko
sdhci-acpi.ko
sdhci-pci.ko
sdhci.ko

View File

@@ -1 +1,2 @@
kernel/drivers/virtio
kernel/drivers/char/virtio_console

View File

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

View File

@@ -14,7 +14,9 @@
* use/syslinux/%.cfg -- подключение кусочков конфигурации.
Переменные generate.mk:
* BOOTARGS -- дополнительные аргументы загрузчику;
* BOOTLOADER -- isolinux (реализовано с оглядкой на syslinux/syslinux4);
* BOOTVGA -- видеорежим, запрашиваемый у ядра (параметр vga=);
* SYSLINUX_UI -- модуль интерфейса (если не указан, то внутренний prompt);
* SYSLINUX_MODULES -- модули .com или .c32 (перечисляются без расширения);
* SYSLINUX_CFG -- дополнительные кусочки конфигурации (например, localboot).

View File

@@ -0,0 +1 @@
serial 0 115200

View File

@@ -1,5 +1,5 @@
label linux
menu label ^Install @relname@
kernel alt0/vmlinuz
append initrd=alt0/full.cz changedisk fastboot showopts automatic=method:cdrom ramdisk_size=@altinst_size@ vga=0x314 @bootargs@
append initrd=alt0/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts vga=@bootvga@ @bootargs@

View File

@@ -1,5 +1,5 @@
label noapic
menu label ^Failsafe install
kernel alt0/vmlinuz
append initrd=alt0/full.cz changedisk lowmem noapic nolapic showopts ramdisk_size=@altinst_size@ xdriver=vesa @bootargs@
append initrd=alt0/full.cz changedisk ramdisk_size=@altinst_size@ showopts lowmem noapic nolapic xdriver=vesa @bootargs@

View File

@@ -0,0 +1,5 @@
label linux
menu label ^VNC install (<Tab>, IP of vncviewer --listen)
kernel alt0/vmlinuz
append initrd=alt0/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless vncconnect=IP

View File

@@ -0,0 +1,5 @@
label linux
menu label VNC install (<Tab>, set pass^word and connect here)
kernel alt0/vmlinuz
append initrd=alt0/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless vncpasswd=VNCPWD

View File

@@ -1,5 +1,5 @@
label live
menu label ^LiveCD (no hard disk needed)
kernel alt0/vmlinuz
append initrd=alt0/full.cz fastboot live lowmem showopts automatic=method:cdrom ramdisk_size=@live_size@ stagename=live vga=0x314 @bootargs@
append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts lowmem vga=@bootvga@ @bootargs@

View File

@@ -1,5 +1,5 @@
label session
menu label LiveCD with ^sessions support
kernel alt0/vmlinuz
append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@live_size@ stagename=live live_rw vga=0x314 @bootargs@
append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts live_rw vga=@bootvga@ @bootargs@

View File

@@ -1,5 +1,5 @@
label rescue
menu label ^Rescue LiveCD
kernel alt0/vmlinuz
append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue @rescue_bootargs@
append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@

View File

@@ -1,5 +1,5 @@
label rescue_session
menu label Rescue with sess^ions support
kernel alt0/vmlinuz
append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue @rescue_bootargs@ live_rw
append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ live_rw

View File

@@ -1,5 +1,5 @@
label rescue_forensic
menu label ^Forensic mode (leave disks alone)
kernel alt0/vmlinuz
append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@
append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ splash=0 showopts stagename=rescue @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@

View File

@@ -1,5 +1,5 @@
label rescue_remote
menu label Rescue with remote SSH ^access (DHCP)
kernel alt0/vmlinuz
append initrd=alt0/full.cz fastboot live showopts automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue @rescue_bootargs@ quiet ip=dhcp port=22 rootpw=AUTO
append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ quiet ip=dhcp port=22 rootpw=AUTO

View File

@@ -1,5 +1,5 @@
label mediachk
menu label ^Check this media for defects
kernel alt0/vmlinuz
append initrd=alt0/full.cz live quiet lowmem automatic=method:cdrom mediacheck=1 stagename=mediacheck @bootargs@
append initrd=alt0/full.cz live quiet lowmem automatic=method:cdrom mediacheck=1 stagename=mediacheck showopts @bootargs@

View File

@@ -3,7 +3,8 @@ use/syslinux: sub/stage1
@$(call add_feature)
@$(call add,STAGE1_PACKAGES,syslinux)
@$(call try,META_SYSTEM_ID,SYSLINUX)
@$(call set,RELNAME,ALT Linux ($(IMAGE_NAME)))
@$(call try,BOOTVGA,0x314)
@$(call set,RELNAME,ALT ($(IMAGE_NAME)))
# UI is overwritten
use/syslinux/ui/%: use/syslinux

View File

@@ -71,7 +71,7 @@ distro: bootargs
@if [ -n "$(META_VOL_SET)" ]; then \
DISTRO="$(META_VOL_SET)"; \
else \
DISTRO="ALT Linux"; \
DISTRO="ALT"; \
fi; \
sed -i "s,@distro@,$$DISTRO," $(DSTDIR)/*.cfg
@@ -85,6 +85,10 @@ bootargs: clean
sed -i "s,@rescue_bootargs@,$(RESCUE_BOOTARGS)," $(DSTDIR)/*.cfg; \
fi; \
sed -i "s,@rescue_bootargs@,," $(DSTDIR)/*.cfg
@if [ -n "$(BOOTVGA)" ]; then \
sed -i "s,@bootvga@,$(BOOTVGA)," $(DSTDIR)/*.cfg; \
fi; \
sed -i "s,@bootvga@,,;s,vga= ,," $(DSTDIR)/*.cfg
clean: copy
@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \

View File

@@ -2,8 +2,12 @@ use/tty:
@$(call add_feature)
@$(call xport,TTY_DEV)
@$(call xport,TTY_RATE)
ifeq (distro,$(IMAGE_CLASS))
@$(call add,BASE_PACKAGES,installer-feature-serial-stage3)
endif
use/tty/S0: use/tty
@$(call add,THE_PACKAGES,agetty)
@$(call add,TTY_DEV,ttyS0)
@$(call set,TTY_RATE,115200)
@$(call add,SYSLINUX_CFG,ttyS0)

View File

@@ -1,10 +1,14 @@
# x86: various VM guest modules/tools
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+vmguest: use/vmguest/complete; @:
use/vmguest:
@$(call add_feature)
use/vmguest/base: use/vmguest/vbox use/vmguest/vmware; @:
use/vmguest/complete: use/vmguest/base use/vmguest/vbox/x11 use/vmguest/kvm; @:
use/vmguest/complete: use/vmguest/base \
use/vmguest/vbox/x11 use/vmguest/vmware/x11 use/vmguest/kvm; @:
use/vmguest/vbox: use/vmguest
@$(call add,THE_KMODULES,virtualbox-addition vboxguest)
@@ -24,4 +28,10 @@ use/vmguest/vmware:
@$(call add,THE_KMODULES,scsi) # mptspi.ko
use/vmguest/vmware/x11: use/vmguest/vmware
@$(call add,THE_PACKAGES,xorg-drv-vmware)
@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
else
+vmguest: ;@:
endif

View File

@@ -3,7 +3,7 @@
use/wireless:
@$(call add_feature)
@$(call add,THE_KMODULES,bcmwl rt3070 rtl8192 staging)
@$(call add,THE_PACKAGES,wireless-tools rfkill crda iw)
@$(call add,THE_LISTS,tools/wireless)
use/wireless/full: use/wireless use/kernel/wireless; @:
@$(call add,RESCUE_PACKAGES,wireless-tools rfkill crda iw)
@$(call add,RESCUE_LISTS,tools/wireless)

View File

@@ -14,9 +14,9 @@
а заодно обычно рано теряющие поддержку "устаревших"
видеокарт.
Их применение возможно совмещать, но в этом случае следует
понимать, что автоопределение в X.org предпочитает свободный
драйвер и nvidia при наличии nouveau не будет автоматически
выбран, т.е. потребуется дополнительное конфигурирование
(вручную или при помощи alterator-x11) -- для live-систем
это может быть лишено практического смысла.
Возможно предоставлять в образе одновременно свободные и закрытые
драйверы, но в этом случае следует понимать, что автоопределение
в X.org предпочитает свободный драйвер и nvidia при наличии nouveau
не будет автоматически выбран, т.е. потребуется дополнительное
конфигурирование (вручную или при помощи alterator-x11) --
для live-систем это может быть лишено практического смысла.

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