Compare commits

...

502 Commits

Author SHA1 Message Date
Michael Shigorin
18a37af977 1.1.93-alt1
- starterkits-20160612
2016-06-13 19:05:13 +03:00
Michael Shigorin
57aa2732d3 p8.mk: stub server-pve
pve-* packages have just hit p8/branch as well.
2016-06-10 18:39:55 +03:00
Michael Shigorin
d3f54dbdce regular.mk: initial server-pve
This one includes shrek@'s work on proxmox packages
ported to ALT Linux (pve-*) and might be incomplete yet.
2016-06-10 18:39:51 +03:00
Michael Shigorin
a65cbc7fa7 sound/base: add alsa-set-initial-options
...to deal with zero ALSA mixer levels out-of-box.
2016-06-10 11:05:57 +03:00
Michael Shigorin
2e1a5d5915 desktop+lxde+extra: mention deadbeef-incomplete
...instead of bare deadbeef which can't play anything, basically.
2016-06-10 11:00:13 +03:00
Michael Shigorin
8be5b8d476 install2: add xorg-drv-synaptics
This has been spotted by rider@ and reproduced by me as well:
some touchpads would work in livecd/installed system but not
within the installer itself.
2016-06-09 11:45:23 +03:00
Michael Shigorin
7f43723503 desktop+regular: added gpart
...for gparted to use for data recovery attempts.
2016-06-09 11:21:39 +03:00
Michael Shigorin
8dc26e0d1c cleanup: fixed GLOBAL_CLEANUP_BASE_PACKAGES
Commit 514652f has broke GLOBAL_CLEANUP_PACKAGES by accidentally
excluding it from export (in favour of GLOBAL_CLEANUP_BASE_PACKAGES
that's been added then); fix that.
2016-06-07 13:47:53 +03:00
Michael Shigorin
a732c4aa58 stage2: more eMMC-related modules
eMMC installation support has a few bugs:

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

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

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

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

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

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

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

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

How to use:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

So this _will_ be traced properly:

    a: b
	@echo "hello world"

and this will too:

    a: b; @:

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

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

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

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

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

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

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

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

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

imagewriter (the openSUSE's original one) goes to the rest of
DE builds: xdg-su would fallback to gksu if none of the desktops
got "detected", and that means several more megabytes of crap
(completely unneeded in WM-based images I think).
2015-12-04 15:38:08 +03:00
Aleksey Avdeev
58254f05eb install2: Add xorg-drv-vboxvideo
Signed-off-by: Aleksey Avdeev <avdeev@pkcc-tb.ru>
2015-12-03 19:42:46 +03:00
Michael Shigorin
72156f9334 gear-store-tags 2015-11-30 23:44:49 +03:00
Michael Shigorin
08c59ff030 1.1.80-alt1
- pre-starterkit cleanups
2015-11-30 23:44:15 +03:00
Michael Shigorin
12454d7d24 regular+server: add screen
It's been REALLY lacking in server starterkits as of 20150912.
2015-11-30 23:12:21 +03:00
Michael Shigorin
cfdf4dc0cc network+extra: add postfix
It's lacking in server starterkits for no good reason;
if there's another well supported MTA some day that's
challenging postfix as the default in any images,
just drop me a note/commit.
2015-11-30 23:10:57 +03:00
Michael Shigorin
5a1def512b server: add firmware to installers
It's been found out in the field that the lack of firmware
can hurt quite significantly; just add that.
2015-11-30 23:08:02 +03:00
Michael Shigorin
d54e449e75 sysvinit: add etcnet
This is to avoid systemd components getting pulled in
during early dependency resolution stage for no good
reason (see also http://bugzilla.altlinux.org/30806);
should be fixed within mkimage so that hardwiring
both sysklogd and etcnet here gets unneccessary.
2015-11-30 17:17:57 +03:00
Michael Shigorin
547af7bd8a init: drop useless bits
These lines don't effect anything currently due to #30806.
2015-11-30 17:17:08 +03:00
Michael Shigorin
dfed18a5cb Revert "pkg.in/lists/sysvinit: added systemd-services- for remove him as well"
This reverts commit 1c44272f00
which breaks p7 builds with sysvinit emitting this message:

  E: Couldn't find package systemd-services-
2015-11-30 16:50:08 +03:00
Michael Shigorin
41f6e5c820 rescue+extra: added hivex
This package has CLI utilities as well and no X dependencies,
fits ALT Linux Rescue just fine.
2015-11-30 16:50:02 +03:00
Michael Shigorin
bdf15dbd9e desktop+regular: added x11-ssh-askpass
Some regular builds might get their specific ones
but let's provide something for any of those, it's tiny.
2015-11-30 16:49:59 +03:00
Michael Shigorin
21883b057f build.mk: drop an extra space
Spotted when working on http://linuxpiter.ru slides.
2015-11-30 16:49:52 +03:00
Michael Shigorin
cbd0d4d2f5 regular.mk, desktop+regular: use ntp feature
...instead of those two homegrown lines.
2015-11-30 16:49:41 +03:00
Michael Shigorin
df45ac1bca initial ntp feature
This one has been partially implemented for regular builds
but making it generally available seems much better.
2015-11-30 16:49:32 +03:00
Michael Shigorin
514ee63baa gear-store-tags 2015-11-16 22:11:11 +03:00
Michael Shigorin
87c49583ad 1.1.79-alt1
- faked workaround
2015-11-16 22:10:03 +03:00
Michael Shigorin
c388017022 regular.mk: custom VOL_IDs for E-based images
Enlightenment is a long enough word to trigger #28271;
E, on the other hand, is pretty slim to fit that space.

"Volume id: ALT Linux regular-enlightenment/" just isn't
pretty at all.
2015-11-16 21:57:20 +03:00
Michael Shigorin
2d13c05329 regular.mk: move un-def from cinnamon to gnome3
rider@ asked to move gnome3 to un-def kernel flavour,
and there's an unofficial policy for regular builds
that these carry reasonable diversity (in a good sense)
as in various kernels, inits, etc; that diversity would
drop a bit of both GNOME3 based flavours would end up
with the same kernel, so let's mv not cp.
2015-11-16 21:42:50 +03:00
Michael Shigorin
5427f3afdc image.in, stage2: reworked TCB fixup hook
The issue at hand is that:

/etc/tcb/USER/shadow gets USER:auth ownership (OK);
/etc/tcb/USER/shadow- backup file is root:root (broken);
/etc/tcb/USER/shadow.lock file is also root:root (broken).

This is observed for all pseudousers created by package installation
process within working chroots as well as for users created by deflogin
feature; the problem is that e.g. echo USER:PASS | chpasswd will break.

Looks like the cuplrit might be fakeroot/faked.
2015-11-16 20:24:25 +03:00
Michael Shigorin
e02d0cf9f1 regular.mk: added winbind to disabled samba4 services
Samba 4.x in domain controller mode works with "samba"
service, not legacy smbd/nmbd/winbindd; all of those
must be stopped before running the newly-configured one:
http://altlinux.org/SambaDC
2015-11-16 17:36:27 +03:00
Michael Shigorin
fb9f3884de base+desktop+live, network+extra, server+network: added nfs-utils
Ensure NFS client support in distributions with these pkglists:
https://bugzilla.altlinux.org/31498
2015-11-16 16:01:21 +03:00
Michael Shigorin
79b92db55d stage2: mv use/stage2/cifs{-install,}
This has no users in master but out-of-tree branches might need
a trivial update.

The rationale is that it's actually for *any* stage2 and not related
to specifically "install" at all (otherwise it should have been moved
to install2 feature altogether).

Note that there's no reason to add nfs-utils similarly as make-initrd
requires kinit-utils which includes its own nfsmount.
2015-11-16 15:48:33 +03:00
Michael Shigorin
256bd90f20 base+regular: added nfs-utils
All regular images (except for jeos) should be able to work with
or install via NFS, and nfs-utils dependency is finally being
removed from the package carrying mount(8):

https://bugzilla.altlinux.org/31498
2015-11-16 14:52:23 +03:00
Michael Shigorin
0dec1c14ee QUICKSTART: mention BUILDDIR
Some people might end up with setup that leads bin/mktmpdir
to accept e.g. tmpfs on /tmp but that's not enough to build
a larger image (e.g. 2 Gb RAM); let's quickly hint that it's
not the only way to go :-)
2015-11-15 22:25:12 +03:00
Michael Shigorin
073c65efb7 regular.mk, desktop+regular: commoditize gparted
Done due to Balbes' (quite reasonable) suggestion
to do so for all of the installable regular builds
as changing disk partition layout is better made
with the proper tool.

Drop qtparted from lxqt pkglist as it's broken :(

See also (in Russian):
https://forum.altlinux.org/index.php?topic=35681.msg269732#msg269732
2015-11-12 11:16:47 +03:00
Michael Shigorin
4bcc0bbd1d rescue+extra: added afpfs-ng
It's an Apple Filing Protocol client, reportedly with
its own share of problems but working with at least some
AFP versions.
2015-11-10 20:49:47 +03:00
Michael Shigorin
fe6d3d6288 gear-store-tags 2015-11-09 20:37:08 +03:00
Michael Shigorin
c1be1d5bcb 1.1.78-alt1
- regular-enlightenment
2015-11-09 20:36:41 +03:00
Michael Shigorin
16aa4dbcef base+smartcard: added pam_p11
This is what Aladdin folks asked for.
2015-11-09 20:31:45 +03:00
Dmitriy Khanzhin
1c44272f00 pkg.in/lists/sysvinit: added systemd-services- for remove him as well 2015-11-08 17:00:06 +03:00
Michael Shigorin
7e29ad9c18 regular.mk: updated server-samba4
Adjust accordingly to the pkglist having been renamed.
2015-11-06 19:01:02 +03:00
Michael Shigorin
e1721ddec7 server+sambaAD: renamed to server+sambaDC, pruned
samba-DC-4.3.1-alt1 package set introduced task-samba-dc metapackage,
let's use that one while still carrying around what's missing there
and got collected here.
2015-11-06 19:00:43 +03:00
Michael Shigorin
3014fde9fd regular.mk: enable ntpd for desktops
...if any (and there should be some now).
2015-11-03 18:13:17 +03:00
Michael Shigorin
d437a3e971 desktop+regular, regular+tde: commoditize NTP support
It's just wrong to see arbitrary time when LiveCD gets booted,
sem@ tells he runs openntpd in Simply; let's do the same.
2015-11-03 18:13:16 +03:00
Michael Shigorin
d5d5377079 desktop+lxqt+extra: disable arandr
It's a GTK utility, in contrast to the rest of LXQt;
and looks like it's not that needed anymore with
better native display setup (if anyone does prefer
arandr in this particular image, drop me a note).
2015-11-03 18:13:14 +03:00
Michael Shigorin
fd1044d540 regular.mk: move lxqt to sddm
lxqt-lightdm-greeter is finally *really* deprecated,
LXQt's build system has changed enough to warrant its
FTBFS without the same changes.

Note that this won't cut it for p7 starterkits anymore.
2015-11-03 18:13:12 +03:00
Michael Shigorin
8fc08068f3 x11-autologin: updated sddm case
Looks like "LXQt" session type is broken for
sddm 0.12.0 with lxqt 0.10.0 while "lxqt" one
is fine; so be it.
2015-11-03 18:13:11 +03:00
Michael Shigorin
fb1781a4c9 regular.mk: added wmxkbru to wmaker
This one has been suggested by YYY:
https://forum.altlinux.org/index.php?topic=35623.msg268496#msg268496
2015-11-03 18:13:09 +03:00
Michael Shigorin
8b35dcc48a regular.mk: e19 -> enlightenment
The packages have been renamed quite some time ago indeed,
and dancing image URLs don't help a lot.
2015-10-29 16:56:47 +03:00
Michael Shigorin
708cc4fc4b x11: e19 -> enlightenment
The packages have been renamed quite some time ago,
no need to introduce artificial multifurcation.
2015-10-29 16:53:21 +03:00
Michael Shigorin
35dd7ece35 regular.mk: added flashback session to gnome3
This one adds a "classic" GNOME2-like session;
one needs to select it by hand though, and gdm
won't bother them with a selector "gear" widget
unless there's a password set for the user.

Thus no autologin without explicit session
specification seems possible so far.

Note that there's no way to have gdm without
gnome-shell currently.
2015-10-29 16:15:00 +03:00
Michael Shigorin
4534ca313b init: improve systemd debug facilities
The "best" "feature" of systemd "init system" has just
emerged once again: it will happily sit there idling
given startup or shutdown loops resulting in what looks
like a hang to an unsuspecting user; let's provide the
suspecting one with at least some tools described at
http://www.freedesktop.org/wiki/Software/systemd/Debugging
2015-10-20 14:18:18 +03:00
Michael Shigorin
80448ae1bf gear-store-tags 2015-10-19 23:43:39 +03:00
Michael Shigorin
dd8cbc4982 1.1.77-alt1
- webkiosk improvements
2015-10-19 23:43:16 +03:00
Michael Shigorin
206491d078 x11-autologin: nopasswdlogin group for sddm too
See also this somewhat related conversation (in Russian):
https://forum.altlinux.org/index.php?topic=28619.345
2015-10-14 18:50:01 +03:00
Michael Shigorin
b31006e20c live.mk: reduce webkiosk boot noise
Let's try to denoise kiosks a bit (this has been
tested on a project-specific image first)...
2015-10-14 17:29:42 +03:00
Michael Shigorin
37d178800e live.mk: use more of the browser feature
use/browser/firefox/esr was not enough to actually select firefox-esr
as the FX_FLAVOUR handler was simply not getting included (see also
the preceding commit); specify it explicitly.

The future mod might be introducing some "live" flag for that feature
to use it instead of adding livecd-webkiosk-* packages by hand...
2015-10-14 17:21:36 +03:00
Michael Shigorin
4a503294a3 browser: tweak target dependencies
The issue with this was that plain use/browser/firefox/esr
didn't actually pull in the feature as such; it MUST NOT
pull in use/browser/firefox since it will change semantics
from "if it's Firefox make it ESR" to outright "use FX ESR"
(starterkits depend on the former and it was intentional).
2015-10-14 17:04:49 +03:00
Michael Shigorin
ef9b20cd29 rescue+extra: added htop
...so it hits regular-rescue.iso...
2015-10-14 12:59:25 +03:00
Michael Shigorin
3f7d935159 gear-store-tags 2015-10-12 18:47:23 +03:00
Michael Shigorin
33f4fc79ff 1.1.76-alt1
- no more GREP_OPTIONS
2015-10-12 18:43:46 +03:00
Michael Shigorin
5c49535c59 build.mk: get rid of GREP_OPTIONS
It was superfluous in the first place indeed,
and new grep(1) considers the option deprecated.
2015-10-09 16:40:02 +03:00
Michael Shigorin
e37f5e1307 gear-store-tags 2015-09-28 19:34:16 +03:00
Michael Shigorin
1d77e3778b 1.1.75-alt1
- systemd-specific hook for installer (solo@)
2015-09-28 19:32:57 +03:00
Michael Shigorin
1f107fcbd3 regular.mk: font tweaks for test images
Both kde5 and xfce-sysv have received their fair share
of criticism for substandard fonts; zerg@ has proposed
adding droid fonts to the former and someone expressed
their frustration with Terminal fonts in the latter:
http://www.opennet.ru/openforum/vsluhforumID3/104750.html#70

Let's try to make some difference between Xfce based
flavours as well by changing the kernel to a bit more
"bleeding" one as proposed either.
2015-09-24 22:04:32 +03:00
Michael Shigorin
42905a7b5a live.mk, regular.mk: move plymouth to test mediacheck
It was observed in regular-gnustep-20150916-*.iso that
mediacheck boot target sort of starts plymouth bootsplash
when not intended to; let's plug this by moving +plymouth
away to a test image *but* there are couple things with it:

1) supporting plymouth in mediacheck *might* be a good thing
   for distros proper -- this will likely require some support
   on bootsplash theme side either;
2) it's not enough to just drop @bootargs@ from syslinux.cfg
   snippet as the extra payload will still go in to no avail.
2015-09-24 22:04:29 +03:00
Michael Shigorin
bf232c04bf x11-autologin: updated KDE5 session name
s/PLASMA/Plasma/ (thanks zerg@)
2015-09-24 22:04:24 +03:00
Aleksey Avdeev
47f8d6ef1c services: Add systemd-specific hooks
Signed-off-by: Aleksey Avdeev <avdeev@pkcc-tb.ru>
2015-09-24 20:41:39 +03:00
Michael Shigorin
17d9f63a58 gear-store-tags 2015-09-14 21:01:18 +03:00
Michael Shigorin
d5fb22a7f8 1.1.74-alt1
- starterkits-20150912
2015-09-14 21:00:16 +03:00
Michael Shigorin
d2de19e1f3 live.mk, p7.mk: prefer ESR if it's firefox
Both starterkits and live webkiosk images carrying Firefox
are switched to ESR packages by this commit; note that those
images with other browsers aren't affected.
2015-09-08 20:18:29 +03:00
Michael Shigorin
5af8b76db8 browser: introduce firefox-esr support
FX_FLAVOUR variable can be set anywhere to switch
use/browser/firefox to prefer ESR packages, including
the appropriate localization ones.

Note that there's no dependency as it can be set in e.g.
starterkits (still unset in regular builds) wholesale
but shouldn't affect those of them lacking firefox.
2015-09-08 20:11:45 +03:00
Michael Shigorin
8dd2c5d00d im: drop dependency upon l10n
This was wrong as l10n with no LOCALE would result
in "lang=" being added to the boot menu and not
overridden by F2 selection.
2015-09-08 18:07:20 +03:00
Michael Shigorin
dcd8a865e7 desktop+regular, rescue+extra: added ldd-requires
This one has been proposed by antohami@ so as to ease support:
http://forum.altlinux.org/index.php?topic=35274.msg263698#msg263698
2015-09-08 14:54:09 +03:00
Michael Shigorin
b7b3d7b07f desktop+lxde+extra: added notify-osd
This one has been suggested by shadowsbrother@ and restored
in Sisyphus as a lightweight notifyd provider.
2015-09-08 14:52:41 +03:00
Michael Shigorin
29ad239354 regular.mk: added smartcard support
This has been an old TODO item either.
2015-09-08 14:29:07 +03:00
Michael Shigorin
7258e7508a live.mk: added efi/isohybrid to webkiosk images
This has apparently been a TODO item stuck until finding out
whether efi and isohybrid conflict or not; it's been a *long*
time since this has been found out (no conflict) actually,
let's add isohybrid to all of the images as it's completely
free size-wise and efi to chromium image as it's the largest
base one (I don't think that adding any extra functionality
to the already overweight and full of potential and kinetic
security bugs "flash" flavour is a good idea as it would
promote its use among those who need EFI but not Flash).
2015-09-08 11:50:27 +03:00
Michael Shigorin
bcf4c4a265 gear-store-tags 2015-09-07 23:29:08 +03:00
Michael Shigorin
9c075aa2c9 1.1.73-alt1
- im feature
2015-09-07 21:06:04 +03:00
Michael Shigorin
025e611057 mktmpdir: fixed sort key
The sort key field value has been off-by-one apparently,
"6" corresponds to "capacity" field of df -PT output
while the "available" one was meant:

Filesystem     Type  1024-blocks     Used Available Capacity Mounted on
/dev/sda9      ext4     15350768 12799972   1747980      88% /
tmpfs          tmpfs     1967204    27396   1939808       2% /tmp

1              2               3        4         5       6

This lapse has been five years old, looks like it's only
been masked by lower available space limit *and* filesystem
ordering by type so far.  It didn't hit me even now, rather
inspected the code while implementing volumes-profile-starterkit...
2015-09-07 21:01:14 +03:00
Michael Shigorin
881163dcff live: tweak HOMEPAGE
The reason behind this silly patch is that the default URL
can be left alone with no rebuilds neccessary but with the
intranet services delivered through a "captive portal" or
a redirecting proxy; we definitely don't want the canonical
wiki URL, http://www.altlinux.org, blocked by a rule made
for redirecting the default homepage, so let it be another
one which is served but not widely known or linked to.
2015-09-07 19:33:11 +03:00
Michael Shigorin
dde1fe2473 base+smartcard: add PAM module too
pam_pkcs11 is needed for SC-based authentication,
let's carry it as well.

Note that further configuration is still required.
2015-09-07 19:26:48 +03:00
Michael Shigorin
e8e244f74a regular.mk: added templates to gnome3
This has been proposed and largely implemented
by antohami@, see also #30851.
2015-09-06 17:52:49 +03:00
Michael Shigorin
427239601d base+desktop+live: added nano too
gd07e9c3 was apparently not enough to cover regular desktop images...
2015-09-06 17:52:43 +03:00
Michael Shigorin
7e9bf819dd regular.mk: add IM support to some desktop images
Wish this was done before starterkits alpha but still;
here are the preliminary (unqualified) test results:

- cinnamon: OK (vi_VN, zh_CN, ko_KR)
- gnome3: no way to change the hotkey; menu font troubles
- kde4: OK but lacks corresponding localization subpackages
- lxde: OK (vi_VN, zh_CN, ko_KR)
- lxqt: imsettings-xfce somehow gets in (unrequested!)
- mate: unable to change hotkey, applet complains to stderr
- tde: native apps don't recognize ibus input
2015-09-06 17:52:20 +03:00
Michael Shigorin
7f742a8ac2 x11: add IM hints
This makes use of IM_PACKAGES variable processed by
newly added im feature so that DE-specific targets
could tell which DE-specific IM packages they'd like
on a system *iff* use/im has been requested.

Might be lacking right now, to be sorted out with
the actual users.
2015-09-02 16:32:34 +03:00
Michael Shigorin
d773be4dc9 im: new feature
This one has emerged due to request by Chú minh
to add Vietnamese support to LXDE starterkit.
2015-09-02 16:31:42 +03:00
Michael Shigorin
db9615cb9c gear-store-tags 2015-08-31 21:13:34 +03:00
Michael Shigorin
df7a24a965 1.1.72-alt1
- starterkits alpha
2015-08-31 21:13:03 +03:00
Michael Shigorin
adad0d6fa2 regular+server: added fdisk
This was another TODO item based on my own use of this starterkit.
2015-08-31 15:12:03 +03:00
Michael Shigorin
40e776214f rescue+misc: added encled
It's a small python utility to deal with Supermicro/LSI
SAS enclosures via /sys/class/enclosure (got some).
2015-08-31 11:05:54 +03:00
Michael Shigorin
1e0d91b8e4 base+smartcard: purge dirt
Ouch, a dup and both cases of trailing whitespace...
2015-08-25 12:54:09 +03:00
Michael Shigorin
d07e9c37a7 base+extra: added nano
It's a simple text editor quite popular among
debian/ubuntu users for some reason; let's make
it available so that those uncomfortable with
vim(1) aren't totally at loss.
2015-08-14 14:06:13 +03:00
Michael Shigorin
80f9b4ed3b gear-store-tags 2015-08-10 21:03:23 +03:00
Michael Shigorin
d9ad6052e3 1.1.71-alt1
- docs feature
2015-08-10 21:01:42 +03:00
Michael Shigorin
2a29fb1294 added smartcard support pkglists
These should come handy when PC/SC libraries, drivers and
utilities are required.
2015-08-07 16:55:42 +03:00
Michael Shigorin
c83b1f105b image.in, branding: comment fixups
(rather cosmetic changes)
2015-08-07 16:55:34 +03:00
Michael Shigorin
9d77c2d4b3 docs: new feature
This one has been brewin' for quite a while but has been
completed finally; some tweaks sure can come in later but
it's working.

Please note that it's rather needed for "proper" distros
with specific branding and docs packages prepared for those;
one should use l10n feature most likely too.
2015-08-07 16:55:28 +03:00
Michael Shigorin
33f79ccf8a cleanup: a tiny but importand hint
I keep forgetting that CLEAUP_PACKAGES come with
/var/lib/{apt,rpm} purge, gotta do something...
2015-08-04 15:58:59 +03:00
Michael Shigorin
73facd5063 regular.mk: added kde5-telepathy to kde5 flavour
This one conflicts with kde4 so isn't included into
kde5-big metapackage [yet]; just add by hand.
2015-07-23 17:42:05 +03:00
Michael Shigorin
82aa130441 wireless: add rescue support
The "full" target should care for rescue bits as well
(remember that THE_* won't go there); thus regular-rescue.iso
will receive these couple hundred useful kilobytes as well.
2015-07-22 00:32:18 +03:00
Michael Shigorin
31da489243 gear-store-tags 2015-07-20 22:28:43 +03:00
Michael Shigorin
a2a3af0f1d 1.1.70-alt1
- check KFLAVOURS
2015-07-20 22:27:15 +03:00
Michael Shigorin
a277a6cce3 stage2: no kernels no go
The flexible KFLAVOURS handling has a downside:
if no packages match the regexp it's silently OK
until too late, and the error is incomprehensible.
Let's fix the latter at least.
2015-07-11 14:03:16 +03:00
Michael Shigorin
928d7a8188 live.mk, regular.mk: use desktop+sane
I decided that it's worth the added size to sprinkle more
hardware-related packages like SANE throughout the regular
crop so that compatibility tests are easier to do; there's
sane usage in there already, let's port live-gimp over too.
2015-07-03 12:59:03 +03:00
Michael Shigorin
80a9c2a9a0 desktop+sane: it's reused now
There's a rarely-used live-gimp for new GIMP builds
and looks like there's another target now...
2015-07-03 12:58:59 +03:00
Michael Shigorin
fca33ce246 gear-store-tags 2015-06-29 21:32:52 +03:00
Michael Shigorin
0be4f885c5 1.1.69-alt1
- yet another systemd- tweak
2015-06-29 20:38:18 +03:00
Michael Shigorin
155845f468 regular.mk, p7.mk: server-samba4 flavour
The configuration has rather settled down by now
although the actual sisyphus/p7 builds still require
adding custom repositories (this ought to change for
sisyphus but not for p7):

http://git.altlinux.org/tasks/138496/ for sisyphus
http://git.altlinux.org/tasks/132256/ for p7
2015-06-29 20:37:02 +03:00
Michael Shigorin
5b6a8f96d7 regular.mk: rescue uses sysvinit
...now explicitly.

The problem started with systemd being tossed in but was ignored
for some time -- until systemd-221-alt1 gained X11 dependency
through /etc/X11/xinit.d/ script and triggered the libX11 test
that breaks regular-rescue.iso build.

pam_systemd and systemd-services still get in (and can be removed
by hand with nothing else requiring those).
2015-06-29 20:26:34 +03:00
Michael Shigorin
30d38381a3 init: rework de-systemd-ization
It's the very same problem that must be solved within mkimage:
some package lists get expanded early and some late thus having
no chance to influence apt's choices of alternatives made early
(in fact, too early).

Until that, here's another kludge...

PS: turns out that ^systemd- is not "drop ^systemd" but rather:
    systemd-analyze
    systemd-coredump
    systemd-journal-gateway
    systemd-networkd
    systemd-sysvinit
    -- thus one /really/ wants something else.
2015-06-29 20:26:33 +03:00
Michael Shigorin
93c3fbf79b conf.d: further note on SYSTEM_PACKAGES
These _do not_ go into rescue images unlike COMMON_PACKAGES.
2015-06-29 16:35:05 +03:00
Dmitriy Khanzhin
7884fe3bc2 regular+icewm: removed icewm-startup-delay again 2015-06-29 16:31:39 +03:00
Michael Shigorin
db6f0da9fb gear-store-tags 2015-06-22 23:20:09 +03:00
Michael Shigorin
d2fe19c577 1.1.68-alt1
- LIVE_CLEANUP_KDRIVERS actually works
2015-06-22 23:19:32 +03:00
Michael Shigorin
1345c6e041 syslinux: dropped netinstall snippet (useless)
This one was an experimental but the server is long
offline and isn't going back up; remove the obsolete
config snippet, if/when it's done again it's the easiest
part to be restored (the implementation should provide
HTTP/FTP/NFS-publishable deliverables without the need
to extract those from ISO images).
2015-06-22 23:16:50 +03:00
Michael Shigorin
932ba1e24a regular.mk: change xfce-sysv back to std-def
Speccyfighter was upset with backlight breakage:
http://forum.altlinux.org/index.php/topic,34428.msg257036.html#msg257036
-- it's a bug to be sorted out separately, let's not insist.

This reverts commit f02fc7ac1e.
2015-06-22 23:16:49 +03:00
Michael Shigorin
7e549243ef regular.mk: use sysv/polkit for xfce-sysv
See also http://forum.altlinux.org/index.php/topic,34428.0.html
2015-06-16 14:50:26 +03:00
Michael Shigorin
47c1639618 init: added experimental polkit "support"
This one relies on the controversial polkit-sysvinit package
that subverts policykit using well known groups to make it
"work" for things like NM and shutdown helpers.

See also http://altlinux.org/sysvinit and feel free to improve.
2015-06-16 14:49:59 +03:00
Michael Shigorin
f02fc7ac1e regular.mk: change xfce-sysv to un-def
Let's provide some kernel versatility as well
since there are two distinct Xfce-based images.
2015-06-16 14:29:38 +03:00
Michael Shigorin
dc470a58cc regular.mk: added liberation fonts to xfce*
Both Xfce-based images have been falling back to
a completely wrong Monospace font alias implementation
at least for ASCII part which resulted in hard to read
Serif font in Terminal (even if e.g. Cyrillics are OK);
adding Liberation seems to work around this.

Too bad this commit didn't hit the recent starterkits.
2015-06-16 14:25:32 +03:00
Michael Shigorin
b44e602802 deflogin: added sudoers security note
/etc/sudoers is persistent with regard to userdel(8)
so removing a LiveCD user isn't going to drop this kind
of the added privilege and might result in an unintended
grant of those by adding a user with the same name after
permanent LiveCD installation.

This has been spotted by Speccyfighter:
https://bugzilla.altlinux.org/31071
2015-06-16 13:10:41 +03:00
Michael Shigorin
0dfab0cede regular.mk: added a few packages to xfce-sysv
These have been asked for by Speccyfighter:
http://forum.altlinux.org/index.php/topic,34428.msg256990.html#msg256990
2015-06-16 12:45:09 +03:00
Michael Shigorin
3cd7f9832a regular.mk: added xcalib to gnome3
This flavour is known to behave the best on touchscreen
based devices at the moment, let's fit it with the
calibration tool.
2015-06-15 17:03:03 +03:00
Michael Shigorin
b76aa22729 live: implemented kernel driver cleanup
This one is alike to install2's one; it's not a shared rootfs
script/variable though as contexts differ a lot, let's be careful.

The commit has been missing from 1.1.64 somehow, found in patch
series while figuring out why LIVE_CLEANUP_KDRIVERS seems to be
just ignored in live-privacy *after* the massive rebase of that
branch...
2015-06-12 20:39:43 +03:00
Michael Shigorin
7f5d8b8a18 gear-store-tags 2015-06-08 22:51:12 +03:00
Michael Shigorin
5529041fba 1.1.67-alt1
- minor post-tweaks
2015-06-08 22:50:23 +03:00
Dmitriy Khanzhin
3ce162db18 regular+icewm: added icewm-startup-delay 2015-06-08 10:12:23 +03:00
Michael Shigorin
5095b0c40d live.mk: initial rescue-remote
This one has formed off the recent addition to regular-rescue.iso,
namely the feature starting network and sshd upon generating some
random password and setting it as the root one for the (remotely
started) livecd session so that a person operating an IP-KVM/iKVM
would be able to boot off the ISO file via virtual media and then
look up an IP obtained via DHCP and the root password.
2015-06-05 15:17:02 +03:00
Michael Shigorin
18dbadd81c syslinux: introduce SYSLINUX_DIRECT
There's a convention that syslinux configuration snippets
carrying the names of subprofiles involved are picked up
automatically; there were a few special cases already
when this is actually inconvenient, and there's another
one at hand so let's just step up and do it.

NB: this is a sort of a hacky hook though, wish an elegant
    interface would come to mind some day.
2015-06-05 11:13:36 +03:00
Michael Shigorin
1e84c84971 dev: added a line to predefined shell history
This one has been proposed by Oleg Ivanov again,
and more are supposed to come as people use it.
2015-06-05 11:10:53 +03:00
Michael Shigorin
8e3a2d7f0c main.mk: fix the help-related glitch
`make help/distro' would yield a needless complaint
that's been suppressed for `make help' already...

Fixes: f147927522
2015-06-03 13:31:38 +03:00
Michael Shigorin
2e131656d1 gear-store-tags 2015-06-01 23:15:05 +03:00
Michael Shigorin
a78e3b8ce1 1.1.66-alt1
- remote rescue
2015-06-01 23:12:18 +03:00
Michael Shigorin
345375f535 rescue: adjust for rescue-remote as well
The added initscript used to be purged by 98-init-rescue
which has been somewhat overlooked during vain attempts
to build an image that would actually run it!
2015-06-01 20:08:34 +03:00
Michael Shigorin
1258934e75 regular.mk: rescue with remote access and a minute
The goal of implementing rescue_remote was regular-rescue.iso
indeed; so let's both add it and bump the default boot timeout
to 600 deciseconds, that is, a minute: 20 seconds might be way
too low for some slow IP-KVM/iKVM use cases.
2015-06-01 20:08:23 +03:00
Michael Shigorin
54d19238ac syslinux: added 84rescue_remote.cfg
This one provides cmdline arguments for startup-rescue >= 0.24
which would bring up networking and sshd in its turn thus allowing
remote access to the host booted in this mode.

The feature has been asked for by many people including mithraen@
and valintinr@ (and I'd make use of it another day too).

See the appropriate startup-rescue commit description for notes
on implementation; this default set of variable values should be
both useful and illustrative though.
2015-06-01 20:07:57 +03:00
Michael Shigorin
85e9b375e5 security+extra: added pwgen too
apg(1) is already there but let's provide another
well known utility either, habits use to vary...
2015-06-01 12:05:29 +03:00
Michael Shigorin
a0062f0242 rescue+extra: added stress, winusb
These packages have been proposed by valintinr@:
- stress is included in SRCD and was found useful;
- winusb is handy when dealing with legacy OS media.
2015-06-01 10:35:58 +03:00
Dmitriy Khanzhin
f7edad7b65 regular+icewm: added icewm-startup-simple-sound, more themes 2015-06-01 08:25:34 +03:00
Dmitriy Khanzhin
ee14c5b44c regular+icewm: removed deepsolver 2015-06-01 08:25:28 +03:00
Michael Shigorin
e758b41bef server: added k-m-staging to RPMS.main
A recent commit has dropped wireless support from
regular server images; staging modules might still
come handy in some situations, let's keep those in
but not as a part of default installation.
2015-05-31 18:30:21 +03:00
Michael Shigorin
0cdc8a7d77 tar2fs: fixed broken sfdisk use
Yet another age old bug: `sfdisk -l' is mimicking what
a person does by hand but the script is rather interested
in what `sfdisk -g' provides, that is, geometry.

And it's stupid enough to only grok C locale.
2015-05-31 18:08:19 +03:00
Michael Shigorin
1d0d1ceaef regular.mk: shuffle +wireless along
It's all started with glebfm@ wondering why
kernel-modules-v4l-std-def ends up installed
with altlinux-p7-server-ovz.iso; this has been
tossed in by kernel-modules-staging-std-def
which has been requested by +wireless.

WiFi support is nice to have handy when one hits
a wifi-only device and no means to bring networking
up (the infamous "unzip.zip" situation) but it's
a bit too much to force a bunch of extra drivers
specifically known for sub-par or unknown quality
onto everyone installing an ALT Linux based server.

So let's contain that feature to desktop/rescue images
and exclude it from their common base with server ones.
2015-05-31 18:07:01 +03:00
Michael Shigorin
80c34ffad8 regular.mk: moved openscada to regular-tde
It's been added to al of tde-based images
but it looks like LiveCDs make more sense,
and it's the regular-tde.iso that hits both
regular builds and starterkits; let's put it
there and hope it gets spotted appropriately.
2015-05-31 16:52:40 +03:00
Michael Shigorin
c17370daa0 dev: add proposed commands to shell history
This has been suggested by Oleg Ivanov:

http://lists.altlinux.org/pipermail/antique/2015-May/002353.html

...and does make sense; additions are welcome.

Ah, and fix that silly thinko with ~/.zshrc perms while at that.
2015-05-31 16:40:58 +03:00
Michael Shigorin
d75db52aa0 regular+tde: dropped asoundconf-gtk
It pulls in a huge pile of dependencies including
libopenblas -- this should be fixed in repositories
of course but let's do something on our end too...
2015-05-31 15:32:56 +03:00
Michael Shigorin
73c8b983ae base+regular: added openssh-blacklist
It's still recommended unfortunately.
2015-05-31 15:31:17 +03:00
Michael Shigorin
b08f351ff9 regular.mk: disable upower, bluez for tde images
These make no sense as kdebluetooth is officially broken
in TDE 3.5.13 and hal is used for power management.
2015-05-31 15:26:50 +03:00
Michael Shigorin
e007cf958f regular.mk: removed plymouth from tde/sysv images
It's been both somewhat problematic as of plymouth-0.9.x
due to broken rendering and explicitly asked for by asy@
regarding sysv-tde starterkit which makes sense for an
image targeting low-resource systems as well.
2015-05-31 15:19:25 +03:00
Michael Shigorin
8ab5ee5f7f regular.mk: added anacron to regular-sysv-tde
It's been asked for by asy@ and added to available packages,
not to base installation.
2015-05-31 15:16:31 +03:00
Michael Shigorin
6496bcf38d regular.mk: added upower, bluez to desktops
It's been noted by aris@ that the experimental
regular-leechcraft.iso lacks both upower and bluez;
let's try and add those missing to all of regular
desktop images.
2015-05-31 15:04:55 +03:00
Michael Shigorin
283eed21f5 regular.mk: added PA to LCDE
LiveCD would hang with "Initializing Azoth: first stage"
during startup otherwise; see ~/.leechcraft/warning.log
2015-05-31 14:54:20 +03:00
Michael Shigorin
c771420e90 regular.mk: added vzstats group to server-ovz
This is our answer to this VZstats FAQ entry:

  Q: Why is it opt-out rather than opt-in?
  A: We just don't have a good place
     (such as installer or some GUI)
     to ask you for opt-in.

Well ALT Linux got one. :)
2015-05-31 14:49:02 +03:00
Michael Shigorin
3b5217534c vzstats package list/group
This one adds vzstats(8) reporting utility,
see also http://openvz.org/vzstats; it's only
relevant for hosts running OpenVZ, obviously.
2015-05-31 14:47:19 +03:00
Michael Shigorin
2853fd312c desktop+lxqt+extra: added easypaint
A minimalistic paint application, just in case.
2015-05-13 22:30:17 +03:00
Michael Shigorin
f1704f27dd mkimage-profiles.asciidoc: index optimization
The new archdep part has been initially included into
"The Basics" chapter which it doesn't really belong to,
let's move it into Addendum.

NB: I'd better try building a package and skimming over
    at least the index upon having modified docs next time.
2015-05-05 15:58:43 +03:00
Michael Shigorin
c407a89947 gear-store-tags 2015-05-04 23:56:42 +03:00
Michael Shigorin
243d5e373f 1.1.65-alt1
- archdep pkglists
2015-05-04 23:55:11 +03:00
Michael Shigorin
15c75c1092 archdep.txt: these are quotes
Build process would choke on "unescaped" stuff otherwise,
and these blocks should be blockquotes in the first place.
2015-05-04 23:55:11 +03:00
Michael Shigorin
9baf84fa32 regular.mk: initial kde5 flavour
This is known to work using 5.2.2/5.3.0 packages
but is still pretty basic regarding functionality.
2015-05-04 23:20:11 +03:00
Michael Shigorin
86426a0dce x11: initial use/x11/kde5 target
This one relies on kde5-*/kf5-* packages still in heavy
development but the results are starting to work now.
2015-05-04 23:19:54 +03:00
Michael Shigorin
c9c5d4f2cb regular.mk: added regular-leechcraft
An initial draft.
2015-05-02 19:49:40 +03:00
Michael Shigorin
3a155f00da x11: added leechcraft support
This is a single-package DE by now, might change
towards the whole bunch of modules (but then again
might not); see http://leechcraft.org for details.
2015-05-02 19:30:02 +03:00
Michael Shigorin
ac10ec6de0 rescue+misc: added hwinfo, inxi
hwinfo has evaded the lists so far [fixed];
inxi has just been packaged by cas@ [thanks].
2015-04-27 14:02:56 +03:00
Michael Shigorin
ac5dbb4bba pkg.in/lists: archdep suffices for pkglists
This is an initial implementation of architecture dependent
contents handling for package lists more or less in the vein
of mkimage-profiles-desktop's one *but* using suffix part to
filter words in or out *not* prefix part to replace it with
a comment marker (thus filtering out lines).

The syntax should be pretty obvious:

  a b@i586 c@x86_64

will get "a b" given ARCH=i586 and "a c" given ARCH=x86_64;
please see doc/archdep.txt for a more elaborate description
and a conversion script.
2015-04-20 23:09:55 +03:00
Michael Shigorin
f6d2790423 gear-store-tags 2015-04-20 22:54:39 +03:00
Michael Shigorin
50c053fb19 1.1.64-alt1
- modularized stage1 modules list
2015-04-20 22:34:47 +03:00
Michael Shigorin
f9f1437bfe stage1: added ext4.ko to modules
It's been found out that live_rw isn't going to work
without ext4 module being available; let's ensure that.
2015-04-20 22:34:46 +03:00
Michael Shigorin
96574fce54 live.mk: initial live-privacy image
This one has been brewing since last autumn but the need
to cut down the stage1 (propagator) modules has been stopping
the code from showing up in master branch; now that the proper
infrastructure is in place it's there too.
2015-04-20 22:34:01 +03:00
Michael Shigorin
e63c5e9333 live: added use/live/privacy
This target is responsible for providing isolation
of local hard drives and networking from the system
running off the LiveCD/Flash.
2015-04-20 13:35:34 +03:00
Michael Shigorin
71caf44aa3 memclean: new feature
This one is likely to get just a single user right now
but the future potential is clearly higher.

Please do review libzmalloc implementation if concerned.
2015-04-20 13:35:32 +03:00
Michael Shigorin
111ec1d044 stage2: make use of finer-grained module lists
This is sort of laying the ground for the future dismantling
of 10-stage2 (which was sub.in/stage1/modules just recently);
things look like tagged lists might become due some day, e.g.
"net+usb" or "scsi+raid" -- time will tell.
2015-04-20 13:35:31 +03:00
Michael Shigorin
559f80adf3 a few modules.d test drives
These are aimed to test the modules.d/ and auto-pickup
implementation as well as to present an example.

At least 50-net might change (or just get renamed to avoid
auto-pickup) some day as the "net" feature's meaning is
to provide networking upon bootup and these modules are
only needed within stage1 if we're going to netboot;
and that's quite different thing.

armh-cubox bits are prone to get renamed/generalized too
since e.g. ArmadaXP based server images are going to need
this as well.
2015-04-20 13:35:28 +03:00
Michael Shigorin
e139a5e091 stage2: added broken-down module lists
These were produced off the single sub.in/stage1/modules
file using this scriptlet to prefix/annotate the names:

  grep '\.ko$' modules \
  | grep -v / \
  | while read m; do \
  	echo "$(find /lib/modules/$(uname -r)/kernel/{drivers,fs} \
		-name "$m" -printf %P $m $(modinfo -d "${m%.ko}" 2>&1)"; \
    done

...with subsequent sorting and manual separation.

This is meant to be the second stage in monolithic modules
file split, so the lists themselves are largely unmolested
otherwise.  The plan is to further split those into prefix-
and module-specific ones.

Add a note clarifying 10-stage2's status, by the way.
2015-04-20 13:35:28 +03:00
Michael Shigorin
1ee01498d5 stage1, stage2: moved propagator modules file
What was a static sub.in/stage1/modules (and the only one)
is now features.in/stage2/stage1/modules.d/10-stage2
(basically a compatibility file that might go some day).

It will be auto-picked as its name corresponds to the
NN-SUFFIX pattern specified in stage1 subprofile now
with $(FEATURES) going into default STAGE1_MODLISTS.
2015-04-20 13:35:27 +03:00
Michael Shigorin
a36d0236a4 stage1, stage2: initial modlists support
stage1's got prepare-modules target collecting
modules file snippets all over stage1/modules.d/
subdirectories within individual features.

stage2 now adds names of all the features going into
a particular image as snippet file suffix list so that
individual features don't have to register themselves
twice (as a feature and as a propagator modules.d
snippet carrier).

This is going to allow both "uncommon" modules getting
included with no problem (sin@ has wanted cifs ones
for quite some time, for example, and some want e.g.
infiniband modules) *and* to reduce the actual list
below the common mark as well (which is the case with
live-privacy image, for one).

And stage1 memory consumption does matter in some cases
as it's highly critical with no chance to use swap yet.
2015-04-20 13:35:24 +03:00
Michael Shigorin
a2fbe5115a live: move deflogin from use/live to use/live/base
...and split off use/live/.base *without* use/deflogin/live.

There's need for live images without predefined logins
(like e.g. live-privacy image).

NB: this commit might break things for someone, please notify.
2015-04-20 13:35:21 +03:00
Michael Shigorin
90bf3fcaea x11-autologin: added initial sddm support
The unfortunate thing is that we have to take care
for sessions, somehow; still there are only two for now
(LXQt and KDE5 Plasma Desktop) so this doesn't look like
a disaster just yet.
2015-04-20 13:27:51 +03:00
Michael Shigorin
11be62295b x11: added sddm support
Thanks zerg@ for having packaged it finally.
2015-04-18 20:49:58 +03:00
Michael Shigorin
49382b7294 rescue+extra: added mtd-utils
Yet another "how did we miss this?" package
containing ubifs utilities, among the rest.
2015-04-14 10:02:36 +03:00
Michael Shigorin
2a0dc40857 QUICKSTART: minor tweak
It was found out during the "from scratch" walkthrough
over http://altlinux.org/m-p with a new user that the
proposed test build run isn't clear regarding the proper
current working directory (wiki refers to QUICKSTART
copy over at http://git.altlinux.org, and this file has
been written with assumption that it's being read from
within the repository's toplevel directory; the resulting
context isn't consistent in that regard).
2015-04-09 21:20:23 +03:00
Michael Shigorin
f147927522 main.mk: bail out if no image type was specified
e.g., `make distro/icewm' instead of `make distro/icewm.iso'
would be "successful" as there's a corresponding target indeed
but the "success" would just mean building the configuration
without running the actual build.

Thanks cas@ for hitting this issue and reporting it.

PS: note that the initial flagless implementation turned out
    to produce false positives for e.g. `make distclean'.
2015-04-09 21:18:40 +03:00
Michael Shigorin
3cb4d9ae6a introduce QUIET variable
This one reduces the amount of output that's only
interesting when one is actually watching the console
during builds (at least the early stage) -- these tend
to look boilerplate and be useless when inspecting the
output of a large batch build like [[regular]] one.
2015-04-02 20:48:42 +03:00
Michael Shigorin
ec3d40cc1b help.mk, clean.mk: drop __frontend for tty test
The __frontend variable was introduced to address the needs
of alterator-mkimage module: list the images available in
one column, purge the builddir.

Looks like we should consider other cases with redirected
stdout (cron builds, piped calls, etc) like fundamentally
non-interactive and behave the same.

So commit 3a8af6b55d888d25c1d97561ed2ecf37ff28ad71's
description is wrong now; the current cleanup rules are:

- if CLEAN=0 or DEBUG>1, don't do it;
- if CHECK or REPORT is set, don't do it;
- otherwise if at least one of the following conditions is true:
  + there's more than one target being built in a row;
  + stdout was redirected (cronjob, alterator-mkimage...);
  + metaprofile directory is read-only
  ...then do a distclean.

If that doesn't suit your needs, describe the particular
situation please.

Thanks cas@ for wondering aloud whether greppable output
is unsupported with `make help'.
2015-04-02 20:46:35 +03:00
Michael Shigorin
51cb7825dc regular.mk: added xfce4-mixer to regular-xfce-sysv
sem@ noted that it had to be dropped from xfce4-full metapackage
as this package is built on top of gstreamer 0.10 and the API it
uses was dropped from gstreamer 1.0 so it's gonna die some day;
upstream recommends xfce4-pulseaudio-plugin but it's not suitable
to some of us, like Speccyfighter; well let's add the good ol'
plugin to sysv based flavour for now and see how it holds.
2015-03-31 14:33:52 +03:00
Michael Shigorin
f2e77e4417 gear-store-tags 2015-03-30 22:13:53 +03:00
Michael Shigorin
ec8326e739 1.1.63-alt1
- support USB3, ACPI suspend
2015-03-30 22:01:16 +03:00
Michael Shigorin
f1af0aefa1 regular.mk, p7.mk: initial xfce-sysv flavour
This one has been requested by a user over at #altlinux
and seems working, at least when built on p7/branch.
2015-03-29 20:41:35 +03:00
Michael Shigorin
ccbbbede55 test.mk: propagator-test image
This one is a minimalistic one to test propagator
without having to add the debug stanza by hand
as well as to run stage1 build/test cycles faster
(would have helped me understand the recent thinko
with xhci-hcd vs xhci_hcd, for example).
2015-03-29 20:41:35 +03:00
Michael Shigorin
07933f3c60 syslinux: mediacheck should honour bootargs too
...just like any other stage2 based boot target,
both for consistency and specifically for propagator
test image.
2015-03-29 20:41:34 +03:00
Michael Shigorin
b2cfbc3f1f boot.mk: factor out boot/% from distro.mk
Yes these bits are related to distro/ prefixed images
still the overgeneralization in distro.mk didn't pay off
but rather hid a bug with the only boot/isolinux in use
having no dependency on use/syslinux (which is required).

Maybe this will get revisited when we have other kinds
of bootable images with other bootloaders (vm/ ones care
for themselves as of today).
2015-03-29 20:41:32 +03:00
Michael Shigorin
d0228a5380 install2: don't require bootloader just always
Commit 657c0bf has silently added use/bootloader
to the base use/install2 target thus breaking
experimental distro/netinst; it seems better to
require *a* bootloader in the target that's been
specifically designed to cover the common case
(thus linked to by +installer shortcut) but still
to have our base lightweight and flexible.

This doesn't hurt the actual distros as these use
+installer of course.
2015-03-29 20:41:29 +03:00
Michael Shigorin
08d802ab0d stage1: drop dummy.ko
Looks like it's been dumped in along with the rest but not
actually used in {make-initrd-,}propagator; the problem with it
is that snd-dummy.ko matches and pulls a bunch of unrelated
modules where these don't belong (grep -w wouldn't match
snd_dummy.ko though).
2015-03-29 20:41:29 +03:00
Michael Shigorin
bc0f8a45ee stage1: re-add a few modules
These can be found in (semi-)supported branches still:

- loop.ko:
  + 3.0.101-std-def-alt0.M60P.1
  + 3.4.96-led-ws-alt0.M70P.1
- aufs.ko:
  + 2.6.32-el-smp-alt31
  + 3.4.96-led-ws-alt0.M70P.1

ehci_marvell.ko isn't found in contemporary sisyphus/armh
kernels but let's purge it later during archdep rewrite.

NB: libusual.ko has been renamed to usb-libusual.ko as of p6
    (not to be found in p7 anymore), and nls_base.ko was in
    2.6.32 kernels as of p6 but not there in p7; purge these
    somewhere down the road.
2015-03-29 20:41:29 +03:00
Michael Shigorin
09a9255f2f stage1: purge nonexistent modules
This file has been floating around for quite some time,
and some of its contents are pure bit rot by now...

Drop the modules that don't exist as of 3.19.2-un-def-alt1
upon manual diff examination.
2015-03-29 20:41:29 +03:00
Michael Shigorin
71ad34a9bf stage1: fix module name
It wasn't sdhci_pci.ko back in 2.6.32 actually and it's
sdhci-pci.ko; so grep used by mkmodpack won't pick it up.
2015-03-29 20:41:28 +03:00
Michael Shigorin
f112a3358e stage1: add USB3 support
This has been missing for *so* long somehow, and adding some 200k
of modules for fast hardware that's widely available by now
looks like a deal.

Added USB Attached SCSI module just in case (or rather for weak
crc_t10dif symbols?).
2015-03-29 20:41:26 +03:00
Michael Shigorin
a01f4a9f91 live.mk: drop extra services from kiosks
There are a few ones that aren't needed for a one-time
environment off a LiveCD/Flash like a webkiosk; if you
happen to need a text-based kiosk some day, tell me so.
2015-03-29 20:41:24 +03:00
Michael Shigorin
3129d6efcf live.mk: live-0ad draft
This one is based on live-flightgear of course.
2015-03-29 20:41:21 +03:00
Michael Shigorin
bc3b3a2450 desktop+lxqt+extra: use metapackage
clementine-codecs-* looks more appropriate than direct
lowlevel dependency list indeed; thanks cow@.
2015-03-29 20:41:18 +03:00
Michael Shigorin
9f9f32bf4c regular.mk: make use of ACPI suspend support
There's no excuse to miss it now that it's there.
2015-03-29 20:15:31 +03:00
Michael Shigorin
072fefdf3b install2, live: implement ACPI suspend support
The corresponding installer feature had to be updated first
following blkid(8) output format changes, but that's it!
2015-03-29 19:51:17 +03:00
Michael Shigorin
2845c89b48 gear-store-tags 2015-03-16 22:36:02 +03:00
Michael Shigorin
84e514dc76 1.1.62-alt1
- starterkits-20150312
2015-03-16 22:35:53 +03:00
Michael Shigorin
86708edeaf regular.mk: move fonts from gnustep mixin to wmaker one
Shame on me, gnustep mixin is only used in gnustep flavour
while wmaker one is used in both gnustep and wmaker flavours.

So the default serif fonts in regular-wmaker.iso were still ugly.
2015-03-12 02:22:14 +03:00
Michael Shigorin
0cbc959f86 pkg/groups: slightly better names
Consistent case and LAMP the '00s buzzword!
2015-03-12 01:42:52 +03:00
Michael Shigorin
f021e19bc3 regular.mk, regular+tde: be careful with kpowersave
I don't know of [k]powersave interactions with systemd
and the rest of that ilk, let's be cautious and only provide
it for sysv-tde images which have been actually tested
by Speccyfighter who asked for this package.

Can't tell for sure but something seems to break
suspend menu option (hibernate isn't supported in
all of the regular builds/starterkits just yet).
2015-03-12 01:28:15 +03:00
Michael Shigorin
ce8f6dc3cb http-server: drop php5 modules depending on X11
These aren't going to survive use/cleanup/x11 anyways
(and weren't that generic in the first place); let root@
install whatever they actually need later.
2015-03-12 01:21:56 +03:00
Michael Shigorin
b4d704f2c1 regular.mk: rework server images a bit
This refactoring is aimed at both providing reasonable
alterator package set in server-ovz (and server-hyperv)
while purging the install-time modules from plain server
as these were useless without a frontend package like
the web-based alterator-fbi.
2015-03-12 00:39:47 +03:00
Michael Shigorin
719e1d7d0c regular.mk, regular+kde4: move to pkglist
A few more additions proposed by Sluggard:
http://www.opennet.ru/openforum/vsluhforumID3/101671.html#182

...and it seems like LIVE_PACKAGES are asking for a pkglist;
let's switch to THE_PACKAGES for remainder while at that.
2015-03-11 13:41:27 +03:00
Michael Shigorin
bacc1a1793 regular+tde: added kpowersave
...as requested by Speccyfighter:
http://forum.altlinux.org/index.php/topic,34272.msg249405.html#msg249405
2015-03-11 03:05:25 +03:00
Michael Shigorin
4bcbe44245 regular.mk: switched lxqt to connman
It used to run NM without any kind of applet which is
not exactly usable unless it's DHCP over Ethernet there;
provide connman and qconnman-ui (applets on the road).
2015-03-11 02:36:45 +03:00
Michael Shigorin
b6d37f3430 regular.mk: disable bridge service
This has been proposed for server-hyperv by lewellyn@freenode
last summer, looks like a reasonable default for all of the
server images as those interersted in bridge setup are going
to do a few more things anyways.
2015-03-10 13:48:55 +03:00
Michael Shigorin
e09e11b978 regular.mk: switch jeos to its own volumes-profile
This image has been cleaned up somewhat thoroughly
regarding its installed package base but partitioning
has remained poorly generic with swap etc; it's now
been set to use 3/4 Gb as a minimum (to fit 1Gb VMs
or USB sticks just fine) with the only partition
created being root one; those wishing something else
are welcome to go ahead and partition by hand anyways.

See also https://bugzilla.altlinux.org/30024
2015-03-10 13:31:32 +03:00
Michael Shigorin
9b42d4dc54 gear-store-tags 2015-03-10 00:01:02 +03:00
Michael Shigorin
289b292a81 1.1.61-alt1
- EFI_BOOTARGS
2015-03-10 00:00:31 +03:00
Michael Shigorin
c907a4f6e7 regular.mk: purge qt4 from installed server images
It's not use/cleanup/x11-alterator in its entirety
but qt4-core is really *really* not needed there.
2015-03-10 00:00:30 +03:00
Michael Shigorin
2b233fffda regular.mk: allow EFI boot to make/use RW overlay
propagator-20150306-alt1 and make-initrd-propagator-0.25-alt1
have made it actually possible to use resulting LiveCD images
along with USB flash media to achieve data persistence that's
been long available for BIOS boot mode (see also #28289).

This isn't perfect but let's try flipping the switch:
all desktop regular builds are now "live_rw" by default
in EFI mode.

This requires mkimage >= 0.2.17.
2015-03-10 00:00:28 +03:00
Michael Shigorin
8a859a2902 regular.mk: "quiet" down jeos flavour
This image doesn't deign to waste one's time by presenting
them with a bootloader menu and a few other things;
make it even less verbose where not neccessary.
2015-03-10 00:00:26 +03:00
Michael Shigorin
0db031823c desktop+regular: added terminus and inconsolata
Looks like we'd better provide a few really good console fonts.
2015-03-10 00:00:24 +03:00
Michael Shigorin
280efe2a94 desktop+lxqt+extra: added liberation fonts
cool-retro-term 1.0.0 exhibits a bug without these fonts around:
glyphs would be drawn higher than cursor with upper half being
cut off (found out by putting my current crop of font packages
into livecd environment and removing them until the correct
behaviour would get broken).
2015-03-10 00:00:22 +03:00
Michael Shigorin
5bfa0182c2 regular.mk: added xpra and winswitch to icewm
xpra.org and winswitch.org are wonderful applications
helping one working with X11 apps all over the place,
running those on local and remote desktops and servers
with persistent sessions.

These aren't exactly trivial to plan and use but icewm
isn't for newbies either; thus these seem like nice match
for an "X11 thin client" image.

Size addition is ca. 50 Mb as of today which is a lot
but worth it.
2015-03-10 00:00:21 +03:00
Michael Shigorin
13f23357ea regular+icewm: added lftp
This nice FTP/HTTP client has one issue that bars its inclusion
into every regular desktop image: lftp.desktop file that pops up
in menu but only offers an xterm with a CLI-based utility which
feels embarrassing for a casual user unfamiliar with its power.

IceWM users shouldn't be surprised however.
2015-03-10 00:00:20 +03:00
Michael Shigorin
cf374217cd regular.mk: added kde-gtk-config to kde4
...as suggested by Sluggard again:
http://www.opennet.ru/openforum/vsluhforumID3/101671.html#143
2015-03-10 00:00:17 +03:00
Michael Shigorin
ae5141a0ad regular.mk: add gparted to kde4 flavour
This has been suggested by Sluggard at opennet:
http://www.opennet.ru/openforum/vsluhforumID3/101671.html#91
2015-03-10 00:00:14 +03:00
Michael Shigorin
0f75f701fc efi: bridge bootargs into EFI too
It's been missing roughly from the start there :-/
2015-03-10 00:00:14 +03:00
Michael Shigorin
3e1fe68a54 syslinux: update rw to use cdrom method, not disk
The former approach to handling "LiveCD with sessions"
has been to mangle "automatic=method:cdrom" into
"automatic=method:disk,label:ALT*" within gfxboot
so that propagator and make-initrd-propagator would
try and discover/create a filesystem labelled
"alt-live-storage" on a LiveFlash's free space.

Then "live_rw" handling has been unified in
make-initrd-propagator (as of 0.18-alt1) to accept
any of "label" subparameter or "live_rw" argument
to go and create_disk_slice().

Then propagator's cdrom.c has been fixed to actually
try sdX1 before sdX (as of 20150306-alt1).

And now it's all been tested to verify that:
- flash "ro" and "rw" boot is OK
- CD-ROM "ro" boot is OK
- CD-ROM "rw" boot is fine given that there's
  a partition labeled "alt-live-storage" elsewhere

This is a can of worms indeed :-/

References
~~~~~~~~~~
* http://altlinux.org/initrd-propagator
* http://altlinux.org/make-initrd-propagator
* http://bugzilla.altlinux.org/28289
2015-03-10 00:00:14 +03:00
Michael Shigorin
de2dc3e7ab regular.mk: better fonts for gnustep/tde flavours
The problem is URW again (just as in commit ab44f80),
and the workaround is the same either.
2015-03-10 00:00:14 +03:00
Michael Shigorin
fc98316c95 desktop+lxqt+extra: added QCheckers
That's what's been found via "qt game" query with Synaptic
while running a functional testing session upon lxqt starterkit
beta as of 20150305 :)
2015-03-10 00:00:13 +03:00
Michael Shigorin
f511271917 dev: hint regarding hasher repo
It's entirely unclear to an unsuspecting curious user
where the actual results of a proposed example hasher
build end up; that's ~/hasher/repo, just state that.
2015-03-10 00:00:11 +03:00
Michael Shigorin
42a5fa8af2 rescue+extra: (re-)added nfs-server
Is it news or was it missing all the way through?..
2015-03-10 00:00:09 +03:00
Michael Shigorin
7cb477c38a stage2, install2: oops, narrow the cleanup back
The former install2-only "bloated binary" purge script
happened to hit stage2 (which is a lot more than just
install2); a kind of safety net has been stuck into it
to guard installable LiveCDs against this particular
cleanup but seems it was not enought for ildar@ who
reported this problem almost three years after it was
introduced.

This change re-places the script back into install2
section; the binaries in question amount for ca. 8 Mb
(except openssl ildar@ asked about); if these are deemed
unneccessary within any other stage2-based subprofiles,
please step up with details.
2015-03-10 00:00:09 +03:00
Michael Shigorin
0a7c57a5b1 gear-store-tags 2015-03-02 21:30:30 +03:00
Michael Shigorin
c0b74931b5 1.1.60-alt1
- vmguest, install2: refactoring
2015-03-02 21:29:08 +03:00
Michael Shigorin
8cbb7146ea vmguest: fixup vbox targets
use/vmguest/vbox/base used to pull in DRM modules
which are required for vboxvideo but useless without
xorg bits; and all of these aren't needed in jeos.

Things might break, doublecheck please.
2015-03-02 20:07:22 +03:00
Michael Shigorin
937facafab regular.mk: added bash-completion to jeos
It's half a megabyte but useful enough.
2015-03-02 19:26:13 +03:00
Michael Shigorin
c44623ded0 regular.mk: setup repo for jeos too
It's a bit sad to hit a minimalistic environment
with apt knowing no repositories at all...
2015-03-02 19:20:59 +03:00
Michael Shigorin
f611807d36 regular.mk: dedup jeos a bit
use/cleanup/x11 has been extended with commit 122c305,
a few manually specified items can be dropped now.
2015-03-01 23:26:28 +03:00
Michael Shigorin
17bcc73fc8 regular+icewm: added iftop
This nice utility is preconfigured for network monitoring
in default icewm configuration but was missing, unfortunately;
just fix this.
2015-02-27 00:11:40 +03:00
Michael Shigorin
bc2a4025d8 init: use the proper variable for i-f packages
When installer-feature-systemd-stage3 hits BASE_PACKAGES
it pulls install2-init-functions in which is wrong
(one of the consequences is that alterator-browser-qt
lands into even a very basic server installation).

And install2 doesn't even need that package as init feature
carries a script hook that does the same...
2015-02-26 17:36:31 +03:00
Michael Shigorin
b312bc35ae ve.mk: initial ve/systemd-bare
This one has also been asked for by shaba@:
http://lists.altlinux.org/pipermail/devel/2015-February/199510.html
2015-02-25 18:53:47 +03:00
Michael Shigorin
03435a70d0 drop razorqt support (see lxqt)
This project has evolved/merged into LXQt which has been
packaged for both p7/t7 and sisyphus by now, no need to
carry on deprecated bits.

NB: 0.6.x still have it as t6/p6 still bear razorqt.
2015-02-25 15:13:54 +03:00
Michael Shigorin
ec196c4497 regular.mk: re-add extended gnome3 metapackage
...the one actually meant for regular builds.
2015-02-25 12:39:44 +03:00
Michael Shigorin
f3f373b9e3 x11: rollback gnome3 metapackage
The gnome3-regular one adds quite a few megabytes,
let's keep the mid-sized -default for common targets
while moving -regular to, well, regular one.
2015-02-25 12:39:39 +03:00
Michael Shigorin
4033edf208 test.mk: smaller server-systemd
This has been asked for by shaba@:
http://lists.altlinux.org/pipermail/devel/2015-February/199506.html
2015-02-25 12:39:33 +03:00
Michael Shigorin
620c827c5f cleanup: introduce use/cleanup/libs
The installer feature added is a trivial wrapper around
apt-cache nodeps to uninstall the ^lib packages that have
no more dependencies upon those when the temporarily
installed packages like alterator-browser-qt get removed.
2015-02-25 12:39:27 +03:00
Michael Shigorin
b080d40ae9 net: added use/net/networkd
Specifically for the minimalistic systemd-based server image
suggested by shaba@.
2015-02-25 12:39:21 +03:00
Michael Shigorin
f31e392ca4 net, net-eth, regular.mk: introduce use/net/etcnet
This has been simply use/net but it looks like we've got
some people who would like to cope without etcnet, even:
http://lists.altlinux.org/pipermail/devel/2015-February/199506.html

Adjust its usage accordingly.
2015-02-25 12:39:17 +03:00
Michael Shigorin
a211aec73c install2: drop use/install2/kms
This has only been useful for plymouth feature,
and +installer shortcut included this target
for all the wrong reasons as it seems today
(thus blocking the DRM-free server installers,
for example).
2015-02-25 12:39:12 +03:00
Michael Shigorin
1ca7975520 init: add systemd debug target
This one enables a spare shell on tty9 just in case.
2015-02-25 12:39:05 +03:00
Michael Shigorin
30b7a94e9e gear-store-tags 2015-02-23 23:34:35 +03:00
Michael Shigorin
92558ac8ba 1.1.59-alt1
- regular rebase
2015-02-23 23:33:39 +03:00
Michael Shigorin
29327e2b80 features.in/Makefile: avoid spurious backups
This doesn't look like a clean solution, whitelist should be
way more reasonable; still better than dirty builddir though.
2015-02-21 20:12:11 +03:00
Michael Shigorin
aea95968ef build-vm: cleanup the leftover tarball
...unless we're debuggin'.
2015-02-20 19:08:31 +03:00
Michael Shigorin
9c7a33c093 p7.mk: add vagrant bridge
Base vagrant-compatible disk image seems good enough
to have a try at building some public stable sample...
2015-02-20 19:06:57 +03:00
Michael Shigorin
d4b3ccc0e4 vm.mk: don't be shy with thin disk image size
The resulting image size will be less than the specified maximal one
as it's thin-provided with contents taking up what they do.
2015-02-20 19:06:46 +03:00
Michael Shigorin
dee3512dd1 vagrant: oops, some junk left
This authorized_keys file has been downloaded to get incorporated
into a script hook but was looking common enough to be forgotten
during pre-commit feature cleanup unfortunately; fix that.
2015-02-19 21:33:12 +03:00
Michael Shigorin
d281e6fd71 base+regular: added apt-scripts
How did it manage to evade pkglists so far?
These are very useful:

apt-cache list-extras
apt-cache list-nodeps
2015-02-19 21:29:52 +03:00
Michael Shigorin
122c305bc0 cleanup: extend x11-related target
A few more leftover libraries tend to hang around after
purging extra alterator packages that have fired already
during installation stage3; this change might hurt someone,
please do notify if that is the case (OTOH one isn't forced
to use it or to inherit intermediate targets that do so).
2015-02-19 20:04:31 +03:00
Michael Shigorin
a90f36d220 regular.mk: drop alterator GUI from server images
The issue at hand is that some sneaky stage3 alterator modules
seem to have tossed alterator-browser-qt (thus libqt4* and friends)
into base server installations; while this must be solved in within
package base and should be worked around by server feature probably
let's start out with leaf targets.
2015-02-19 16:48:09 +03:00
Michael Shigorin
ab44f800bc regular.mk: add liberation fonts to gnome3
epiphany (or fontconfig?) insists on URW fonts for rendering
webpages like http://opennet.ru which hurts my eyes; looks like
/etc/fonts/conf.d/60-alt-post-user.conf would override these
with e.g. Liberation or Dejavu (with the latter being inferior
to the former, IMHO).
2015-02-18 18:53:39 +03:00
Michael Shigorin
57fa35d504 regular.mk: split off .regular-bare from .regular-base
...so that regular builds really have common ground again,
which is something that got broken with regular-jeos introduction;
adjusted jeos and builder flavours to make use of this.
2015-02-17 20:19:07 +03:00
Michael Shigorin
d6a4f2c7e8 regular.mk: .regular-bare -> .regular-base
...so base is base and bare is freed for a leaner entity...
2015-02-17 19:59:31 +03:00
Michael Shigorin
2c6a37d4a9 regular.mk: .regular-base -> .regular-wm
There's considerable confusion accumulated over the
expansion of regular builds with non-GUI targets:

- bare meant quite a lot including wireless;
- base meant GUI base actually,

so rescue, server, and especially jeos images had to
either cope with the bloat or start from scratch.

Let's fix "base" first...
2015-02-17 19:59:30 +03:00
Michael Shigorin
fdf8baf7a8 regular.mk: drop +vmguest from regular-builder
Looks like QEMU 2.2.0 gets surprised with some kernel module
that udev tries to load during "Populating /dev:" boot stage;
dropping *both* +vmguest and +wireless dependencies does help
while switching to un-def kernel flavour doesn't (as is or with
any single one of these two deps removed).

Thanks user who reported the problem at opennet.ru
(alias "myhand").
2015-02-17 19:11:40 +03:00
Michael Shigorin
750aaac150 gear-store-tags 2015-02-16 23:53:50 +03:00
Michael Shigorin
512411ee9e 1.1.58-alt1
- vagrant feature (closes: #28553)
2015-02-16 23:49:46 +03:00
Michael Shigorin
048c7c0834 vm.mk: initial vagrant-base
This should be built as vagrant-base.vdi (xz before publishing).
2015-02-16 23:49:27 +03:00
Michael Shigorin
451d7c012d vagrant: initial implementation
This feature adds initial vagrant-compatible box
build support as outlined in #28553.
2015-02-16 23:10:50 +03:00
Michael Shigorin
5542415e19 tar2fs: wait a bit
Looks like there's a race condition somewhere: this script
will fail to clean up after itself when considerable background
load is inflicted upon the host it's running on (e.g. LA ~16
on a 8-core, single-disk system).

Note that this commit is NOT enough to win that race
but just a step in the right direction...
2015-02-16 17:58:51 +03:00
Michael Shigorin
e238973c04 tar2fs: add ahci module
It's unwise to skip the common storage driver,
and vagrant (which uses virtualbox by default)
is likely to crash and burn as well.
2015-02-16 17:58:43 +03:00
Michael Shigorin
1823c557db base+regular, server+network: added apt-rsync
This has been suggested by cas@ and sounds quite reasonable
given that we ship rsync anyways.
2015-02-16 16:01:46 +03:00
Michael Shigorin
23cae74ab1 regular.mk: tweaked default vm profile for kde4
altlinux-p7-kde4-20141212 images had a problem:

- the generic starterkit profile is tuned
  for modest disk space consumption;
- KDE4 is quite extensive;
- kde4-regular subpackage tosses in most of KDE4 SC

...thus the livecd wouldn't autopartition enough
space for root filesystem when being installed.

volumes-profile-lite specifies 10Gb rootfs currently
which is just fine (-kdesktop one starts with 30Gb),
let's use it until vm-profile management is imported
into mkimage-profiles or things are redone completely.
2015-02-16 15:52:45 +03:00
Michael Shigorin
ea55aee5b7 live: refactored to use pkglist
This feature operates LIVE_* variables specifically
(as opposed to the more generic THE_* ones) so +alsa
isn't exactly suitable but reusing the pkglist that's
just been factored out is fine.
2015-02-10 23:10:49 +03:00
Denis Smirnov
15a3cb12e8 sound feature refactoring
Split package lists:

- base alsa packages (also needed in pulseaudio-based installations)
- additional alsa packages (needed only if not using pulseaudio)
- pulseaudio packages
2015-02-10 23:06:30 +03:00
Michael Shigorin
0da76ba29a gear-store-tags 2015-02-09 23:30:28 +03:00
Michael Shigorin
4a1af47cbf 1.1.57-alt1
- fix the lists copying fix
2015-02-09 23:29:48 +03:00
Michael Shigorin
292caede4e pkg/lists: fix the fix (handle no lists too)
cp(1) would get confusing arguments with no files to copy
if there are no lists to handle; employ xargs(1) as promised
to handle this properly.
2015-02-08 01:32:45 +03:00
Michael Shigorin
eadc204b9e x11: drop explicit gst-libav
aris@ tells that it's been specified as totem dependency since,
no need to carry this temporary duplication on.
2015-02-04 21:39:58 +03:00
Michael Shigorin
35c89b61db rescue+extra: added usbmuxd
This might come handy for those who have to deal with iDevices.
2015-02-04 21:39:45 +03:00
Michael Shigorin
c2adec79ab gear-store-tags 2015-02-02 21:50:16 +03:00
Michael Shigorin
3177c23e70 1.1.56-alt1
- fix lilo check for vm images
2015-02-02 21:47:53 +03:00
Michael Shigorin
7b0501ae2a tar2fs: fix check for lilo binary
The check introduced by commit d7689f30 while rewriting tar2vm
(which presumed x86) was subtly broken: it checked for *host*
binary before preparing *chroot* configuration file for it.

Wonder how many build servers run lilo over here that this BUG
has managed to evade attention for almost two years...
2015-02-02 21:45:57 +03:00
Michael Shigorin
b311aba13d pkg.in/lists: extended README a bit
This notice essentially duplicates the recent addition to
http://www.altlinux.org/Mkimage/Profiles/m-p/objects
(in a brief offline form).
2015-02-02 21:45:51 +03:00
Michael Shigorin
34a13fa371 live: disarm URW
It's been discussed that URW fonts' priority be lowered
and way too many direct dependencies upon those be reviewed:

http://lists.altlinux.org/pipermail/devel/2014-September/199105.html

...just not there yet.
2015-02-02 21:45:42 +03:00
Michael Shigorin
fc45abb395 live.mk: disable rpcbind for webkiosk livecds
Looks pretty superfluous there.
2015-02-02 21:45:23 +03:00
Denis Smirnov
11763010b8 xmonad extra: not include debuginfo for ghc.*-darcs 2015-02-02 21:45:10 +03:00
Denis Smirnov
8df9c40d34 Fix /etc/tcb/*/shadow* permissions
Looks like there's some issue with fakeroot as pseudousers
created with useradd during package installation have their
/etc/tcb/*/shadow files with proper permissions ($user:auth)
but shadow- and shadow.lock belong to root:root which makes
passwd(1) fail.
2015-02-02 14:01:42 +03:00
Michael Shigorin
903e52841b gear-store-tags 2015-01-26 23:59:29 +03:00
Michael Shigorin
521d837395 1.1.55-alt1
- lists copying fixed
2015-01-26 23:59:13 +03:00
Michael Shigorin
fa1089f51e x11: upgrade gnome3 metapackage
There's gnome3-regular now extending -default (thx aris@).
2015-01-26 15:44:29 +03:00
Michael Shigorin
8712c0ca44 regular.mk: update package name
There's no more livecd-gnome3-nosetup, it's been renamed
to setup-gnome3-done with no P:/O: to reduce repo spam.

Should have cherry-picked this into master back then :-/
2015-01-26 15:44:16 +03:00
Michael Shigorin
a86dd0c425 pkg/lists: uncrustify Makefile
The problem with the changed piece of code is that it would
- both call cp(1) multiple times if multiple *_LIST variables
  were non-empty (which is usually the case), and
- try to evaluate stdout of the called commands as a shell
  script (which would be empty unless someone passed e.g. -v
  to that cp(1) but it's crazy to rely on things like this).

So the functions should prepare arguments for a single copy
command that is predictable and could be made verbose.

Ouch.
2015-01-20 22:31:32 +03:00
Michael Shigorin
dc679621e2 rescue+misc: added office file format parsers
This batch deals with various Microsoft(R) Word(TM)
instilled formats like RTF/DOC/DOCX and requires nothing
but basic libraries and perl at most; might get extended
over time but please mind the extra dependencies!
2015-01-13 05:11:51 +03:00
Michael Shigorin
e02a898c59 gear-store-tags 2015-01-05 11:19:41 +03:00
Michael Shigorin
78c3cab5ad 1.1.54-alt1
- live: don't force localboot
2015-01-05 11:19:13 +03:00
Michael Shigorin
39fa788ac8 build-vm: update referenced script name
It's probably a good year to get rid of this reference practice
resulting in a known sort of misdocumentation over time :-/
2015-01-05 11:18:48 +03:00
Michael Shigorin
ec1ce73cb3 live: don't force localboot here
live-webkiosk.iso regressed into trying to boot off the local disk
immediately, the exact cause is not yet discovered but this one
has popped in build trace (distcfg.mk) already.

Desktop images are still likely to depend on it though.
2015-01-05 11:18:02 +03:00
Michael Shigorin
3744ab55b8 live.mk: force kiosk images to live boot
I've been puzzled to find current live-webkiosk.iso trying to go
localboot with no timeout; this is basically a plug, VM images
might need more effort to go in.
2014-12-31 21:30:39 +03:00
Michael Shigorin
675ec1cb4b desktop+xfce+extra: added arandr
This utility should help those operating multi-display
configurations with somewhat non-trivial requirements:
http://www.opennet.ru/openforum/vsluhforumID3/100999.html#31
2014-12-24 20:24:34 +03:00
Michael Shigorin
9c8fe80ec3 ve.mk, p7.mk: experimental ve/pgsql94
This one has been prepared for PostgreSQL 9.4 meetup in Moscow:
http://postgresmen.ru/meetup/2014-12-23-parallels
2014-12-24 20:20:54 +03:00
Michael Shigorin
e7acdd8d4b base+rescue: added servicectl
This utility manages systemd services inside chroot
while the host system runs sysvinit (systemctl will say
"Running in chroot, ignoring request" and bail out).
2014-12-23 00:08:09 +03:00
Michael Shigorin
b5da790b75 regular+tde: added k{cpu,net}load
Thanks asy@ for getting both packages back to sisyphus
and stable branches.
2014-12-20 18:07:13 +03:00
Michael Shigorin
4459f1771d server: added ftp/http clients to ovz
wget is actually required by vzctl currently
but lftp is a handy tool which is missing,
and both are better specified explicitly.
2014-12-18 18:26:46 +03:00
Michael Shigorin
1da70393de regular.mk: extend FS support for sysv-tde
This is a somewhat "advanced" flavour,
extra filesystems seem reasonable.
2014-12-16 17:12:33 +03:00
Michael Shigorin
be0dc77c5f base+regular: added system-report
george@ wondered why it's not included into regular builds;
well, here it is.
2014-12-15 20:43:19 +03:00
Michael Shigorin
22289352dd gear-store-tags 2014-12-15 19:24:05 +03:00
Michael Shigorin
ef2259afd8 1.1.53-alt1
- starterkits-20141212
2014-12-15 19:23:05 +03:00
Michael Shigorin
1121b06e9f regular.mk: there's no livecd-gnome3-nosetup in p7
There's GNOME 3.8 in p7/branch and it has no initial setup tool
thus no disabler is needed anyways; I've fixed this a while ago
but seem to have managed to lose the commit somehow :-/
2014-12-12 19:01:07 +03:00
Michael Shigorin
c1a5a22cb1 desktop+lxqt: last-minute tweaks
Replaced qxkb with axkb as it seems less unstable;
added gvfs and friends as pcmanfm-qt won't handle devices otherwise:
http://forum.altlinux.org/index.php/topic,33244.msg242391.html#msg242391
2014-12-12 18:01:30 +03:00
Michael Shigorin
e4077b2bbf live: fix broken regexp to actually enable repos
The problem with hardwired "[alt]" was that it's not going
to match "[p7]", for example.

Brown paper bag bug.
2014-12-12 15:16:05 +03:00
Michael Shigorin
574058a764 desktop+lxqt: added qxkb
Thanks dango for this proposal either:
http://forum.altlinux.org/index.php/topic,33700.msg242365.html#msg242365
2014-12-12 15:05:06 +03:00
Michael Shigorin
5ccdb5e20e desktop+lxqt+razorqt+extra: work around clementine
Specifically the seemingly missing dependencies on gstreamer:
https://bugzilla.altlinux.org/show_bug.cgi?id=30556

Thanks dango for heads-up:
http://forum.altlinux.org/index.php/topic,33700.msg242323.html#msg242323
2014-12-12 02:29:30 +03:00
Michael Shigorin
1cf1bcb87d dev: rework user setup
There were quite a few things missing:
- packager pseudo for both rpm and hasher;
- proper target (so that i686 or athlon don't confuse people);
- hasher repo for apt so that mkimage would use it too;
- last but not least, a friendly bootstrap message! ;-)
2014-12-12 01:47:35 +03:00
Michael Shigorin
5205364a6e regular.mk, p7.mk: builder image
So ALT Linux has got decent build tools but no one even knows
about those, right?  And starting to use those is somewhat tedious
as it requires ALT installation with a specially crafted user account?

live-builder.iso has been useful enough to consider including its
relative into starterkits skipping regular builds for roughly the
same reasons as those for installers: we're better off helping users
to get onto the stable platform bandwagon than having them excited
with Sisyphus just to hit some wall down the road (even if we warn
of these walls well in advance most of the time), and while packages
tend to get into branches via sisyphus repo it's still better to stay
on the safe side with what we make easily available.
2014-12-12 01:34:35 +03:00
Michael Shigorin
52a4265eab dev: tweak main subprofile to avoid extra packages
THE_* and friends are all unneeded for live builder image;
this commit makes dev feature basically incompatible with
install2 feature (which relies on the conventional behaviour
of main subprofile), will have to think it all over if the
combination of these two ever becomes needed.
2014-12-12 00:41:00 +03:00
Michael Shigorin
74126092a4 dev, live.mk: refactor live-builder bits
It feels like time to introduce regular-builder.iso,
let's help it by factoring most of the common part out
into the feature.
2014-12-12 00:37:20 +03:00
Michael Shigorin
6082b77d7d regular.mk: added NTFS support to server-hyperv installer
Might be useful for those wishing to set up additional drives
carrying NTFS at install time.
2014-12-10 13:46:43 +03:00
Michael Shigorin
be7f377b7a rescue+misc: added smartmontools
This was basically a feature request to get smartctl into
sysv-tde starterkit; it's in regular+extra which is pulled
for regular/starterkit rescue images already but it's better
to have it duplicated here than missing somewhere as the tool
is pretty requisite these days.
2014-12-09 19:28:36 +03:00
Michael Shigorin
768c78bfca efi, regular.mk: drop led-ws
It's not supported anymore:
http://git.altlinux.org/tasks/archive/done/_133/136193/
2014-12-09 18:10:55 +03:00
Michael Shigorin
ba3ded078d vm.mk: fix vm/net to handle ROOTPW
It's been ignored since the introduction of deflogin feature
and removal of build-vm specific ROOTPW variable handling;
might be adjusted to mandate this for vm/bare too, have to
think it over.
2014-12-04 21:04:49 +03:00
Michael Shigorin
1445ff423b deflogin: treat no users as a warning
There could be root-only VM appliances, for example,
and ROOTPW is now handled through this feature.
2014-12-04 21:04:43 +03:00
Michael Shigorin
4cb875cc5b gear-store-tags 2014-11-18 00:19:49 +03:00
249 changed files with 2637 additions and 739 deletions

View File

@@ -1,5 +1,5 @@
Name: mkimage-profiles
Version: 1.1.52
Version: 1.1.93
Release: alt1
Summary: ALT Linux based distribution metaprofile
@@ -11,7 +11,7 @@ Source: %name-%version.tar
Packager: Michael Shigorin <mike@altlinux.org>
BuildArch: noarch
BuildRequires: rsync asciidoc-a2x xmlgraphics-fop fonts-ttf-dejavu
BuildRequires: rsync asciidoc-a2x fop fonts-ttf-dejavu
Requires: rsync git-core
Requires: time schedutils sfdisk
@@ -23,12 +23,13 @@ Requires: mkimage-preinstall
%define mpdir %_datadir/%name
%add_findreq_skiplist %mpdir/*.in/*
%def_with doc
%define docs $HOME/docs
%package doc
Summary: %name documentation
Group: Development/Documentation
BuildRequires: java /proc
%{?_with_doc:BuildRequires: java /proc}
%description
mkimage-profiles is a collection of bits and pieces useful for
@@ -64,21 +65,155 @@ as a book in HTML and PDF formats.
%setup
%build
%if_with doc
make BUILDDIR=%docs docs
%endif
%install
mkdir -p %buildroot%mpdir
mkdir -p %buildroot{%mpdir,%_man7dir}
cp -a * %buildroot%mpdir
%if_with doc
mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
%endif
%files
%mpdir/
%if_with doc
%_man7dir/*
%endif
%if_with doc
%files doc
%doc README
%doc QUICKSTART
%doc %docs/*
%endif
%changelog
* Mon Jun 13 2016 Michael Shigorin <mike@altlinux.org> 1.1.93-alt1
- starterkits-20160612
* Mon May 30 2016 Michael Shigorin <mike@altlinux.org> 1.1.92-alt1
- server-openstack
* Mon May 23 2016 Michael Shigorin <mike@altlinux.org> 1.1.91-alt1
- nvidia/nouveau rehash
- overlayfs support (lakostis@)
* Tue May 03 2016 Michael Shigorin <mike@altlinux.org> 1.1.90-alt1
- starterkits-20160429
* Mon Apr 25 2016 Michael Shigorin <mike@altlinux.org> 1.1.89-alt1
- preparing for p8 starterkits
* Mon Apr 11 2016 Michael Shigorin <mike@altlinux.org> 1.1.88-alt1
- pkg.in/profiles
* Mon Mar 14 2016 Michael Shigorin <mike@altlinux.org> 1.1.87-alt1
- starterkits-20160312
* Mon Feb 29 2016 Michael Shigorin <mike@altlinux.org> 1.1.86-alt1
- junior
* Mon Feb 15 2016 Michael Shigorin <mike@altlinux.org> 1.1.85-alt1
- regular-jeos-ovz
* Mon Feb 08 2016 Michael Shigorin <mike@altlinux.org> 1.1.84-alt1
- %name(7) :)
* Mon Jan 25 2016 Michael Shigorin <mike@altlinux.org> 1.1.83-alt1
- openssh 7.x (see also #31716)
* Mon Jan 11 2016 Michael Shigorin <mike@altlinux.org> 1.1.82-alt1
- firmwarez
* Mon Dec 07 2015 Michael Shigorin <mike@altlinux.org> 1.1.81-alt1
- regular fixes
* Mon Nov 30 2015 Michael Shigorin <mike@altlinux.org> 1.1.80-alt1
- pre-starterkit cleanups
* Mon Nov 16 2015 Michael Shigorin <mike@altlinux.org> 1.1.79-alt1
- faked workaround
* Mon Nov 09 2015 Michael Shigorin <mike@altlinux.org> 1.1.78-alt1
- regular-enlightenment
* Mon Oct 19 2015 Michael Shigorin <mike@altlinux.org> 1.1.77-alt1
- webkiosk improvements
* Mon Oct 12 2015 Michael Shigorin <mike@altlinux.org> 1.1.76-alt1
- no more GREP_OPTIONS
* Mon Sep 28 2015 Michael Shigorin <mike@altlinux.org> 1.1.75-alt1
- systemd-specific hook for installer (solo@)
* Mon Sep 14 2015 Michael Shigorin <mike@altlinux.org> 1.1.74-alt1
- starterkits-20150912
* Mon Sep 07 2015 Michael Shigorin <mike@altlinux.org> 1.1.73-alt1
- im feature
* Mon Aug 31 2015 Michael Shigorin <mike@altlinux.org> 1.1.72-alt1
- starterkits alpha
* Mon Aug 10 2015 Michael Shigorin <mike@altlinux.org> 1.1.71-alt1
- docs feature
* Mon Jul 20 2015 Michael Shigorin <mike@altlinux.org> 1.1.70-alt1
- check KFLAVOURS
* Mon Jun 29 2015 Michael Shigorin <mike@altlinux.org> 1.1.69-alt1
- yet another systemd- tweak
* Mon Jun 22 2015 Michael Shigorin <mike@altlinux.org> 1.1.68-alt1
- LIVE_CLEANUP_KDRIVERS actually works
* Mon Jun 08 2015 Michael Shigorin <mike@altlinux.org> 1.1.67-alt1
- minor post-tweaks
* Mon Jun 01 2015 Michael Shigorin <mike@altlinux.org> 1.1.66-alt1
- remote rescue
* Mon May 04 2015 Michael Shigorin <mike@altlinux.org> 1.1.65-alt1
- archdep pkglists
* Mon Apr 20 2015 Michael Shigorin <mike@altlinux.org> 1.1.64-alt1
- modularized stage1 modules list
* Mon Mar 30 2015 Michael Shigorin <mike@altlinux.org> 1.1.63-alt1
- support USB3, ACPI suspend
* Mon Mar 16 2015 Michael Shigorin <mike@altlinux.org> 1.1.62-alt1
- starterkits-20150312
* Mon Mar 09 2015 Michael Shigorin <mike@altlinux.org> 1.1.61-alt1
- EFI_BOOTARGS
* Mon Mar 02 2015 Michael Shigorin <mike@altlinux.org> 1.1.60-alt1
- vmguest, install2: refactoring
* Mon Feb 23 2015 Michael Shigorin <mike@altlinux.org> 1.1.59-alt1
- regular rebase
* Mon Feb 16 2015 Michael Shigorin <mike@altlinux.org> 1.1.58-alt1
- vagrant feature (closes: #28553)
* Mon Feb 09 2015 Michael Shigorin <mike@altlinux.org> 1.1.57-alt1
- fix the lists copying fix
* Mon Feb 02 2015 Michael Shigorin <mike@altlinux.org> 1.1.56-alt1
- fix lilo check for vm images
* Mon Jan 26 2015 Michael Shigorin <mike@altlinux.org> 1.1.55-alt1
- lists copying fixed
* Mon Jan 05 2015 Michael Shigorin <mike@altlinux.org> 1.1.54-alt1
- live: don't force localboot
* Mon Dec 15 2014 Michael Shigorin <mike@altlinux.org> 1.1.53-alt1
- starterkits-20141212
* Mon Nov 17 2014 Michael Shigorin <mike@altlinux.org> 1.1.52-alt1
- docs: "7.0+" (closes: #30474)
- l10n feature

View File

@@ -0,0 +1,6 @@
object a6dc910d144a87c1c5303b3d8f6d5ca929c8a7c0
type commit
tag v1.1.92
tagger Michael Shigorin <mike@altlinux.org> 1464632677 +0300
server-openstack

View File

@@ -1,6 +0,0 @@
object 4e2e450b3a9aaf0ee20e075f3057e4e9e746886f
type commit
tag v1.1.51
tagger Michael Shigorin <mike@altlinux.org> 1415640567 +0300
current updates

View File

@@ -1 +1 @@
bba8b02b8e4a143d52dd9f23e65960f72b0c492e v1.1.51
94f41754b87c908a12be5237ea2e4478e8d8f50f v1.1.92

View File

@@ -56,8 +56,12 @@ SHELL = /bin/bash
say "** goal: $@ [$$n/$(NUM_TARGETS)]"; \
fi; \
for ARCH in $(ARCHES); do \
if [ "$$ARCH" != "$(firstword $(ARCHES))" ]; then say; fi; \
say "** ARCH: $$ARCH"; \
if [ -z "$(QUIET)" ]; then \
if [ "$$ARCH" != "$(firstword $(ARCHES))" ]; then \
say; \
fi; \
say "** ARCH: $$ARCH"; \
fi; \
if $(MAKE) -f main.mk ARCH=$$ARCH $@ $(POSTPROC); then \
if [ -n "$$REPORT" ]; then \
$(MAKE) -f reports.mk ARCH=$$ARCH; \

View File

@@ -5,15 +5,14 @@ http://en.altlinux.org/Hasher; large tmpfs helps a lot).
~~~~~~~~~
- ALT Linux 7.0 или выше (возможна адаптация "вниз")
- установленный mkimage (свежий, как и hasher)
- пользователь с правом запуска hasher
- пользователь с правом запуска hasher и подключения /proc к нему
полезно
~~~~~~~
- смонтированный tmpfs на несколько гигабайт
- смонтированный tmpfs на несколько гигабайт (или укажите BUILDDIR)
* например, в /tmp или /home/USER/hasher
* каталог из prefix в /etc/hasher-priv/system
- установленный git-core
- настроенный ~/.gitconfig
- установленный git-core и настроенный ~/.gitconfig
команды
~~~~~~~
@@ -30,7 +29,7 @@ $ git config --global user.name "My Name"
$ mkdir -p ~/out ~/tmp
----
тестовая сборка::
тестовая сборка (в каталоге mkimage-profiles)::
----
$ make syslinux.iso
----

5
README
View File

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

View File

@@ -6,6 +6,14 @@
DIRS="$TMP $TMPDIR $HOME/hasher /tmp /var/tmp .."
MINSIZE=262144 # face control criterion
# mkimage needs /proc among those, be clear about that
check_allowed_mountpoints()
{
grep -wqs "^allowed_mountpoints=[^#]*/proc" \
/etc/hasher-priv/system \
`/usr/libexec/hasher-priv/getconf.sh`
}
# poor man's SourceIfExists()
try_source() { [ -f "$1" ] && . "$1"; }
@@ -45,7 +53,7 @@ choose_tmpdir() {
echo -n "$i "
df -PT "$i" | tail -1
done \
| sort -unk6 \
| sort -unk5 \
| while read dir dev fstype size used free percent mnt; do
check_options "$dev" "$mnt" || continue
[ "$free" -gt "$MINSIZE" ] || continue
@@ -59,6 +67,12 @@ choose_tmpdir() {
}
# bringing it all together
if ! check_allowed_mountpoints; then
echo "error: hasher's allowed_mountpoints do not include /proc;"
echo "please check hasher docs and /etc/hasher-priv/system"
exit 1
fi >&2
TMPDIRS="`contemplate_dirs $DIRS`"
if [ -z "$TMPDIRS" ]; then
echo "error: no suitable directories found;"

View File

@@ -3,6 +3,7 @@
# tar2fs chroot.tar image.raw [size_in_bytes [fstype]]
. shell-error
export LANG=C
if [ $# -lt 2 ]; then
fatal "error: tar2fs needs at least two arguments"
@@ -33,7 +34,7 @@ BOOTPART=
case "`arch`" in # NB: sudo => no GLOBAL_ will do either; mind qemu-*
*86*)
# NB: different storage modules might be needed for non-kvm
INITRD_MODULES="sd_mod ata_piix"
INITRD_MODULES="sd_mod ata_piix ahci virtio-scsi virtio-blk"
BLOCKDEV="/dev/sda" # might be /dev/vda for virtio
ROOTPART="1"
;;
@@ -129,7 +130,7 @@ exit_handler() {
umount ${BOOTFS:+"$BOOTFS"} "$ROOTFS"{/dev,/proc,/sys,}
if [ -n "$LOOPDEV" ]; then
kpartx -d "$LOOPDEV"
kpartx -d -s "$LOOPDEV"
losetup --detach "$LOOPDEV"
fi
rm -r -- "$ROOTFS"
@@ -202,6 +203,7 @@ 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"
@@ -209,17 +211,17 @@ chroot "$ROOTFS" make-initrd -k "$KERNEL"
# ...target device too
sed -i "s,$LOOPROOT,$ROOTDEV," "$ROOTFS/etc/fstab"
if [ -x /sbin/lilo ]; then
if [ -x "$ROOTFS"/sbin/lilo ]; then
# configure and install bootloader
REGEXP='^Disk .*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
set -- $(sfdisk -l "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
REGEXP='^.*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
set -- $(sfdisk -g "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
LILO_COMMON="lba32
delay=1
vga=0
image=/boot/vmlinuz
initrd=/boot/initrd.img
append=\"root=$ROOTDEV rootdelay=3 quiet\"
append=\"root=$ROOTDEV rootdelay=3 console=tty1 console=ttyS0,115200n8\"
label=linux"
cat > "$ROOTFS"/etc/lilo-loop.conf <<-EOF

View File

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

View File

@@ -6,8 +6,8 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
mixin/desktop-installer: use/x11-autostart use/sound +net-eth +vmguest
@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
mixin/desktop-installer: +net-eth +vmguest \
use/x11-autostart use/fonts/install2 use/sound
@$(call add,BASE_LISTS, \
$(call tags,(base || desktop) && (l10n || network)))
@$(call add,INSTALL2_PACKAGES,ntfs-3g)

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

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

View File

@@ -6,6 +6,11 @@ distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
distro/rescue: distro/.base use/rescue use/syslinux/ui/menu \
use/efi/signed use/efi/refind use/efi/shell; @:
distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
@$(call set,SYSLINUX_CFG,rescue_remote)
@$(call set,SYSLINUX_DIRECT,1)
@$(call add,RESCUE_PACKAGES,livecd-net-eth)
distro/syslinux: distro/.init \
use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
@@ -20,27 +25,23 @@ distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
use/syslinux/timeout/1 use/cleanup use/stage2/net-eth \
use/fonts/otf/adobe +power
@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
@$(call set,SYSLINUX_UI,none)
@$(call set,SYSLINUX_CFG,live)
@$(call add,STAGE2_BOOTARGS,quiet)
@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind klogd syslogd)
@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver fbsetfont keytable)
distro/live-builder-mini: distro/.live-base use/dev/mkimage use/dev \
use/stage2/net-eth use/net-eth/dhcp use/syslinux/timeout/30 \
use/isohybrid
@$(call set,KFLAVOURS,$(BIGRAM))
@$(call add,LIVE_LISTS,\
$(call tags,(base || live) && (server || builder)))
@$(call add,LIVE_PACKAGES,livecd-qemu-arch strace)
@$(call add,LIVE_PACKAGES,qemu-user-binfmt_misc)
@$(call add,LIVE_PACKAGES,zsh sudo)
distro/live-builder-mini: distro/.live-base use/dev/builder/base \
use/syslinux/timeout/30 use/isohybrid \
use/stage2/net-eth use/net-eth/dhcp; @:
distro/live-builder: distro/live-builder-mini \
use/efi/signed use/live/rw use/live/repo use/dev/repo
@$(call add,MAIN_LISTS,$(call tags,live builder))
@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ mkisofs)
use/dev/builder/full use/live/rw +efi; @:
distro/live-install: distro/.live-base use/live/textinstall; @:
distro/.livecd-install: distro/.live-base use/live/install; @:
distro/live-icewm: distro/.live-desktop use/x11/lightdm/gtk +icewm; @:
distro/live-razorqt: distro/.live-desktop +razorqt; @:
distro/live-tde: distro/.live-desktop-ru use/live/install +tde; @:
distro/live-fvwm: distro/.live-desktop-ru use/x11/lightdm/gtk use/x11/fvwm; @:
@@ -50,24 +51,26 @@ distro/live-rescue: distro/live-icewm +efi
$(call tags,(base || extra) && (archive || rescue || network)))
# NB: this one doesn't include the browser, needs to be chosen downstream
distro/.live-webkiosk: distro/.live-kiosk use/live/hooks use/live/ru use/sound
distro/.live-webkiosk: distro/.live-kiosk \
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
@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
# kiosk users rather prefer stability to latest bling
distro/live-webkiosk-mini: distro/.live-webkiosk-gtk \
use/fonts/otf/mozilla use/isohybrid
use/browser/firefox use/browser/firefox/esr use/fonts/otf/mozilla
@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)
# NB: flash/java plugins are predictable security holes
distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live \
use/browser/plugin/flash use/browser/plugin/java use/efi/signed \
+vmguest; @:
use/browser/plugin/flash use/browser/plugin/java +vmguest; @:
distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:
distro/live-webkiosk-chromium: distro/.live-webkiosk use/fonts/ttf/google
distro/live-webkiosk-chromium: distro/.live-webkiosk use/fonts/ttf/google +efi
@$(call add,LIVE_PACKAGES,livecd-webkiosk-chromium)
distro/live-webkiosk-seamonkey: distro/.live-webkiosk use/fonts/ttf/google
@@ -82,22 +85,32 @@ distro/.live-3d: distro/.live-x11 use/x11/3d \
distro/live-glxgears: distro/.live-3d; @:
distro/live-flightgear: distro/.live-kiosk use/x11/3d use/sound \
distro/.live-games: distro/.live-kiosk use/x11/3d use/sound \
use/stage2/net-eth use/net-eth/dhcp use/services +efi +sysvinit
@$(call set,KFLAVOURS,un-def)
@$(call add,LIVE_LISTS,$(call tags,xorg misc))
@$(call add,LIVE_PACKAGES,FlightGear FlightGear-tu154b)
@$(call add,LIVE_PACKAGES,fgo input-utils livecd-fgfs)
@$(call add,LIVE_PACKAGES,glxgears glxinfo)
@$(call add,LIVE_PACKAGES,pciutils input-utils glxgears glxinfo)
@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind alteratord messagebus)
@$(call add,SERVICES_DISABLE,livecd-net-eth)
distro/live-flightgear: distro/.live-games
@$(call add,LIVE_PACKAGES,FlightGear)
@$(call add,LIVE_PACKAGES,fgo livecd-fgfs)
@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
distro/live-flightgear-tu154: distro/.live-games
@$(call add,LIVE_PACKAGES,FlightGear-tu154b)
distro/live-0ad: distro/.live-games
@$(call add,STAGE2_BOOTARGS,quiet)
@$(call add,LIVE_PACKAGES,0ad livecd-0ad)
@$(call try,HOMEPAGE,http://play0ad.com/)
distro/live-e17: distro/.live-desktop-ru use/x11/e17 use/x11/lightdm/gtk; @:
distro/live-gimp: distro/live-icewm use/live/ru
@$(call add,LIVE_LISTS,$(call tags,desktop sane))
@$(call add,LIVE_PACKAGES,gimp tintii immix fim)
@$(call add,LIVE_PACKAGES,sane sane-frontends xsane)
@$(call add,LIVE_PACKAGES,darktable geeqie rawstudio ufraw)
@$(call add,LIVE_PACKAGES,macrofusion python-module-pygtk-libglade)
@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync usbutils)
@@ -105,4 +118,29 @@ distro/live-gimp: distro/live-icewm use/live/ru
distro/live-robo: distro/live-icewm +robotics use/live/ru; @:
# NB: use/browser won't do as it provides a *single* browser ATM
distro/live-privacy: distro/.base +power +efi +systemd +vmguest \
use/live/base use/live/privacy use/live/ru \
use/x11/xorg use/x11/lightdm/gtk use/x11/mate use/x11-autologin \
use/browser/firefox/i18n use/sound \
use/fonts/otf/adobe use/fonts/otf/mozilla \
use/fonts/ttf/google use/fonts/ttf/redhat
@$(call set,KFLAVOURS,un-def)
@$(call add,LIVE_LISTS,$(call tags,base l10n))
@$(call add,LIVE_LISTS,$(call tags,archive extra))
@$(call add,LIVE_PACKAGES,chromium gedit mc-full pinta xchm livecd-ru)
@$(call add,LIVE_PACKAGES,LibreOffice-langpack-ru java-1.8.0-openjdk)
@$(call add,LIVE_PACKAGES,mate-document-viewer-caja)
@$(call add,LIVE_PACKAGES,mate-document-viewer-djvu)
@$(call add,LIVE_PACKAGES,cups system-config-printer livecd-admin-cups)
@$(call add,LIVE_KMODULES,staging)
@$(call add,DEFAULT_SERVICES_ENABLE,cups)
@$(call add,EFI_BOOTARGS,live_rw)
distro/live-privacy-dev: distro/live-privacy use/live/rw use/live/repo \
use/dev/repo use/dev/mkimage use/dev use/control/sudo-su
@$(call add,LIVE_LISTS,$(call tags,(base || live) && builder))
@$(call add,MAIN_LISTS,$(call tags,live builder))
@$(call add,MAIN_PACKAGES,syslinux mkisofs)
endif

View File

@@ -1,7 +1,9 @@
# p7 base kits
mixin/p7:
mixin/p7: use/browser/firefox/esr
@$(call set,BRANDING,altlinux-starterkit)
@$(call set,IMAGE_FLAVOUR,$(subst altlinux-p7-,,$(IMAGE_NAME)))
@$(call set,META_VOL_ID,ALT Linux p7 $$(IMAGE_FLAVOUR)/$(ARCH))
ifeq (distro,$(IMAGE_CLASS))
@@ -16,26 +18,32 @@ distro/altlinux-p7-lxde: distro/regular-lxde mixin/p7; @:
distro/altlinux-p7-lxqt: distro/regular-lxqt mixin/p7; @:
distro/altlinux-p7-lxqt-sysv: distro/regular-lxqt-sysv mixin/p7; @:
distro/altlinux-p7-mate: distro/regular-mate mixin/p7; @:
distro/altlinux-p7-razorqt: distro/regular-razorqt mixin/p7; @:
distro/altlinux-p7-rescue: distro/regular-rescue mixin/p7; @:
distro/altlinux-p7-tde: distro/regular-tde mixin/p7; @:
distro/altlinux-p7-tde-sysv: distro/regular-tde-sysv mixin/p7; @:
distro/altlinux-p7-wmaker: distro/regular-wmaker mixin/p7; @:
distro/altlinux-p7-xfce: distro/regular-xfce mixin/p7; @:
distro/altlinux-p7-xfce-sysv: distro/regular-xfce-sysv mixin/p7; @:
distro/altlinux-p7-sysv-tde: distro/regular-sysv-tde mixin/p7; @:
distro/altlinux-p7-jeos: distro/regular-jeos mixin/p7; @:
distro/altlinux-p7-jeos-ovz: distro/regular-jeos-ovz mixin/p7; @:
distro/altlinux-p7-server: distro/regular-server mixin/p7; @:
distro/altlinux-p7-server-ovz: distro/regular-server-ovz mixin/p7; @:
distro/altlinux-p7-server-hyperv: distro/regular-server-hyperv mixin/p7; @:
distro/altlinux-p7-server-samba4: distro/regular-server-samba4 mixin/p7; @:
distro/altlinux-p7-builder: distro/regular-builder mixin/p7; @:
endif
ifeq (ve,$(IMAGE_CLASS))
ve/altlinux-p7-ovz-generic: ve/generic mixin/p7; @:
ve/altlinux-p7-ovz-pgsql94: ve/pgsql94 mixin/p7; @:
endif
ifeq (vm,$(IMAGE_CLASS))
vm/altlinux-p7-vm-net: vm/net mixin/p7; @:
vm/altlinux-p7-vagrant: vm/vagrant-base mixin/p7; @:
endif

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

@@ -0,0 +1,52 @@
# 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))
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/basealt-p8-enlightenment: distro/regular-enlightenment mixin/p8
@$(call set,META_VOL_ID,BaseALT p8 E/$(ARCH))
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-server-openstack: distro/regular-server-openstack mixin/p8; @:
distro/basealt-p8-server-pve: distro/regular-server-pve mixin/p8; @:
distro/basealt-p8-builder: distro/regular-builder mixin/p8; @:
endif
ifeq (ve,$(IMAGE_CLASS))
ve/basealt-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; @:
endif

View File

@@ -1,90 +1,104 @@
# regular build/usage images
ifeq (distro,$(IMAGE_CLASS))
# common ground
distro/.regular-bare: distro/.base +wireless +net-eth \
use/efi/signed use/memtest use/kernel/net
# common ground (really lowlevel)
distro/.regular-bare: distro/.base +net-eth use/kernel/net use/docs/license
@$(call try,SAVE_PROFILE,yes)
# base target (for most images)
distro/.regular-base: distro/.regular-bare use/vmguest use/memtest +efi; @:
# graphical target (not enforcing xorg drivers or blobs)
distro/.regular-x11: distro/.regular-bare use/x11/wacom +vmguest \
use/live/x11 use/live/install use/live/repo use/live/rw \
use/luks use/branding use/browser/firefox/live use/browser/firefox/i18n
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
@$(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,EFI_BOOTARGS,live_rw)
# common WM live/installer bits
mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
@$(call add,THE_PACKAGES,alterator-notes)
@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
@$(call set,THE_IMAGEWRITER,imagewriter)
# WM base target
distro/.regular-base: 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-base \
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,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
@$(call add,DEFAULT_SERVICES_ENABLE,powertop)
@$(call set,KFLAVOURS,std-def)
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
distro/.regular-sysv: distro/.regular-base +sysvinit; @:
distro/.regular-sysv: distro/.regular-wm +sysvinit; @:
distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
use/x11/gdm2.20; @:
distro/.regular-install: distro/.regular-bare +installer +sysvinit +power \
distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
use/branding use/bootloader/grub use/luks \
use/install2/fs use/install2/vnc use/install2/repo
@$(call add,THE_LISTS,$(call tags,base regular))
@$(call add,INSTALL2_BRANDING,alterator notes)
@$(call add,THE_BRANDING,alterator)
# NB:
# - no +power or even use/power/acpi/button on intent
# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
distro/regular-jeos: distro/.base use/isohybrid +sysvinit +net-eth \
use/install2/packages use/install2/vmguest use/vmguest/base \
# 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 \
use/install2/repo use/install2/packages \
use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
use/cleanup/x11-alterator use/net use/kernel/net use/power/acpi/button
@$(call set,KFLAVOURS,led-ws) # led-vs might be nice here
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)
@$(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 openssh vim-console)
@# a *lot* of stray things get pulled in by alterator modules
@$(call add,CLEANUP_PACKAGES,libICE 'libX*' libxcb libfreetype)
@$(call add,CLEANUP_PACKAGES,fontconfig 'glib2*' libffi 'libltdl*')
@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libpng*' 'libtiff*')
@$(call add,CLEANUP_PACKAGES,avahi-autoipd bridge-utils) # i-c-stage3
@$(call add,CLEANUP_PACKAGES,iw wpa_supplicant)
@$(call add,CLEANUP_PACKAGES,openssl libpcsclite)
@# fully fledged interactivesystem isn't needed here either
@$(call add,CLEANUP_PACKAGES,interactivesystem 'groff*' man stmpclean)
@$(call add,CLEANUP_PACKAGES,glibc-gconv-modules gettext)
@$(call add,CLEANUP_PACKAGES,console-scripts console-vt-tools 'kbd*')
@$(call add,CLEANUP_PACKAGES,libsystemd-journal libsystemd-login)
@$(call add,CLEANUP_PACKAGES,dbus libdbus libcap-ng)
@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console)
@$(call add,THE_LISTS,openssh)
# NB:
# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
distro/regular-jeos: distro/.regular-jeos use/cleanup/jeos/full \
use/install2/vmguest use/vmguest/base
@$(call add,MAIN_PACKAGES,firmware-linux)
@$(call add,INSTALL2_PACKAGES,volumes-profile-jeos)
@$(call add,CLEANUP_PACKAGES,'glib2*' libffi 'libltdl*')
@$(call add,CLEANUP_PACKAGES,bridge-utils)
@$(call add,STAGE2_BOOTARGS,quiet)
@$(call set,KFLAVOURS,un-def)
# NB: no +efi as it brings in grub2 (no ELILO support for system boot)
distro/regular-jeos-ovz: distro/.regular-jeos \
use/server/ovz-base use/control/server/ldv use/firmware
@$(call add,THE_PACKAGES,ipmitool lm_sensors3 mailx)
distro/.regular-install-x11: distro/.regular-install \
mixin/regular-desktop +vmguest
use/install2/suspend mixin/regular-desktop +vmguest +wireless
@$(call set,INSTALLER,altlinux-desktop)
@$(call add,THE_LISTS,$(call tags,regular desktop))
distro/regular-icewm: distro/.regular-sysv-gtk +icewm \
use/browser/seamonkey/i18n use/fonts/ttf/redhat
@$(call add,LIVE_LISTS,$(call tags,regular icewm))
@$(call add,LIVE_PACKAGES,gparted mnt)
@$(call add,LIVE_PACKAGES,mnt winswitch xpra)
@$(call set,KFLAVOURS,un-def)
mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot use/x11/wmaker
mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
use/fonts/ttf/redhat use/x11/wmaker
@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
@@ -92,25 +106,30 @@ mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot use/x11/wmaker
# 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
@$(call add,LIVE_PACKAGES,wdm)
@$(call set,KFLAVOURS,led-ws)
@$(call add,LIVE_PACKAGES,wdm wmxkbru)
# gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \
use/browser/firefox/classic +plymouth
use/browser/firefox/classic
@$(call add,THE_BRANDING,graphics)
distro/regular-gnustep: distro/.regular-sysv \
mixin/regular-wmaker mixin/regular-gnustep; @:
distro/regular-gnustep-systemd: distro/.regular-base +systemd \
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/x11/gtk/nm +nm; @:
use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:
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 elinks mpg123)
distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality \
use/x11/gtk/nm +nm
use/x11/gtk/nm use/im +nm
@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
@@ -119,29 +138,39 @@ distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
distro/regular-mate: distro/.regular-gtk +nm \
use/x11/mate use/fonts/ttf/google use/domain-client/full
@$(call add,LIVE_LISTS,$(call tags,mobile mate))
@$(call add,LIVE_LISTS,$(call tags,desktop sane))
distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @:
distro/regular-e19: distro/.regular-gtk use/x11/e19 use/fonts/infinality; @:
distro/regular-e19-sysv: distro/.regular-sysv-gtk use/x11/e19; @:
distro/regular-enlightenment: distro/.regular-gtk \
use/x11/enlightenment use/fonts/infinality
@$(call set,META_VOL_ID,ALT Linux regular-E/$(ARCH))
distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \
use/x11/enlightenment
@$(call set,META_VOL_ID,ALT Linux regular-E-SysV/$(ARCH))
distro/regular-cinnamon: distro/.regular-gtk \
use/x11/cinnamon use/fonts/infinality use/net/nm/mmgui
use/x11/cinnamon use/fonts/infinality use/net/nm/mmgui use/im
@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
@$(call set,KFLAVOURS,un-def)
# not .regular-gtk due to gdm vs lightdm
distro/regular-gnome3: distro/.regular-desktop \
use/x11/gnome3 use/browser/epiphany +plymouth +nm
@$(call add,LIVE_PACKAGES,livecd-gnome3-nosetup)
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,livecd-gnome3-setup-done)
@$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates)
@$(call add,LIVE_PACKAGES,gnome-flashback)
# reusable bits
mixin/regular-tde: use/syslinux/ui/gfxboot use/browser/firefox/classic \
+tde +plymouth
mixin/regular-tde: +tde \
use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
@$(call add,THE_PACKAGES,kdeedu)
@$(call add,THE_LISTS,openscada)
@$(call add,DEFAULT_SERVICES_DISABLE,upower bluez)
distro/regular-tde: distro/.regular-desktop mixin/regular-tde \
use/x11/gtk/nm use/net/nm/mmgui; @:
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; @:
@@ -149,59 +178,121 @@ distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
use/browser/konqueror4 use/fonts/zerg use/domain-client/full \
use/net/nm/mmgui +pulse +plymouth
@$(call add,LIVE_LISTS,$(call tags,regular kde4))
@$(call add,LIVE_PACKAGES,rosa-imagewriter)
@$(call add,THE_LISTS,$(call tags,regular kde4))
@$(call add,THE_PACKAGES,fonts-ttf-levien-inconsolata)
@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)
distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @:
mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
use/net/connman use/browser/qupzilla +plymouth
@$(call add,THE_PACKAGES,qconnman-ui)
@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
mixin/regular-lxqt: use/x11/lxqt use/x11/lightdm/lxqt \
use/browser/qupzilla +plymouth; @:
distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +nm; @:
distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:
distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
use/net-eth/dhcp use/efi/refind; @:
distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
distro/regular-leechcraft: distro/.regular-desktop \
use/x11/leechcraft use/x11/lightdm/lxqt +pulse; @:
distro/regular-kde5: distro/.regular-desktop \
use/x11/kde5 use/x11/sddm \
use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
+nm +pulse +plymouth
@$(call add,THE_PACKAGES,kde5-telepathy)
@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
# NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
# kernel cmdline resulting in method:disk instead of method:cdrom
# which will change propagator's behaviour to probe additional
# filesystems (ro but no loop) thus potentially writing to
# an unrecovered filesystem's journal
distro/regular-rescue: distro/.regular-bare use/rescue/rw use/luks \
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/rescue_fm.cfg \
use/syslinux/timeout/200 use/mediacheck test/rescue/no-x11
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
@$(call set,KFLAVOURS,un-def)
@$(call add,RESCUE_PACKAGES,gpm)
@$(call add,RESCUE_PACKAGES,gpm livecd-net-eth)
@$(call add,RESCUE_LISTS,$(call tags,base && (smartcard || bench)))
@$(call add,RESCUE_LISTS,$(call tags,network security))
distro/regular-sysv-tde: distro/.regular-install-x11 \
mixin/desktop-installer mixin/regular-tde \
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 set,KFLAVOURS,led-ws)
@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@$(call add,THE_LISTS,$(call tags,base desktop))
@$(call add,THE_LISTS,$(call tags,regular tde))
@$(call add,MAIN_PACKAGES,man-whatis usb-modeswitch)
@$(call add,THE_PACKAGES,kpowersave)
@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
distro/regular-server: distro/.regular-install use/server/mini use/rescue/base
distro/.regular-server-base: distro/.regular-install \
use/server/base use/stage2/kms
@$(call add,THE_LISTS,$(call tags,regular server))
@$(call add,MAIN_PACKAGES,aptitude)
@$(call set,INSTALLER,altlinux-server)
distro/regular-server-ovz: distro/regular-server \
use/server/ovz use/server/groups/base; @:
distro/.regular-server: distro/.regular-server-base \
use/server/mini use/firmware/qlogic use/rescue/base use/cleanup/x11
@$(call add,MAIN_PACKAGES,aptitude)
@$(call add,CLEANUP_PACKAGES,qt4-common)
@$(call add,DEFAULT_SERVICES_DISABLE,bridge)
distro/regular-server-hyperv: distro/regular-server
@$(call set,KFLAVOURS,un-def)
@$(call add,THE_PACKAGES,hyperv-daemons)
distro/.regular-server-managed: distro/.regular-server
@$(call add,THE_PACKAGES,alterator-fbi)
@$(call add,THE_LISTS,$(call tags,server alterator))
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
@$(call add,DEFAULT_SERVICES_DISABLE,bridge cpufreq-simple)
distro/regular-server: distro/.regular-server-managed use/server/groups/base
@$(call add,MAIN_GROUPS,server/sambaDC)
@$(call add,MAIN_GROUPS,tools/hyperv)
distro/regular-server-ovz: distro/.regular-server \
use/server/ovz use/server/groups/tools use/cleanup/x11-alterator
@$(call add,MAIN_GROUPS,tools/vzstats)
distro/regular-server-hyperv: distro/.regular-server-managed
@$(call set,KFLAVOURS,un-def)
@$(call add,THE_PACKAGES,hyperv-daemons)
@$(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,THE_PACKAGES,pve-manager)
@$(call add,THE_KMODULES,ipset kvm)
@$(call add,DEFAULT_SERVICES_ENABLE,pve-manager)
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 \
use/isohybrid use/syslinux/timeout/30 \
use/stage2/net-eth use/net-eth/dhcp
@$(call add,LIVE_PACKAGES,cifs-utils elinks lftp openssh wget)
@$(call add,LIVE_PACKAGES,bash-completion gpm screen tmux zsh)
@$(call add,LIVE_PACKAGES,ccache rpm-utils wodim)
@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
distro/regular-server-samba4: distro/regular-server
@$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator)))
@$(call add,THE_PACKAGES,alterator-fbi alterator-dhcp)
@$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind)
endif

View File

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

View File

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

View File

@@ -8,7 +8,7 @@ distro/syslinux-noescape: distro/syslinux-auto use/syslinux/noescape.cfg; @:
distro/live-systemd: distro/.base use/live/base +systemd; @:
distro/live-plymouth: distro/.live-base use/plymouth/live; @:
distro/live-mediacheck: distro/.base use/mediacheck; @:
distro/live-mediacheck: distro/.base use/mediacheck +plymouth; @:
distro/live-testserver: distro/live-install use/server/mini
@$(call set,KFLAVOURS,std-def el-smp)
@@ -25,12 +25,14 @@ distro/live-zabbix: distro/live-icewm use/net-eth
distro/icewm-efi: distro/icewm use/efi/debug use/firmware
@$(call add,INSTALL2_PACKAGES,strace)
distro/razorqt-kz: distro/regular-razorqt
distro/mate-kz: distro/regular-mate
@$(call set,GLOBAL_BOOT_LANG,kk_KZ)
@$(call add,LIVE_PACKAGES,hunspell-kk)
distro/server-systemd: distro/server-mini +systemd
@$(call set,KFLAVOURS,std-def)
# a minimalistic systemd-based server installer
distro/server-systemd: distro/server-nano \
use/install2/repo use/cleanup/x11-alterator use/net/networkd +systemd
@$(call add,CLEANUP_PACKAGES,glib2 iw libpython libwireless)
distro/server-test: distro/server-mini use/relname
@$(call set,RELNAME,Test-Server)
@@ -39,10 +41,8 @@ distro/server-test: distro/server-mini use/relname
# NB: doesn't carry stage3 thus cannot use/bootloader
distro/netinst: distro/.base use/install2/net; @:
# tiny network-only server-ovz installer (stage2 comes over net too)
distro/server-ovz-netinst: distro/.base sub/stage1 use/stage2 \
use/syslinux/ui/menu use/syslinux/localboot.cfg use/memtest
@$(call add,SYSLINUX_CFG,netinstall2)
distro/propagator-test: distro/.base use/mediacheck
@$(call add,STAGE2_BOOTARGS,propagator-debug)
distro/desktop-luks: distro/icewm use/luks; @:
distro/desktop-systemd: distro/icewm +systemd; @:

View File

@@ -1,7 +1,7 @@
ifeq (ve,$(IMAGE_CLASS))
# no "vzctl enter"
ve/bare: ve/.base use/init/sysv; @:
ve/bare: ve/.base +sysvinit; @:
# /dev/pty and friends start here
ve/base: ve/bare
@@ -26,4 +26,11 @@ ve/generic: ve/base use/repo
ve/openvpn: ve/bare
@$(call add,BASE_LISTS,$(call tags,server openvpn))
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
@$(call add,BASE_PACKAGES,interactivesystem su)
@$(call add,BASE_LISTS,openssh)
endif

View File

@@ -5,9 +5,30 @@ ifeq (vm,$(IMAGE_CLASS))
vm/bare: vm/.bare +sysvinit
@$(call add,BASE_PACKAGES,apt)
vm/net: vm/bare use/net-eth/dhcp use/net-ssh use/repo use/control/sudo-su
vm/systemd: vm/.bare +systemd
@$(call add,BASE_PACKAGES,apt)
# handle ROOTPW (through deflogin)
vm/net: vm/bare use/net-eth/dhcp use/net-ssh \
use/repo use/control/sudo-su use/deflogin
@$(call add,BASE_PACKAGES,su)
vm/systemd-net: vm/systemd use/net-eth/networkd-dhcp use/net-ssh \
use/repo use/control/sudo-su use/deflogin
@$(call add,BASE_PACKAGES,su)
# vm/net or vm/systemd-net
vm/cloud-systemd: vm/systemd-net use/vmguest/kvm
@$(call add,BASE_PACKAGES,cloud-init)
@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
@$(call set,KFLAVOURS,un-def)
@$(call add,THE_KMODULES,kdbus)
vm/cloud-sysv: vm/net use/vmguest/kvm use/power/acpi/button
@$(call add,BASE_PACKAGES,cloud-init)
@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
# NB: use/x11 employs some installer-feature packages
vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
@@ -23,4 +44,8 @@ vm/icewm-setup: vm/.desktop-bare mixin/icewm use/oem use/x11-autostart
@$(call add,THE_BRANDING,graphics)
@$(call add,THE_LISTS,$(call tags,base l10n))
# some arbitrary gigabyte
vm/vagrant-base: vm/net use/vagrant
@$(call set,VM_SIZE,10737418240)
endif

View File

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

46
doc/archdep.txt Normal file
View File

@@ -0,0 +1,46 @@
== Архитектурно-зависимые фрагменты ==
=== Makefile ===
Достаточно воспользоваться ifeq/ifneq, сравнивая $(ARCH) с нужным:
ifeq (x86_64,$(ARCH))
EFI_LISTS := $(call tags,base efi)
endif
При необходимости сравнить со списком ("любой x86") можно сделать так:
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
use/x11/xorg: use/x11 use/x11/intel use/firmware
else
use/x11/xorg: use/x11
endif
В рецептах (shell-часть Makefile) используйте $(ARCH) или $$ARCH.
=== скрипты ===
В скриптовых хуках ({image-,}scripts.d/*) проверяйте $GLOBAL_ARCH.
=== списки пакетов ===
Бывает так, что в списке пакетов есть смысл упоминать какой-либо из них
только для определённой архитектуры (например, wine или steam); в таких
случаях можно воспользоваться механизмом подстановки, который пословно
обрабатывает списки и в случае наличия суффикса @ARCH оставляет только
слова, в которых этот суффикс соответствует заданной архитектуре сборки.
Например, для Simply Linux в mkimage-profiles-desktop есть строчки:
@I586_ONLY@haspd
@X86_64_ONLY@i586-haspd
В случае mkimage-profiles они должны выглядеть так:
haspd@i586
i586-haspd@x86_64
Для преобразования можно воспользоваться следующей командой:
sed -r -e 's/@I586_ONLY@([^\t ]+)/\1@i586/g' \
-e 's/@X86_64_ONLY@([^\t ]+)/\1@x86_64/g'

View File

@@ -1,4 +1,4 @@
== Ловля плюх ==
== Ловля блох ==
При отладке сборки конфигурации или самого дистрибутива
могут оказаться полезными следующие средства:

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

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

View File

@@ -80,3 +80,4 @@ include::vm.txt[]
include::qemu.txt[]
include::archdep.txt[]

View File

@@ -70,6 +70,11 @@
** значение: пусто (по умолчанию) либо любая строка
** см. lib/build.mk
* QUIET
** отключает поясняющие сообщения при сборке (например, под cron)
** значение: пусто (по умолчанию) либо любая строка
** см. Makefile, lib/build.mk, lib/clean.mk, lib/profile.mk
* REPORT
** запрашивает создание отчётов о собранном образе
** значение: пусто (по умолчанию) либо любая строка

View File

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

View File

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

View File

@@ -65,6 +65,8 @@ prep:
# - "rootfs@/": copy feature's rootfs parts into BUILDDIR toplevel
$(FEATURES):
@feat=$@; \
args="-qab --exclude README --exclude config.mk"; \
args="$$args --exclude generate.mk --exclude generate.sh"; \
if [ -n "$(GLOBAL_DEBUG)" ]; then \
echo "** adding $$feat feature"; \
fi; \
@@ -92,7 +94,7 @@ $(FEATURES):
fi; \
: "why this overduplication was done? (still needed)"; \
for srcdir in $$srcdirs; do \
rsync -qab "$$srcdir/" "$(BUILDDIR)/$$dst/"; \
rsync $$args "$$srcdir/" "$(BUILDDIR)/$$dst/"; \
done; \
fi; \
if [ -n "$(GLOBAL_DEBUG)" ]; then \
@@ -105,7 +107,7 @@ $(FEATURES):
destdir="$(BUILDDIR)/$$dst/$$part"; \
[ -d "$$destdir" ] || continue; \
if [ "$$sub" = / -a -d "$$part" ]; then \
rsync -qab "$$part/" "$$destdir/"; \
rsync $$args "$$part/" "$$destdir/"; \
fi; \
done; \
popd >&/dev/null; \

View File

@@ -0,0 +1 @@
ehci_marvell

View File

@@ -1,5 +1,4 @@
# step 4: build the distribution image
# NB: this comes just before build-distro.mk
DOT_BASE += $(call branding,$(THE_BRANDING))

View File

@@ -3,7 +3,11 @@ use/browser:
@$(call add,THE_PACKAGES_REGEXP,$$(THE_BROWSER))
@$(call try,THE_BROWSER,webclient) # fallback
use/browser/firefox use/browser/seamonkey \
# support both firefox and firefox-esr
use/browser/firefox: use/browser
@$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR))
use/browser/seamonkey \
use/browser/chromium use/browser/epiphany \
use/browser/qupzilla use/browser/rekonq \
use/browser/elinks use/browser/links2: \
@@ -16,12 +20,23 @@ use/browser/konqueror: use/browser
use/browser/konqueror4: use/browser
@$(call set,THE_BROWSER,kde4base-konqueror)
# the complete lack of dependencies is intentional
use/browser/firefox/esr: use/browser
@$(call set,FX_FLAVOUR,-esr)
use/browser/firefox/h264: use/browser/firefox
@$(call add,THE_BROWSER,gst-libav)
@$(call add,THE_BROWSER,gst-plugins-base1.0 gst-plugins-good1.0)
use/browser/firefox/live: use/browser/firefox
@$(call add,THE_BROWSER,livecd-firefox)
# scarey, and will have to be done otherwise when l10n feature is there
use/browser/firefox/i18n: use/browser/firefox
@$(call add,THE_BROWSER,firefox-be firefox-kk firefox-ru firefox-uk)
@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-be)
@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-kk)
@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-ru)
@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-uk)
# fx29+
use/browser/firefox/classic: use/browser/firefox
@@ -35,4 +50,4 @@ use/browser/plugin/flash: use/browser
@$(call add,THE_PACKAGES,mozilla-plugin-adobe-flash)
use/browser/plugin/java: use/browser
@$(call add,THE_PACKAGES,mozilla-plugin-java-1.6.0-sun)
@$(call add,THE_PACKAGES,mozilla-plugin-java-1.8.0-openjdk)

View File

@@ -1,6 +1,6 @@
#!/bin/sh
# predictable file locations make bootloader configuration simple;
# this script relates to features.in/stage2/stage1/scripts.d/80-make-initfs
# this script relates to features.in/stage2/stage1/scripts.d/81-make-initfs
kver="$(rpm -qa 'kernel-image*' \
--qf '%{installtime} %{version}-%{name}-%{release}\n' \

View File

@@ -38,6 +38,7 @@ convert-image: prepare-image
qemu-img convert -O "$$VM_FORMAT" \
"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
rm "$(VM_RAWDISK)"; \
if [ -z "$(DEBUG)" ]; then rm "$(VM_TARBALL)"; fi; \
fi
run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)

View File

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

View File

@@ -1,20 +1,43 @@
use/cleanup:
@$(call add_feature)
@$(call xport,CLEANUP_PACKAGES)
@$(call xport,CLEANUP_BASE_PACKAGES)
use/cleanup/libs:
@$(call add,BASE_PACKAGES,apt-scripts)
@$(call add,INSTALL2_PACKAGES,installer-feature-cleanup-libs-stage3)
use/cleanup/installer: use/cleanup
@$(call add,CLEANUP_PACKAGES,'installer-*')
@$(call add,CLEANUP_BASE_PACKAGES,'installer-*')
use/cleanup/x11: use/cleanup
@$(call add,CLEANUP_PACKAGES,libSM libXext libXmu libXi)
use/cleanup/x11: use/cleanup use/cleanup/libs
@$(call add,CLEANUP_PACKAGES,libICE libSM libxcb 'libX*')
# as some alterator modules are installed into stage3 (the destination
# root filesystem) to perform actions like bootloader setup, we might
# have to remove them (contrary to the usual build-up)...
use/cleanup/alterator: use/cleanup
@$(call add,CLEANUP_PACKAGES,'alterator*' rpm-macros-alterator)
@$(call add,CLEANUP_PACKAGES,'guile*' libvhttpd)
@$(call add,CLEANUP_PACKAGES,'guile*' libvhttpd autologin-sh-functions)
# for lightweight server distros
use/cleanup/x11-alterator: use/cleanup/x11 use/cleanup/alterator
@$(call add,CLEANUP_PACKAGES,libmng qt4-common)
# "basically everything else"; this *will* change with branches and distros
use/cleanup/jeos: use/cleanup/x11-alterator
@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libpng*' 'libtiff*')
@$(call add,CLEANUP_PACKAGES,avahi-autoipd iw wpa_supplicant)
@$(call add,CLEANUP_PACKAGES,openssl libpcsclite)
@# a *lot* of stray things get pulled in by alterator modules
@$(call add,CLEANUP_PACKAGES,libfreetype fontconfig)
@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libpng*' 'libtiff*')
@$(call add,CLEANUP_PACKAGES,openssl libpcsclite)
# mostly non-interactive system
use/cleanup/jeos/full: use/cleanup/jeos
@$(call add,CLEANUP_PACKAGES,interactivesystem 'groff*' man stmpclean)
@$(call add,CLEANUP_PACKAGES,glibc-gconv-modules gettext)
@$(call add,CLEANUP_PACKAGES,console-scripts console-vt-tools 'kbd*')
@$(call add,CLEANUP_PACKAGES,libsystemd-journal libsystemd-login)
@$(call add,CLEANUP_PACKAGES,dbus libdbus)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -2,7 +2,10 @@
# issue welcome message if there's a guest user
# (the first one configured with empty password)
[ -n "$GLOBAL_USERS" ] || exit 1
[ -n "$GLOBAL_USERS" ] || {
echo "** 50-issue: warning, no users created" >&1
exit 0
}
guest=
for u in $GLOBAL_USERS; do

View File

@@ -18,6 +18,7 @@ set_password() { echo "$1:$2" | chpasswd; }
set_admin() { usermod -a --groups "wheel" "$1"; }
# NB: one must care to purge this from LiveCD if it's installed permanently
set_sudo() {
[ ! -w "/etc/sudoers" ] ||
echo "$1 ALL=(ALL) ALL" >> "/etc/sudoers"

View File

@@ -3,3 +3,9 @@
Реализована поддержка LiveCD, возможно приспособление для образов
сборочных VM/VE.
Обратите внимание: эта фича достаточно серьёзно изменяет поведение
субпрофиля main, оставляя из всего обычного множества обрабатываемых
переменных только MAIN_PACKAGES, MAIN_PACKAGES_REGEXP и MAIN_LISTS
во избежание дублирования не требующихся для сборки минимальных
образов пакетов.

View File

@@ -11,3 +11,15 @@ use/dev/repo: use/dev use/repo/main
@$(call add,MAIN_PACKAGES,rpm-build basesystem)
@$(call add,MAIN_PACKAGES,fakeroot sisyphus_check)
@$(call add,MAIN_PACKAGES,file make-initrd make-initrd-propagator)
use/dev/builder/base: use/dev/mkimage use/dev
@$(call set,KFLAVOURS,$(BIGRAM))
@$(call add,LIVE_LISTS,\
$(call tags,(base || live) && (server || builder)))
@$(call add,LIVE_PACKAGES,livecd-qemu-arch strace)
@$(call add,LIVE_PACKAGES,qemu-user-binfmt_misc)
use/dev/builder/full: use/dev/builder/base use/dev/repo
@$(call add,MAIN_LISTS,$(call tags,live builder))
@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ xorriso)
@$(call add,LIVE_PACKAGES,sudo)

View File

@@ -1,6 +1,33 @@
#!/bin/sh -efu
# configure hasher (implies that 30-users has been run already)
ARCH="$(rpm --eval '%_host_cpu')"
[ -n "$ARCH" ] || exit 2
gray="$(echo -ne "\\033[0;37m")"
white="$(echo -ne "\\033[1;37m")"
cyan="$(echo -ne "\\033[1;36m")"
# root
cat >> /root/.bash_profile << EOF
ram="\$(awk '/^MemTotal/ { print int(\$2/1024+0.5) }' /proc/meminfo)"
swap="\$(awk '/^SwapTotal/ { print int(\$2/1024+0.5) }' /proc/meminfo)"
tmpfs="\$(df -kT /tmp 2>/dev/null \\
| awk '/^[a-zA-Z_0-9/-]+[[:space:]]+tmpfs/ { print int(\$3/1024); }')"
cat << EOH
Welcome to live builder host system!
Memory: $cyan\${ram}M$gray, swap: $cyan\${swap}M$gray
Autoconfigured tmpfs on /tmp: $cyan\${tmpfs}M$gray
Run ${white}swapon${gray}(8) on any local swaps you might like to employ
followed by ${white}service livecd-tmpfs restart${gray} to reconfigure tmpfs
EOH
EOF
# predefined passwordless livecd user
USER="altlinux"
if ! id "$USER" >&/dev/null; then
@@ -12,6 +39,9 @@ fi
HOME="/home/$USER"
install -dm750 -o "$USER" -g "$USER" "$HOME"
# http://altlinux.org/tmpfs
TMP="/tmp/.private/$USER"
# we honestly don't know much more
if type -t git && type -t su; then
su - -c "git config --global user.email $USER@localhost" "$USER"
@@ -22,18 +52,62 @@ fi >&/dev/null
ZSHELL="/bin/zsh"
if [ -x "$ZSHELL" ]; then
chsh -s "$ZSHELL" "$USER"
install -m755 -o "$USER" -g "$USER" /dev/null "$HOME/.zshrc"
echo "mkdir -p \"\$TMP/hasher\"" >> "$HOME/.zshrc"
install -m644 -o "$USER" -g "$USER" /dev/null "$HOME/.zshrc"
cat >> "$HOME/.zsh_history" <<-EOF
git clone git://git.altlinux.org/gears/m/mkimage-profiles.git && cd mkimage-profiles && make help/distro
make -C /usr/share/mkimage-profiles syslinux.iso
git clone git://git.altlinux.org/gears/h/hello.git && cd hello && gear-hsh
EOF
fi
# $TMP
TMP="/tmp/.private/$USER"
sed -i '/^%_tmppath.*tmp$/d' "$HOME/.rpmmacros"
echo "%_tmppath $TMP" >> "$HOME/.rpmmacros"
if type -t screen; then
cat >> "$HOME/.screenrc" <<-EOF
caption always "%{+b rk}%H%{gk} |%c %{yk}%d.%m.%Y | %72=Load: %l %{wk}"
defscrollback 1000
EOF
fi >&/dev/null
# ~/hasher
cat >> "$HOME/.profile" << EOF
alias l='ls -l'
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:
* ${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};
* ${white}mkimage-profiles${gray} described in Russian at ${cyan}http://altlinux.org/m-p${gray}
Examples (use right/middle mouse button to paste; see ~/hasher/repo/):
* ${white}git clone git://git.altlinux.org/gears/h/hello.git && cd hello && gear-hsh${gray}
* ${white}make -C /usr/share/mkimage-profiles syslinux.iso${gray}
EOH
EOF
# rpm
sed -i '/^%_tmppath.*tmp$/d' "$HOME/.rpmmacros"
cat << EOF >> "$HOME/.rpmmacros"
%packager Unknown <nobody@altlinux.org>
%_target_cpu $ARCH
%_tmppath $TMP
%_sourcedir %{_topsrcdir}/SOURCES/%name
EOF
# hasher
WORKDIR="$TMP/hasher"
ln -s "$TMP/hasher" "$HOME/hasher"
ln -s "$WORKDIR" "$HOME/hasher"
echo "rpm-dir file://$HOME/hasher/repo $ARCH hasher" \
>> /etc/apt/sources.list.d/hasher.list
mkdir "$HOME/.hasher"
cat >> "$HOME/.hasher/config" << EOF
packager="\$(rpm --eval %packager)"
def_target=$ARCH
export GCC_USE_CCACHE=1
mkdir -p "$WORKDIR"
EOF
# online repo needs network not isolation
echo "export share_network=1" >> /etc/profile.d/hasher.sh

View File

@@ -0,0 +1,4 @@
# only MAIN_* should go in this time
IMAGE_PACKAGES_REGEXP = $(MAIN_PACKAGES_REGEXP)
IMAGE_PACKAGES = $(MAIN_PACKAGES) $(call map,list,$(MAIN_LISTS))

12
features.in/docs/README Normal file
View File

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

View File

@@ -0,0 +1,21 @@
# copy the packaged docs to image root
# packaged documentation sources:
# 1) branding-*-indexhtml
# 2) docs-* (should be installed elsewhere)
+docs: use/docs; @:
use/docs:
@$(call add_feature)
use/docs/indexhtml: use/docs use/branding
@$(call add,THE_BRANDING,indexhtml)
use/docs/manual: use/docs
@$(call xport,DOCS)
@$(call add,THE_PACKAGES,docs-$$(DOCS))
use/docs/license: use/docs use/branding
@$(call add,THE_BRANDING,notes)
use/docs/full: use/docs/indexhtml use/docs/manual use/docs/license; @:

View File

@@ -0,0 +1,12 @@
# step 4: build the distribution image
ifneq (,$(DOCS))
DOT_BASE += docs-$(DOCS)
CHROOT_PACKAGES += docs-$(DOCS)
endif
ifneq (,$(BRANDING))
CHROOT_PACKAGES_REGEXP += $(call branding,notes)
endif
CHROOT_PACKAGES_REGEXP += $(call branding,indexhtml)

View File

@@ -0,0 +1,46 @@
#!/bin/sh -e
# trailing slash is important here
dest="docs/"
mkdir -p "$WORKDIR/$dest"
cd $WORKDIR
nonfatal() { echo "** $*" >&2; exit 0; }
indexdir="/usr/share/doc/indexhtml"
indexfile="$indexdir/index.html"
[ -s "$indexfile" ] || nonfatal "$indexfile not found"
[ -n "$GLOBAL_LOCALE" ] ||
echo "** warning: GLOBAL_LOCALE empty, maybe use/l10n" >&2
LANG="$GLOBAL_LOCALE" indexhtml-update
# http://unix.stackexchange.com/questions/94185/convert-soft-to-hardlinks
cp -aH "$indexdir" "$dest"
mkredir() {
cat >"${1}index.html" <<-EOF
<html>
<head>
<meta http-equiv="refresh" content="0;url=${2}indexhtml/index.html">
<title>Redirecting...</title>
</head>
<body>
<h1>Redirecting...</h1>
</body>
</html>
EOF
}
mkredir "" "$dest" # /index.html -> docs/indexhtml/index.html
mkredir "$dest" "" # docs//index.html -> indexhtml/index.html
docdir="/usr/share/doc/documentation"
[ -d "$docdir" ] || nonfatal "$docdir not found"
cp -aH "$docdir" "$dest"
### no need to replace symlinks with hardlinks by now? (-aH)

View File

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

View File

@@ -14,13 +14,15 @@ use/efi:
@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
@$(call try,EFI_BOOTLOADER,elilo) # default one
@$(call add,STAGE1_KCONFIG,EFI EFI_PARTITION EFI_VARS FB_EFI)
@$(call set,MKI_VER_OPTIMAL,0.2.17) # for EFI_BOOTARGS
@$(call add,EFI_BOOTARGS,$$(STAGE2_BOOTARGS))
use/efi/refind: use/efi
@$(call set,EFI_BOOTLOADER,refind)
use/efi/signed: use/efi
@$(call set,EFI_CERT,altlinux)
@$(call add,THE_PACKAGES,shim-signed)
@$(call add,COMMON_PACKAGES,shim-signed)
@$(call add,RESCUE_PACKAGES,openssl pesign sbsigntools)
use/efi/shell: use/efi
@@ -31,7 +33,6 @@ use/efi/memtest86: use/efi/refind
use/efi/debug: use/efi
@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
@$(call set,KFLAVOURS,led-ws)
else

View File

@@ -6,7 +6,7 @@ use/firmware:
@$(call add_feature)
@$(call add,SYSTEM_PACKAGES,firmware-linux)
use/firmware/full: use/firmware/server use/firmware/laptop
use/firmware/full: use/firmware/server use/firmware/laptop; @:
use/firmware/cpu: use/firmware
@$(call add,THE_PACKAGES,microcode-data-intel microcode_ctl)
@@ -15,14 +15,22 @@ use/firmware/server: use/firmware
@$(call add,SYSTEM_PACKAGES,firmware-aic94xx-seq)
@$(call add,THE_PACKAGES_REGEXP,firmware-ql.*)
use/firmware/qlogic: use/firmware
@$(call add,SYSTEM_PACKAGES,firmware-ql2100)
@$(call add,SYSTEM_PACKAGES,firmware-ql2200)
@$(call add,SYSTEM_PACKAGES,firmware-ql2300)
@$(call add,SYSTEM_PACKAGES,firmware-ql2322)
@$(call add,SYSTEM_PACKAGES,firmware-ql2400)
@$(call add,SYSTEM_PACKAGES,firmware-ql2500)
@$(call add,SYSTEM_PACKAGES,firmware-ql6312)
# NB: individual firmwarez would sometimes conflict
# with ones newly merged into firmware-linux
# FIXME: kernel modules rather belong to use/hardware
use/firmware/wireless: use/firmware use/kernel/wireless
use/firmware/wireless: use/firmware
@$(call add,THE_PACKAGES,firmware-acx100)
@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)
use/firmware/laptop: use/firmware/wireless use/firmware/cpu
use/firmware/laptop: use/firmware/cpu
@$(call add,KMODULES,acpi_call)

View File

@@ -4,6 +4,10 @@ use/fonts:
@$(call xport,FONT_FEATURES_ENABLE)
@$(call xport,FONT_FEATURES_DISABLE)
# standalone target to specify non-bitmap installer fonts
use/fonts/install2:
@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
# just stating that kernels and font habits are pretty individual
use/fonts/zerg: use/fonts
@$(call set,FONT_FEATURES_ENABLE,antialias lcdfilter-default \
@@ -27,7 +31,9 @@ use/fonts/otf/mozilla:
@$(call add,THE_PACKAGES,fonts-otf-mozilla-fira)
use/fonts/ttf/google:
@$(call add,THE_PACKAGES,fonts-ttf-droid)
@$(call add,THE_PACKAGES,fonts-ttf-google-droid-sans)
@$(call add,THE_PACKAGES,fonts-ttf-google-droid-sans-mono)
@$(call add,THE_PACKAGES,fonts-ttf-google-droid-serif)
@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-arimo)
@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-cousine)
@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-tinos)

4
features.in/im/README Normal file
View File

@@ -0,0 +1,4 @@
Эта фича добавляет средства настройки методов ввода (Input Methods).
На данный момент является экспериментальной, приветствуется помощь
в тестировании/доработке/отладке.

6
features.in/im/config.mk Normal file
View File

@@ -0,0 +1,6 @@
# Input Method configuration through IBus
use/im:
@$(call add_feature)
@$(call add,THE_PACKAGES,$$(IM_PACKAGES))
@$(call add,THE_LISTS,$(call tags,desktop ibus))

View File

@@ -10,10 +10,19 @@ use/init:
use/init/sysv: use/init
@$(call set,INIT_TYPE,sysvinit)
@$(call add,BASE_PACKAGES,syslogd)
@$(call add,BASE_PACKAGES_REGEXP,^systemd- ^systemd-services-)
use/init/sysv/polkit: use/init/sysv
@$(call add,THE_PACKAGES,polkit-sysvinit)
### i-f should be dropped as soon as rootfs scripts are effective there
use/init/systemd: use/init
@$(call set,INIT_TYPE,systemd)
@$(call add,BASE_PACKAGES,installer-feature-systemd-stage3)
@$(call add,BASE_PACKAGES,installer-feature-journald-tty)
@$(call add,INSTALL2_PACKAGES,installer-feature-journald-tty)
# 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)
@$(call add,SERVICES_ENABLE,debug-shell)
@$(call add,STAGE2_BOOTARGS,systemd.log_level=debug)
@$(call add,STAGE2_BOOTARGS,systemd.log_target=kmsg)
@$(call add,STAGE2_BOOTARGS,log_buf_len=1M enforcing=0)

View File

@@ -3,7 +3,7 @@
+installer: use/install2/full; @:
use/install2: use/stage2 sub/stage2@install2 use/metadata \
use/cleanup/installer use/bootloader
use/cleanup/installer
@$(call add_feature)
@$(call try,INSTALLER,altlinux-generic) # might be replaced later
@$(call add,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
@@ -16,8 +16,17 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
@$(call xport,INSTALL2_CLEANUP_KDRIVERS)
# doesn't use/install2/fs on purpose (at least so far)
use/install2/full: use/install2/packages use/install2/kms use/install2/vmguest \
use/syslinux/localboot.cfg use/syslinux/ui/menu; @:
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)
# for distributions with their own -stage3 installer part
use/install2/stage3: use/install2
@$(call add,BASE_PACKAGES,installer-$$(INSTALLER)-stage3)
# just an alias, better use its endpoint directly
use/install2/fonts: use/fonts/install2
# see also use/vmguest
use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @:
@@ -33,10 +42,6 @@ use/install2/repo: use/install2
use/install2/net: use/install2
@$(call add,INSTALL2_PACKAGES,curl)
# modern free xorg drivers for mainstream hardware require KMS support
use/install2/kms: use/stage2/kms
@$(call add,BASE_KMODULES_REGEXP,drm.*)
# see also use/vmguest/kvm; qxl included in xorg pkglist
use/install2/kvm:
@$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl)
@@ -44,6 +49,7 @@ use/install2/kvm:
# virtualbox guest support for installer
use/install2/vbox:
@$(call add,STAGE1_KMODULES,virtualbox-addition vboxguest)
@$(call add,INSTALL2_PACKAGES,xorg-drv-vboxvideo)
# see also use/vmguest/vmware
use/install2/vmware:
@@ -67,6 +73,14 @@ use/install2/jfs:
use/install2/reiserfs:
@$(call add,SYSTEM_PACKAGES,reiserfsprogs)
# prepare bootloader for software suspend (see also live)
use/install2/suspend:
@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-suspend-stage2)
# extras
use/install2/tools:
@$(call add,INSTALL2_PACKAGES,pxz)
# when VNC installation is less welcome than a few extra megs
use/install2/cleanup/vnc:
@$(call add,INSTALL2_CLEANUP_PACKAGES,x11vnc xorg-xvfb)

View File

@@ -0,0 +1,8 @@
#!/bin/sh
# purge outstanding binaries (up to 1.5M each)
rm -f /sbin/{sash,sln,tc}
rm -f /usr/bin/{openssl,ipv6log*}
rm -f /bin/ipv6calc
:

View File

@@ -14,5 +14,11 @@ use/kernel/net:
@$(call add,THE_KMODULES,e1000e igb)
@$(call add,MAIN_KMODULES,r8168 rtl8168)
use/kernel/wireless:
use/kernel/wireless: use/firmware/wireless
@$(call add,THE_KMODULES,bcmwl ndiswrapper)
use/kernel/laptop: use/firmware/laptop
@$(call add,KMODULES,omnibook tp_smapi)
use/kernel/desktop:
@$(call add,KMODULES,lirc v4l)

View File

@@ -0,0 +1,6 @@
# l10n
nls_base.ko
nls_cp866.ko
nls_koi8-r.ko
nls_utf8.ko
#

View File

@@ -7,3 +7,15 @@
при появлении необходимости обойтись без него можно
временно продублировать содержимое цели и сообщить
о таком случае.
Дополнительно обрабатываемые переменные:
* LIVE_REPO
** позволяет выбрать и включить зеркало репозитория
** значение: http/alt (по умолчанию) либо протокол/зеркало
** см. тж. /etc/apt/sources.list.d/, проверьте наличие нужного!
* LIVE_CLEANUP_KDRIVERS
** перечисляет префиксы каталогов драйвров ядра для удаления
** значение: пусто (по умолчанию) или список через пробел
** см. config.mk

View File

@@ -12,16 +12,19 @@ _OFF = anacron blk-availability bridge clamd crond dhcpd dmeventd dnsmasq \
# 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/deflogin/live
use/live: use/stage2 sub/rootfs@live sub/stage2@live use/services
@$(call add_feature)
@$(call add,CLEANUP_PACKAGES,'installer*')
@$(call add,CLEANUP_BASE_PACKAGES,'installer*')
@$(call add,DEFAULT_SERVICES_ENABLE,$(_ON))
@$(call add,DEFAULT_SERVICES_DISABLE,$(_OFF))
@$(call add,CONTROL,rpcbind:local)
@$(call xport,LIVE_CLEANUP_KDRIVERS)
use/live/base: use/live use/net use/syslinux/ui/menu
@$(call add,LIVE_LISTS,$(call tags,base && (live || network)))
use/live/.base: use/live use/syslinux/ui/menu
@$(call add,LIVE_LISTS,$(call tags,base live))
use/live/base: use/live/.base use/net use/deflogin/live
@$(call add,LIVE_LISTS,$(call tags,base network))
# rw slice, see http://www.altlinux.org/make-initrd-propagator and #28289
ifeq (,$(EFI_BOOTLOADER))
@@ -32,8 +35,7 @@ use/live/rw: use/live; @:
endif
# graphical target (not enforcing xorg drivers or blobs)
use/live/x11: use/live/base use/syslinux/localboot.cfg \
use/deflogin/desktop use/x11-autologin use/sound \
use/live/x11: use/live/base use/deflogin/desktop use/x11-autologin use/sound \
use/fonts/otf/adobe use/fonts/otf/mozilla +power +efi
@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
@$(call add,LIVE_LISTS,$(call tags,base l10n))
@@ -42,7 +44,8 @@ use/live/x11: use/live/base use/syslinux/localboot.cfg \
# this target specifically pulls free xorg drivers in (and a few more bits);
# a browser is requested too, the recommended one can be overridden downstream
use/live/desktop: use/live/x11 use/x11/xorg use/x11/wacom \
use/l10n use/browser/firefox/live use/xdg-user-dirs/deep +vmguest; @:
use/l10n use/browser/firefox/live use/xdg-user-dirs/deep \
use/syslinux/localboot.cfg +vmguest; @:
# preconfigure apt for both live and installed-from-live systems
use/live/repo: use/live
@@ -82,4 +85,24 @@ use/live/hooks: use/live
use/live/ru: use/live use/l10n/default/ru_RU; @:
use/live/sound: use/live
@$(call add,LIVE_PACKAGES,amixer alsa-utils aplay udev-alsa)
@$(call add,LIVE_LISTS,sound/base)
# prepare bootloader for software suspend (see also install2)
use/live/suspend: use/live
@$(call add,LIVE_PACKAGES,installer-feature-desktop-suspend-stage2)
# deny network/local drive access for security reasons
use/live/privacy: use/services use/memclean use/deflogin
@$(call add,DEFAULT_SERVICES_ENABLE,livecd-nodisks)
@$(call add,LIVE_PACKAGES,livecd-nodisks)
@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/net/)
@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/net/)
@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/ata/)
@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/scsi/)
@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/block/)
@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/cdrom/)
@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/firewire/)
@$(call add,LIVE_CLEANUP_KDRIVERS,kernel/drivers/bluetooth/)
@$(call set,STAGE1_MODLISTS,stage2-ata stage2-drm stage2-hid)
@$(call add,STAGE1_MODLISTS,stage2-mmc stage2-usb)
@$(call add,USERS,altlinux:::)

View File

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

View File

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

View File

@@ -0,0 +1,7 @@
#!/bin/sh -e
if [ -n "$GLOBAL_LIVE_CLEANUP_KDRIVERS" ]; then
for i in $GLOBAL_LIVE_CLEANUP_KDRIVERS; do
rm -rf /lib/modules/*/"$i"
done
fi

View File

@@ -0,0 +1,4 @@
#!/bin/sh
# URW fonts are responsible for sub-par website text rendering usually...
rm -f /etc/X11/fontpath.d/type1-urw:pri=40

View File

@@ -6,7 +6,7 @@ cd /usr/share/fonts/bitmap/misc/ &&
# drop unneeded translation
# FIXME: whitelist is reasonable
cd /usr/share/qt4/translations/ &&
cd /usr/share/qt?/translations/ &&
rm -f *_ar* *_cs* *_da* *_de* *_es* *_fa* *_fr* \
*_gl* *_he* *_hu* *_ko* *_pl* \
*_sk* *_sl* *_sv*

View File

@@ -0,0 +1,2 @@
Эта фича добавляет и включает очистку освобождаемой памяти
средствами zmalloc (через LD_PRELOAD).

View File

@@ -0,0 +1,4 @@
use/memclean: use/control
@$(call add_feature)
@$(call add,THE_PACKAGES,libzmalloc)
@$(call add,CONTROL,libzmalloc:enabled)

View File

@@ -15,7 +15,7 @@ if [ -n "$($(2)_$(1))" ]; then \
echo -e "\n## $(2)_$(1)"; \
case "$(1)" in \
PACKAGES) echo "$($(2)_$(1))";; \
LISTS) cat $($(2)_$(1));; \
LISTS) echo -e "\n# $($(2)_$(1))"; cat $($(2)_$(1));; \
esac; \
fi;
endef
@@ -40,4 +40,5 @@ metadata: metadata-.base
tar -C $(PKGDIR) -cvf - \
$(call rlist,$(THE_GROUPS) $(MAIN_GROUPS) .base) \
$(call rgroup,$(THE_GROUPS) $(MAIN_GROUPS)) \
$(call rprofile,$(PKG_PROFILES)) \
> $(METADIR)/pkg-groups.tar

View File

@@ -3,7 +3,12 @@
# see also use/stage2/net-eth; do not depend on it though
# as stage2-less images need preconfigured networking too
use/net-eth: use/net
use/net-eth: use/net/etcnet
@$(call add_feature)
@$(call xport,NET_ETH)
@$(call add,BASE_PACKAGES,udev-rule-generator-net)
use/net-eth/networkd: use/net/networkd
@$(call add_feature)
@$(call xport,NET_ETH)
@$(call add,BASE_PACKAGES,udev-rule-generator-net)
@@ -12,4 +17,7 @@ use/net-eth: use/net
use/net-eth/dhcp: use/net-eth use/net/dhcp
@$(call add,NET_ETH,eth0:dhcp)
use/net-eth/networkd-dhcp: use/net-eth/networkd
@$(call add,NET_ETH,eth0:dhcp)
# use e.g. eth0:static:10.0.0.2/24:10.0.0.1 for predefined static configuration

View File

@@ -13,26 +13,38 @@ else
NMCTL=no
fi
IFACEDIR="/etc/net/ifaces"
ETCNET_IFDIR="/etc/net/ifaces"
SYSTEMD_IFDIR="/etc/systemd/network"
# uses global variables
write_iface() {
dir="$IFACEDIR/$iface"
case "$proto" in
dhcp)
;;
static)
[ -n "$ipv4addr" ] || fatal "ipv4addr missing"
;;
*)
fatal "unknown proto value: $proto"
;;
esac
[ -d "$ETCNET_IFDIR" ] && write_etcnet_iface ||:
[ -d "$SYSTEMD_IFDIR" ] && write_systemd_iface ||:
}
# these use global variables
write_etcnet_iface() {
dir="$ETCNET_IFDIR/$iface"
mkdir -p "$dir"
append=
case "$proto" in
dhcp)
append="DHCP_TIMEOUT=3"
append="DHCP_TIMEOUT=7"
;;
static)
[ -n "$ipv4addr" ] || fatal "ipv4addr missing"
echo "$ipv4addr" > "$dir/ipv4address"
[ -z "$ipv4gw" ] ||
echo "default via $ipv4gw" > "$dir/ipv4route"
;;
*)
fatal "unknown proto value: $proto"
;;
esac
{
echo "TYPE=eth"
@@ -44,6 +56,28 @@ write_iface() {
} > "$dir/options"
}
write_systemd_iface() {
case "$proto" in
dhcp)
echo "[Match]"
echo "Name=$iface"
echo
echo "[Network]"
echo "DHCP=yes"
;;
static)
echo "[Match]"
echo "Name=$iface"
echo
echo "[Network]"
echo "Address=$ipv4addr"
[ -z "$ipv4gw" ] ||
echo "Gateway=$ipv4gw"
echo "LinkLocalAddressing=no"
;;
esac > "$SYSTEMD_IFDIR/$iface.network"
}
[ -z "$GLOBAL_NET_ETH" ] ||
echo "$GLOBAL_NET_ETH" \
| tr ' ' '\n' \

View File

@@ -2,6 +2,9 @@
use/net: use/services
@$(call add_feature)
@$(call add,THE_PACKAGES,network-config-subsystem)
use/net/etcnet: use/net
@$(call add,THE_PACKAGES,etcnet)
@$(call add,DEFAULT_SERVICES_ENABLE,network)
@@ -12,6 +15,7 @@ use/net/dhcp: use/net
use/net/nm: use/net
@$(call add,THE_LISTS,$(call tags,base nm))
@$(call add,LIVE_PACKAGES,livecd-save-nfs)
@$(call add,DEFAULT_SERVICES_ENABLE,network) # need for NM?
@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)
@$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs) # keep interface up
@@ -24,3 +28,7 @@ use/net/nm/mmgui: use/net/nm
use/net/connman: use/net
@$(call add,THE_PACKAGES,connman)
@$(call add,DEFAULT_SERVICES_ENABLE,connmand connman)
use/net/networkd: use/net
@$(call add,THE_PACKAGES,systemd-networkd)
@$(call add,DEFAULT_SERVICES_ENABLE,systemd-networkd)

View File

@@ -0,0 +1,6 @@
# net
kernel/drivers/net/mii.ko
kernel/drivers/net/phy
kernel/drivers/net/ethernet
kernel/drivers/net/usb
#

4
features.in/ntp/README Normal file
View File

@@ -0,0 +1,4 @@
Эта фича конфигурирует службу NTP в качестве клиента
с целью предоставления точного времени в составе LiveCD;
для установленных систем рекомендуется применение модуля
alterator-datetime.

View File

@@ -0,0 +1,8 @@
use/ntp: use/services
@$(call add_feature)
@$(call add,THE_PACKAGES,openntpd)
@$(call add,DEFAULT_SERVICES_ENABLE,ntpd)
use/ntp/client: use/ntp
@$(call add,NTP_SERVERS,pool.ntp.org)
@$(call xport,NTP_SERVERS)

View File

@@ -0,0 +1,10 @@
#!/bin/sh
# basic NTP client configuration
. shell-config
CONFIG="/etc/ntpd.conf"
[ -f "$CONFIG" ] || exit 0
[ -n "$GLOBAL_NTP_SERVERS" ] || exit 0
shell_config_set "$CONFIG" 'servers' "$GLOBAL_NTP_SERVERS" '[[:space:]]\+' ' '

View File

@@ -20,9 +20,10 @@ use/plymouth/stage2: use/plymouth use/branding \
@$(call add,STAGE2_BRANDING,bootsplash)
@$(call add,STAGE2_BOOTARGS,quiet splash)
use/plymouth/base: use/plymouth/stage2 use/install2/kms
use/plymouth/base: use/plymouth/stage2
@$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth)
@$(call add,BASE_PACKAGES_REGEXP,make-initrd-plymouth cpio)
@$(call add,BASE_KMODULES_REGEXP,drm.*)
@$(call add,THE_BRANDING,bootsplash)
use/plymouth/full: use/plymouth/stage2 use/plymouth/base; @:

View File

@@ -0,0 +1,19 @@
#!/bin/sh
# re-enable insecure DSA and DH SHA1 support
# see also: http://www.openssh.com/legacy.html
# any openssh at all?
[ -d /etc/openssh ] && cd /etc/openssh || exit 0
# is it p7 or earlier (which won't grok the lines added below)?
[ $(rpmvercmp $(rpmquery --qf='%{VERSION}' openssh-common) 7.0) != "-1" ] ||
exit 0
KEY_TYPES="PubkeyAcceptedKeyTypes +ssh-dss,ssh-dss-cert-v01@openssh.com"
KEX_ALGOS="KexAlgorithms +diffie-hellman-group1-sha1"
grep -qs "^$KEY_TYPES" sshd_config || echo "$KEY_TYPES" >> sshd_config
grep -qs "^$KEY_TYPES" ssh_config || echo "$KEY_TYPES" >> ssh_config
grep -qs "^$KEX_ALGOS" ssh_config || echo "$KEX_ALGOS" >> ssh_config
:

View File

@@ -10,11 +10,14 @@ if [ -x /etc/rc.d/init.d/rpcbind ]; then
fi
# remove unwanted startup scripts
echo "** removing initscripts:"
find /etc/rc.d/rc{2,3,4,5}.d/ -type l -name 'S*' \
-not -name '*livecd-net-eth' \
-not -name '*logd' \
-not -name '*network' \
-not -name '*rpcbind' \
-not -name '*random' \
-not -name '*rescue-remote' \
-not -name '*sysreport' \
-not -name '*udev*' \
-delete -print

View File

@@ -1,23 +1,32 @@
use/server: use/power/acpi/button
@$(call add_feature)
use/server/mini: use/server use/net-ssh use/syslinux/timeout/600
use/server/base: use/server use/firmware/server \
use/net-ssh use/syslinux/timeout/600
@$(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
@$(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)
use/server/ovz: use/server
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_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,BASE_LISTS,ovz-server)
@$(call add,MAIN_KMODULES,staging)
@$(call add,BASE_LISTS,$(call tags,server openvz))
# NB: examine zabbix-preinstall package, initialization is NOT automatic!
use/server/zabbix: use/server use/services use/control
@@ -26,7 +35,17 @@ use/server/zabbix: use/server use/services use/control
@$(call add,DEFAULT_SERVICES_ENABLE,httpd2 mysqld postfix)
@$(call add,CONTROL,postfix:server)
use/server/groups/base: use/server
@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
@$(call add,MAIN_GROUPS,ipmi mysql-server dhcp-server mail-server)
@$(call add,MAIN_GROUPS,monitoring diag-tools)
use/server/groups/tools: use/server
@$(call add,MAIN_GROUPS,tools/diag tools/ipmi tools/monitoring)
use/server/groups/services: use/server
@$(call add,MAIN_GROUPS,server/dns server/http server/ftp server/kvm)
@$(call add,MAIN_GROUPS,server/dhcp server/mail server/mysql)
@$(call add,MAIN_GROUPS,server/pgsql)
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,7 +4,7 @@
# into the system to be installed (instead of applying
# it to rootfs being formed immediately)
# NB:install2 is not a rootfs, handling differs either
# NB: install2 is not a rootfs, handling differs either
STATUS=`mktemp`
@@ -29,11 +29,21 @@ SERVICES="$GLOBAL_DEFAULT_SERVICES_ENABLE $GLOBAL_DEFAULT_SERVICES_DISABLE"
SERVICES="$SERVICES $GLOBAL_SERVICES_ENABLE $GLOBAL_SERVICES_DISABLE"
SERVICES="$(echo $SERVICES | sort -u)"
# TODO: provide systemd-specific hooks too?
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
rm "$STATUS"

View File

@@ -4,12 +4,11 @@ use/slinux: use/x11/xfce
@$(call add,THE_BRANDING,menu xfce-settings)
@$(call set,META_VOL_SET,Simply Linux)
use/slinux/base: use/slinux use/x11/gdm2.20 +pulse
use/slinux/base: use/slinux use/x11/lightdm/gtk +pulse
@$(call add,THE_LISTS,gnome-p2p)
@$(call add,THE_LISTS,slinux/$(ARCH))
@$(call add,THE_LISTS,slinux/games)
@$(call add,THE_LISTS,slinux/graphics)
@$(call add,THE_LISTS,slinux/live)
@$(call add,THE_LISTS,slinux/misc)
@$(call add,THE_LISTS,slinux/misc-dvd)
@$(call add,THE_LISTS,slinux/multimedia)
@@ -18,7 +17,7 @@ use/slinux/base: use/slinux use/x11/gdm2.20 +pulse
@$(call add,THE_LISTS,$(call tags,base l10n))
use/slinux/full: use/isohybrid use/slinux/base +systemd +wireless \
use/branding/complete use/x11/3d; @:
use/branding/complete use/fonts/install2 use/x11/3d; @:
use/slinux/arm: use/slinux use/x11/lightdm/gtk
@$(call add,THE_LISTS,slinux/arm)

View File

@@ -1,11 +1,16 @@
+pulse: use/sound/pulse; @:
+alsa: use/sound/alsa; @:
# "bare" ALSA (which is good enough for many of us) with persistent levels
use/sound:
@$(call add_feature)
@$(call add,THE_KMODULES,alsa sound)
@$(call add,THE_PACKAGES,amixer alsa-utils aplay udev-alsa)
@$(call add,THE_LISTS,sound/base)
# ALSA only sound (additional utils needed if using pulseaudio)
use/sound/alsa: use/sound
@$(call add,THE_PACKAGES,apulse)
# PulseAudio (useful for per-app levels, dynamic devices and networked sound)
use/sound/pulse: use/sound
@$(call add,THE_LISTS,pulseaudio)
@$(call add,THE_LISTS,sound/pulseaudio)

View File

@@ -2,13 +2,23 @@
use/stage2: sub/stage1
@$(call add_feature)
@$(call add,STAGE1_PACKAGES,file make-initrd make-initrd-propagator propagator)
@$(call add,STAGE1_MODLISTS,$$(FEATURES))
@$(call xport,STAGE1_KCONFIG)
use/stage2/kms:
# building blocks for propagator's module cove
use/stage2/ata use/stage2/drm use/stage2/fs use/stage2/hid use/stage2/md \
use/stage2/mmc use/stage2/net use/stage2/net-cifs use/stage2/net-nfs \
use/stage2/pcmcia use/stage2/rtc use/stage2/scsi use/stage2/usb \
use/stage2/virtio: \
use/stage2/%: use/stage2
@$(call add,STAGE1_MODLISTS,stage2-$*)
use/stage2/kms: use/stage2/drm
@$(call add,STAGE1_KMODULES_REGEXP,drm.*)
# install mount.cifs to stage1
use/stage2/cifs-install:
# NB: there's builtin nfsmount there, no reason for nfs-utils
use/stage2/cifs: use/stage2/net-cifs
@$(call add,STAGE1_PACKAGES,cifs-utils)
# eth0 instead of enp0s3

View File

@@ -0,0 +1,207 @@
# a copy of the old static modules file for compatibility
kernel/drivers/ata
kernel/drivers/block
kernel/drivers/crypto
kernel/drivers/gpu/drm
kernel/drivers/hid
kernel/drivers/md
kernel/drivers/net/\([^w]\|w[^i]\).\+\.ko
kernel/drivers/rtc
kernel/drivers/scsi
kernel/drivers/usb/host
kernel/drivers/usb/storage
kernel/drivers/virtio
kernel/lib
3c574_cs.ko
3c589_cs.ko
3c59x.ko
3w-9xxx.ko
3w-xxxx.ko
8139too.ko
8390.ko
a100u2w.ko
aacraid.ko
acenic.ko
advansys.ko
af_packet.ko
aic7xxx.ko
amd8111e.ko
arc4.ko
ata_piix.ko
atl1.ko
atl1e.ko
atl2.ko
atp870u.ko
atp.ko
aufs.ko
overlay.ko
axnet_cs.ko
b44.ko
bnx2.ko
bsd_comp.ko
BusLogic.ko
cassini.ko
catc.ko
cciss.ko
cdrom.ko
ch.ko
cifs.ko
DAC960.ko
dc395x.ko
de4x5.ko
defxx.ko
dl2k.ko
dmfe.ko
dmx3191d.ko
dpt_i2o.ko
e1000.ko
e1000e.ko
e100.ko
eata.ko
ehci-hcd.ko
ehci_marvell.ko
epic100.ko
eql.ko
ext2
ext3.ko
ext4.ko
fat.ko
fdomain.ko
fealnx.ko
fmvj18x_cs.ko
forcedeth.ko
gdth.ko
hamachi.ko
hp100.ko
hptiop.ko
i82092.ko
ifb.ko
imm.ko
initio.ko
ipr.ko
ips.ko
iscsi_tcp.ko
isofs.ko
kaweth.ko
libata.ko
libiscsi.ko
lockd.ko
loop.ko
md4.ko
megaraid.ko
megaraid_mbox.ko
mii.ko
natsemi.ko
ne2k-pci.ko
netconsole.ko
nfs.ko
nfsv2.ko
nfsv3.ko
nfsv4.ko
nls_base.ko
nls_cp866.ko
nls_koi8-r.ko
nmclan_cs.ko
ns83820.ko
ohci-hcd.ko
osst.ko
pata_it8213.ko
pata_marvell.ko
pcmcia_core.ko
pcmcia.ko
pcnet32.ko
pcnet_cs.ko
pd6729.ko
pdc_adma.ko
pegasus.ko
plip.ko
ppa.ko
ppp_async.ko
ppp_deflate.ko
ppp_generic.ko
ppp_mppe.ko
pppoe.ko
pppox.ko
ppp_synctty.ko
qla1280.ko
r8169.ko
raid_class.ko
reiserfs.ko
rrunner.ko
s2io.ko
sata_mv.ko
sata_nv.ko
sata_promise.ko
sata_qstor.ko
sata_sil24.ko
sata_sil.ko
sata_sis.ko
sata_svw.ko
sata_sx4.ko
sata_uli.ko
sata_via.ko
sata_vsc.ko
sb1000.ko
scsi_mod.ko
scsi_transport_fc.ko
scsi_transport_iscsi.ko
scsi_transport_sas.ko
scsi_transport_spi.ko
sd_mod.ko
serial_cs.ko
sg.ko
sha256-ssse3.ko
sis190.ko
sis900.ko
skge.ko
sky2.ko
slhc.ko
slip.ko
smc91c92_cs.ko
squashfs.ko
sr_mod.ko
starfire.ko
stex.ko
st.ko
sundance.ko
sungem.ko
sungem_phy.ko
sunhme.ko
sunrpc.ko
sym53c8xx.ko
tg3.ko
tlan.ko
tulip.ko
tun.ko
typhoon.ko
uhci-hcd.ko
usbcore.ko
usbhid.ko
usbnet.ko
usb-libusual.ko
usb-storage.ko
vfat.ko
via-rhine.ko
via-velocity.ko
winbond-840.ko
xirc2ps_cs.ko
xircom_cb.ko
yellowfin.ko
yenta_socket.ko
ahci.ko
dm-mod.ko
evdev.ko
ext2.ko
mbcache.ko
nls_cp866.ko
nls_koi8-r.ko
nls_utf8.ko
scsi_mod.ko
sd_mod.ko
serio_raw.ko
sr_mod.ko
sdhci.ko
sdhci-pci.ko
xhci-hcd.ko
xhci-pci.ko
uas.ko

View File

@@ -0,0 +1,20 @@
kernel/drivers/ata
kernel/drivers/block
ahci.ko
ata_piix.ko
libata.ko
pata_it8213.ko
pata_marvell.ko
pdc_adma.ko
sata_mv.ko
sata_nv.ko
sata_promise.ko
sata_qstor.ko
sata_sil.ko
sata_sil24.ko
sata_sis.ko
sata_svw.ko
sata_sx4.ko
sata_uli.ko
sata_via.ko
sata_vsc.ko

View File

@@ -0,0 +1 @@
kernel/drivers/gpu/drm

View File

@@ -0,0 +1,7 @@
ext2.ko
ext3.ko
ext4.ko
fat.ko
mbcache.ko
reiserfs.ko
vfat.ko

View File

@@ -0,0 +1 @@
kernel/drivers/hid

View File

@@ -0,0 +1,2 @@
kernel/drivers/md
dm-mod.ko

View File

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

View File

@@ -0,0 +1,79 @@
kernel/drivers/net/\([^w]\|w[^i]\).\+\.ko
3c574_cs.ko
3c589_cs.ko
3c59x.ko
8139too.ko
8390.ko
acenic.ko
amd8111e.ko
atl1.ko
atl1e.ko
atl2.ko
atp.ko
axnet_cs.ko
b44.ko
bnx2.ko
bsd_comp.ko
cassini.ko
catc.ko
de4x5.ko
defxx.ko
dl2k.ko
dmfe.ko
e100.ko
e1000.ko
e1000e.ko
epic100.ko
eql.ko
fealnx.ko
fmvj18x_cs.ko
forcedeth.ko
hamachi.ko
hp100.ko
ifb.ko
kaweth.ko
mii.ko
natsemi.ko
ne2k-pci.ko
netconsole.ko
nmclan_cs.ko
ns83820.ko
pcnet32.ko
pcnet_cs.ko
pegasus.ko
plip.ko
ppp_async.ko
ppp_deflate.ko
ppp_generic.ko
ppp_mppe.ko
ppp_synctty.ko
pppoe.ko
pppox.ko
r8169.ko
rrunner.ko
s2io.ko
sb1000.ko
sis190.ko
sis900.ko
skge.ko
sky2.ko
slhc.ko
slip.ko
smc91c92_cs.ko
starfire.ko
sundance.ko
sungem.ko
sungem_phy.ko
sunhme.ko
tg3.ko
tlan.ko
tulip.ko
tun.ko
typhoon.ko
usbnet.ko
via-rhine.ko
via-velocity.ko
winbond-840.ko
xirc2ps_cs.ko
xircom_cb.ko
yellowfin.ko

View File

@@ -0,0 +1 @@
cifs.ko

View File

@@ -0,0 +1,6 @@
lockd.ko
nfs.ko
nfsv2.ko
nfsv3.ko
nfsv4.ko
sunrpc.ko

View File

@@ -0,0 +1,6 @@
i82092.ko
pcmcia.ko
pcmcia_core.ko
pd6729.ko
serial_cs.ko
yenta_socket.ko

View File

@@ -0,0 +1 @@
kernel/drivers/rtc

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