Compare commits

..

283 Commits

Author SHA1 Message Date
Michael Shigorin
d53a1d4192 1.1.26-alt1
- docs week
- deflogin: empty ROOTPW explicitly ignored (potential security fix)
2014-03-10 22:47:55 +04:00
Michael Shigorin
a165928959 fdisk is rather "base" than "extra" tool
That's how it evaded the rescue part of regular-sysv-tde.
2014-03-10 22:40:19 +04:00
Michael Shigorin
afa1e2db50 regular.mk: tweaked .regular-sysv-gtk
Looking as how every .regular-sysv-gtk descendant ended up using
use/syslinux/ui/gfxboot by now it seems better to just stick it there.
2014-03-10 22:29:37 +04:00
Michael Shigorin
f2892ad3e4 deflogin: GLOBAL_ROOTPW is always set
use/deflogin will result in ROOTPW being exported no matter
is it set or not; xport() can't check before exporting as it
relies on lazy evaluation when the actual ROOTPW value can be
set or modified after exporting GLOBAL_ROOTPW for mkimage.

So let's not even pretent we can differ unset ROOTPW from
empty ROOTPW: both result in empty GLOBAL_ROOTPW as of today.

Fixing this would require moving the exports into a separate
makefile being included after all the configuration and checking
each variable for being defined before exporting the corresponding
GLOBAL_ prefixed one.

Yes this might be a security fix in some cases.
2014-03-10 22:29:37 +04:00
Michael Shigorin
e00d46cf97 regular.mk: added regular-e18-sysv.iso
It's preliminary but rather working by now;
one of the main woes is #29497 so far.

xterm has been overduplicated,
moved to pkglists for clarity.
2014-03-10 22:29:37 +04:00
Michael Shigorin
ecc5039c29 regular.mk: once-only slideshow for sysv-tde
TDE images are pretty modest regarding resource consumption
thus suitable for older hardware; a slower flash drive can
stall indefinitely showing slideshow and not going any further
with actual package installation so let's put a cap on that.
2014-03-10 22:29:36 +04:00
Michael Shigorin
c104131057 branding: added slideshow knobs
Added use/branding/slideshow/once as one of the uses
albeit the interface is universal; see this page for
more info: http://altlinux.org/branding/slideshow [ru]
2014-03-10 22:29:35 +04:00
Michael Shigorin
039af304d0 net: fix a thinko (it's connmand)
The service and initscript have "connmand" name
while the package is called "connman" indeed.

Shame on me; this became apparent
while building regular-e18-sysv.
2014-03-10 22:28:27 +04:00
Michael Shigorin
93614040c7 regular.mk: use openntpd instead of ntpd
Speccyfighter asked for NTP support within sysv-tde flavour;
meant openntpd apparently, fixing up.
2014-03-10 22:28:27 +04:00
Michael Shigorin
0ae7f37900 desktop+gnustep: initial Etoile project packages
gnustep-AddressManager has been replaced
with gnustep-Etoile-AddressManager, ditto
gnustep-DictionaryReader; see also [ru]:

http://altlinux.org/?title=GNUstep%2FApplications&action=historysubmit&diff=28795&oldid=28694
2014-03-10 22:28:27 +04:00
Michael Shigorin
5360992190 deflogin: minor tweaks
Defining a one-time variable is useless in this case,
and README should state the undefined ROOTPW status
explicitly (since it's now as advertized, heh).
2014-03-10 22:28:27 +04:00
Michael Shigorin
0fcb491500 mkimage-profiles.asciidoc: tac the goals
The goals listed are pretty important to have them ordered
by priority; collaboration is definitely more important
than dynamic range of release managers' experience.
2014-03-06 00:35:10 +04:00
Michael Shigorin
2aece7c6ec p/l/t/README: updates and tweaks
Some more editing has been due over pkg.in/lists/tagged/README
to make it more comprehensible and up-to-date; the problem with
groups isn't actually that bad as alterator-pkg's groups concept
is currently aligned with the requisite functionality provided by
pkg.in/lists/* directly; the tagged pkglists come into play when
we want to add "something like that" and don't really care about
the fine details of a secondary thing trusting that it's actually
comprised and working as advertized through its name tags.

Compare to reusing the pre-existing image configuration or features
versus reimplementing things in a rigid manner -- it's a flexibility
vs predictability question, and both scenarios are supported within
m-p explicitly.
2014-03-05 21:36:30 +04:00
Michael Shigorin
3f547e2504 documentation: use paths relative to toplevel dir
This change is done to reduce ambiguity in some cases;
the previous intention has been to ease navigation when
staying in a particular directory, now it's been changed
in favour of convenient toplevel `git grep' in fact.

Both variants have their pros and cons, I just find myself
leaning to this one by now hence the commit.  Feel free to
provide constructive criticism :)

Some path-related bitrot has also been fixed while at that.
2014-03-05 21:36:30 +04:00
Michael Shigorin
4fff399b35 README: minor tweaks
A few readability fixes and lib/*.mk demotion since conf.d/*.mk
is now an established place for RM-written image configuration.
2014-03-05 17:55:25 +04:00
Michael Shigorin
f30fb765b6 mkimage-profiles.asciidoc: change example target
icewm.iso is an installer needing further hassle to try;
rescue.iso is immediately useful OTOH.
2014-03-05 17:55:25 +04:00
Michael Shigorin
364488e588 mkimage-profiles.asciidoc: fix formatting
"Goals" paragraph ended up with all of list items on a single line;
a colon has been missing in another one.
2014-03-05 17:55:25 +04:00
Michael Shigorin
4ea06fed33 sub.in/README: bitrot fixup
sub/% has moved from lib/distro.mk to lib/sugar.mk
since rootfs introduction with commit g67adab4.
2014-03-05 17:55:21 +04:00
Michael Shigorin
1a25a7052d sub.in/README: mention rootfs
Its name might still change through 1.1.x series
("userfs"?) but things like this should be mentioned
at least -- or superfluous references to neighbouring
entities should be removed.
2014-03-05 16:34:42 +04:00
Michael Shigorin
b0d6476f41 rescue: disable rpcbind
It's required for NFS mounts but having a rescue image listening
to any non-localhost ports is too bad an idea, IMNSHO.

So let's fix this while spotted.
2014-03-05 13:15:08 +04:00
Michael Shigorin
e590862470 desktop+razorqt: dropped psi-plus-plugin-gmailnotify
It's missing as of psi-plus-0.16.289-alt1.
2014-03-04 10:32:07 +04:00
Michael Shigorin
5cc11a6646 t7.mk: initial release
Well, some of the maintainers clearly prefer t7/branch
to publish their works; at least GNUstep and TDE packages
are updated there and might migrate to p7/branch later.

No need to fight that, really.
2014-03-04 00:34:50 +04:00
Michael Shigorin
14976fa864 gear-store-tags 2014-03-04 00:01:15 +04:00
Michael Shigorin
d64ed13dc5 1.1.25-alt1
- regular updates
2014-03-03 22:26:23 +04:00
Michael Shigorin
161f7ccd03 desktop+gnustep: app status update
Split development packages into dev+gnustep pkglist -- these are
worth including in "full" version but will need thorough testing
so as to present the tools to those who value these.

Some of user packages are problematic and shouldn't be included
right now; the problems are mostly of these kinds:

- app won't start (at all or effectively);
- useless for being too alpha quality/incomplete;
- menu file for a commandline app lacking any feedback;
- package lacks the dependencies needed;
- it's a LoginPanel ;-)

Thanks a lot to upstream authors, real@ the packager
and kostyalamer who prepared a lot of menufiles anyways!
2014-03-03 22:24:34 +04:00
Michael Shigorin
9e162659a4 tar2fs: append to MODULES_PRELOAD, do not clobber
Thanks glebfm@ for spotting that it's = instead of +=
as it goes in all the other places; I remember no good
reason to overwrite the potentially preexisting contents.
2014-03-03 19:56:09 +04:00
Michael Shigorin
8040bb5dae regular.mk: extend virtual guest support in jeos
KVM and VirtualBox support packages are pretty tiny
but essential when these images get deployed within
virtual environments for any reason, let's add 'em.
2014-03-01 23:41:33 +04:00
Michael Shigorin
57d7ad149a regular.mk: add gfxboot to icewm :(
It's been gfxboot-free but no user visible facility to select locale
has emerged through these years; it's been decided to put gfxboot
until some text chooser is available (thanks aen@ for discussion).
2014-03-01 23:30:28 +04:00
Michael Shigorin
fbc6c2ff78 regular.mk: several more packages added to sysv-tde
These have been requested by Speccyfighter:
http://lists.altlinux.org/pipermail/community/2014-February/681710.html
2014-03-01 23:30:26 +04:00
Michael Shigorin
b7e824b742 vm.mk: use sysvinit
I don't see any reason to use systemd within VM images,
and it would stick its journal as a syslog implementation
when not ditched explicitly :-/
2014-03-01 23:30:01 +04:00
Michael Shigorin
6ed7da1e49 p7.mk: added vm/net alias
vm/altlinux-p7-vm-net is yet another bridge...
2014-03-01 23:30:01 +04:00
Michael Shigorin
863fa04957 vm.mk: vm/net should use/repo
IOW one has every right to expect that package manager
is set up already in a networked virtual machine.
2014-03-01 23:30:01 +04:00
Michael Shigorin
5b05b64ba1 desktop+gnustep: wholesale facelift
This has been prepared by real@ and kostyalamer,
thanks them both; still needs more QA though.
2014-03-01 23:30:01 +04:00
Michael Shigorin
d778e6e794 p7.mk: tweak VE template cache name
Renamed ve/altlinux-p7 to ve/altlinux-p7-ovz-generic for clarity.
2014-03-01 23:29:59 +04:00
Michael Shigorin
0be43b57af regular.mk: initial regular-jeos
This is a minimalistic ALT-based system installer tailored
for those who know how to bring up networking and apt-get
the packages they actually need; thanks frbrgeorge@ for
proposing the specification as well as sem@ and glebfm@
for discussion.

No mc, no glibc-locales, even no man and interactivesystem!
Packages included: apt basesystem openssh vim-console

PS: Sisyphus-based regular build is not the main goal though
thus the p7/branch {bri,klu}dge.
2014-03-01 23:27:29 +04:00
Michael Shigorin
8017b0886d regular.mk: deduplicate use/install2/fs
We want every regular installer to know more than ext4 apparently.
2014-02-26 17:32:24 +04:00
Michael Shigorin
4ed4f324ab regular.mk, p7.mk: added server-ovz
This image is largely a rebase of server-ovz.iso onto regular-server;
it's not feasible to provide a single image that would install either
"mini" server or openvz/kvm one based on user choice during boot alas
(even if both ovz-el and std-def kernels are provided within "ovz" ISO
and vzctl&co could be stuffed into a package list/group).

Maybe this is fixed some day...
2014-02-26 15:38:50 +04:00
Michael Shigorin
0da7ae547c server: generalize server-ovz configuration bits
OpenVZ related part is now a reusable use/server/ovz target,
and service related groups which have been largely taken from
rider@'s server-light project are now use/server/groups/base.
2014-02-26 15:37:05 +04:00
Michael Shigorin
31084651f7 gear-store-tags 2014-02-10 22:09:42 +02:00
Michael Shigorin
25b983f877 1.1.24-alt1
- service bridge
2014-02-10 22:09:15 +02:00
Michael Shigorin
7ebb297235 live.mk: FG needs network too
TerraSync might come handy (just as online manuals) but one's
going to need internet access for that so let's put at least
DHCP-over-Ethernet configuration preset in.
2014-02-10 02:29:30 +04:00
Michael Shigorin
86d213cd5a live.mk: added Tu-154 aircraft model to FG image
There's a beautiful airliner model out there thanks to the guys
at flightgear.ru, and it was asking to be included but its unclear
licensing status; now that 3.0 is GPLed I'm glad to add this package.
2014-02-10 02:26:05 +04:00
Michael Shigorin
9edbd2a2e1 live.mk: FG needs a mixer!
It's been done and taken into regular-icewm already,
and running FlightGear with whispering sound isn't
really immersive.
2014-02-10 02:26:05 +04:00
Michael Shigorin
6b81b8de20 live: tweak usergroups list
"cdrom" is rather obsolete (currently unused), and "xgrp"
is useful (and actually required to use bumblebee package).
2014-02-10 02:26:05 +04:00
Michael Shigorin
54fbf30611 x11: optimus support
The use/x11/nvidia/optimus target will pull the bits required
to operate NVIDIA Optimus GPU scheme which relies on integrated
GPU to actually drive the screen; much thanks to barssc@ for
good walkthrough: http://altlinux.org/optimus

NB: this *will* break if nouveau gets in, YHBW.
2014-02-10 02:26:05 +04:00
Michael Shigorin
6a5b8115a3 live.mk: initial live-glxgears image
This might belong to test.mk actually but it's been instrumental
in getting bumblebee support operational within these LiveCDs;
icewm and sysvinit are a commonplace among those currently
but aren't set in stone for that matter.
2014-02-10 02:25:17 +04:00
Michael Shigorin
d50b3fe247 server: disable dbus, lvmetad
"messagebus" service is autostarted since dbus gets in being required
by wpa_supplicant <- alterator-net-wifi <- alterator-net-eth; it is
really not needed in the minimalistic server, let's just turn it off.

"lvm2-lvmetad" service requires setup to be actually useful (#29474).
2014-02-09 03:01:46 +04:00
Michael Shigorin
f5fd77640a services: pass service status to installer
This is long overdue: services feature influences live
and rescue but doesn't do anything to the installed system
as that's behind the installation barrier; some piggybacking
required to do that has been merged into installer back in
2012 apparently (thanks to boyarsh@ for both doing that and
bringing my attention to this fact; it's 65-setup-services.sh
as of today).

So the only thing missing has been the bridge to prepare
those files -- still some more tweakery is required given the
two-stage process arranged so that reusable configuration could
include some sane defaults but the release manager is ultimately
able to override anything without extra kludges; thank legion@
for his wonderful libshell either.

NB: install2 script is a partial clone of rootfs one since
processing the variables is identical; still rootfs script
has to change service state directly while install2 one
has to deposit the information for installer to handle.
2014-02-09 02:38:16 +04:00
Michael Shigorin
67d60d0031 rescue+extra: whoops, fixed a thinko
I was crazy not to recheck this :-(
2014-02-04 13:55:39 +04:00
Michael Shigorin
7e925008bd gear-store-tags 2014-02-03 23:54:23 +04:00
Michael Shigorin
47c3a86547 1.1.23-alt1
- live, net*, syslinux fixes (see also #26608)
2014-02-03 23:54:04 +04:00
Michael Shigorin
0fb4b58771 live: use lateboot for textinstall
use/live/textinstall target is a base for those images whose
target audience tends to be somewhat more experienced; these
might prefer to just boot off the image instead of having to
perform any extra action like pressing down arrow and enter.

This is also to help msp@'s homeros-*.iso boot immediately.
2014-02-03 23:32:16 +04:00
Michael Shigorin
5f68010ae8 syslinux: add 40lateboot.cfg (_after_ ??live*.cfg)
Actually a copy of 10localboot.cfg with a different name
and sorting order so as to address #26608: there's no possibility
to make a LiveCD image that would boot itself by default if localboot
has been configured in.

It's only a partial solution as it doesn't override 10localboot
in case it's there already but a step in that direction...
2014-02-03 23:29:32 +04:00
Michael Shigorin
2cec43fddc net-eth: update README
A hint regarding livecd-net-eth is due -- as well as
review and cleanup of live, net, net-eth features
involved in configuring that ethernet for a LiveCD.
2014-02-03 23:20:25 +04:00
Michael Shigorin
3e5d01f146 base+pkg: added cpio just in case
This is not strictly required but is basically requisite for some
operations with both packages (did you know about rpm2cpio.sh?)
and initramfs images (which are gzipped cpio archives).

So let's put it in.
2014-02-03 23:20:25 +04:00
Michael Shigorin
cbcb57ca80 live.mk: add UEFI support to live-builder.iso
It's just reasonable given that new hardware tends to have that.
2014-02-03 23:20:25 +04:00
Michael Shigorin
9d7538838c live, net-eth: add DHCP_TIMEOUT when appropriate
It's hardwired at 1/10 of the default /etc/net value
since 3 seconds are enough for properly functioning
DHCP servers in properly maintained networks (those
improper ones tend to have problems with 30 seconds
anyways), and waiting for too long makes users feel
bad for a reason.

Thanks msp@ for bringing attention to this.
2014-02-03 23:20:25 +04:00
Michael Shigorin
4dbd7c40f0 rescue+extra: added idle3ctl
This one is intended for WD Green drives so as to bring
their spindown timeout into some kind of sanity;
see also http://bugs.etersoft.ru/9438
2014-02-03 22:53:43 +04:00
Michael Shigorin
4639e7960d install2: add installer-common-stage3
This package has replaced installer-feature-setup-network-stage3
without declaring that; it appears that installer-distro-altlinux-*
don't require it even if most of the others do.

This is to ensure it's included, at least at the moment.
2014-02-03 22:53:43 +04:00
Michael Shigorin
1e89117464 regular.mk: dropped kdegames from tde mixin
mixin/regular-tde is used in sysv-tde flavour which has hit 700M
limit for CD-R as Speccyfighter has noted; we can do without games
probably, or at least let's try to.

http://lists.altlinux.org/pipermail/community/2014-January/681534.html
2014-02-03 22:53:43 +04:00
Michael Shigorin
7cc8231ed4 regular.mk: regular-sysv-tde tweaks
It lacked base desktop packages indeed; thanks Speccyfighter
for naming rsync and wget (as well as mc).
2014-02-03 22:53:43 +04:00
Michael Shigorin
a0d0be1a71 syslinux: fixed live_rw configuration
The initial revision was brilliantly buggy: it is *so* apparent
that cdrom will never be actually used for rw slice that this
has evaded my attention rather completely.
2014-01-28 21:25:36 +04:00
Michael Shigorin
d20ab96daf gear-store-tags 2014-01-27 23:58:52 +04:00
Michael Shigorin
0385f90637 1.1.22-alt1
- ahci kludge (see #29705) :(
2014-01-27 23:58:26 +04:00
Michael Shigorin
9d495f26cb stage2: preload ahci before udev/propagator
This change tries to force loading the storage driver
for cases when SecureBoot is "helping" the chainloader
to fail, see #29705 for details collected so far.

Of course ahci.ko only does AHCI but that's every storage
controller I've seen on UEFI/SecureBoot systems so far.
2014-01-27 23:56:07 +04:00
Michael Shigorin
17ce5ae96d Revert "regular.mk: gnustep is broken on x86_64 right now"
This reverts commit d160d6100e:
GNUstep reportedly works on x86_64 now.

Conflicts:
	conf.d/regular.mk
2014-01-21 13:13:57 +04:00
Michael Shigorin
18fc7960cb gear-store-tags 2014-01-20 23:31:41 +04:00
Michael Shigorin
c5d543510c 1.1.21-alt1
- rescue tweaks
2014-01-20 23:25:06 +04:00
Michael Shigorin
26cef0ad92 server: add osec support
Let's put osec tools into installable packages at least
(aiming to shift these into default install probably);
these are worthwile addition to sysadmin's toolbox.

Thanks dobr@ for bringing this up.
2014-01-20 14:59:24 +04:00
Michael Shigorin
3879fb002a rescue+extra: add a few more fuses
It turns out that regular-rescue.iso lacks sshfs,
which is unfortunate (even if it could be installed
with apt in this particular case); three more FUSE
based filesystems have been added just in case.

Thanks mithraen@ for suggesting davfs2.
2014-01-20 14:59:24 +04:00
Michael Shigorin
954d89cf9c regular.mk: employ test/rescue/no-x11
I'm fed up with graphical software occasionally making it
into regular-rescue.iso and bloating it for no good reason
given that window managers or xinitrc aren't included.
2014-01-20 14:59:24 +04:00
Michael Shigorin
711ae1ee9e rescue: experimental test to check for libX11
This has been spotted and solved manually several times already,
and that's just boring so let's add the ability to state that
X11-based software is not accepted into a particular rescue image.

Not that I would hate X but things like that belong to a carefully
crafted image which includes either X server or reasonable means
to ensure that GUI software can actually be used.

NB: this is a somewhat new entity: test/rescue/no-x11 knob
for an image-script intended to make it blow up the build
when libX11 is found within the chroot that makes up
the rescue image's filesystem.

The interface is not documented intentionally: it will take
some time to find out whether it sticks or is bad enough.
Please do remind/ask if interested in using that.
2014-01-20 14:57:42 +04:00
Michael Shigorin
e06090a11f base+rescue: move glibc-locales to rescue+extra
It's a pretty hefty addition which isn't strictly required
in a basic rescue image even if it's welcome as an extra.
2014-01-16 17:45:10 +04:00
Michael Shigorin
7c7d74b4d9 tags2lists: skip backup files too
Seeing tagged/base+rescue~ in build.log isn't particularly
heart-warming; while other editors but the one leaving tilda
marked backups and .sw* swap files might exist let's do this
step at this time.

Wonder what changed though, this used not to happen before.
2014-01-16 15:52:12 +04:00
Michael Shigorin
1186a5e7f7 luks: move alterator-luks from pkglist to feature
Rescue images definitely don't need alterator pulled in.
2014-01-16 15:30:22 +04:00
Michael Shigorin
d5f10cbe49 gear-store-tags 2014-01-13 21:35:37 +04:00
Michael Shigorin
24033f6dbe 1.1.20-alt1
- support for CIFS installation method (sin@)
- glibc-locales for regular images (closes: #29693)
2014-01-13 21:34:18 +04:00
Michael Shigorin
ab7d5f218e base+regular: added glibc-locales
At least regular images should include locale support,
various software and users might malfunction otherwise;
thanks manowar@ for spotting and reporting this (#29693):

http://lists.altlinux.org/pipermail/sisyphus/2014-January/361929.html
2014-01-13 21:29:54 +04:00
Michael Shigorin
978984daf1 install2: put filesystem utils into installed system too
It's a tad pointless to be able to create a filesystem
but not to be able to fsck it at boot.
2014-01-13 21:29:54 +04:00
Evgeny Sinelnikov
d385a7864c stage1: add CIFS installation method 2014-01-11 22:51:19 +04:00
Michael Shigorin
531d976f58 gear-store-tags 2013-12-30 20:34:59 +02:00
Michael Shigorin
e4636b8345 1.1.19-alt1
- regular fixes
2013-12-30 20:34:14 +02:00
Michael Shigorin
c89ac47af3 regular.mk: added aptitude to server image
Dank Bagryantsev asked if it could be added to available packages
at least; well it is there now but not in default install
as aptitude is currently unsupported.
2013-12-30 20:34:14 +02:00
Michael Shigorin
9b8da4087b rescue, server, regular: added pciutils
At least lspci was sorely missing in non-rescue images
(as well as in mini rescue part of server image);
thanks Dank Bagryantsev for pointing this out:
http://lists.altlinux.org/pipermail/community/2013-December/681223.html
2013-12-30 20:34:14 +02:00
Michael Shigorin
e87593b596 QUICKSTART: refer to mkimage-preinstall
Thanks ksa at Russia-2 forum:
http://forum.russ2.com/index.php?showtopic=3784&st=0&p=37927&#entry37927
2013-12-27 23:58:53 +02:00
Michael Shigorin
2d4061fc6e regular.mk: added rescue image to regular-server
This is pretty valuable addition and doesn't take that much space
(roughly +100M).
2013-12-25 12:38:22 +02:00
Michael Shigorin
6d95f8c370 branding, plymouth: rescue is stage2 too
I don't think we're gonna like plymouth over rescue image
anytime soon, especially when it hides the moment when shell
pops up somewhere under it without startup-rescue caring to
remove the splash.

So let's put that $(INSTALL2_BRANDING) into proper stage2
flavours only and avoid choking on missing plymouth as well.
2013-12-25 02:36:48 +02:00
Michael Shigorin
f044f58775 install2, sound, vmguest: support led-ws modules
led@ has different kernel-modules-* package set,
some of those "standard" names are provided but
vbox* is not the case.

As our macros and helpers will grok this just fine,
let's add both variants so what's present gets in.
2013-12-25 02:21:00 +02:00
Michael Shigorin
8cc33c105a regular.mk: add vmguest support to graphical installers
Another fork place: live branch used to depend on +vmguest,
installable one omitted that for some reason.
2013-12-25 02:21:00 +02:00
Michael Shigorin
6617b1a1b7 regular.mk: beef up sysv-tde a bit
Suddenly got lots of extra space to wa^H^Hfill due to led-ws
thus a few more FRs by Speccyfighter can go in ;-)
2013-12-25 02:21:00 +02:00
Michael Shigorin
0bfbdcb3e0 regular.mk: move sysv-tde to led-ws
This kernel can help save almost 50 megabytes of image size
and shave off several megs of RAM consumption as well which
is important after the installation has been through.
2013-12-25 00:01:34 +02:00
Michael Shigorin
faae2165de regular.mk: sysv-tde += rescue, efi-shell
Adding rescue image was requested by Speccyfighter (in Russian):

http://lists.altlinux.org/pipermail/community/2013-December/681045.html

...and it seems hard but doable if one doesn't mind barebone rescue;
still efi-shell shouldn't spoil x86_64 build as that one won't fit CD-R
and doesn't have to anyways.
2013-12-25 00:01:34 +02:00
Michael Shigorin
38152b0f59 rescue: added euro variant (a crisis one)
In these tough times there are no extra resources to waste
for wars or some extra rescue; so it is imperative to provide
some lean and mean help, you know.

IOW a common base has been split out and a more tight rescue
image configuration has been added on top of that so as to
try and fit altlinux-p7-sysv-tde.iso for i586 into CD-R.
2013-12-25 00:01:34 +02:00
Michael Shigorin
b8cccbefe9 desktop+regular: dropped alterator-nsswitch
Argh, so alterator-auth was hiding under a name it provides too
-- now *that* is the cause for those last-step failures as the
rest of the environment hasn't been getting set up apparently.

Just drop it, there's a proper domain-client pkglist for that.
This is what 63293ff22a should
have done too.
2013-12-25 00:01:34 +02:00
Michael Shigorin
1bce465aa4 base+live: renamed to base+desktop+live
...so that it hits regular-sysv-tde (and other installers) too.
2013-12-24 23:20:51 +02:00
Michael Shigorin
300295da23 regular.mk: use various kernels again
un-def got unsuitable due to initial ramdisk migrating from
initramfs to tmpfs by default in newer kernels, and propagator
was using pretty kludgy way to determine that /dev has been
mounted already; led-ws (and supposedly lks-wks) have stumbled
upon this earlier.

20130822 version has been fixed regarding that.
2013-12-24 23:19:01 +02:00
Michael Shigorin
596a6bfe3d efi: whoops, non-x86_64 got broken
I've noted that this bit of code should be fixed up
before pushing but managed to overlook that in the end :(

mkimage version bump is due to the somewhat changed layout
of EFI packages and binaries within those (linked message in Russian):
http://lists.altlinux.org/pipermail/devel-distro/2013-December/001283.html
2013-12-24 11:54:01 +02:00
Michael Shigorin
c4a6bab55c gear-store-tags 2013-12-23 21:33:03 +02:00
Michael Shigorin
6929adbcf3 1.1.18-alt1
- efi updates
2013-12-23 21:28:31 +02:00
Michael Shigorin
e6d41a6f1c regular.mk: use installer-distro-altlinux-desktop
...instead of installer-distro-desktop which pulls in
alterator-auth which breaks things big time for sysv-tde
installer image due to avahi-daemon lazy to run.

Of course it's the last step of installation that has to fail.

And I've been considering this for several months already anyways.
2013-12-23 20:49:15 +02:00
Michael Shigorin
18ae053e93 desktop+e17+e18+extra: include "e18"
I wondered how regular-e18 lacked econnman but it only
took a closer look to understand that it's just not told
to go in, plain and simple!

There are no e18-extra-modules (at least so far),
confine that to desktop+e17.
2013-12-23 20:48:31 +02:00
Michael Shigorin
bbc9ee359a regular+kde4: added quick-usb-formatter
Thanks zerg@, it's been one of the things asked for.
Should end up in kde4-regular dependencies if OK.
2013-12-19 16:44:41 +04:00
Michael Shigorin
893e71a9db desktop+regular: added synaptics setup for tap clicks
Thanks sem@ for implementing and announcing wrt Simply 7.0.2.
2013-12-19 03:23:17 +04:00
Michael Shigorin
129e40395a efi: add pesign to the rescue
It's at least as worthy as sbsigntools are.
2013-12-19 03:11:11 +04:00
Michael Shigorin
56f30e72b0 regular.mk: use/efi/memtest86 for regular-rescue
It's proprietary now but still very useful with no free software
alternatives for UEFI platform so far; let's include efi-memtest86
into the rescue image at least.
2013-12-19 03:11:11 +04:00
Michael Shigorin
83b17d2982 efi: add use/efi/memtest86
It's implemented just like EFI_SHELL and will definitely
change someday but so far it's like this...
2013-12-19 03:11:11 +04:00
Michael Shigorin
90429a8508 efi: drop -signed subpackages
We chose to provide methods to sign packages but to avoid
signing these by default (with some arbitrary test keys)
the signatures are being added *after* the build by means
of rpmrebuild-pesign; all of this is made significantly
more complicated if there are separate -signed subpackages.

So these are being dropped in the packages; account for that.
2013-12-17 15:48:59 +02:00
Michael Shigorin
ed5367cb89 gear-store-tags 2013-12-16 23:41:29 +02:00
Michael Shigorin
55819f0577 1.1.17-alt1
- refind branding
2013-12-16 23:39:28 +02:00
Michael Shigorin
e4bb17279d branding: support refind branding
Everything is handled within mki-copy-efiboot currently
but it needs an image to process; extracting one from
bootloader branding seems less hassle than forcing it
into every flavour of branding.
2013-12-13 21:26:45 +04:00
Michael Shigorin
3ee4109b3e rescue+misc: added two more deduplication utilities
My personal favourite one is hardlinkpy currently
(thanks ldv@) but a few others might be handy as well.
2013-12-11 16:45:50 +04:00
Michael Shigorin
4c37fec82c rescue+backup: dropped duplicity
I've managed to overlook that it pulls in libX*...
2013-12-11 16:36:13 +04:00
Michael Shigorin
365c914a29 rescue: added rescue+fs pkglist
The changes in commits gb3e3234 and ga860b17 were actually useless
as rescue+fs list wasn't included into RESCUE_LISTS... and I need
pv(1) for convenient local disk cloning with time estimate.
2013-12-10 18:23:56 +04:00
Michael Shigorin
05cb913baa gear-store-tags 2013-12-09 22:53:24 +04:00
Michael Shigorin
b744e77f32 1.1.16-alt1
- e18
2013-12-09 22:52:44 +04:00
Michael Shigorin
1283270439 regular.mk: added regular-e18.iso
Thanks aris@ there are now e18 packages available;
everything is almost the same distribution-wise.
2013-12-09 22:50:05 +04:00
Michael Shigorin
32d4aed7f2 x11: added use/x11/e18
The implementation is identical to e17 one.
2013-12-09 22:48:03 +04:00
Michael Shigorin
489e5cf075 desktop+regular: added glxgears
Thanks Aleksey Cheusov for proposing this.
2013-12-09 22:48:03 +04:00
Michael Shigorin
c60813581d regular.mk: un-def -> std-def
kernel-image-un-def doesn't contain suitable aufs as of 3.12.3-alt1,
revert to std-def flavour again for the time being.
2013-12-09 22:48:03 +04:00
Michael Shigorin
a4f1574be1 desktop+live: re-added livecd-firefox
This basically reverts commit c18ef37274
for all practical purposes and restores the problem with chromium livecd
still that's less of a problem compared to regular builds complaining
that firefox is not the default browser when it's the only one anyways.
2013-12-03 16:17:49 +04:00
Michael Shigorin
cdbb759ed5 gear-store-tags 2013-12-02 20:45:20 +04:00
Michael Shigorin
af6b3282d7 1.1.15-alt1
- regular fixups
2013-12-02 20:44:33 +04:00
Michael Shigorin
7e91e1b6d2 net: brief remark regarding livecd-save-nfs
A bit longer version is: add the script which cares to protect
the interfaces which has been brought up during NFS root bootup
already from being tampered with by NetworkManager so as to avoid
losing network with networked rootfs.
2013-11-29 22:21:10 +04:00
Michael Shigorin
63293ff22a regular.mk: do not duplicate domain-client
There's domain-client pkglist out there, no need to pull
alterator-net-shares (and alterator-auth it requries)
everywhere.
2013-11-28 19:51:18 +04:00
Michael Shigorin
394ece8646 desktop.mk: add os-prober to installers
GRUB won't present dualboot systems in boot menu otherwise.
2013-11-28 17:41:42 +04:00
Michael Shigorin
f7c4f3ee61 regular.mk: pick up regular lists for installers
A lot of packages that should be in the classic installable images
got missed during initial effort; start merging the difference.
2013-11-28 17:38:17 +04:00
Michael Shigorin
cadd482725 desktop.mk: need to be able to resize ntfs
We're better off providing NTFS support so that Windows partitions
can be shrunk at least if one's not going to just blow these away
upon encounter.
2013-11-28 17:26:05 +04:00
Michael Shigorin
795d33ab68 regular.mk: drop fuse-exfat
It's a kernel module now.

Suggested-by: glebfm@
2013-11-27 14:46:24 +04:00
Michael Shigorin
ace9227dc5 gear-store-tags 2013-11-25 21:08:36 +04:00
Michael Shigorin
f47091fc8f 1.1.14-alt1
- important bugfix: THE_PACKAGES weren't getting through to .base
- regular-sysv-tde related churn
2013-11-25 21:04:02 +04:00
Michael Shigorin
c18ef37274 desktop+network+live: was redundant
live-webkiosk doesn't really need it and mixin/desktop-installer
was picking it up due to d+n+l satisfying d+n query.  This could
be fixed with && !live but fixing bitrot is the better way to go.
2013-11-25 19:42:42 +04:00
Michael Shigorin
3c40bb0d46 metadata: fix THE_PACKAGES processing
Actually the issue was worse in general: *_PACKAGES
weren't quoted when put into .base thus resulting
in a potentially broken echo command (silent one).

The macro scheme used was overgeneralized; stuffing
quoting differentiation into it was doable but ugly
(unless one is able to pass an unquoted quote sign
as a function's parameter in some elegant manner),
let's just make it straightforward.
2013-11-25 09:30:36 +04:00
Michael Shigorin
f6f7caec30 install2: support vbox guest
It's still inconvenient to discover mouse pointer
captured inside a box, let's overthrow the hardware
node and free it.
2013-11-25 00:38:01 +04:00
Michael Shigorin
815b4ebbe0 speech: should use/sound too
It's sort of pointless otherwise.
2013-11-25 00:17:32 +04:00
Michael Shigorin
f383969f37 desktop.mk: mixin/desktop-installer should use/sound
Its scope of desktop does cover basic multimedia.
2013-11-25 00:17:02 +04:00
Michael Shigorin
7a75cb1320 speech: use emacspeak pkglist
...which has just been imported from m-p-d and looked like
badly missing (yasr wasn't starting).
2013-11-25 00:17:02 +04:00
Michael Shigorin
220c760708 base+regular: added zsh
It's /the/ shell.
2013-11-25 00:17:02 +04:00
Michael Shigorin
9ff4d968d8 regular.mk: add luks to .regular-install
distro/.regular-install depends on use/luks now too;
this isn't a hard decision but so far looks good
given the overall functionality range and balance
within regular builds.
2013-11-24 21:29:04 +04:00
Michael Shigorin
e329617c57 regular.mk: move server to grub for the time being
alterator-lilo needs facelift unfortunately.
2013-11-24 21:29:04 +04:00
Michael Shigorin
b1c18d43da branding: added bootloader to components
branding-*-bootloader was handled for stage1 by syslinux feature
but somehow got missed regarding the installed system; let's fix.
2013-11-24 21:29:04 +04:00
Michael Shigorin
45842a0773 pkglists.txt: s/installer/install2/
It was less clear/greppable what "installer" refers to...
or maybe so it seems to me.
2013-11-24 21:29:04 +04:00
Michael Shigorin
6d1f4f6b89 regular.mk, p7.mk: initial sysvinit tde installer
I've been considering a way to avoid confusion between:
- a tde based livecd with systemd;
- a tde based livecd with sysvinit;
- a tde based installer with sysvinit
and finally came to conclusion that regular-sysv prefix
will be common for installers with sysvinit within regular.mk
and p7.mk; this might be not perfect but should be good enough.

Note that while regular-sysv-tde.iso is buildable and installs
just fine at the moment I don't plan to publish Sisyphus based
installer builds as a rule since these require extra knowledge
regarding daily use (starting with http://altlinux.org/changes
and/or https://lists.altlinux.org/mailman/listinfo/sisyphus ML
subscription).

Sisyphus-based rescue image is fine as well as LiveCDs are;
installable LiveCDs (most of regular-*.iso) are actually
risky in case user actually installs *and* updates those
having ignored the red "unstable" status in the branding,
and that's the line I'm not going to cross that often.
2013-11-24 21:29:04 +04:00
Michael Shigorin
93cd57c8d2 regular.mk: split out a mixin
Parts common to both livecd and installer images factored out
to avoid duplication.
2013-11-24 21:29:04 +04:00
Michael Shigorin
00c58c3725 bootloader: add a guardian
BASE_BOOTLOADER must have been set to any of the supported
bootloader names somewhere during configuration; it is not
impossible to avoid this elsewhere so let's put a guardian
script which will stop the build which is known to result
in a broken image.
2013-11-24 21:29:04 +04:00
Michael Shigorin
657c0bf6ef 00example, bootloader, install2: drop sub/main
sub/main subprofile should not be requested directly
as documented in its README but rather via use/repo/main;
let's fix this discrepancy and check that no regressions
come hurling down.
2013-11-24 21:29:04 +04:00
Michael Shigorin
02e3012d3b regular.mk: grub by default for installers
This image family doesn't inherit from distro/.installer
and thus could miss the bootloader setup with no problems
(at least until an installed system would attempt booting
without a bootloader).

The whole thing requires some more thinking over and probably
moving more bits to mixins but in the mean time let's make sure
the bootloader *is* configured.
2013-11-24 21:29:04 +04:00
Michael Shigorin
b5b96931ad regular.mk: regular-server refactoring
distro/.regular-install is now factored out to be reused in
tde based installer (and potentially more images later on).

This implies sysvinit at the moment which might change too
but looks just fine right now.
2013-11-24 21:29:04 +04:00
Michael Shigorin
f8bdbdd607 desktop.mk: cosmetics
Fixed line length for distro/kde4-lite target,
shouldn't wrap with good ol' 80x24 xterm.
2013-11-24 21:29:04 +04:00
Michael Shigorin
20138959de desktop.mk: split out a mixin
What was added for networked desktop installers is now needed
for regular desktop installers as well; moved to a mixin.
These will probably get reshaked at some point.
2013-11-24 21:29:03 +04:00
Michael Shigorin
87a22774c0 regular.mk: tde bits: move to mixin
distro/.regular-tde-extras is now mixin/regular-tde which pulls in
several extra bits in addition to just the lists.
2013-11-24 21:29:03 +04:00
Michael Shigorin
3c61d471a0 desktop+razorqt: psi-plus was missing!
It's amazing but I've managed to miss out this brilliant
Qt-based Jabber client; a small selection of plugins is
added as well, suggestions are welcome.
2013-11-24 21:19:37 +04:00
Michael Shigorin
737d0d3cb0 rescue+extra: testdisk-doc is no more
...and it was pretty much useless anyways
(real docs are online).
2013-11-24 21:19:37 +04:00
Michael Shigorin
326142c8f6 speech: handle Headphone output too
...and generalize/de-noise the script a bit.
2013-11-22 21:41:33 +04:00
Michael Shigorin
e469a19e2a speech-*: refactored and unified
These two features were largely an internal fork,
let's refactor them into a single tunable one.
2013-11-22 21:28:37 +04:00
Michael Pozhidaev
5dc287f885 Homeros distro changes:
- speech-ru and speech-en features are added;
- speech-related things removed from homeros features;
- speech/ directory for package lists added and other corresponding changes.
2013-11-12 14:05:41 +07:00
Michael Shigorin
08706b6f43 gear-store-tags 2013-11-04 18:56:05 +04:00
Michael Shigorin
251c26da57 1.1.13-alt1
- rescue friday
2013-11-04 18:54:59 +04:00
Michael Shigorin
da5eae9b17 rescue: set up apt sources unconditionally
Networking is *not* brought up by these rescue images
by default, one is expected to know enough to do that
by hand if needed; still there's no harm to have apt
preconfigured so that it would be operational then.
2013-11-01 20:22:23 +04:00
Michael Shigorin
d3636555b2 rescue: insist on sysvinit
systemd would get pulled in via journal but both are really
irrelevant for these rescue images.
2013-11-01 20:22:09 +04:00
Michael Shigorin
ae10a1bf7c regular.mk: rescue += EFI shell
Wonder how this got missed.
2013-11-01 19:03:39 +04:00
Michael Shigorin
b94bc99e3f rescue: added grub2, syslinux
There are various bootloaders around there and some of them
are supported in ALT Linux; let's provide all the mainstream
ones so that knowledgeable root@ has every tool needed for
most situations needing bootloader repairs.

These might require particular knowledge or special boot mode
(like EFI ones).
2013-11-01 19:03:39 +04:00
Michael Shigorin
e3f5060d90 rescue: added archive/backup/comm pkglists
Being able to handle [compressed] archives of all kinds
tends to be pretty instrumental in rescue operations,
and some backup system clients won't hurt either.

Some ancient Serial words like "minicom" still come handy
at times too.

Comments, constructive criticism and proposals are welcome.
2013-11-01 19:03:39 +04:00
Michael Shigorin
db279fc279 archive+extra: added lziprecover
This doesn't add much but complements the compression utilities.
Maybe it should be moved to rescue+archive, especially if more
tools of this kind get written and packaged.
2013-11-01 19:03:38 +04:00
Michael Shigorin
8b3b306685 rescue+backup: rescue might mean restore
This package list is somewhat non-trivial and controversial:
- bacula client support is a pretty tiny addition; it does require
  extensive knowledge of what's being done and too new client version
  can actually hurt (as the bacula director version must not be lower);
- duplicity was added due to lav@ seemingly using it (it's tiny either).

Suggestions are welcome.
2013-11-01 19:03:38 +04:00
Michael Shigorin
b3e3234c1c rescue+*: added assorted extra packages
It was the proposal to add fsarchiver that has started this;
the package was there in X11-bearing live-rescue.iso but appears
to be a console program thus moved to rescue+misc pkglist;
more than a few rescue-grade utilities have turned up during
a quick look at what else is missing.

shellinabox and dvdsaster have been "added" as candidates since
the former does require additional actions but can provide a nice
security hole if these are taken without extra consideration,
and the latter is just pretty large although might still be useful.
2013-11-01 19:03:38 +04:00
Michael Shigorin
9cebd23bcf desktop+tde: added filelight
This neat little utility helps immendely to deal with
the eternal "where all of my mega/giga/tera/petabyte disk
space went so busy?"... wonder how it could evade m-p ;-)
2013-10-30 21:37:50 +04:00
Michael Shigorin
8834dd824f regular.mk: sync regular-tde{,-sysv} as in extras
I considered these two to be either close forks differing in init system
used (and things involved too much like NM at the moment), or to bring
some more choice along; this commit sticks with the former approach,
namely "let's only toggle the init system and let the rest be the same"
so that choosing the particular implementation can be based on this very
difference and not any other ones added along with it.
2013-10-30 15:33:47 +04:00
Michael Shigorin
cf838e7859 regular.mk: wmaker += gfxboot
...so that locale is selectable at boot (unfortunately there's no
way to do that with text menu so far as cmdline is only changed
in its entirety there and generating it from the bits involved
is Not Implemented Yet as usual).
2013-10-30 15:33:47 +04:00
Michael Shigorin
9e1c834b0d p7.mk: added altlinux-p7-{wmaker,tde-sysv}
Sigh, this kludgy bridge does need maintenance indeed. :-/
2013-10-30 15:33:26 +04:00
Michael Shigorin
1cf502329c gear-store-tags 2013-10-21 22:37:30 +04:00
Michael Shigorin
c104fd0341 1.1.12-alt1
- live-builder update
2013-10-21 22:36:35 +04:00
Michael Shigorin
884c37f044 regular.mk: add /notes/license
Or at least regular-tde-sysv.iso would lack it for livecd-install.
2013-10-21 22:35:10 +04:00
Michael Shigorin
8b4208bd9c spec: require mkimage-preinstall for good
...so that the images are buildable immediately.

It's basically required by mkimage since Linux 3.6,
see the description of that package.
2013-10-21 20:39:01 +04:00
Michael Shigorin
44dbda4170 live+builder: add isoinfo
Helps to analyze the resulting ISO9660 images.
2013-10-21 20:39:01 +04:00
Michael Shigorin
bcaa37704d live.mk: predictable eth setup for live-builder
...as it *does* rely on connectivity.
2013-10-21 20:39:01 +04:00
Michael Shigorin
fde155993a regular.mk: added a few wmaker packages
...to RPMS.main; those eager to use them can install by hand
and configure properly.
2013-10-21 20:39:01 +04:00
Michael Shigorin
af739c1d3d desktop+wmaker+extra: initial pkglist
Some of the excluded dockapps would crash on startup
or just require manual configuration thus getting those
into the default menu on a live image would rather harm.
2013-10-21 20:39:01 +04:00
Michael Shigorin
b44e6e2ed0 regular.mk: more sysvinit-based images
distro/.regular-sysv{,-gtk} intermediate targets are factored out
to form the base for more image targets as at least e17, icewm,
tde and wmaker are fine without systemd-logind.  These represent
both GTK and Qt based environments hence the two footholds.
2013-10-21 20:38:49 +04:00
Michael Shigorin
0ab00c0902 gear-store-tags 2013-10-14 21:13:04 +04:00
Michael Shigorin
c5346a456e 1.1.11-alt1
- luks better
2013-10-14 21:00:38 +04:00
Michael Shigorin
8e590f70b2 regular.mk: fix ifdef thinko
The "workaround" would mis-apply to regular-wmaker target
instead of regular-gnustep it was intended for...
2013-10-14 19:15:11 +04:00
Michael Shigorin
f23fdcb859 regular.mk: regular-server tweaks
LUKS seems like a worthwile addition to this particular image;
it's also switched to use installer-distro-altlinux-server
for both LUKS support (until installer-steps are dynamic)
and server-oriented partitioning presets.
2013-10-14 17:32:35 +04:00
Michael Shigorin
34df065896 luks: did it work yet?
Let's ensure that make-initrd-luks gets to the base install
until installer is tweaked to enable in-flight installation
of options like this.

Adding luks to stage1 [make-initrd] features makes no sense
on the other hand (and it wasn't happening anyways due to
the lack of add_feature function call in config.mk as was
accidentally spotted).

And putting luks packages into an installer image lacking
the reference to alterator-luks isn't that sensible, let's
complain to logs at the very least (this isn't going to hit
the default output though).
2013-10-14 17:08:49 +04:00
Michael Shigorin
50c72650e2 mkimage-profiles.asciidoc: fix list formatting
It got missed somehow that it's a bullet list indeed...
2013-10-09 12:07:41 +04:00
Gleb Fotengauer-Malinovskiy
8eae258a8c 90-build-distro.mk: add "date +%F" to .disk/info 2013-10-09 12:07:41 +04:00
Michael Shigorin
9a86628882 gear-store-tags 2013-09-30 20:26:14 +04:00
Michael Shigorin
b4c7954db5 1.1.10-alt1
- regular tweaks
2013-09-30 20:24:12 +04:00
Michael Shigorin
c7a79f4c0a regular.mk: added livecd-install-apt-cache
Carrying over metadata and packages downloaded by apt while
being run off a LiveCD is implemented as suggested in #29192.
2013-09-30 20:21:33 +04:00
Michael Shigorin
beb011f509 regular.mk: added license note to server
It's the only installer in this collection
and it did lack any branding indeed.
2013-09-25 18:18:07 +04:00
Michael Shigorin
73fd4d337e syslinux: cosmetic space
"prompt" and subsequent first "label" were not separated
in any way while second "label" and forth were; let's make
the resulting isolinux.cfg a tiny bit more pretty.
2013-09-24 14:51:45 +04:00
Michael Shigorin
7dd8e77753 1.1.9-alt1
- regular fixes
2013-09-23 22:23:13 +04:00
Roman Savochenko
a87b793d47 add NM and ARTS to regular-tde
NM/TDE is fixed (#25713), ARTS is needed.
2013-09-23 22:20:34 +04:00
Michael Shigorin
23c4ebf14d net: use livecd-save-nfs for LiveCDs with NM
This is to avoid NM messing with network interface
involved in NFS root filesystem being operational
(see alterator-netinst); thanks sem@ for the hint.
2013-09-23 22:20:34 +04:00
Michael Shigorin
144d4c0f22 regular.mk: add gpm to desktop/rescue images
Make it automatically start in desktop ones,
and let it be available in rescue too (there's
a risk of gpm picking up a wrong protocol and
selecting/pasting at random which is not exactly
the right thing for rescue environment with root
shells all around).
2013-09-23 22:20:34 +04:00
Michael Shigorin
c7dadfd899 syslinux: ensure "default" line is there
alterator-netinst currently relies on "default"
being specified explicitly; it's wrong and it should
cope with the first "label" clause as well but we're
better off being strict to this script, not that one.

This commit should be no-op regarding syslinux itself.
2013-09-23 22:20:34 +04:00
Michael Shigorin
8f7c712390 server: add sshd
sshd is rather requisite, wonder how it got missed.
2013-09-23 22:17:32 +04:00
Michael Shigorin
01b3adb619 ve.mk: added ve/ldv
It's based on the package list provided by ldv@ and intended
for barebone OpenVZ template cache serving as a base for any
customizations needed.
2013-09-23 22:17:32 +04:00
Michael Shigorin
3f34577393 added systemd-analyze to systemd pkglist
It's a great tool giving the ability to at least debug
the novel problems that weren't there before systemd.

Good that it doesn't want half of GNOME or python yet...
2013-09-23 22:17:32 +04:00
Michael Shigorin
0e3484c25b regular.mk: don't use/live/ru
It was a desperate kludge to warrant fallback localization
for cases when livecd-setlocale failed to work out properly;
"thanks" to systemd paralizing startup the order was chaotic,
see #28991 for some details.

Now that livecd-setlocale >= 0.3.1 looks like working this
should be dropped for good.

And the proper preset solution will be l10n feature.
That one requires part of alterator-sysconfig backend
factored out into a standalone package along with its data.
2013-09-23 22:17:32 +04:00
Michael Shigorin
210baab8cd gear-store-tags 2013-09-16 21:43:03 +04:00
Michael Shigorin
418cc79195 1.1.8-alt1
- armh/p7/ve fixes
2013-09-16 21:01:04 +04:00
Michael Shigorin
7bdda821e7 ve.mk: use/repo for ve/generic
Setting up apt configuration in every container
is pretty annoying, let's enable it by default.

Some provision to add/enable local mirror would
be beneficial but not there yet...
2013-09-16 21:01:04 +04:00
Michael Shigorin
3bad58987b p7.mk: ve/altlinux-p7 bridge
This one adds another image class as well.
Hope this kludge will not get self-conscious...
2013-09-16 21:01:04 +04:00
Michael Shigorin
441a5bdfbd ve.mk: tweaked ve/generic
etckeeper was suggested by george@ along with vim-console;
the latter should come by server,base tags but so far does not
(splitting server-base list into common, bare metal and virtualized
parts in haste looked suboptimal).
2013-09-16 21:01:04 +04:00
Michael Shigorin
3161c43467 ve.mk: employ init feature
It should actually work better than manual specification
now that it's fixed.
2013-09-16 21:01:04 +04:00
Michael Shigorin
b2a1befe25 init: we don't need no systemd with sysvinit
That is, no need to pull in systemd as syslogd-daemon provider
when an unspecified one has been requested by interactivesystem
or anything else.

The tricky issue is that THE_LISTS will get expanded separately
and too late to specify a particular provider which will have been
auto-chosen while expanding e.g. BASE_PACKAGES.
2013-09-16 21:01:04 +04:00
Michael Shigorin
f43d68ce62 power: employ services feature
rootfs got handy either though managing modules to preload
might be enhanced further.
2013-09-13 17:33:58 +04:00
Michael Shigorin
93371601fb p7.mk: add regular-server bridge
This proxy makefile is still needed unfortunately...
2013-09-13 17:33:58 +04:00
Michael Shigorin
d931d69ddd armh.mk: *fix* nexus7 aliases
So the autobuilds were failing for these two weeks since
commit e43386c1fe was *totally*
braindead: there's no "arm-e17" target neither "arm-kde4" one.

Fixed while awake and adjusted (in sync with build node)
to reference particular nexus7 and not just "arm".

The sad thing is that it should now read "nexus7old" TBH,
2013 model is not Linux friendly at all at the moment...
2013-09-13 17:33:58 +04:00
Michael Shigorin
bd9fef2c2c gear-store-tags 2013-08-26 17:08:54 +03:00
Michael Shigorin
15a0e6769e 1.1.7-alt1
- minor fixes
2013-08-26 17:06:41 +03:00
Michael Shigorin
674f7db26e clean.mk: allow to forbid cleanup explicitly
The behaviour that sort of settled didn't actually follow
the principle of the least surprise when one really wanted
to have BUILDDIR available for inspection; DEBUG=2 would be
effective to achieve that but CLEAN=0 would not.

Thanks led@ for spotting and reporting this.
2013-08-13 22:32:27 +04:00
Michael Shigorin
891f982e92 regular.mk: get gvfs back into lxde flavour
aen@ has suggested that gvfs support be present in regular-lxde
as pcmanfm2 can make use of it; let's factor it back in here.
2013-08-13 22:23:11 +04:00
Michael Shigorin
b05007943b desktop+gvfs: factored out from lxde pkglists
gvfs pulls gnome-online-accounts and dconf in;
these add considerable bloat that well may be
undesirable in a lightweight distro, just pull
this into a separate pkglist.
2013-08-13 22:23:11 +04:00
Michael Shigorin
07cc320b99 armh: get rid of 50-sshd-root
It was a temporary hack actually, and is better dropped long-term:
things like predefined root accounts with remote access are *evil*
and this hook was a half of that "solution".

Use of oem feature to integrate first-boot setup is recommended
to deal with this issue, at least when graphics are available.
2013-08-13 13:35:56 +04:00
Michael Shigorin
f0368c6327 x11: make use/x11/xorg arch-dependent
There's no such thing as xorg-dr[vi]-intel on non-x86 AFAIK,
and the rest of the videodrivers is only generic on x86 too.
2013-08-13 13:30:33 +04:00
Michael Shigorin
4cfe0fa10f gear-store-tags 2013-08-12 21:59:10 +04:00
Michael Shigorin
8b26752de9 1.1.6-alt1
- vm-net retired
2013-08-12 21:49:00 +04:00
Michael Shigorin
f44c386107 firmware: drop firmware-amd-ucode
It's merged into firmware-linux, thanks lakostis@
for the explanation; P:/O: should be added
but less line noise is better anyways.
2013-08-12 20:53:02 +04:00
Michael Shigorin
af1dd0f4e3 armh.mk: tweak vm/arm-server too
basesystem doesn't warrant an init these days apparently,
let's make sure one does land here.
2013-08-12 20:53:02 +04:00
Michael Shigorin
1276284ce7 armh.mk: initial cubox-server
This one was asked for and is pretty reasonable common base
to play with cubox from scratch (being ALT); the intermediate
targets had to be refactored with:

- vm/.cubox-bare becoming *that* bare (it doesn't even
  warrant an init anymore, let alone xorg);
- vm/.cubox-desktop accomodating most of desktop bits;
- vm/.cubox-base becoming vm/.cubox-oem as it should be.

The just-introduced tty feature is employed either.
2013-08-12 20:53:02 +04:00
Michael Shigorin
20f8c1853d armh-{cubox,dovefb}: minor refactoring
The initial suggestion that any cubox image is a desktop one
didn't hold out for long; and xorg related bits are not that
related to boot script setup in terms of neccessity.
2013-08-12 20:53:02 +04:00
Michael Shigorin
989c903efb initial tty feature
This one only cares for serial console(s) in sysvinit case now
but might end up controlling the number of gettys for ve/vm, etc.
2013-08-12 20:53:02 +04:00
Michael Shigorin
de38413966 armh: update warning in 50-sshd-root
It basically reads the same but was referring to a neighbour
script that has been moved to a separate deflogin feature
during heavy refactoring of initial implementation draft.
2013-08-12 20:53:01 +04:00
Michael Shigorin
43e76bd650 vm-net: feature retired
This one was replaced by the net feature completely
and has been declared obsolete since 1.1.1 (a month ago).

A few remaining users trivially adjusted.
2013-08-12 20:53:01 +04:00
Michael Shigorin
de94641c41 vm-ssh: renamed to net-ssh and cleaned up
There was no need to split carrying over the pubkey
and tightening up permissions on the file and its parent
directory to be done in two separate scripts; this should
be more generic now as a bonus.

Users adjusted accordingly.
2013-08-12 20:53:01 +04:00
Michael Shigorin
62a37f373f control: fix sudo-su target
use/control/sudo-su apparently lacked dependency on plain
use/control thus defeating the whole affair; thanks msp@
for spotting and reporting this.
2013-08-12 20:53:01 +04:00
Michael Shigorin
9257927e86 homeros: replace chkconfig hooks with use/services
Things that had to be done by hand are now generalized
and made convenient, hopefully.
2013-08-12 20:53:01 +04:00
Michael Pozhidaev
99a7a97284 stage2: extend /boot cleaner stoplist
Minor fix: /boot directory is not cleaned for livecd if there are
homeros-install or luwrain-install files (in addition to live-install
and livecd-install being already checked).
2013-08-12 20:53:01 +04:00
Michael Shigorin
49b400378d gear-store-tags 2013-08-05 21:42:00 +04:00
Michael Shigorin
922b44bf57 1.1.5-alt1
- armh related fixes
2013-08-05 20:57:18 +04:00
Michael Shigorin
e43386c1fe armh.mk: added aliases for nightly/arm
The automated build relies on particular names
to be buildable and this broke during some sync;
http://nightly.altlinux.org/sisyphus-arm/snapshots/
were empty as autobuild was failing since 20130710.

p7 aliases go in too.
2013-08-05 11:21:35 +00:00
Michael Shigorin
84ad4092dc Makefile: fixed an interbug
This inobvious buglet has been spotted shortly after
1.1.0 refactoring was roughly over; the problem is
that armh-specific targets would get ignored without
explicit ARCH=armh.

It's commit 768df7e9e9
which streamlined introspection within main.mk
and a bug in Makefile which left ARCH empty
even upon having autodetected it for ARCHES.

The current version is more straightforward as a bonus.
2013-08-05 11:21:35 +00:00
Michael Shigorin
fbe571e296 armh.mk: forward-ported vm/arm-server
Thanks glebfm@ for nudging me to do this; initial draft
was the very firsh armh distro target successfully built
and tested but the effort has refocused onto nexus7 ones
with cubox images joining the party a bit later.

Now it's the time for all good servers...
2013-08-05 11:19:49 +00:00
Michael Shigorin
5ef8291755 armh.mk: fix the silly comment
It was sitting next to the wrong line after refactoring
of cubox related target and was referring to "king"
instead of "kind", very kind of me but not so kingly.
2013-08-05 13:53:26 +04:00
Michael Shigorin
9dc9f14f21 desktop+lxde+extra: s/gqview/geeqie/
george@ spotted gqview in regular-lxde.iso and wondered why;
it's not being developed since 2006 or so while there's a fork
named geeqie which has continued to improve upon it.
2013-08-01 13:48:42 +04:00
Michael Shigorin
873737a24e net: avoid NM showstopper at boot by default
Intro: NetworkManager-wait-online.service would, well, wait
for some network interface to become online or for timeout
to kick in.

Problem: if a LiveCD is tested in offline environment
that timeout will only impede the boot.

Proposed solution: use/net/nm/nodelay target has been implemented
to disable that service as proposed by sem@ and done in Simply;
"+nm" target changed to be an alias to this one.
2013-07-30 09:58:22 +04:00
Michael Shigorin
6470e1d8da gear-store-tags 2013-07-29 21:38:51 +04:00
Michael Shigorin
a7146f993a 1.1.4-alt1
- assorted fixups
2013-07-29 21:20:42 +04:00
Michael Shigorin
25616fb388 kvm-server: update for qemu/kvm merge
kvm fork is no more, and qemu-kvm is provided by qemu-system.
2013-07-25 22:34:46 +04:00
Michael Shigorin
c8d92ab767 http-server: drop php5-rrdtool
Thanks glebfm@ for spotting and reporting bitrot;
these pkglists were copied from m-p-d during
server-light reproduction.
2013-07-25 22:27:42 +04:00
Michael Shigorin
282257d479 sound: get udev-alsa back
It's old, it uses consolekit (even if not neccessarily),
it borders obsolescence *but* removal of udev-alsa has caused
massive regressions (e.g. regular-gnome3 had soundcard mixer
levels dropped to zero from the start, regular-razorqt added
inability to poweroff to that...).

Just get it back.
2013-07-23 23:01:05 +04:00
Michael Shigorin
6063a9913f armh.mk: use centaurus branding for cubox-mate
Thanks boyarsh@ and cas@ for pointing out that the branding
that takes MATE peculiarities (e.g. background settings)
into account is in Sisyphus/armh already.
2013-07-23 11:36:22 +00:00
Michael Shigorin
3820a3cb26 regular.mk: regular-tde += openscada
Following cubox-tde it's just plain reasonable to add
OpenSCADA to the regular one ;-)
2013-07-23 14:23:47 +04:00
Michael Shigorin
ce6c4b6bf2 gear-store-tags 2013-07-22 23:44:29 +04:00
Michael Shigorin
c1366d3195 1.1.3-alt1
- armh fixes and tweaks
2013-07-22 23:43:42 +04:00
Michael Shigorin
4db16f0eb8 armh.mk: initial TDE image
This one is IMHO best suited DE for cubox' meagre performance
(especially on I/O side due to microSD) as it incurs quite modest
I/O, CPU and RAM footprint quite suitable for PII-300 times
(cubox feels quite like that but has lots of RAM compared to
even maxed-out Pentium II workstation).

The image includes OpenSCADA as a nice and unique feature
which has been developed with TDE environment in mind
and was used on ARM hardware like N900, incidentally;
thanks aen@ for this suggestion.
2013-07-22 23:40:59 +04:00
Michael Shigorin
5c943e1cdf initial openscada pkglist
Thanks rom_as@ for the entire OpenSCADA project and
packages as well as for keeping TDE packages alive
and kickin' in Sisyphus.
2013-07-22 23:40:58 +04:00
Michael Shigorin
615d1793ab armh.mk: rebased cubox images
Most of these are slated to employ oem feature by now,
no sense to call it in almost every dependency chain;
the only image left with predefined locale and credentials
is cubox-xfce-ru.
2013-07-22 23:40:58 +04:00
Michael Shigorin
fc3569a491 x11-autostart: tweak for oem case
The nuance being that:
- alterator-setup package would change default.target
  for systemd providing a symlink of its own and making
  a backup of what was there (rc3 basically);
- 40-x11-autostart would ignore that backup;
- 99-oem-setup would do nothing about it all either;
- alterator-setup removal would restore rc3 symlink.

It's not pretty either, something more robust should be
invented some day.
2013-07-22 23:40:58 +04:00
Michael Shigorin
dc8799be08 desktop+kde4: added Ukrainian translations
Basically forgot to add after initial testing.
2013-07-22 23:40:58 +04:00
Michael Shigorin
8e87358b66 net-eth: fix defaults
It came unnoticed that USE_IFPLUGD clashes with
CONFIG_WIRELESS which is the default for eth ifaces.
2013-07-22 23:40:58 +04:00
Michael Shigorin
5a09eed232 armh.mk: initial cubox-kde4
It's a bit heavy but still works.
2013-07-22 23:40:58 +04:00
Michael Shigorin
93a8a89103 armh.mk: use/cleanup/installer dropped
That one conflicted with alterator-setup
by removing what it needs... should be done
differently.
2013-07-22 23:40:58 +04:00
Michael Shigorin
4918019b29 tar2fs: use -s Luke
Really no need to test and sleep when there's sync mode.
2013-07-22 23:40:58 +04:00
Michael Shigorin
0cb540acf2 gear-store-tags 2013-07-15 22:22:33 +04:00
Michael Shigorin
9c09cd1447 1.1.2-alt1
- control and sound features
2013-07-15 22:21:37 +04:00
Michael Shigorin
72986b5321 build-distro: un-hardwire .disk/info
It used to be a hasty static string; something like
"ALT Linux regular-e17/x86_64" seems more relevant.
2013-07-15 21:32:13 +04:00
Michael Shigorin
a10125ffb2 services: update README
The extent of this feature's action should be clear
as well as its prerequisite.
2013-07-15 21:20:59 +04:00
Michael Shigorin
da65dc2fd9 build-distro: skip pseudo subprofiles
rootfs presented a special case when there is no resulting
directory at all as it gets merged with the target subprofile
by design.

Still those features adding only rootfs scripts need to depend
on it but this resulted in an attempt to process a missing subdir.

This is brought back to sanity now.
2013-07-15 21:20:59 +04:00
Michael Shigorin
33e154dd7e net-usershares: added missing README
`make check' must be included in my release process :-/
2013-07-15 21:20:59 +04:00
Michael Shigorin
f110716ae6 armh.mk: tiny dedup in cubox-xfce
vm/.cubox-gtk already pulls +nm in, no need to do it again.
2013-07-15 21:20:59 +04:00
Michael Shigorin
607aa1b7d8 regular.mk: regular-server revisited
Few things:

- extend feature specification
  + SysVinit can be chosen explicitly via init feature,
    no need to keep sysklogd in yet another pkglist;
  + power management should be included too
    (both cpufreq setup and power button handling);
  + LILO seems to be heavily preferred among the
    target audience :)

- use desktop installer for regular-server
  + the seeming controversy is explained easily:
    installer-distro-altlinux-generic has very few
    modules to the point of being inconvenient for
    anything but quick rounds of basic testing,
    and distributions rather do need network setup
    along with a non-privileged user.
2013-07-15 21:15:44 +04:00
Michael Shigorin
7afce7b46c desktop+lxde: added ConsoleKit
The funny thing while debugging this was "how the heck
could a sound related change induce privilege related shift?"
-- turns out that udev-alsa (which pulls in ConsoleKit)
was the culprit... looks like LXDE hasn't dumped it yet :)
2013-07-15 21:14:45 +04:00
Gleb F-Malinovskiy
81a6ab9ec1 tar2fs: double /boot size
Factor of 2 is not enough for kernel upgrade due to filesystem overhead.
Add BOOT_SIZE_FACTOR on top of that.
2013-07-15 13:56:00 +04:00
Michael Shigorin
d79061fb44 xdg-user-dirs: employ control feature
Maybe the conditionals shouldn't be too terse, by the way...
2013-07-15 13:56:00 +04:00
Michael Shigorin
f123fea698 dev: employ control feature
...instead of setting up pam_mktemp ourselves
even if that was no big deal too.
2013-07-15 13:56:00 +04:00
Michael Shigorin
f059955d31 armh: employ control feature
As 50-sudo-su script cares for sudo and su control facilities no more
that hook is aptly renamed to 50-sshd-root (should be generalized
either some day).
2013-07-15 13:56:00 +04:00
Michael Shigorin
7666d3ac2d homeros: employ control feature
...instead of having to do the same by hand.
2013-07-15 13:56:00 +04:00
Michael Shigorin
42e6674120 initial control feature
TODO--, and this one was pretty expected
after the "invention" of iterators.
2013-07-15 13:56:00 +04:00
Michael Shigorin
37b971f533 net-eth: ensure single-subsystem control
Setting NM_CONTROLLED is apparently not enough to disable
/etc/net handling of a particular interface; thanks sem@
for noticing the fortunate error messages in logs
and explaining this peculiarity to me.
2013-07-15 13:56:00 +04:00
Michael Shigorin
ba857b9e34 deflogin: do require passwd
50-root script uses passwd(1),
mea culpa
for having optimized it out...
2013-07-15 13:56:00 +04:00
Michael Shigorin
f879c16d80 armh.mk: use sound, net features
The main reason was use/net but warranting the
bits needed for proper pulseaudio functioning
via use/sound seems also logical.
2013-07-15 13:55:59 +04:00
Michael Shigorin
889be05910 armh.mk: employ sound feature
This bunch of commits was done so these can be
mixed and matched (or even reverted) later if needed;
it was tempting to just revamp things wholesale again
but coarse grained approach is worse to maintain.
2013-07-15 13:55:59 +04:00
Michael Shigorin
ddca9d469b slinux: employ sound feature
One of the earlier duplicates pruned now.
2013-07-15 13:55:59 +04:00
Michael Shigorin
0b870ef03c ltsp: employ sound feature
The client side might benefit a bit more in the future
but the server side does not (and should not) require
everything client side does; thus use base ALSA target.
2013-07-15 13:55:59 +04:00
Michael Shigorin
42ed473409 regular.mk: employ sound feature for kde4
An act of deduplication again.
2013-07-15 13:55:59 +04:00
Michael Shigorin
006230139c x11: employ sound feature
gnome3 was just asking to line up either.
2013-07-15 13:55:59 +04:00
Michael Shigorin
f92a36da7d live: employ sound feature
use/live/sound target is dropped on the floor,
there were no more in-profile users of it.
2013-07-15 13:55:59 +04:00
Michael Shigorin
e59dca158e initial sound feature
This replaces the many sets of the corresponding packages
wandering all over pkglists, features and configurations;
the interface should be rather well-defined by now.
2013-07-15 13:55:59 +04:00
Michael Shigorin
ce8e2d2272 regular.mk: add an empty recipe
That trailing "; @:" makes up a cause to run a shell,
and SHELL is overloaded with tracing for reports.

Thus an omission fixup.
2013-07-15 13:55:59 +04:00
Michael Shigorin
1b0d05100c live: employ xdg-user-dirs feature
use/live/install stopped to provide a desktop icon; the nuance is
that zdg-user-dirs-install.sh script in livecd-install package
expects ~/.config/user-dirs.dirs to actually do that.
2013-07-15 13:55:59 +04:00
Michael Shigorin
6933b7d41e gear-store-tags 2013-07-01 20:47:48 +00:00
181 changed files with 1125 additions and 445 deletions

View File

@@ -1,5 +1,5 @@
Name: mkimage-profiles
Version: 1.1.1
Version: 1.1.26
Release: alt1
Summary: ALT Linux based distribution metaprofile
@@ -17,6 +17,7 @@ BuildRequires: /proc
Requires: rsync git-core
Requires: time schedutils sfdisk
Requires: mkimage >= 0.2.5
Requires: mkimage-preinstall
# Recommends: graphviz qemu-img
@@ -78,6 +79,84 @@ cp -a * %buildroot%mpdir
%doc %docs/*
%changelog
* Mon Mar 10 2014 Michael Shigorin <mike@altlinux.org> 1.1.26-alt1
- docs week
- deflogin: empty ROOTPW explicitly ignored (potential security fix)
* Mon Mar 03 2014 Michael Shigorin <mike@altlinux.org> 1.1.25-alt1
- regular updates
* Mon Feb 10 2014 Michael Shigorin <mike@altlinux.org> 1.1.24-alt1
- service bridge
* Mon Feb 03 2014 Michael Shigorin <mike@altlinux.org> 1.1.23-alt1
- live, net*, syslinux fixes (see also #26608)
* Mon Jan 27 2014 Michael Shigorin <mike@altlinux.org> 1.1.22-alt1
- ahci kludge (see #29705) :(
* Mon Jan 20 2014 Michael Shigorin <mike@altlinux.org> 1.1.21-alt1
- rescue tweaks
* Mon Jan 13 2014 Michael Shigorin <mike@altlinux.org> 1.1.20-alt1
- support for CIFS installation method (sin@)
- glibc-locales for regular images (closes: #29693)
* Mon Dec 30 2013 Michael Shigorin <mike@altlinux.org> 1.1.19-alt1
- regular fixes
* Mon Dec 23 2013 Michael Shigorin <mike@altlinux.org> 1.1.18-alt1
- efi updates
* Mon Dec 16 2013 Michael Shigorin <mike@altlinux.org> 1.1.17-alt1
- refind branding
* Mon Dec 09 2013 Michael Shigorin <mike@altlinux.org> 1.1.16-alt1
- e18
* Mon Dec 02 2013 Michael Shigorin <mike@altlinux.org> 1.1.15-alt1
- regular fixups
* Mon Nov 25 2013 Michael Shigorin <mike@altlinux.org> 1.1.14-alt1
- important bugfix: THE_PACKAGES weren't getting through to .base
- regular-sysv-tde related churn
* Mon Nov 04 2013 Michael Shigorin <mike@altlinux.org> 1.1.13-alt1
- rescue friday
* Mon Oct 21 2013 Michael Shigorin <mike@altlinux.org> 1.1.12-alt1
- live-builder update
* Mon Oct 14 2013 Michael Shigorin <mike@altlinux.org> 1.1.11-alt1
- luks better
* Mon Sep 30 2013 Michael Shigorin <mike@altlinux.org> 1.1.10-alt1
- regular tweaks
* Mon Sep 23 2013 Michael Shigorin <mike@altlinux.org> 1.1.9-alt1
- regular fixes
* Mon Sep 16 2013 Michael Shigorin <mike@altlinux.org> 1.1.8-alt1
- armh/p7/ve fixes
* Mon Aug 26 2013 Michael Shigorin <mike@altlinux.org> 1.1.7-alt1
- minor fixes
* Mon Aug 12 2013 Michael Shigorin <mike@altlinux.org> 1.1.6-alt1
- vm-net retired
* Mon Aug 05 2013 Michael Shigorin <mike@altlinux.org> 1.1.5-alt1
- armh related fixes
* Mon Jul 29 2013 Michael Shigorin <mike@altlinux.org> 1.1.4-alt1
- assorted fixups
* Mon Jul 22 2013 Michael Shigorin <mike@altlinux.org> 1.1.3-alt1
- armh fixes and tweaks
* Mon Jul 15 2013 Michael Shigorin <mike@altlinux.org> 1.1.2-alt1
- control and sound features
* Mon Jul 01 2013 Michael Shigorin <mike@altlinux.org> 1.1.1-alt1
- cuboxism

View File

@@ -0,0 +1,6 @@
object d64ed13dc5be294656774ac47fa722a51e6d272c
type commit
tag v1.1.25
tagger Michael Shigorin <mike@altlinux.org> 1393876856 +0400
regular updates

View File

@@ -1,6 +0,0 @@
object 386c1b14a371c5fa3309a86a8dc8d9b3eeaaac84
type commit
tag v1.1.0
tagger Michael Shigorin <mike@altlinux.org> 1371486056 +0400
1.1 branch

View File

@@ -1 +1 @@
c04d762aaa33d776387780e0f65c95be05b6e5d9 v1.1.0
28f3af58fecdd4419fa394fa1e03f50feacf81d8 v1.1.25

View File

@@ -6,15 +6,16 @@
-include $(HOME)/.mkimage/profiles.mk
# for immediate assignment
ifndef ARCHES
ifdef ARCH
ARCHES := $(ARCH)
else
ARCHES := $(shell arch \
ifndef ARCH
ARCH := $(shell arch \
| sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/; s/ppc.*/ppc/')
endif
ifndef ARCHES
ARCHES := $(ARCH)
endif
export ARCHES
export ARCHES ARCH
export PATH := $(CURDIR)/bin:$(PATH)

View File

@@ -19,7 +19,7 @@ http://en.altlinux.org/Hasher; large tmpfs helps a lot).
~~~~~~~
от имени root::
----
# apt-get install mkimage hasher git-core
# apt-get install mkimage mkimage-preinstall hasher git-core
# hasher-useradd USER
----

10
README
View File

@@ -21,7 +21,7 @@
Особенности:
* метапрофиль может быть полностью read-only при сборке
* метапрофиль при сборке может быть доступен только на чтение
* для сборки подыскивается предпочтительно tmpfs
* в профиль копируются только нужные объекты;
он автономен относительно метапрофиля
@@ -36,10 +36,9 @@
Объекты:
* дистрибутивы и виртуальные среды/машины:
** описываются в conf.d/*.mk или соответственно lib/{distro,ve,vm}.mk
** описываются в conf.d/*.mk
** могут основываться на предшественниках, расширяя их
** дистрибутивы также:
*** включают один или более субпрофилей по надобности
** дистрибутивы также включают один или более субпрофилей по надобности
** желательно избегать множественного наследования, см. тж. фичи
* субпрофили:
** список собирается в $(SUBPROFILES)
@@ -72,6 +71,9 @@
** pkglists.txt: формирование состава образа
** features.txt: обзор подключаемых особенностей
Примечание: пути в документации задаются от каталога верхнего уровня,
если не указаны как относительные в явном виде (./) или по смыслу.
Удачи; что не так -- пишите.
Michael Shigorin <mike@altlinux.org>

View File

@@ -30,4 +30,7 @@ transformed="$(sed \
-e "s, *) *, ) ,g")"
[ "$DEBUG" = 2 ] && echo "`basename $0`: transformed = \"$transformed\"" >&2
[ -z "$transformed" ] || find $transformed | sed 's,^\./,,' | grep -v '\.sw.$'
[ -z "$transformed" ] ||
find $transformed \
| sed 's,^\./,,' \
| egrep -v '(\.sw.|~)$'

View File

@@ -20,7 +20,9 @@ fi
[ -n "$GLOBAL_DEBUG" ] || message "WORKDIR: $WORKDIR"
MB=1048576 # a parted's "megabyte" in bytes is *broken*
SIZE_FACTOR=2 # multiply the sizes found by this value
BOOT_SIZE_FACTOR=2 # multiply /boot size by this value additionally
CUR_BOUNDARY=0 # align first partition at 1MB for performance (+1)
@@ -87,15 +89,15 @@ IMG="$2"
ROOTSIZE="$3"
[ -n "$ROOTSIZE" -a "$ROOTSIZE" != 0 ] || unset ROOTSIZE
# image size in bytes (note the final ceil rounding to megabytes)
# image size in bytes
TARSIZE="$(stat -Lc %s "$TAR")"
# /boot size in that tarball
BOOTSIZE="$(boot_size "$TAR")"
DEFSIZE="$(($SIZE_FACTOR * ($TARSIZE - $BOOTSIZE)))" # (exact sizes)
ROOTSIZE="$((${ROOTSIZE:-$DEFSIZE} + $MB - 1))"
ROOTSIZE="$((${ROOTSIZE:-$DEFSIZE} + $MB - 1))" # for ceil rounding to MB
# image and /boot sizes in megabytes
ROOTSIZEM="$(($ROOTSIZE / $MB))"
BOOTSIZEM="$((($SIZE_FACTOR * $BOOTSIZE + $MB - 1) / $MB))"
BOOTSIZEM="$((($SIZE_FACTOR * $BOOT_SIZE_FACTOR * $BOOTSIZE + $MB - 1) / $MB))"
# tested to work: ext[234], jfs
# NB: xfs doesn't have a spare sector for the bootloader
@@ -155,14 +157,9 @@ fi
# not ROOTSIZEM but "the rest"; somewhat non-trivial arithmetics lurk in parted
mkpart
kpartx -a "$LOOPDEV"
kpartx -a -s "$LOOPDEV"
LOOPROOT="/dev/mapper/$(basename "$LOOPDEV")p$ROOTPART"
# might take a tiny bit of time to actually appear
for i in `seq 10`; do
[ -b "$LOOPROOT" ] && break || sleep 0.1
done
mkfs."$ROOTFSTYPE" "$LOOPROOT"
if [ -n "$BOOTPART" ]; then
@@ -190,7 +187,7 @@ if [ -n "$BOOTPART" ]; then
echo "$BOOTDEV /boot $BOOTFSTYPE defaults 1 2" >> "$ROOTFS/etc/fstab"
fi
echo "MODULES_PRELOAD=$INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
echo "MODULES_PRELOAD += $INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
KERNEL="$(readlink $ROOTFS/boot/vmlinuz | sed 's,vmlinuz-,,')"
chroot "$ROOTFS" make-initrd -k "$KERNEL"

View File

@@ -12,7 +12,7 @@
Попросту говоря, copy-paste -- тревожный признак.
По переменным (см. тж. ../doc/pkglists.txt):
По переменным (см. тж. doc/pkglists.txt):
* для пользовательского окружения (live, main) предназначены
THE_PACKAGES, THE_LISTS, THE_GROUPS, THE_PACKAGES_REGEXP

View File

@@ -2,10 +2,16 @@ ifeq (armh,$(ARCH))
ifeq (ve,$(IMAGE_CLASS))
# aliases for autobuild
ve/regular-nexus7-e17: ve/nexus7-e17; @:
ve/regular-nexus7-kde4: ve/nexus7-kde4; @:
ve/altlinux-p7-nexus7-e17: ve/nexus7-e17; @:
ve/altlinux-p7-nexus7-kde4: ve/nexus7-kde4; @:
ve/.tegra3-base: ve/.base use/armh use/kernel
@$(call add,BASE_PACKAGES,nvidia-tegra)
ve/.tegra3-tablet: ve/.tegra3-base use/armh-tegra3
ve/.tegra3-tablet: ve/.tegra3-base use/armh-tegra3 +pulse
@$(call add,BASE_LISTS,$(call tags,base tablet))
ve/.nexus7-tablet: ve/.tegra3-tablet use/armh-nexus7 \
@@ -18,7 +24,7 @@ ve/.nexus7-tablet: ve/.tegra3-tablet use/armh-nexus7 \
ve/nexus7-e17: ve/.nexus7-tablet use/x11/e17 use/x11/lightdm/gtk; @:
ve/nexus7-kde4: ve/.nexus7-tablet use/x11/lightdm/kde +systemd
ve/nexus7-kde4: ve/.nexus7-tablet use/x11/lightdm/kde +systemd +pulse +nm
@$(call add,BASE_LISTS,$(call tags,base kde4mobile))
ve/nexus7-xfce: ve/.nexus7-tablet use/x11/xfce use/x11/lightdm/gtk +systemd
@@ -29,18 +35,19 @@ endif
ifeq (vm,$(IMAGE_CLASS))
# NB: early dependency on use/kernel is on intent
vm/.arm-base: profile/bare use/kernel use/net-eth/dhcp use/vm-ssh; @:
vm/.arm-base: profile/bare use/kernel use/net-eth/dhcp use/net-ssh; @:
@$(call add,BASE_PACKAGES,interactivesystem e2fsprogs)
@$(call add,BASE_PACKAGES,apt)
@$(call add,BASE_PACKAGES,mkinitrd uboot-tools)
@$(call set,BRANDING,altlinux-kdesktop)
vm/.cubox-bare: vm/.arm-base use/armh use/armh-cubox use/services/ssh +systemd \
use/cleanup/installer use/repo use/branding use/xdg-user-dirs/deep
@$(call set,KFLAVOURS,cubox)
vm/.cubox-bare: vm/.arm-base use/armh-cubox use/net-ssh use/repo use/tty/S0
@$(call add,BASE_PACKAGES,glibc-locales vim-console rsync)
vm/.cubox-desktop: vm/.cubox-bare use/armh-dovefb +systemd +pulse \
use/armh-cubox use/branding use/xdg-user-dirs/deep
@$(call set,BRANDING,altlinux-kdesktop)
@$(call add,THE_BRANDING,alterator graphics indexhtml menu notes)
@$(call add,BASE_PACKAGES,glibc-locales vim-console rsync)
@$(call add,BASE_PACKAGES,parole gst-ffmpeg gst-plugins-vmeta)
@$(call add,BASE_PACKAGES,gst-plugins-good gst-plugins-nice)
@$(call add,BASE_PACKAGES,gst-plugins-bad gst-plugins-ugly)
@@ -49,16 +56,38 @@ vm/.cubox-bare: vm/.arm-base use/armh use/armh-cubox use/services/ssh +systemd \
@$(call add,BASE_PACKAGES,LibreOffice4-full LibreOffice4-langpack-ru)
@$(call add,BASE_LISTS,$(call tags,(base || desktop) && regular))
vm/.cubox-base: vm/.cubox-bare use/deflogin/altlinuxroot; @:
vm/.cubox-gtk: vm/.cubox-base use/x11/lightdm/gtk +nm; @:
vm/cubox-xfce: vm/.cubox-bare use/slinux/arm use/oem use/net-usershares \
use/domain-client +nm; @:
vm/cubox-xfce-ru: vm/.cubox-gtk use/slinux/arm use/x11-autologin
vm/cubox-xfce-ru: vm/.cubox-desktop use/deflogin/altlinuxroot \
use/slinux/arm use/x11/lightdm/gtk use/x11-autologin +nm
@$(call add,BASE_PACKAGES,livecd-ru)
vm/cubox-mate: vm/.cubox-gtk use/x11/mate +nm; @:
# these images use a kind of OEM setup
vm/.cubox-oem: vm/.cubox-desktop use/oem; @:
vm/.cubox-gtk: vm/.cubox-oem use/x11/lightdm/gtk +nm; @:
vm/cubox-xfce: vm/.cubox-gtk \
use/slinux/arm use/net-usershares use/domain-client; @:
vm/cubox-mate: vm/.cubox-gtk use/x11/mate; @:
@$(call set,BRANDING,altlinux-centaurus)
@$(call add,THE_BRANDING,mate-settings)
vm/cubox-tde: vm/.cubox-oem use/net-eth/dhcp use/x11-autostart +tde
@$(call add,BASE_LISTS,openscada)
vm/cubox-kde4: vm/.cubox-oem use/x11/kde4 use/x11/kdm4 use/fonts/zerg +pulse
@$(call add,BASE_LISTS,$(call tags,desktop && kde4 && !extra))
vm/cubox-server: vm/.cubox-bare use/deflogin/altlinuxroot use/control/sudo-su \
+sysvinit
@$(call set,BRANDING,altlinux-centaurus)
@$(call add,BASE_PACKAGES,agetty fdisk)
@$(call add,BASE_LISTS,$(call tags,base security))
vm/arm-server: vm/.arm-base use/net-eth/dhcp use/cleanup/installer +sysvinit
@$(call set,KFLAVOURS,armadaxp)
@$(call add,BASE_PACKAGES,agetty)
@$(call add,BASE_LISTS,$(call tags,extra (server || network)))
endif

View File

@@ -6,16 +6,22 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
distro/.desktop-network: distro/.desktop-mini use/stage2/net-eth +vmguest
mixin/desktop-installer: use/x11-autostart use/sound +vmguest
@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
@$(call add,BASE_PACKAGES,udev-rule-generator-net sysklogd)
@$(call add,BASE_LISTS, \
$(call tags,(base || desktop) && (l10n || network)))
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,BASE_PACKAGES,os-prober)
distro/.desktop-network: distro/.desktop-mini \
mixin/desktop-installer use/stage2/net-eth; @:
distro/.desktop-extra:
@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))
distro/kde4-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde4-lite
distro/kde4-lite: distro/.desktop-mini \
distro/.desktop-network distro/.desktop-extra +kde4-lite
@$(call set,KFLAVOURS,std-def)
distro/tde: distro/.desktop-network +tde; @:

View File

@@ -1,6 +1,6 @@
ifeq (distro,$(IMAGE_CLASS))
distro/homeros-mini: distro/.live-base use/live/textinstall use/homeros; @:
distro/homeros-mini: distro/.live-base use/live/textinstall \
use/homeros use/speech/en use/isohybrid; @:
endif

View File

@@ -22,7 +22,8 @@ distro/.live-kiosk: distro/.base use/live/base use/live/autologin +power \
@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
distro/live-builder-mini: distro/.live-base use/dev/mkimage use/dev \
use/syslinux/timeout/30
use/stage2/net-eth use/net-eth/dhcp use/syslinux/timeout/30 \
use/efi/signed
@$(call set,KFLAVOURS,$(BIGRAM))
@$(call add,LIVE_LISTS,\
$(call tags,(base || live) && (server || builder)))
@@ -49,9 +50,8 @@ distro/live-rescue: distro/live-icewm use/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
distro/.live-webkiosk: distro/.live-kiosk use/live/hooks use/live/ru use/sound
@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
@$(call add,LIVE_PACKAGES,alsa-utils udev-alsa)
@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
distro/live-webkiosk-mini: distro/.live-webkiosk
@@ -67,9 +67,17 @@ distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:
distro/live-webkiosk-chromium: distro/.live-webkiosk
@$(call add,LIVE_PACKAGES,livecd-webkiosk-chromium)
distro/live-flightgear: distro/.live-x11 use/x11/lightdm/gtk use/x11/3d +icewm
distro/.live-3d: distro/.live-x11 use/x11/3d \
use/x11/lightdm/gtk +icewm +sysvinit
@$(call add,LIVE_PACKAGES,glxgears glxinfo)
distro/live-glxgears: distro/.live-3d; @:
distro/live-flightgear: distro/.live-3d use/stage2/net-eth use/net-eth/dhcp
@$(call add,LIVE_LISTS,$(call tags,xorg misc))
@$(call add,LIVE_PACKAGES,FlightGear fgo input-utils)
@$(call add,LIVE_PACKAGES,FlightGear-tu154b)
@$(call add,LIVE_PACKAGES,icewm-startup-tray_mixer_plus)
@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
distro/live-e17: distro/.live-desktop-ru use/x11/e17 use/x11/lightdm/gtk; @:

View File

@@ -1,10 +1,11 @@
# p7 base kits
ifeq (distro,$(IMAGE_CLASS))
mixin/p7:
@$(call set,BRANDING,altlinux-starterkit)
### kludge compatibility: introspection stub for ../main.mk :-/
ifeq (distro,$(IMAGE_CLASS))
### kludge compatibility: introspection stub for main.mk :-/
distro/altlinux-p7-cinnamon: distro/regular-cinnamon mixin/p7; @:
distro/altlinux-p7-e17: distro/regular-e17 mixin/p7; @:
distro/altlinux-p7-icewm: distro/regular-icewm mixin/p7; @:
@@ -15,6 +16,22 @@ 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-sysv-tde: distro/regular-sysv-tde mixin/p7; @:
distro/altlinux-p7-jeos: distro/regular-jeos mixin/p7; @:
distro/altlinux-p7-server: distro/regular-server mixin/p7; @:
distro/altlinux-p7-server-ovz: distro/regular-server-ovz mixin/p7; @:
endif
ifeq (ve,$(IMAGE_CLASS))
ve/altlinux-p7-ovz-generic: ve/generic mixin/p7; @:
endif
ifeq (vm,$(IMAGE_CLASS))
vm/altlinux-p7-vm-net: vm/net mixin/p7; @:
endif

View File

@@ -8,48 +8,89 @@ distro/.regular-bare: distro/.base +wireless use/efi/signed \
# graphical target (not enforcing xorg drivers or blobs)
distro/.regular-x11: distro/.regular-bare use/x11/wacom +vmguest \
use/live/x11 use/live/ru use/live/install use/live/repo use/live/rw \
use/live/x11 use/live/install use/live/repo use/live/rw \
use/luks use/branding
@$(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)
# common WM live/installer bits
mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
@$(call add,THE_PACKAGES,alterator-notes)
@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
# WM base target
distro/.regular-base: distro/.regular-x11 use/x11/xorg
@$(call add,LIVE_PACKAGES,installer-feature-desktop-other-fs-stage2)
@$(call add,THE_BRANDING,indexhtml notes alterator)
@$(call add,THE_BRANDING,graphics)
distro/.regular-base: 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 \
use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind +systemd
@$(call add,LIVE_PACKAGES,fuse-exfat)
@$(call add,LIVE_LISTS,domain-client)
@$(call add,THE_BRANDING,bootloader)
@$(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-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
use/x11/lightdm/gtk; @:
distro/regular-icewm: distro/.regular-base use/init/sysv \
use/x11/lightdm/gtk +icewm
distro/.regular-install: distro/.regular-bare +installer +sysvinit +power \
use/branding use/bootloader/grub use/luks use/install2/fs
@$(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 +sysvinit \
use/install2/packages use/install2/kvm use/install2/vbox \
use/branding use/bootloader/lilo use/syslinux/lateboot.cfg \
use/cleanup/x11-alterator use/net use/kernel/net use/stage2/net-eth
@$(call set,KFLAVOURS,led-ws) # led-vs might be nice here
@$(call add,BASE_KMODULES,guest vboxguest)
@$(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 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)
distro/.regular-install-x11: distro/.regular-install \
mixin/regular-desktop +vmguest
@$(call set,INSTALLER,altlinux-desktop)
@$(call add,THE_LISTS,$(call tags,regular desktop))
distro/regular-icewm: distro/.regular-sysv-gtk +icewm
@$(call add,LIVE_LISTS,$(call tags,regular icewm))
@$(call set,KFLAVOURS,un-def)
distro/regular-wmaker: distro/.regular-desktop use/x11/lightdm/gtk \
use/x11/wmaker
distro/regular-wmaker: distro/.regular-sysv-gtk use/x11/wmaker use/efi/refind
@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
@$(call add,LIVE_PACKAGES,xxkb)
@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru)
ifeq (i586,$(ARCH))
distro/regular-gnustep: distro/regular-wmaker use/x11/gnustep +plymouth
@$(call add,THE_BRANDING,graphics)
else
$(error $@ is known buggy on non-i586 at the moment)
endif
distro/regular-xfce: distro/.regular-gtk use/x11/xfce +nm; @:
distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality +nm
@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
@$(call add,LIVE_PACKAGES,livecd-regular-xmonad)
@@ -57,8 +98,9 @@ distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
distro/regular-mate: distro/.regular-gtk use/x11/mate +nm
@$(call add,LIVE_LISTS,$(call tags,mobile mate))
distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality
@$(call add,LIVE_PACKAGES,xterm)
distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @:
distro/regular-e18: distro/.regular-gtk use/x11/e18 use/fonts/infinality; @:
distro/regular-e18-sysv: distro/.regular-sysv-gtk use/x11/e18; @:
distro/regular-cinnamon: distro/.regular-gtk \
use/x11/cinnamon use/fonts/infinality
@@ -66,11 +108,18 @@ distro/regular-cinnamon: distro/.regular-gtk \
distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3 +plymouth; @:
distro/regular-tde: distro/.regular-desktop +tde +plymouth +nm
@$(call add,LIVE_PACKAGES,kdegames kdeedu)
# reusable bits
mixin/regular-tde: use/syslinux/ui/gfxboot +tde +plymouth
@$(call add,THE_PACKAGES,kdeedu)
@$(call add,THE_LISTS,openscada)
distro/regular-tde: distro/.regular-desktop mixin/regular-tde +nm; @:
distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
use/net-eth/dhcp use/efi/refind; @:
distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \
use/fonts/zerg +plymouth
use/fonts/zerg +pulse +plymouth
@$(call add,LIVE_LISTS,$(call tags,regular kde4))
distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @:
@@ -78,11 +127,28 @@ distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @:
distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
distro/regular-rescue: distro/.regular-bare use/rescue/rw \
use/syslinux/ui/menu use/hdt use/efi/refind
use/efi/refind use/efi/shell use/efi/memtest86 \
use/syslinux/ui/menu use/hdt test/rescue/no-x11
@$(call set,KFLAVOURS,un-def)
@$(call add,RESCUE_PACKAGES,gpm)
distro/regular-server: distro/.regular-bare +installer \
use/bootloader/grub use/firmware use/server/mini
@$(call add,THE_LISTS,$(call tags,(base || server) && regular))
distro/regular-sysv-tde: distro/.regular-install-x11 \
mixin/desktop-installer mixin/regular-tde \
use/branding/complete use/branding/slideshow/once \
use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base
@$(call set,KFLAVOURS,led-ws)
@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@$(call add,THE_PACKAGES,alterator-datetime alterator-x11)
@$(call add,THE_PACKAGES,htop k3b openntpd pm-utils)
@$(call add,THE_PACKAGES,lm_sensors3 hdparm sdparm smartmontools)
@$(call add,THE_LISTS,$(call tags,base desktop))
distro/regular-server: distro/.regular-install use/server/mini use/rescue/base
@$(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; @:
endif

View File

@@ -11,18 +11,11 @@ distro/server-nano: distro/.server-base use/bootloader/lilo +power
distro/server-mini: distro/.server-base use/server/mini use/kernel/net \
use/efi use/stage2/net-eth
@$(call set,INSTALLER,altlinux-server)
@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
use/firmware/server use/firmware/cpu use/power/acpi/button +wireless
@$(call set,STAGE1_KFLAVOUR,std-def)
@$(call set,KFLAVOURS,std-def ovz-el)
@$(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_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)
distro/server-ovz: distro/server-mini use/server/ovz use/server/groups/base \
use/install2/net use/hdt use/rescue use/power/acpi/button \
use/firmware/server use/firmware/cpu +wireless; @:
endif

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

@@ -0,0 +1,12 @@
# t7 base kits
mixin/t7:
@$(call set,BRANDING,altlinux-starterkit) ### needs changing
ifeq (distro,$(IMAGE_CLASS))
distro/altlinux-t7-gnustep: distro/regular-gnustep mixin/t7; @:
distro/altlinux-t7-tde: distro/regular-tde mixin/t7; @:
distro/altlinux-t7-sysv-tde: distro/regular-sysv-tde mixin/t7; @:
endif

View File

@@ -72,9 +72,8 @@ endif # IMAGE_CLASS: ve
ifeq (vm,$(IMAGE_CLASS))
vm/net-static: vm/bare use/vm-net/static use/vm-ssh
@$(call set,VM_NET_IPV4ADDR,10.0.2.16/24)
@$(call set,VM_NET_IPV4GW,10.0.2.2)
vm/net-static: vm/bare use/net-eth use/net-ssh
@$(call add,NET_ETH,eth0:static:10.0.2.16/24:10.0.2.2)
endif # IMAGE_CLASS: vm

View File

@@ -1,15 +1,22 @@
ifeq (ve,$(IMAGE_CLASS))
# no "vzctl enter"
ve/bare: ve/.base
@$(call add,BASE_PACKAGES,sysvinit)
ve/bare: ve/.base use/init/sysv; @:
# /dev/pty and friends start here
ve/base: ve/bare
@$(call add,BASE_PACKAGES,interactivesystem)
# this should be more or less deployable
ve/generic: ve/base
# a particular package list
ve/ldv: ve/bare
@$(call add,BASE_PACKAGES,xz bzip2 glibc hostinfo less)
@$(call add,BASE_PACKAGES,vim-console netlist rsync time)
@$(call add,BASE_PACKAGES,openssh-blacklist openssh-server)
@$(call add,BASE_PACKAGES,shadow-edit shadow-groups)
# this should be more or less convenient
ve/generic: ve/base use/repo
@$(call add,BASE_PACKAGES,vim-console etckeeper)
@$(call add,BASE_LISTS,openssh \
$(call tags,base && (server || network || security || pkg)))

View File

@@ -1,10 +1,10 @@
# virtual machines
ifeq (vm,$(IMAGE_CLASS))
vm/bare: vm/.bare
vm/bare: vm/.bare +sysvinit
@$(call add,BASE_PACKAGES,apt)
vm/net: vm/bare use/vm-net/dhcp use/vm-ssh
vm/net: vm/bare use/net-eth/dhcp use/net-ssh use/repo
@$(call add,BASE_PACKAGES,su)
# NB: use/x11 employs some installer-feature packages

View File

@@ -10,26 +10,27 @@ mkimage-profiles, или _m-p_ — результат осмысления и о
*Цели*
* пригодность к применению как очень крутыми хакерами, так и новичками
* относительно низкая трудоёмкость использования
* поощрение совместной работы
* относительно низкая трудоёмкость использования
* пригодность к применению как очень крутыми хакерами, так и новичками
*Средства*
Двухуровневость:
метапрофиль более объёмен и сложен, но выгоден для долгосрочной разработки
сгенерированный дистрибутивный профиль более легко обозрим и модифицируем как одноразовый форк
наследственность на уровне индивидуальных особенностей и образов в целом
прозрачность и диагностируемость формирования конфигурации
документированность
* метапрофиль более объёмен и сложен, но выгоден для долгосрочной разработки
* сгенерированный дистрибутивный профиль более легко обозрим и модифицируем как одноразовый форк
* наследственность на уровне индивидуальных особенностей и образов в целом
* прозрачность и диагностируемость формирования конфигурации
* документированность
*Примеры использования*
Выполняем начальные инструкции по документации
Выполняем начальные инструкции по документации:
git clone git://git.altlinux.org/people/mike/packages/mkimage-profiles.git
cd mkimage-profiles
make icewm.iso
make rescue.iso
= Основы =

View File

@@ -6,91 +6,91 @@
* APTCONF
** задаёт путь к требуемому apt.conf
** значение: пусто (по умолчанию системный) либо строка
** см. ../image.in/Makefile, apt.conf.sample
** см. image.in/Makefile, doc/apt.conf.sample
* ARCH
** задаёт целевую архитектуру образов
** значение: пусто (по умолчанию авто), i586, x86_64, arm, ppc
** см. ../lib/build.mk
** см. lib/build.mk
* ARCHES
** задаёт набор целевых архитектур при параметрическом задании APTCONF
** значение: пусто (по умолчанию авто) либо список через пробел
** см. ../Makefile, profiles.mk.sample
** см. Makefile, doc/profiles.mk.sample
* BELL
** подаёт сигнал после завершения сборки
** значение: пусто (по умолчанию нет) либо любая строка
** см. ../lib/build.mk
** см. lib/build.mk
* BUILDDIR
** задаёт каталог генерируемого профиля и сборки
** значение: пусто (по умолчанию авто) либо строка
** см. ../lib/profile.mk
** см. lib/profile.mk
* BUILDDIR_PREFIX
** задаёт префикс каталога генерируемого профиля и сборки
** значение: строка; по умолчанию выбирается алгоритмически
** см. ../main.mk
** см. main.mk
* BUILDLOG
** задаёт путь к файлу журнала сборки/очистки
** значение: по умолчанию $(BUILDDIR)/build.log либо строка
** см. ../lib/log.mk
** значение: $(BUILDDIR)/build.log (по умолчанию) либо строка
** см. lib/log.mk
* CHECK
** включает режим проверки сборки конфигурации (без сборки образа)
** значение: пусто (по умолчанию) либо любая строка
** см. ../lib/build.mk, ../lib/clean.mk
** см. lib/build.mk, lib/clean.mk
* CLEAN
** экономия RAM+swap при сборке в tmpfs, иначе места на диске
** очистка рабочего каталога после успешной сборки очередной стадии
** может помешать использовать некоторые варианты отладки
** значение: любая строка; по умолчанию пусто при DEBUG, иначе 1
** см. ../lib/clean.mk
** значение: пусто, 0, 1, 2; по умолчанию пусто при DEBUG, иначе 1
** см. lib/clean.mk
* DEBUG
** включает средства отладки, может отключить зачистку после сборки
** значение: пусто (по умолчанию), 1 или 2
** см. ../lib/log.mk, ../lib/clean.mk
** см. lib/log.mk, lib/clean.mk
* HOMEPAGE, HOMENAME, HOMEWAIT
** указывают адрес, название и таймаут перехода для домашней страницы
** значение: корректный URL, строка, целое неотрицательное число
** см. ../features.in/live/generate.mk (тж. по умолчаниям)
** см. features.in/live/generate.mk (тж. по умолчаниям)
* ISOHYBRID
** включает создание гибриднго ISO-образа
** значение: пусто (по умолчанию) либо любая строка
** см. ../features.in/pack/config.mk
** см. features.in/pack/config.mk, features.in/isohybrid/config.mk
* NICE
** понижает нагрузку системы сборочной задачей
** значение: пусто (по умолчанию) либо любая строка
** см. ../lib/build.mk
** см. lib/build.mk
* REPORT
** запрашивает создание отчётов о собранном образе
** значение: пусто (по умолчанию) либо любая строка
** NB: в силу специфики обработки передаётся только явно
** см. ../Makefile, ../report.mk, ../lib/report.mk
** см. Makefile, report.mk, lib/report.mk
* ROOTPW
** устанавливает пароль root по умолчанию для образов виртуальных машин
** значение: пусто (по умолчанию root) либо строка
** см. ../features.in/build-vm/image-scripts.d/00root
** см. features.in/deflogin/rootfs/image-scripts.d/50-root
* SAVE_PROFILE
** сохраняет архив сгенерированного профиля в .disk/
** значение: пусто (по умолчанию) либо любая строка
** см. ../image.in/Makefile
** см. image.in/Makefile
* SORTDIR
** дополнительно структурирует каталог собранных образов
** значение: пусто (по умолчанию) либо строка
*** например, '$(IMAGE_NAME)/$(DATE)'
** см. ../image.in/Makefile
** см. image.in/Makefile
* SQUASHFS
** определяет характер сжатия squashfs для stage2
@@ -98,18 +98,18 @@
*** пусто (по умолчанию) либо normal: xz
*** tight: xz с -Xbcj по платформе (лучше, но дольше -- подбор в два прохода)
*** fast: gzip/lzo (быстрее запаковывается и распаковывается, меньше степень)
** см. ../features.in/stage2/stage1/scripts.d/03-test-kernel
** см. features.in/stage2/stage1/scripts.d/03-test-kernel
* STATUS
** добавляет в имя образа указанный префикс
** значение:
*** пусто (по умолчанию) либо строка (например, "alpha", "beta")
** см. ../image.in/Makefile
** см. image.in/Makefile
* VM_SIZE
** задаёт размер несжатого образа виртуальной машины в байтах
** значение: пусто (по умолчанию двойной размер чрута) или целое
** см. ../features.in/build-vm/lib/90-build-vm.mk, ../bin/tar2fs
** см. features.in/build-vm/lib/90-build-vm.mk, bin/tar2vm
[float]
=== пример ===

View File

@@ -1,7 +1,7 @@
== Списки пакетов ==
Состав пакетной базы субпрофилей определяется значенями
следующих переменных профиля (см. тж. ../conf.d/README;
Состав пакетной базы субпрофилей определяется значениями
следующих переменных профиля (см. тж. conf.d/README;
некоторые "*" ниже заэкранированы ради парсера asciidoc):
* main: пакетная база для установки
@@ -14,14 +14,14 @@
** THE_KMODULES, BASE_KMODULES, MAIN_KMODULES, BASE_KMODULES_REGEXP
*** KFLAVOURS
* stage2: общая часть installer, live, rescue
* stage2: общая часть install2, live, rescue
** sub.in/stage2/Makefile, features.in/\*/stage2/lib/*.mk
** SYSTEM_PACKAGES, STAGE2_PACKAGES
** STAGE1_KMODULES, STAGE1_KMODULES_REGEXP,
STAGE2_KMODULES, STAGE2_KMODULES_REGEXP
*** STAGE1_KFLAVOUR или последний из KFLAVOURS
* installer: компактная "живая" система, содержащая только инсталятор
* install2: компактная "живая" система, содержащая только инсталятор
** см. stage2
*** features.in/install2/install2/stage2cfg.mk,
features.in/\*/install2/lib/*.mk

View File

@@ -21,12 +21,12 @@
цели в UI конфигурирования образа.
Остальное содержимое является дополнительным и используется
в таком порядке (см. ../Makefile):
в таком порядке (см. features.in/Makefile):
* сперва в $(BUILDDIR)/image/ копируются все подкаталоги,
соответствующие итоговым именам субпрофилей, запрошенных
для профиля образа; при этом они сливаются с деревом,
которое уже сформировано субпрофилями (../sub.in/*) и уже
которое уже сформировано субпрофилями (sub.in/*) и уже
скопированными фичами; если какие-либо файлы перекрылись
по именам, rsync должен оставить резервные копии (*~),
которые должны просигнализировать о беспорядке;

View File

@@ -8,6 +8,6 @@
#
# for somewhat more involved example, see syslinux feature
use/00example: sub/main use/anotherfeature
use/00example: use/repo/main use/anotherfeature
@$(call add_feature)
@$(call add,MAIN_PACKAGES,hello)

View File

@@ -8,14 +8,14 @@
других фич либо субпрофилей.
Каждая фича должна содержать файл config.mk, включаемый
в ../main.mk при построении конфигурации будущего профиля;
в main.mk при построении конфигурации будущего профиля;
он может описывать одну или более целей вида use/*,
дополняющих конфигурацию, и обязан добавить имя фичи
в $(FEATURES), для чего создана функция add_feature.
На этапе генерации сборочного профиля фичи рассматриваются
после инициализации профиля (см. ../image.in/) и копирования
субпрофилей (см. ../sub.in/). Для каждой фичи, указанной
после инициализации профиля (см. image.in/) и копирования
субпрофилей (см. sub.in/). Для каждой фичи, указанной
в $(FEATURES), копируются подкаталоги сообразно включенным
субпрофилям, а также lib/ и {image-,}scripts.d/; затем
выполняются generate.sh и generate.mk при их наличии.

View File

@@ -1,2 +1,3 @@
use/armh-cubox: use/armh-dovefb
use/armh-cubox: use/armh
@$(call add_feature)
@$(call set,KFLAVOURS,cubox)

View File

@@ -1,3 +1,3 @@
use/armh-dovefb:
use/armh-dovefb: use/armh
@$(call add_feature)
@$(call add,THE_PACKAGES,xorg-drv-dovefb)

View File

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

View File

@@ -1,11 +0,0 @@
#!/bin/sh
# poor man's root switch
# NB: 50-users creates predefined users
control su public
control sudo public
cat >> /etc/openssh/sshd_config << EOF
PermitRootLogin yes
UseDNS no
EOF

View File

@@ -4,7 +4,7 @@
# the last different one wins
# - remember .base if adding yet another *_PACKAGES
use/bootloader: use/install2 sub/main
use/bootloader:
@$(call add_feature)
@$(call add,BASE_PACKAGES,alterator-$$(BASE_BOOTLOADER))

View File

@@ -0,0 +1,6 @@
#!/bin/sh
if [ -z "$GLOBAL_BASE_BOOTLOADER" ]; then
echo "** error: BASE_BOOTLOADER empty while bootloader feature requested" >&2
exit 1
fi

View File

@@ -4,8 +4,13 @@ use/branding:
# NB: not every distro might have all the branding of its own
use/branding/full: use/branding use/syslinux/ui/gfxboot
@$(call add,THE_BRANDING,alterator bootsplash graphics)
@$(call add,THE_BRANDING,alterator bootloader bootsplash graphics)
@$(call add,THE_BRANDING,indexhtml notes slideshow)
use/branding/complete: use/branding/full use/plymouth/full
@$(call add,INSTALL2_BRANDING,notes slideshow)
# http://altlinux.org/branding/slideshow
use/branding/slideshow/once: use/branding
@$(call add,INSTALL2_BRANDING_SLIDESHOW,once:true)
@$(call xport,INSTALL2_BRANDING_SLIDESHOW)

View File

@@ -0,0 +1,7 @@
#!/bin/bash
[ -n "$GLOBAL_INSTALL2_BRANDING_SLIDESHOW" ] || exit 0
for arg in $GLOBAL_INSTALL2_BRANDING_SLIDESHOW; do
echo "${arg/:/=}" >> /etc/alterator/slideshow.conf
done

View File

@@ -1 +1,2 @@
IMAGE_PACKAGES_REGEXP += $(call branding,$(INSTALL2_BRANDING))
IMAGE_PACKAGES_REGEXP += $(call branding, \
$(STAGE2_BRANDING) $(INSTALL2_BRANDING))

View File

@@ -2,3 +2,6 @@
# NB: this comes just before build-distro.mk
DOT_BASE += $(call branding,$(THE_BRANDING))
CHROOT_PACKAGES_REGEXP += $(call branding,bootloader)
CHROOT_PACKAGES += ImageMagick-tools

View File

@@ -1 +1,2 @@
IMAGE_PACKAGES_REGEXP += $(call branding,$(THE_BRANDING))
IMAGE_PACKAGES_REGEXP += $(call branding, \
$(THE_BRANDING) $(STAGE2_BRANDING))

View File

@@ -1 +0,0 @@
IMAGE_PACKAGES_REGEXP += $(call branding,$(STAGE2_BRANDING))

View File

@@ -1,3 +1,3 @@
# hooked from ../../lib/sugar.mk
# hooked from lib/sugar.mk
use/build-distro:
@$(call add_feature)

View File

@@ -1,7 +1,8 @@
# step 4: build the distribution image
# take the latter part for complex-specified subprofiles like stage2@live
SUBDIRS = $(SUBPROFILE_DIRS)
# take the latter part for complex-specified subprofiles like stage2@live;
# care to exclude non-directories holding no makefiles like rootfs
SUBDIRS = $(sort $(dir $(wildcard $(addsuffix /Makefile,$(SUBPROFILE_DIRS)))))
# proxy over the ISO metadata collected; see also genisoimagerc(5)
BOOT_SYSI := $(META_SYSTEM_ID)
@@ -12,6 +13,7 @@ BOOT_VOLI := $(shell echo $(META_VOL_ID) | cut -c1-32)
BOOT_VOLS := $(META_VOL_SET)
BOOT_BIBL := $(META_BIBLIO)
BOOT_ABST := $(META_ABSTRACT)
DATE_F := $(shell date +%F)
BOOT_TYPE := isolinux
@@ -23,7 +25,7 @@ prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER)
# can't use mp-showref which belongs to the metaprofile
dot-disk:
@mkdir -p files/.disk
@echo "ALT Linux based" >files/.disk/info
@echo "$(META_VOL_ID) $(DATE_F)" >files/.disk/info
@echo "$(ARCH)" >files/.disk/arch
@echo "$(DATE)" >files/.disk/date
@if type -t git >&/dev/null; then \

View File

@@ -1,3 +1,3 @@
# hooked from ../../lib/sugar.mk
# hooked from lib/sugar.mk
use/build-ve: sub/rootfs@/
@$(call add_feature)

View File

@@ -1,3 +1,3 @@
Эта фича конфигурирует создание образа виртуальной машины (VM).
Дополняет финальную стадию сборки (lib/, image-scripts.d/).
Требует для работы sudo(8) -- см. тж. ../../doc/vm.txt .
Требует для работы sudo(8) -- см. тж. doc/vm.txt

View File

@@ -1,3 +1,3 @@
# hooked from ../../lib/sugar.mk
# hooked from lib/sugar.mk
use/build-vm: sub/rootfs@/ use/kernel use/deflogin
@$(call add_feature)

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/80-make-initfs
kver="$(rpm -qa 'kernel-image*' \
--qf '%{installtime} %{version}-%{name}-%{release}\n' \

View File

@@ -0,0 +1,2 @@
Эта фича предоставляет интерфейс для конфигурирования дистрибутивных
значений по умолчанию control(8); см. тж. http://altlinux.org/control

View File

@@ -0,0 +1,8 @@
use/control:
@$(call add_feature)
@$(call add,THE_PACKAGES,control)
@$(call xport,CONTROL)
# some presets
use/control/sudo-su: use/control
@$(call add,CONTROL,su:public sudo:public)

View File

@@ -0,0 +1,11 @@
#!/bin/sh
# setup control(8) states
[ -z "$GLOBAL_CONTROL" ] ||
echo "$GLOBAL_CONTROL" \
| tr ' ' '\n' \
| while IFS=':' read facility state; do
[ -z "$facility" -o -z "$state" ] ||
control "$facility" "$state"
done
:

View File

@@ -1,4 +1,6 @@
Эта фича конфигурирует root login и пользователей по умолчанию.
Если ROOTPW не задан, то подходящий пароль не существует.
Различить пустой и незаданный при текущей реализации xport() невозможно.
ВНИМАНИЕ: применяйте разумно, т.к. крайне легко создать и оставить
дыру в безопасности!

View File

@@ -1,7 +1,7 @@
# WARNING: the variable values are stored in build config/log!
use/deflogin:
@$(call add_feature)
@$(call add,THE_PACKAGES,shadow-utils)
@$(call add,THE_PACKAGES,shadow-utils passwd)
@$(call xport,ROOTPW)
@$(call xport,USERS)
@$(call xport,GROUPS)

View File

@@ -1,10 +1,8 @@
#!/bin/sh
# set root password if any; no-op if it is unset
# set root password if any; no-op if it is empty
test="${GLOBAL_ROOTPW=:unset}"
if [ "$test" = ":unset" ]; then
echo "** warning: no root password provided, you're on your own" >&2
if [ -z "$GLOBAL_ROOTPW" ]; then
echo "** warning: no root password provided, skipping" >&2
else
echo "$GLOBAL_ROOTPW" | passwd --stdin root
fi

View File

@@ -1,6 +1,7 @@
use/dev:
use/dev: use/control
@$(call add_feature)
@$(call add,THE_PACKAGES,git-core hasher gear)
@$(call add,CONTROL,pam_mktemp:enabled)
use/dev/mkimage: use/dev
@$(call add,THE_PACKAGES,mkimage shadow-change su)

View File

@@ -28,7 +28,6 @@ fi
# $TMP
TMP="/tmp/.private/$USER"
control pam_mktemp enabled
sed -i '/^%_tmppath.*tmp$/d' "$HOME/.rpmmacros"
echo "%_tmppath $TMP" >> "$HOME/.rpmmacros"

View File

@@ -2,7 +2,7 @@
Конфигурируется заданием загрузчика (EFI_BOOTLOADER)
и файла сертификата (EFI_CERT) при помощи целей;
пример использования доступен в ../../conf.d/regular.mk
пример использования доступен в conf.d/regular.mk
См. тж.:
* http://www.altlinux.org/UEFI

View File

@@ -6,7 +6,7 @@ EFI_LISTS := $(call tags,base efi)
use/efi:
@$(call add_feature)
@$(call set,MKI_VER_MINIMAL,0.2.5) # see #28219
@$(call set,MKI_VER_MINIMAL,0.2.12) # it's official now
@$(call add,THE_LISTS,$(EFI_LISTS))
@$(call add,RESCUE_LISTS,$(EFI_LISTS))
@$(call add,THE_PACKAGES,$$(EFI_SHELL))
@@ -18,16 +18,16 @@ use/efi/refind: use/efi
@$(call set,EFI_BOOTLOADER,refind)
use/efi/signed: use/efi
@$(call set,MKI_VER_MINIMAL,0.2.7) # refind->elilo handoff
@$(call set,EFI_CERT,altlinux)
@$(call add,THE_PACKAGES,shim-signed)
@$(call set,EFI_SHELL,efi-shell-signed) # even more useful
@$(call add,RESCUE_PACKAGES,refind-signed)
@$(call add,RESCUE_PACKAGES,openssl sbsigntools)
@$(call add,RESCUE_PACKAGES,openssl pesign sbsigntools)
use/efi/shell: use/efi
@$(call try,EFI_SHELL,efi-shell)
use/efi/memtest86: use/efi/refind
@$(call set,EFI_MEMTEST86,efi-memtest86)
use/efi/debug: use/efi
@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
@$(call set,KFLAVOURS,led-ws)
@@ -35,6 +35,7 @@ use/efi/debug: use/efi
else
# ignore on an unsupported target arch but make it hybrid at least
use/efi use/efi/refind use/efi/signed use/efi/shell use/efi/debug: use/isohybrid
use/efi use/efi/signed use/efi/debug \
use/efi/refind use/efi/shell use/efi/memtest86: use/isohybrid
endif

View File

@@ -9,7 +9,6 @@ use/firmware:
use/firmware/full: use/firmware/server use/firmware/laptop
use/firmware/cpu: use/firmware
@$(call add,THE_PACKAGES,firmware-amd-ucode)
@$(call add,THE_PACKAGES,microcode-data-intel microcode_ctl)
use/firmware/server: use/firmware

View File

@@ -1,10 +1,7 @@
use/homeros:
use/homeros: use/control/sudo-su use/services
@$(call add_feature)
# @$(call set,BRANDING,simply-linux)
# @$(call add,THE_BRANDING,menu xfce-settings)
@$(call add,THE_LISTS,homeros/voiceman)
@$(call add,THE_LISTS,homeros/homeros)
@$(call add,THE_LISTS,homeros/tts)
@$(call add,THE_LISTS,homeros/yasr)
@$(call add,THE_LISTS,homeros/tools)
# @$(call set,META_VOL_SET,Homeros)
@$(call add,DEFAULT_SERVICES_ENABLE,sshd)

View File

@@ -1,13 +0,0 @@
#!/bin/sh
cat <<EOF > /etc/rc.d/rc.local
#!/bin/sh
amixer set Master 75%
amixer set Master toggle
amixer set PCM 75%
amixer set PCM toggle
EOF
chmod 755 /etc/rc.d/rc.local

View File

@@ -1,4 +0,0 @@
#!/bin/sh -e
/bin/ln -s /etc/tts.d/rhvoice-en.voiceman /etc/voiceman.d/rhvoice-en.output
/bin/ln -s /etc/tts.d/rhvoice.voiceman /etc/voiceman.d/rhvoice.output

View File

@@ -1,3 +0,0 @@
#!/bin/sh -e
chkconfig sshd on

View File

@@ -2,5 +2,3 @@
mkdir -p /etc/sudo.d
chmod 700 /etc/sudo.d
control su public
control sudo public

View File

@@ -1,3 +0,0 @@
#!/bin/sh -e
chkconfig voiceman on

View File

@@ -5,8 +5,11 @@ use/init:
@$(call add_feature)
@$(call add,THE_LISTS,$$(INIT_TYPE))
# THE_LISTS is too late when BASE_PACKAGES have pulled in
# the wrong syslogd-daemon provider already
use/init/sysv: use/init
@$(call set,INIT_TYPE,sysvinit)
@$(call add,BASE_PACKAGES,syslogd)
### i-f should be dropped as soon as rootfs scripts are effective there
use/init/systemd: use/init

View File

@@ -2,17 +2,20 @@
+installer: use/install2/full; @:
use/install2: use/stage2 sub/stage2@install2 use/metadata use/cleanup/installer
use/install2: use/stage2 sub/stage2@install2 use/metadata \
use/cleanup/installer use/bootloader
@$(call add_feature)
@$(call try,INSTALLER,altlinux-generic) # might be replaced later
@$(call add,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
@$(call add,BASE_PACKAGES,installer-common-stage3)
@$(call add,BASE_LISTS,$(call tags,basesystem))
@$(call xport,BASE_BOOTLOADER)
# doesn't use/install2/fs on purpose (at least so far)
use/install2/full: use/install2/packages use/install2/kms use/install2/kvm \
use/install2/full: use/install2/packages use/install2/kms \
use/install2/kvm use/install2/vbox \
use/syslinux/localboot.cfg use/syslinux/ui/menu; @:
# stash local packages within installation media
@@ -30,14 +33,18 @@ use/install2/kms: use/stage2/kms
use/install2/kvm:
@$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl)
# virtualbox guest support for installer
use/install2/vbox:
@$(call add,STAGE1_KMODULES,virtualbox-addition vboxguest)
# filesystems handling
use/install2/fs: use/install2/xfs use/install2/jfs use/install2/reiserfs; @:
use/install2/xfs:
@$(call add,INSTALL2_PACKAGES,xfsprogs)
@$(call add,SYSTEM_PACKAGES,xfsprogs)
use/install2/jfs:
@$(call add,INSTALL2_PACKAGES,jfsutils)
@$(call add,SYSTEM_PACKAGES,jfsutils)
use/install2/reiserfs:
@$(call add,INSTALL2_PACKAGES,reiserfsprogs)
@$(call add,SYSTEM_PACKAGES,reiserfsprogs)

View File

@@ -5,7 +5,7 @@
Можно указать в цепочке зависимостей дистрибутива явно с тем,
чтобы гарантировать гибридный вид образа, либо запросить включение
этой фичи при сборке конфигурации произвольного дистрибутива
(ISOHYBRID=1, см. ../pack/config.mk).
(ISOHYBRID=1, см. features.in/pack/config.mk).
Обратите внимание: в propagator до 20101130-alt15 поддержка
автоматической загрузки с флэш-носителя, содержащего ISO-образ,

View File

@@ -18,7 +18,7 @@ use/live/rw: use/live; @:
endif
# graphical target (not enforcing xorg drivers or blobs)
use/live/x11: use/live/base use/x11-autologin use/live/sound +power +efi
use/live/x11: use/live/base use/x11-autologin use/sound +power +efi
@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
@$(call add,LIVE_LISTS,$(call tags,base l10n))
@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
@@ -40,12 +40,12 @@ use/live/repo/online:
@$(call add,LIVE_PACKAGES,livecd-online-repo)
# alterator-based permanent installation
use/live/install: use/metadata use/syslinux/localboot.cfg
use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg
@$(call add,LIVE_PACKAGES,livecd-install)
@$(call add,LIVE_PACKAGES,livecd-installer-features)
# text-based installation script
use/live/textinstall: use/syslinux/localboot.cfg
use/live/textinstall: use/syslinux/lateboot.cfg
@$(call add,LIVE_PACKAGES,live-install)
# a very simplistic one
@@ -66,6 +66,3 @@ use/live/hooks: use/live
# a crude hack to make sure Russian is supported in a particular image
use/live/ru: use/live
@$(call add,LIVE_PACKAGES,livecd-ru)
use/live/sound: use/live
@$(call add,LIVE_PACKAGES,amixer alsa-utils aplay udev-alsa)

View File

@@ -2,7 +2,7 @@
# * reset password for root
# * add user `altlinux' (without password)
GRPLIST="users scanner audio radio proc cdrom cdwriter wheel fuse netadmin"
GRPLIST="users scanner audio radio proc cdwriter wheel fuse netadmin xgrp"
verbose()
{

View File

@@ -57,6 +57,7 @@ else
mkdir -p "$prefix"/eth0 && {
echo TYPE=eth
echo BOOTPROTO=dhcp
echo DHCP_TIMEOUT=3
} > "$prefix"/eth0/options
else
verbose "NOT configuring eth0 for DHCP"

View File

@@ -1,6 +1,6 @@
+ltsp: use/ltsp/base; @:
use/ltsp:
use/ltsp: use/sound
@$(call add_feature)
@$(call add,INSTALL2_PACKAGES,installer-feature-ltsp-stage2)
@$(call add,MAIN_LISTS,ltsp-client)

View File

@@ -1,5 +1,8 @@
LUKS_LISTS := $(call tags,security luks)
use/luks:
@$(call add_feature)
@$(call add,BASE_PACKAGES,make-initrd-luks)
@$(call add,THE_PACKAGES,alterator-luks)
@$(call add,THE_LISTS,$(LUKS_LISTS))
@$(call add,RESCUE_LISTS,$(LUKS_LISTS))

View File

@@ -0,0 +1,9 @@
#!/bin/sh
# let's check if support is there until installer-steps are dynamic
CONFIG="/usr/share/install2/installer-steps"
if ! grep -q '^luks$' "$CONFIG"; then
PKG="$(rpm -qf "$CONFIG")"
echo "** warning: luks step missing in ${PKG:-$CONFIG}" >&2
fi

View File

@@ -1,3 +0,0 @@
#!/bin/sh
echo 'FEATURES += luks' >> /etc/initrd.mk

View File

@@ -2,3 +2,5 @@ use/memtest: use/syslinux
@$(call add_feature)
@$(call add,SYSTEM_PACKAGES,memtest86+)
@$(call add,SYSLINUX_CFG,memtest)
# see also use/efi/memtest86

View File

@@ -3,28 +3,31 @@
# package lists are needed for installer and live-install images
METADIR := files/Metadata
# preparation targets of ../../build-distro/lib/build-distro.mk
# preparation targets of features.in/build-distro/lib/build-distro.mk
WHATEVER += metadata
# handle these too
DOT_BASE += $(BASE_PACKAGES_REGEXP)
# args: name, suffix, command
define dump-THEM
if [ -n "$($(1)_$(2))" ]; then echo -e "\n## $(1)_$(2)"; $(3) $($(1)_$(2)); fi;
# args: type, name
define dump
if [ -n "$($(2)_$(1))" ]; then \
echo -e "\n## $(2)_$(1)"; \
case "$(1)" in \
PACKAGES) echo "$($(2)_$(1))";; \
LISTS) cat $($(2)_$(1));; \
esac; \
fi;
endef
dump-PACKAGES = $(call dump-THEM,$(1),PACKAGES,echo)
dump-LISTS = $(call dump-THEM,$(1),LISTS,cat)
# BASE_PACKAGES, BASE_LISTS and whatever else goes into base install;
# thus construct requisite .base packagelist for alterator-pkg
metadata-.base:
@cd $(call list,/); \
{ \
echo "## generated by features.in/metadata/lib/50-metadata.mk"; \
$(foreach p,SYSTEM COMMON THE BASE,$(call dump-PACKAGES,$(p))) \
$(foreach l,THE BASE,$(call dump-LISTS,$(l))) \
echo "## generated by features.in/metadata/lib/50-metadata.mk";\
$(foreach p,SYSTEM COMMON THE BASE,$(call dump,PACKAGES,$(p))) \
$(foreach l,THE BASE,$(call dump,LISTS,$(l))) \
if [ -n "$(DOT_BASE)" ]; then \
echo -e "\n## DOT_BASE\n$(DOT_BASE)"; \
fi; \

View File

@@ -1 +1,6 @@
Эта фича позволяет задать конфигурацию Ethernet-интерфейсов.
Обратите внимание: в systemd-udevd сломали предсказуемые имена
вида eth0/eth1/..., для генерируемых "на лету" имён следует
применять конфигурирование времени загрузки (NM, connman либо
пакет livecd-net-eth).

View File

@@ -19,8 +19,10 @@ IFACEDIR="/etc/net/ifaces"
write_iface() {
dir="$IFACEDIR/$iface"
mkdir -p "$dir"
append=
case "$proto" in
dhcp)
append="DHCP_TIMEOUT=3"
;;
static)
[ -n "$ipv4addr" ] || fatal "ipv4addr missing"
@@ -37,7 +39,9 @@ write_iface() {
echo "DISABLED=no"
echo "BOOTPROTO=$proto"
echo "NM_CONTROLLED=$NMCTL"
echo "USE_IFPLUGD=yes"
echo "DISABLED=$NMCTL"
echo "#USE_IFPLUGD=yes"
[ -z "$append"] || echo "$append"
} > "$dir/options"
}

View File

@@ -0,0 +1,3 @@
Эта фича предназначена для добавления в образ поддержки SSH:
добавляется клиент и конфигурируется сервер (требуется задание
пути к существующему публичному ключу посредством переменной SSH_KEY).

View File

@@ -0,0 +1,4 @@
use/net-ssh: use/net use/services
@$(call add_feature)
@$(call add,THE_LISTS,openssh)
@$(call add,DEFAULT_SERVICES_ENABLE,sshd)

View File

@@ -2,11 +2,12 @@ ifdef BUILDDIR
include $(BUILDDIR)/distcfg.mk
# prepare the provided public SSH key to be carried over into the VM image
# prepare the provided public SSH key to be carried over into the image
all: SSH_DIR = $(BUILDDIR)/files/root/.ssh
all:
@if [ -s "$(SSH_KEY)" ]; then \
install -pD "$(SSH_KEY)" "$(SSH_DIR)/authorized_keys"; \
mkdir -pm0700 "$(SSH_DIR)"; \
install -pm0600 "$(SSH_KEY)" "$(SSH_DIR)/authorized_keys"; \
fi
endif

View File

@@ -0,0 +1,5 @@
Эта фича выполняет предварительное конфигурирование системы
для работы плагинов файл-менеджеров, реализующих взаимодействие
с Samba-сервером для динамического создания разделяемых файловых
ресурсов ("пользовательских шар"). Без добавления соответствующего
файл-менеджера и нужного плагина смысла не имеет.

View File

@@ -1,4 +1,4 @@
+nm: use/net/nm; @:
+nm: use/net/nm/nodelay; @:
use/net: use/services
@$(call add_feature)
@@ -10,8 +10,13 @@ use/net/dhcp: use/net
use/net/nm: use/net
@$(call add,THE_LISTS,$(call tags,desktop nm))
@$(call add,LIVE_PACKAGES,livecd-save-nfs)
@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)
@$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs) # don't reconfig
use/net/nm/nodelay: use/net/nm
@$(call add,DEFAULT_SERVICES_DISABLE,NetworkManager-wait-online)
use/net/connman: use/net
@$(call add,THE_PACKAGES,connman)
@$(call add,DEFAULT_SERVICES_ENABLE,connman)
@$(call add,DEFAULT_SERVICES_ENABLE,connmand)

View File

@@ -6,4 +6,5 @@ if [ -f "$CONFIG" ]; then
grep -q '^Theme=' "$CONFIG" || sed -i 's/#\([T\[]\)/\1/' "$CONFIG"
fi
cp -a /usr/share/plymouth/default-install-duration /var/lib/plymouth/boot-duration
cp -a /usr/share/plymouth/default-install-duration \
/var/lib/plymouth/boot-duration ||:

View File

@@ -1,14 +1,14 @@
+power: use/power/acpi/button use/power/acpi/cpufreq; @:
# common
# TODO: invent multi-target scripts and integrate that 08-powerbutton
use/power:
use/power: sub/rootfs use/services
@$(call add_feature)
@$(call add,COMMON_PACKAGES,installer-feature-powerbutton-stage3)
# modern power management
use/power/acpi: use/power
@$(call add,COMMON_PACKAGES,acpid acpi)
@$(call add,DEFAULT_SERVICES_ENABLE,acpid)
use/power/acpi/button: use/power/acpi
@$(call add,COMMON_PACKAGES,acpid-events-power)
@@ -18,7 +18,10 @@ use/power/acpi/cpufreq: use/power/acpi
use/power/acpi/powersave: use/power/acpi
@$(call add,COMMON_PACKAGES,powersave)
@$(call add,DEFAULT_SERVICES_DISABLE,acpid) # override
@$(call add,DEFAULT_SERVICES_ENABLE,powersaved)
# legacy power management
use/power/apm: use/power
@$(call add,COMMON_PACKAGES,apmd lphdisk)
@$(call add,DEFAULT_SERVICES_ENABLE,apmd)

View File

@@ -0,0 +1,6 @@
#!/bin/sh -efu
# provide kernel interface for ACPI power button
if [ -x /etc/init.d/acpid ]; then
grep -qsx button /etc/modules || echo button >> /etc/modules
fi

View File

@@ -1,11 +1,24 @@
use/rescue: use/stage2 sub/stage2@rescue use/syslinux/sdab.cfg \
use/firmware/full +wireless
use/rescue/.base: use/stage2 sub/stage2@rescue
@$(call add_feature)
@$(call add,RESCUE_PACKAGES,interactivesystem sysvinit udev)
@$(call add,RESCUE_PACKAGES,startup startup-rescue lilo)
@$(call add,RESCUE_LISTS, openssh \
$(call tags,(base || extra || server || misc) && \
(rescue || network || security)))
@$(call add,RESCUE_LISTS,sysvinit)
@$(call add,RESCUE_PACKAGES,startup startup-rescue udev)
@$(call add,RESCUE_LISTS,openssh)
use/rescue/base: use/rescue/.base
@$(call add,RESCUE_PACKAGES,pciutils)
@$(call add,RESCUE_LISTS,\
$(call tags,base && (rescue || network || security || archive)))
use/rescue: use/rescue/.base use/syslinux/sdab.cfg \
use/services use/firmware/full +wireless
@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind)
@$(call add,RESCUE_PACKAGES,grub2-pc lilo syslinux)
ifneq (,$(EFI_BOOTLOADER))
@$(call add,RESCUE_PACKAGES,grub2-efi)
endif
@$(call add,RESCUE_LISTS,\
$(call tags,(base || extra || server || backup || misc || fs) \
&& (rescue || comm || network || security || archive)))
# rw slice, see also use/live/rw (don't use simultaneously)
ifeq (,$(EFI_BOOTLOADER))
@@ -14,3 +27,9 @@ use/rescue/rw: use/rescue use/syslinux
else
use/rescue/rw: use/rescue; @:
endif
test/rescue:
@$(call xport,TEST_RESCUE)
test/rescue/no-x11: test/rescue
@$(call add,TEST_RESCUE,no-x11)

View File

@@ -0,0 +1,13 @@
#!/bin/sh -efu
no_x11() {
if rpmquery libX11 >&/dev/null; then
echo "** rescue image contains libX11 which is prohibited" >&2
exit 1
fi
}
case "${GLOBAL_TEST_RESCUE:-}" in
*no-x11*)
no_x11;;
esac

View File

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

View File

@@ -1,9 +1,24 @@
use/server:
@$(call add_feature)
use/server/mini: use/server
use/server/mini: use/server use/net-ssh
@$(call add,THE_KMODULES,e1000e igb)
@$(call add,STAGE1_KMODULES,e1000e igb)
@$(call add,THE_LISTS,\
$(call tags,base && (server || network || security || pkg)))
@$(call add,THE_LISTS,$(call tags,extra (server || network)))
@$(call add,THE_LISTS,$(call tags,extra && (server || network)))
@$(call add,MAIN_LISTS,osec)
@$(call add,DEFAULT_SERVICES_DISABLE,messagebus lvm2-lvmetad)
use/server/ovz: use/server
@$(call set,STAGE1_KFLAVOUR,std-def)
@$(call set,KFLAVOURS,std-def ovz-el)
@$(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)
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)

View File

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

View File

@@ -4,9 +4,3 @@ use/services: sub/rootfs
@$(call xport,DEFAULT_SERVICES_DISABLE)
@$(call xport,SERVICES_ENABLE)
@$(call xport,SERVICES_DISABLE)
# some presets
use/services/ssh: use/services use/net
@$(call add,THE_LISTS,openssh)
@$(call add,DEFAULT_SERVICES_ENABLE,sshd)

View File

@@ -0,0 +1,41 @@
#!/bin/sh
# this script piggybacks service status information
# into the system to be installed (instead of applying
# it to rootfs being formed immediately)
# NB:install2 is not a rootfs, handling differs either
STATUS=`mktemp`
. shell-config
switch() {
case "$2" in
on|off)
shell_config_set "$STATUS" "$1" "$2";;
esac
}
# defaults (most likely features.in ones)
for i in $GLOBAL_DEFAULT_SERVICES_ENABLE; do switch $i on; done
for i in $GLOBAL_DEFAULT_SERVICES_DISABLE; do switch $i off; done
# explicitly specified behaviour (e.g. via conf.d)
for i in $GLOBAL_SERVICES_ENABLE; do switch $i on; done
for i in $GLOBAL_SERVICES_DISABLE; do switch $i off; done
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"
done
rm "$STATUS"
:

View File

@@ -4,7 +4,7 @@ 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
use/slinux/base: use/slinux use/x11/gdm2.20 +pulse
@$(call add,THE_LISTS,gnome-p2p)
@$(call add,THE_LISTS,slinux/$(ARCH))
@$(call add,THE_LISTS,slinux/games)

2
features.in/sound/README Normal file
View File

@@ -0,0 +1,2 @@
Эта фича добавляет поддержку аудиоподсистемы (как ядерную,
если не включена в kernel-image, так и утилиты).

View File

@@ -0,0 +1,11 @@
+pulse: use/sound/pulse; @:
# "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)
# PulseAudio (useful for per-app levels, dynamic devices and networked sound)
use/sound/pulse: use/sound
@$(call add,THE_LISTS,pulseaudio)

View File

@@ -0,0 +1,2 @@
Эта фича полностью подготавливает русскоязычный или англоязычный
вывод речи на базе сервера VoiceMan.

View File

@@ -0,0 +1,9 @@
use/speech: use/sound
@$(call add_feature)
@$(call add,THE_LISTS,speech/voiceman speech/$$(SPEECH_LANG))
@$(call add,THE_LISTS,speech/emacspeak)
@$(call add,DEFAULT_SERVICES_ENABLE,voiceman)
@$(call xport,SPEECH_LANG)
use/speech/en use/speech/ru: use/speech/%: use/speech
@$(call set,SPEECH_LANG,$*)

View File

@@ -0,0 +1,13 @@
#!/bin/sh
cat <<EOF > /etc/rc.d/rc.local
#!/bin/sh
for i in Master PCM Headphone; do
amixer set $i 75%
amixer set $i toggle
done >&/dev/null
EOF
chmod 755 /etc/rc.d/rc.local

View File

@@ -0,0 +1,15 @@
#!/bin/sh -e
case "$GLOBAL_SPEECH_LANG" in
en)
ln -s ../tts.d/espeak.voiceman /etc/voiceman.d/espeak.output
;;
ru)
ln -s ../tts.d/rhvoice-en.voiceman /etc/voiceman.d/rhvoice-en.output
ln -s ../tts.d/rhvoice.voiceman /etc/voiceman.d/rhvoice.output
;;
*)
echo "** error: speech feature used with no language chosen" >&2
exit 1
;;
esac

View File

@@ -6,6 +6,10 @@ use/stage2: sub/stage1
use/stage2/kms:
@$(call add,STAGE1_KMODULES_REGEXP,drm.*)
# install mount.cifs to stage1
use/stage2/cifs-install:
@$(call add,STAGE1_PACKAGES,cifs-utils)
# eth0 instead of enp0s3
use/stage2/net-eth: use/stage2
@$(call add,STAGE1_PACKAGES,udev-rule-generator-net)

View File

@@ -12,3 +12,6 @@ else
fi
echo 'FEATURES += propagator' >> /etc/initrd.mk
# FIXME: #29705 workaround
echo 'MODULES_PRELOAD += ahci' >> /etc/initrd.mk

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