Compare commits

...

208 Commits

Author SHA1 Message Date
Michael Shigorin
890172bfed 0.9.10-alt1
- fonts: axios!
2013-03-18 16:37:00 +02:00
Michael Shigorin
88e2dcdcee live.mk: drop efi support for kiosk base target
UEFI means quite a chunk of additional packages that aren't really
required for the *base* target aimed at presumably minimalistic images.
2013-03-18 16:37:00 +02:00
Michael Shigorin
9e3ca09dd4 conf.d/live.mk: firefox/chromium kiosk support
As implemented in livecd-webkiosk-0.2.
2013-03-18 16:37:00 +02:00
Michael Shigorin
e4de48d477 xorg: re-added xorg-utils instead of its deps
Thanks sem@ for restoring xorg-utils, things are good again :)
(basically reverts d1a6eed839)
2013-03-18 16:37:00 +02:00
Michael Shigorin
e75e1f4458 ltsp += alterator-{standalone,ltsconf}
Looks like the cause to temporarily omit these is irrelevant.
2013-03-18 16:36:59 +02:00
Michael Shigorin
cdf86ff1da desktop.mk: the now-missing links
Added sysklogd and udev-rule-generator-net there too; if someone
needs to inherit a systemd based image from distro/.desktop-network
don't break the existing behaviour please.

Rebased tde flavours to .desktop-network as these were the actual
target to fix.
2013-03-18 16:36:59 +02:00
Michael Shigorin
97e4d03a75 desktop.mk: fall back to std-def for now
There's some peculiarity causing Sisyphus' initrd
(namely led-ws and make-initrd{,-propagator} of today
to die with this message while booting the resulting ISO:

  initrd: Running /scripts/pre/prepare/000-propagator
  FATAL ERROR IN INIT: mkdir

  I can't recover from this,please reboot manually and send bugreport.
2013-03-18 16:36:59 +02:00
Michael Shigorin
e37df0c72b regular.mk: enable plymouth for gnustep flavour
It might be in the base target if gdm3 weren't exposing bugs...
2013-03-18 16:36:59 +02:00
Michael Shigorin
a65d1c420c regular.mk: added wmaker livecd-install button
The setup has to be livecd-only thus made as a service, not a hook.
2013-03-18 16:36:59 +02:00
Michael Shigorin
d31a2ff745 regular.mk: initial regular-{wmaker,gnustep}
Thanks aen@ for the whole pkglist and vast amounts of advice
and inspiration; thanks real@ and kostyalamer for the packages
themselves.
2013-03-18 16:36:59 +02:00
Michael Shigorin
f4844483b9 x11: added generic sugar
...and introduced regular-sugar flavour immediately,
it's rather working by now.
2013-03-18 16:36:59 +02:00
Michael Shigorin
0e01a08378 initial desktop+sugar pkglist
Now waiting for the package base to stabilize...
2013-03-18 16:36:59 +02:00
Michael Shigorin
c5642bfb67 base+live: added fdisk
It's required by make-initrd-propagator in "rw slice" mode
when the remainder of an USB Flash drive is prepared and used
for persistent storage; fdisk is also immensely useful in general.
2013-03-18 16:36:59 +02:00
Michael Shigorin
be7507a9c4 firmware: dropped firmware-carl9170
It's been merged into recent firmware-linux, apparently.
2013-03-18 16:36:59 +02:00
Michael Shigorin
9c766cd9e4 live: temporary #28669 workaround (drop fbdev)
Please see the bug for explanations; too bad I chose to limit this
workaround to experimental gnustep image yesterday when aen@ suggested
to apply it universally...
2013-03-18 16:36:59 +02:00
Michael Shigorin
d3b9d7578a desktop+razorqt: s/arora/qupzilla/
Arora is long unsupported and left known buggy (#26937);
QupZilla is alive and kickin', on the other hand.
2013-03-18 16:36:59 +02:00
Michael Shigorin
19eb870338 regular.mk: pull desktop+regular in too
Whoops, and I was mildly wondering where are alterator modules...
thanks Speccyfighter again for bringing attention to the issue
which has turned out to be ultimately caused by an overlooked bit
being missing.
2013-03-18 16:36:33 +02:00
Michael Shigorin
07ac06abda desktop+regular: added alterator-{x11,xkb}
Added xkb module as per Speccyfighter's request on the forum
and x11 one due to aen@'s advice (which is fairly reasonable).
2013-03-13 02:42:48 +04:00
Michael Shigorin
03ea74647f rescue+extra: added fatresize too
The real issue was that regular-tde.iso was discovered to
lack FAT support in alterator-vm (known as #28470); as the
filesystem specific packages are pulled in via rescue lists
let's add it here along with dosfstools.

Thanks Speccyfighter at forum.altlinux.org for spotting this.
2013-03-13 02:29:23 +04:00
Michael Shigorin
d1a6eed839 xorg: dropped xorg-drv-video, xorg-utils
1.14 package set doesn't provide these convenient metapackages
anymore, unfortunately.
2013-03-12 13:15:23 +04:00
Michael Shigorin
27c49b2599 regular+kde4: keep synaptic-usermode outside
As zerg@ noted there's synaptic-kde already; I managed to overlook
that synaptic-usermode still gets into kde4 image as it's put into
base+regular pkglist.  Thanks aen@ for spotting.
2013-03-11 12:28:30 +02:00
Michael Shigorin
97816c354a ltsp: switch to led-ws on both x86 arches
The mechanics were simple and funny but having unified kernel
available is even better ;-)
2013-03-10 19:02:27 +02:00
Michael Shigorin
937a80015a xorg: dropped xorg-drv-s3 (no more in 1.14)
I've got some Trio64 cards, even...
2013-03-10 19:02:26 +02:00
Michael Shigorin
0fe3eed725 desktop.mk, server.mk: added use/stage2/net-eth
...so that enp0s3 is just not there.
2013-03-10 19:02:26 +02:00
Michael Shigorin
28e3cf21ef regular.mk: added hdt to rescue
It was proposed by someone and looks pretty reasonable.
2013-03-10 19:01:34 +02:00
Michael Shigorin
c6d9cae4b1 regular.mk: added graphics branding to base
Sort of unification; still the background of the regular builds should
rather be the particular DE's authentic one in the ideal case.
2013-03-10 18:59:48 +02:00
Michael Shigorin
dcdd444f61 rescue+misc: added make-initrd-*
plymouth helper omitted as it's not mission critical usually.
2013-03-06 01:21:03 +02:00
Michael Shigorin
0f77f9749d base+rescue: added apt-repo
apt-get is requisite for a network-enabled livecd
with rw overlay since it's almost universal then.
2013-03-06 01:21:03 +02:00
Michael Shigorin
92fb8bd361 rescue: add security related pkglists as well
It's currently security+extra.
2013-03-06 01:21:03 +02:00
Michael Shigorin
1f94112e7f initial rescue+misc
Things that weren't fit in the other rescue pkglists went here;
more are sure to follow.
2013-03-06 01:21:03 +02:00
Michael Shigorin
0c6cfd855e rescue: added server+network
It happens to hold a noticeable share of what might go into
rescue+misc, so why duplicate.
2013-03-06 01:21:03 +02:00
Michael Shigorin
a860b1792e rescue+{extra,fs}: facelift and exchange
Quite a few filesystem specific tools and utilities went into extra,
some of them pulled back from fs since the proper categorization will
clearly require even more effort.

Added utilities for: f2fs, nilfs, logfs, reiser4fs, clicfs, cloop,
ocfs2, exofs, zfs, cifs.
2013-03-06 01:21:03 +02:00
Michael Shigorin
32cc9a67dd live, stage2: net-eth moved
It would be better to put it into stage2 in the first place
but this somehow went over my head; rescue made a reminder.
2013-03-06 01:21:03 +02:00
Michael Shigorin
07d58b91cc regular.mk: introduced regular-rescue
This one was just asking to be built for quite a long time;
http://sourceforge.net/apps/trac/smartmontools/wiki/LiveCDs
specifically accenting use of smartmontools 6.0 has finally
persuaded me to roll out yet another rescue livecd, that is
on the regular basis.
2013-03-06 01:20:59 +02:00
Michael Shigorin
546fae5961 rescue: extended firmware support
As the firmware feature got more involved, this one
has successfully dodged the change but is amended now.
2013-03-06 01:20:37 +02:00
Michael Shigorin
50dccfc04d firmware: added "full" target
The reason is to contain the implementation details
within this feature while adding the ability to include
everything it can provide (e.g., for rescue images).
2013-03-06 01:20:37 +02:00
Michael Shigorin
12206fbbd3 regular.mk: generalize infinality font setup
It's been delegated to a fonts subfeature.
2013-03-06 01:20:37 +02:00
Michael Shigorin
fa96c6be18 fonts: added infinality fontconfig setup support
Thanks cow@ for both the packages and suggestion.
2013-03-06 01:20:37 +02:00
Michael Shigorin
4657181828 regular.mk: kde4 font setup
KDE4 is maintained by zerg@ as well as the vast RM experience
connected to it; so use/fonts/zerg there.
2013-03-06 01:20:37 +02:00
Michael Shigorin
5f44404182 initial fonts feature
This includes an updated version of 50-fontconfig script
which actually works (the preliminary one attached to #28612
didn't); thanks zerg@ and cow@ for providing the incentive
to introduce it.

Based on m-p-d and installer-feature-kdesktop-fontconfig.
2013-03-06 01:20:37 +02:00
Michael Shigorin
e03f103169 vmguest: fix targets
Thanks make(1) for the warning, `vmguest' target was
getting pulled in twice indeed.
2013-03-06 01:20:37 +02:00
Michael Shigorin
96ecdc90df regular.mk: added NM to lxde
...by popular demand, see also
http://forum.altlinux.org/index.php/topic,28619.html
2013-03-06 01:20:36 +02:00
Michael Shigorin
ee52093576 base+regular: dropped uvcview
Forum feedback has shown that it's a bit surprising
given the lack of other multimedia applications in
baseline package set; aen@ suggested to leave it out
and hardware support testing requires much more than
that anyways.
2013-03-06 01:20:36 +02:00
Michael Shigorin
35689d158d stage1: replace r8169 with r8168
The issue is that r8169 is rather broken nowadays while
r8168 tends to work on the same hardware; see also #28473.

Thanks zerg@ for having hinted that it's stage1 modules,
not the root squashfs.
2013-03-06 01:20:36 +02:00
Michael Shigorin
83705cd8ab regular-kde4: refactored and extended pkglist
The metapackage was fine, the "only one" additional package
was more or less okay, but there came a dozen more so it's
now reasonable to stash these into a separate pkglist.
2013-03-06 01:20:36 +02:00
Michael Shigorin
4e56d663f5 desktop+lxde+extra: put both terminal emulators in
...so that the benefits and shortcomings of each
"as is" in Sisyphus are more obvious.
2013-03-06 01:20:36 +02:00
Michael Shigorin
240907f533 regular.mk: added fontconfig-infinality to lxde
...and refactored its use in cinnamon image too;
this isn't a permanent solution though,
slated to move into fonts feature.

Thanks gns@ for suggestion.
2013-03-06 01:20:36 +02:00
Michael Shigorin
57ddb85d5b desktop+lxde: minor tweaks
Thanks aen@ for figuring these out and suggesting them.
2013-03-06 01:20:36 +02:00
Michael Shigorin
8f48544d94 regular.mk: merged regular-deepsolver into regular-icewm
There isn't much sense to keep an entirely separate flavour
as deepsolver starts being actually useful and icewm is
a somewhat special flavour for those who know their ways
around Linux plumbing.
2013-03-06 01:20:34 +02:00
Michael Pozhidaev
f52eecc8db Distro target set changes:
- regular-deepsolver.iso target is added using regular-icewm.iso as a base.
2013-03-05 18:55:58 +07:00
Michael Shigorin
b86a4f8f1c gear-store-tags 2013-02-26 01:00:30 +04:00
Michael Shigorin
6605eb61bd 0.9.9-alt1
- regular refactoring
2013-02-26 00:46:34 +04:00
Michael Shigorin
062a9d915a efi: specify minimal mkimage version for SB
Bump it to account for the useful fixes in mkimage-0.2.7.
2013-02-26 00:42:36 +04:00
Michael Shigorin
d207a1e963 desktop+mate: further 1.5 changes
Switched from mate-default to mate-full as aen@ asked to,
and dropped a few leftover packages which are now in
mate-default 1.5.0-alt3+.
2013-02-21 23:07:20 +04:00
Michael Shigorin
6fcbbccc4f QUICKSTART: mention `make help'
It wasn't really obvious what are the available targets;
sorry for that and thanks led@ for a suggestion.
2013-02-21 22:37:28 +04:00
Michael Shigorin
9629cbe143 efi: tweak shell setup
It's possible that use/efi/signed target has fired already
at the time when use/efi/shell is invoked; shouldn't clobber
the signed shell with unsigned one.
2013-02-21 22:37:28 +04:00
Michael Shigorin
9d09833121 live.mk: extended EFI support in rescue
Added rEFInd, EFI shell and SB stuff.
2013-02-21 22:37:28 +04:00
Michael Shigorin
716744888a server.mk: pretty-printing kmodules
Maybe it's worth moving to the kernel feature as well.
2013-02-21 22:37:28 +04:00
Michael Shigorin
753d827320 kernel: introduced use/kernel/net target
The various *8168 and friends among kernel modules
have finally been pushed into a designated target
so that RM doesn't have to care which particular
additional ethernet modules are available in this
particular branch and kernel.

Tweak distros as appropriate.

NB: *maybe* this is required by distro/.base either.
2013-02-21 22:37:28 +04:00
Michael Shigorin
ca517ecc48 firmware: introduced use/firmware/laptop
acpi_call is used far too often when dealing with the newer
portable x86 hardware, we're better off including it when
it's available.

regular.mk adjusted appropriately.
2013-02-21 22:37:23 +04:00
Michael Shigorin
a903457e65 firmware: factored out cpu ucode
Let's make CPU microcode an explicit target, it isn't
required at every host where firmware-linux is.

Adjusted its use accordingly.
2013-02-21 22:36:54 +04:00
Michael Shigorin
17736ec40e wireless: depend on firmware
Richard and Theo would probably roll their eyes at this point
but the unfortunate reality is that wireless hardware is very
much dependent on firmware being explicitly provided; so here
it is.

rtl8192 kernel module added since it's present in t6/branch
at least.
2013-02-21 22:36:27 +04:00
Michael Shigorin
85223fc12a refactored regular images
This change mostly concerns with making icewm flavour
the lean one again.

The goal is to widen the dynamic range of regular image features:
icewm is not a desktop thus can bear withouth systemd-logind
even if a bunch of network-managing-media-mounting crap has been
rigged to depend on it, and ALT domain client should be included
in most builds for convenient testing in SMB environments but can
stay out of this minimal and "different" image.

It also receives the "un-def" kernel flavour (3.8.0 as of today)
which might benefit from the more available testing facility too.

Its branding is also simplified, plain syslinux menu is fine;
in similar vein, refind feature is flipped from icewm-only to
all-but-icewm set of images with its state being good enough
as of refind 0.6.7 and mkimage 0.2.7.
2013-02-21 22:34:58 +04:00
Michael Shigorin
83790cbc31 regular.mk: e17: dropped xnest
It was gdm2.20's feature that requires further setup
to actually function; thanks aen@ for explanations.
2013-02-21 13:15:12 +04:00
Michael Shigorin
ea9353abfa regular.mk: added settime-rfc867 to kde4
ALT domain client regular.mk: added settime-rfc867 to kde4

Seems like this belongs to domain-client pkglist though...
2013-02-20 19:35:40 +04:00
Michael Shigorin
ba3ed689f0 desktop+mate: dropped stale comments
There were a few packages disappearing or changing
along the autoimport path, let's clean up the cruft.

mate-conf-gtk is now gone, so removed either.
2013-02-20 19:35:12 +04:00
Michael Shigorin
8bde78725d desktop+mate: dropped duplicates
mate-default pulls in mate-minimal and both of them
require packages which are also specified in this
pkglist; thus the pkglist should be pruned to avoid
double work and splits like "mate-vfs is dropped
from 1.5 package set, mate-default is adjusted but
the pkglist references the now-missing package".
2013-02-20 15:30:38 +04:00
Michael Shigorin
5fda2afe1f profile.mk: fixed arch test for "bulk repo" case
It happens when there are no separate arch/noarch subrepositories
but everything is dumped into a single directory like in installer
or live-builder environment (at least as of today).
2013-02-19 22:12:51 +04:00
Michael Shigorin
6038e55b3c regular.mk: razorqt uses its own lightdm greeter now
Relevant for 0.5.2-alt2+, ping me if a backport is needed.
2013-02-19 19:01:21 +02:00
Michael Shigorin
1fdee01921 x11: use/x11/lightdm/razorqt support added
razorqt-0.5.2 out there already, zerg@ reminded of the greeter,
maybe it's finally time to get the pieces together.
2013-02-19 19:01:21 +02:00
Michael Shigorin
f590b33a36 gear-store-tags 2013-02-19 18:57:27 +02:00
Michael Shigorin
f10f3b18db 0.9.8.1-alt1
- works with make-initrd 0.8.1+ (see #28578)
2013-02-19 20:55:19 +04:00
Michael Shigorin
6139571a8b stage2: fix 10-initrd-base for current make-initrd
It was removing autodetection setting completely
thus implicitly setting it to the default "all"
with make-initrd-0.8.1+; just set it to be empty.

Thanks legion@ and boyarsh@; see also #28578.
2013-02-19 20:51:15 +04:00
Michael Shigorin
d3a39f2168 gear-store-tags 2013-02-18 21:58:05 +02:00
Michael Shigorin
867b2f65c9 0.9.8-alt1
- live fixes/tweaks galore
2013-02-18 21:50:46 +02:00
Michael Shigorin
13094e7901 live.mk: use "net-eth" for kiosks
Added use/live/net-eth so that autoconfigured images
still work in predictable manner.

May those breaking trivial cases walk with zillion of
cdrom, modem, ethernet etc device nodes all around them!
2013-02-18 21:48:41 +02:00
Michael Shigorin
18e6406588 desktop+lxde: use altlinux settings
The inobvious issue is that while lxde-settings
is required by lxde-common and provided by both
lxde-settings-{altlinux,upstream}, we can't just
add the needed one via PACKAGES since the LISTS'
deps are expanded already with -upstream taking
lexicographical precedence.

This might become more serious if/when there are
several useful packages, -upstream isn't AFAIK
(thanks gns@ for explanation).
2013-02-18 21:48:41 +02:00
Michael Shigorin
f7a97306fb desktop+lxde: added eject for pcmanfm
A tiny small utility
that gives us the ability
to eject that noisy disc.
2013-02-18 21:48:41 +02:00
Michael Shigorin
92ff4c1cc8 desktop+lxde+extra: well, use sakura
Citing the initial comment: "lxterminal is reportedly
sub-par (gns@) but official (aen@)"; the functionality
PoV finally won.

Terminus fonts added to account for presets.

See also #28567.
2013-02-18 21:48:30 +02:00
Michael Shigorin
ba2ca7e578 base+regular: added eepm
As per lav@'s proposition at LVEE.
2013-02-18 22:15:10 +04:00
Michael Shigorin
971732bfe6 live.mk: specify exact browser
livecd-webkiosk used to support firefox only but has been changed
to do chromium either; now we need to be more specific.
2013-02-18 22:14:42 +04:00
Michael Shigorin
acf17cd785 live.mk: live-webkiosk-mini: use generic kernel
led-ws doesn't work for me with make-initrd 0.8.0-alt1 yet...
2013-02-18 22:14:42 +04:00
Michael Shigorin
6fa08c52e7 live.mk: added EFI support to kiosk images
UEFI systems encountered should work too.
2013-02-18 22:14:42 +04:00
Michael Shigorin
8645219667 live: added EFI to use/live/desktop
Its support is quite mature and practically useful by now.
Let's also add a convenient alias.
2013-02-18 22:14:42 +04:00
Michael Shigorin
a89fff3c6a live: fixed 40-autologin
It was bailing out due to the grossly unneeded -e;
thanks dans@ for bringing my attention to this
right at LVEE 2013 Winter.
2013-02-18 22:14:42 +04:00
Michael Shigorin
8fc64a023f desktop+live: added sudo, os-prober
sudo added by popular demand, see also this subthread:
http://lists.altlinux.org/pipermail/sisyphus/2013-February/359726.html

os-prober added on dubrsl@'s request (#altlinux)
after having a look at m-p-d as well.
2013-02-14 21:31:14 +04:00
Michael Shigorin
5fd2be3edd regular.mk: font tweaks for cinnamon
Vladimir Didenko suggested including fontconfig-infinality
into regular-cinnamon.iso, see this subthread:
http://lists.altlinux.org/pipermail/sisyphus/2013-February/359724.html
2013-02-14 21:30:36 +04:00
Michael Shigorin
cbf8426add live.mk: facelift due to fvwm addition
Added fvwm flavour specially for perestoronin from da LOR.

As if it wasn't enough,
- added UEFI support to desktop/,live-desktop intermediate target;
- added live installation capability to desktop/.livecd-install;
- added "net-eth" subfeature to get good ol' eth0 insteal of enp0s3;
- dropped use/x11/autologin as live subprofile sets up
  a supported DM for automatic login anyways.
2013-02-14 21:25:58 +04:00
Michael Shigorin
e5fdaacc94 x11: added fvwm support
It's becoming a relatively popular request ;-)
2013-02-14 21:25:38 +04:00
Michael Shigorin
91466e6643 net-eth: moved from regular.mk to live feature
It'd be better for this commit to appear before 0.9.7
(and clobber the original one) but at least the added
functionality has been tested; time to generalize it.
2013-02-14 21:25:38 +04:00
Michael Shigorin
375e1afe34 gear-store-tags 2013-02-11 22:03:27 +04:00
Michael Shigorin
eb569544ca 0.9.7-alt1
- going nightly
2013-02-11 21:43:46 +04:00
Michael Shigorin
77f1459f52 live: tweak 50-setup-network regarding resolving
The issue has shown up in regular-*-20130207: /etc/resolv.conf
would suddenly be empty upon successful bootup in virtualbox
with a single DHCP configurable ethernet.

dmesg has some trouble signs:

  aufs au_lkup_neg:267:kworker/0:2[998]:
  I/O Error, resolv.conf should be negative on b0

sem@ tells something like that has been seen before in a different
configuration (multiple aufs overlays with /etc/ and /var sitting
in different ones resulting in broken hardlinks); rescue boot with
a test "echo > /etc/resolv.conf" yields an I/O error either.

The patch is loosely based upon livecd-net-eth and
m-p-d::profiles/live/image-scripts.d/init3-{network,resolve}.

See also #28484 for the (still ongoing) discussion.
2013-02-11 21:29:16 +04:00
Michael Shigorin
28f7f9be27 regular.mk: get good ol' interface naming back
enp0s3 is quite inferior to eth0 in terms of usability
even if it might be more convenient for the machine{,ry}.

Let's stick with what works here in ALT Linux (see #28484).
2013-02-11 21:29:16 +04:00
Michael Shigorin
cec6b26207 live: employ livecd-net-eth
Once upon a time the first and only ethernet interface
on a Linux system used to be known under the name of eth0;
but years passed and the systemd shadow has drawn closer
even to the seemingly remote areas like interface names.

In short, it might get named e.g. enp0s3 (a more human
friendly name of course) and the exact name is to be
figured out in runtime as well.

Sigh.
2013-02-11 21:29:15 +04:00
Michael Shigorin
96bdf36935 regular.mk: added r8168
See #28390, #28473 and #28471; thanks zerg@ for reminder.
2013-02-11 21:29:15 +04:00
Michael Shigorin
c12f0c17bc syslinux: drop "menu label" for gfxboot
The issue is that gfxboot's gettext support works on "label"
strings but doesn't work properly on "menu label" ones as of 4.04
(the "menu label" translations pop up in the "Loading ..." window
but menu items themselves are unaffected thus untranslated).

NB: debian wheezy's syslinux-4.05 package patchset contains
somewhat related 07-gfxboot-menu-label.patch; might be worth
attention given that debian folks participate in upstream.
2013-02-11 21:29:15 +04:00
Michael Shigorin
5834dac8c8 server.mk: added mdadm, lvm support to server-mini
Pretty natural but delayed somehow...
2013-02-11 21:29:15 +04:00
Michael Shigorin
6a554e21ab regular.mk: added domain-client pkglist
It's specified in http://altlinux.org/regular and it rather modest
(~13M image size growth on i586).
2013-02-11 21:29:15 +04:00
Michael Shigorin
313b279d40 added domain-client pkglist
See also http://altlinux.org/domain for description;
this should allow for client support.
2013-02-11 21:29:15 +04:00
Michael Shigorin
ad264c7033 fixed mp-commit and its use
Now this is ugly: instead of commoditizing the repetitive code
the result ended up working differently by creating several
repositories for the target subdirs instead of the single one
for the generated subprofile as a whole.

This results in .disk/profile.tgz being basically useless
in every image since c4311108ea.
2013-02-11 21:29:15 +04:00
Michael Shigorin
ec8bcac5ff image.in: extended .gitignore a bit
These generated directories aren't part of a profile itself.
2013-02-11 21:29:15 +04:00
Michael Shigorin
3161ec500b regular.mk: use branding*graphics for gtk based
The same "regular-gtk" based set of images received common
desktop background provided; note that kde4 won't like it
(branding package didn't really anticipate kde4 and is to
be updated appropriately as well as extended for mate/fvwm).

This one is also used for lightdm/gtk.
2013-02-11 21:29:15 +04:00
Michael Shigorin
458d72b8c3 regular.mk: switch from gdm2.20 to lightdm/gtk
"regular-gtk" based images moved from the (unsupported) gdm2.20
to the (supported) lightdm with gtk greeter; while a couple of
gdm2 forks have emerged it's still unclear whether mate or mint
one will be actually alive, even short/mid-term.
2013-02-11 21:29:15 +04:00
Michael Shigorin
d83eb78762 efi: added fatresize
Helps with #28470 (FAT not being recognized) which is critical
due to ESP being FAT by spec :-/

Thanks timonbl4@ for the hint.
2013-02-11 21:29:15 +04:00
Michael Shigorin
61ead13d3a regular.mk: disable plymouth for gnome3-based distros
The issue is that it's suddenly broken in current Sisyphus,
looks like the peculiar set of assumptions in fedora-tweaked
systemd+plymouth+gdm3 relies on tty1 being the X session tty
and it's different here.
2013-02-11 21:29:09 +04:00
Michael Shigorin
d9ae996571 gear-store-tags 2013-02-04 22:19:49 +04:00
Michael Shigorin
5fcc2aaa78 0.9.6-alt1
- assorted fixes
2013-02-04 22:18:27 +04:00
Michael Shigorin
e46c259a90 ensure that IMAGEDIR exists (thus globbable)
It appears that manually specified IMAGEDIR, e.g. by adding

  IMAGEDIR = ~/out/$(shell date +%Y%m%d)

to ~/.mkimage/profiles.mk, might be problematic due to
missing globbing.  Let's make sure the paths are globbed
and directories are created -- since make's wildcard()
returns an empty string when there's nothing there [yet].
2013-02-04 22:18:27 +04:00
Michael Shigorin
692f8ec010 desktop+cinnamon+extra: drop the office
It's a bit superfluous so far; this isn't a final decision
but rather a current change of mind though.
2013-02-04 22:18:27 +04:00
Michael Shigorin
423c250ec8 regular.mk: regular-mate += branding-*-graphics
This is largely a workaround for #28239.
2013-02-04 22:18:27 +04:00
Michael Shigorin
de6598a6d9 desktop+mate: minor 1.5 related tweaks
The metapackage is out there but mate-media-apps seems
like not available at the moment.
2013-02-04 22:18:27 +04:00
Michael Shigorin
c133f161bf live: enable avahi service
Some file managers (particularly Dolphin) depend
on avahi for network service browsing; turn it on
if it's there.
2013-02-04 22:18:27 +04:00
Michael Shigorin
b3b09f55c0 live: added plymouth to enabled services list
This might have been related to the plymouth bar missing
at live system shutdown.
2013-02-04 22:18:27 +04:00
Michael Shigorin
e7fa4c466a plymouth: stage2 fix primarily for live
It appeared that plymouthd.conf wasn't set up properly
thus "service plymouth stop" didn't result in anything
meaningful; thanks boyarsh@ for his help figuring this
out again.
2013-02-04 22:18:27 +04:00
Michael Shigorin
a8819db073 regular.mk: re-added plymouth again
Looks like LUKS has had its share of testing,
now it's plymouth's time again.
2013-02-04 22:18:27 +04:00
Michael Shigorin
efd06839f7 live, slinux: use systemctl --no-reload
Thanks boyarsh@ for m-p-d implementation and sem@ for the hint.
2013-02-04 22:18:27 +04:00
Michael Shigorin
7603f0728a base+regular: added eject
It was missing indeed; thanks cas@.
2013-02-04 22:18:27 +04:00
Michael Shigorin
1eb0dbc534 desktop+cinnamon+extra: changed metapackage
Thanks cow@ for his work on Cinnamon and for being helpful;
see also http://altlinux.org/regular regarding the whole affair.
2013-02-04 22:18:27 +04:00
Michael Shigorin
aef58a4d60 mobile+mate: s/wpa_gui/NetworkManager-l2tp-gnome/
Thanks cas@ for suggesting to get rid of the former
for being superfluous and ugly as well as to add
the latter which has been missing.
2013-02-04 22:18:26 +04:00
Michael Shigorin
67c224fc67 power: added acpi to acpid as well
It's a must to look up battery charge, after all.
2013-02-04 22:18:26 +04:00
Michael Shigorin
6a4ede8ccd regular.mk: move things to a package list
These were becoming a bit longish already.
2013-02-04 22:18:26 +04:00
Michael Shigorin
8e668d4ff2 regular.mk: added sudo, acpi
As a matter of practical distribution use
these two appeared to be rather missing.
2013-02-04 22:18:26 +04:00
Michael Shigorin
6d8cbcb61d assumptions.txt: clarified sisyphus/branch status
Folks have been wondering already whether e.g. t6 breakage
qualifies as a bug; it does indeed unless the "broken" part
depends on the features not available with that branch yet,
e.g. EFI support.
2013-02-04 22:18:26 +04:00
Michael Shigorin
2d3e5f2b1c kernel: factor the former lib/kernel.mk in
It wasn't spotted when introducing the distinct kernel feature;
will need fixup as we meet packaged ARM/PPC kernels.
2013-02-04 22:18:26 +04:00
Michael Shigorin
fc061fba0c x11: fglrx related comment fixup
Somewhat silly but still: fglrx got fixed up for 1.12 by now
*but* 1.13 broke it as usual.  The updated warning thus holds.
2013-02-04 22:18:26 +04:00
Michael Shigorin
0f4e72cf79 kernel: move to std-def again
un-def was a desperate measure when std-def of the day
was suddenly plain broken.

This reverts 0e8871e7b4.
2013-02-04 22:18:26 +04:00
Michael Shigorin
9e776e3ade test.mk: drop distro/live-efi
No longer needed as every regular-* x86_64 image
would do UEFI by now.
2013-02-04 22:18:26 +04:00
Michael Shigorin
671c788e3a build-distro: drop sortfile on the floor
Its support was dropped in mkimage some time ago
since xorriso semantics changed quite considerably
and the tweak that was done here is now performed
out-of-box thus no longer needed.
2013-02-04 22:18:26 +04:00
Michael Shigorin
f576b01988 build-distro: trim BOOT_VOLI at 32 chars
The nice and pleasant effect of hitting this barrier
is build process break at (almost) the very end of it.
2013-02-04 22:18:26 +04:00
Michael Shigorin
40e680e50d efi: employ shim-signed
Was an oversight to miss it.
2013-02-04 22:18:26 +04:00
Michael Shigorin
fd461c7dd1 desktop+e17+extra: aligned to current sisyphus
connman is now required by econnman,
and aris@ has packaged e17-module-*.
2013-02-04 22:18:24 +04:00
Evgeny Sinelnikov
0d524763ed Rename kde minimal profile to distro/kde4-lite 2013-01-29 12:34:07 +04:00
Michael Pozhidaev
bee01a86cd Homeros:
- homeros-nano image is renamed to homeros-mini;
- homeros/homeros package list is added;
- default volume changed from 100% to 75.
2013-01-28 08:35:16 +07:00
Michael Shigorin
75c08d9f3c gear-store-tags 2013-01-21 18:26:00 +02:00
Michael Shigorin
b74ad4d592 0.9.5-alt1
- homeros
2013-01-21 18:24:01 +02:00
Michael Shigorin
29a94eaf23 firmware: added amd/intel ucode packages/utilities
Thanks lakostis@ for the suggestion; e.g. some Intel Mac systems
won't provide temperature sensors until microcode is updated.
2013-01-21 18:24:01 +02:00
Michael Shigorin
47c4dea456 image.in: bump optimal mkimage version
0.2.6 has fixes for xorriso and support for refind.
2013-01-21 13:49:21 +02:00
Michael Shigorin
ff1f5987b9 regular.mk: use kdm4 for regular-razorqt right now
Unfortunately, current lightdm is broken regarding autologin at least
(1.1 or 1.0 used to work just fine IIRC).
2013-01-21 13:49:21 +02:00
Michael Shigorin
f5893f398a regular.mk: use kde4-regular for regular-kde4
Thanks zerg@ for nice metapackage :)
Hope others will follow the suit.
2013-01-21 13:49:21 +02:00
Michael Shigorin
5810c0e7d2 regular.mk: added kdegames, kdeedu to regular-tde
As suggested by aen@.
2013-01-21 13:49:21 +02:00
Michael Shigorin
91a817a0a5 regular.mk: added mutt to regular-icewm
...since it's used as a default mail handler, which seems reasonable
for this particular case. (thanks aen@ for reminding)
2013-01-21 13:49:21 +02:00
Michael Shigorin
b603622dcd wireless: added iw as well
It's a next-get CLI for wireless interfaces, see also
http://linuxwireless.org/en/users/Documentation/iw
2013-01-21 13:49:21 +02:00
Michael Shigorin
dd140074b9 wireless: added crda package
See also http://wireless.kernel.org/en/developers/Regulatory/#CRDA
2013-01-21 13:49:21 +02:00
Michael Shigorin
915f2c2051 efi: introduced use/efi/shell
It's aimed at providing UEFI shell implementation which is very
useful for repairs and debug; if the "signed" mode is requested
then the signed variant is used either.

Please note that there are two distinct uses:
- a shell lying around on a filesystem to be copied by hand;
- a shell available in EFI part of boot media to be launched
  by firmware's or standalone boot manager (e.g. refind).
2013-01-21 13:49:21 +02:00
Michael Shigorin
84be7f5b0e live.mk: use/efi/signed
That enables additional packages and setup to deal with Restricted Boot.
2013-01-21 13:49:21 +02:00
Michael Shigorin
d004d09c7c efi: efi-shell and signed variants to the rescue
UEFI shell is pretty valuable debugging and fixup tool.

When one has to mess with Restricted Boot, openssl and
some PE signing tools might come handy either; see also
http://www.rodsbooks.com/efi-bootloaders/secureboot.html
2013-01-21 13:49:21 +02:00
Michael Shigorin
0ba8d3fbae efi: added refind to the rescue
Its bootloader autodetection capabilities can prove quite useful;
this particular addition has been "sponsored" by this thread:
http://lists.altlinux.org/pipermail/sisyphus/2013-January/subject.html#359481
2013-01-21 13:49:21 +02:00
Michael Shigorin
12470e01cc lxde+extra: added gvfs packages
PCManFM users seem to benefit from those being available;
thanks aen@ for the exact package list.
2013-01-21 13:49:21 +02:00
Michael Shigorin
cbbfddf86a live: try and enable connman too
Might come with e17 distros; the services should really become
configurable, msp@ and sem@ need that already.
2013-01-21 13:49:21 +02:00
Michael Shigorin
57168fe705 e17: added econnman
Thanks manowar@ for both fitting NM there and subsequently
wrestling EConnMan into its place, things seem better now.
2013-01-21 13:49:21 +02:00
Michael Shigorin
32b492c0c9 desktop+lxde: lxterminal again (moved to +extra)
Let's provide the official terminal emulator as the reference one,
and those preferring others are welcome to include these either.
(to some extent this commit is biased towards regular.mk though)
2013-01-21 13:49:21 +02:00
Michael Shigorin
25eba198f8 lxde: added lxshortcut, obconf
Both look like useful additions.
2013-01-21 13:49:21 +02:00
Michael Shigorin
2e2c7082a6 metadata: fix 50-metadata.mk's treatment of groups
It was missing THE_GROUPS rather completely (but should not care for
LIVE_GROUPS -- are these useful anyways?); thanks sem@ for spotting.
2013-01-21 13:49:09 +02:00
Michael Shigorin
eaee7b9378 regular.mk: added NM plasmoid to regular-kde4
Suggested by zerg@, aen@ and myself upon testing.
Happens to work these days, hooray!
2013-01-20 23:12:06 +04:00
Michael Shigorin
9ff596db7f syslinux: lowered livecd boot priority
The reason is that the most interesting live images by now are
installable ones, and while configurable boot order is not there yet
the "classic" livecd images will require manual choice to boot.

Thanks sem@ for reminding of that FR (which is still open).
2013-01-20 23:11:57 +04:00
Michael Shigorin
31b74b1272 regular.mk: added xxkb to regular-icewm
Thanks aen@ for suggesting this.
2013-01-20 23:11:57 +04:00
Michael Shigorin
31d694f18b regular.mk: initial regular-gnome3
It would be great to have #28289 fixed either so that aris@
could approve the image as usable (I totally agree that it's
a major piece of real world functionality currently missing)
looks like there's sense to prepare a starter iso for tests.
2013-01-20 23:11:57 +04:00
Michael Shigorin
146d1b0fe2 x11: initial gnome3
Seems working.
2013-01-20 23:11:57 +04:00
Michael Shigorin
e5619e904f live: initial rollback hook subsystem
Currently done for 40-autologin script only but might be
more widely useful: when describing an action to be done
while forming the LiveCD image, also prepare the one that
undoes the effect so that an installed LiveCD doesn't
(mis)behave as if it were young again.

NB: livecd-install provides 50-{gdm,kdm}-autologin-off.sh
hooks which can collide with ours, so let's override those
until things are sorted out properly at both sides.

PS: some half-year old nodm hacks are still in place for t6/branch
(and #27451 should be re-examined when dropping those).
2013-01-20 23:11:00 +04:00
Denis Smirnov
2ff873eb73 Add .gitignore for docs 2013-01-20 20:27:19 +04:00
Michael Pozhidaev
fbd3460684 Initial Homeros support
- added destination homeros-nano.iso yields   minimal
  speaking image;
- added "homeros" feature contain scripts appropriate
  for general Homeros functions but need further development.
2013-01-18 06:07:58 +07:00
Michael Shigorin
eb2489fe89 gear-store-tags 2013-01-14 22:07:19 +02:00
Michael Shigorin
a133490be9 0.9.4-alt1
- restricted boot
2013-01-15 00:02:26 +04:00
Michael Shigorin
3ff5f6a195 efi: slightly enhanced documentation
The variables are best influenced by targets and not directly
to avoid architecture dependent clashes.
2013-01-14 18:33:25 +02:00
Michael Shigorin
2234e6b70f regular.mk: test refind with regular-icewm.iso
The current refind support implementation doesn't boot
with either USB Flash or CD-ROM for me (due to the different
actual volumes, FAT vs El Torito, accordingly).

And when it does, a host with Secure Boot present and not
disabled yet would turn the unsigned kernel down unlike ELILO
(due to rEFInd using "natural" calls to boot it).

Both issues are reported upstream; in the meanwhile let's
migrate a single test image but build the rest with elilo.
2013-01-14 18:24:40 +02:00
Michael Shigorin
36a707bbb2 efi: refind support
mkimage > 0.2.5 should have received enhanced UEFI support
including the ability to setup refind (#28349);
make the feature ready for that.
2013-01-14 18:14:47 +02:00
Michael Shigorin
1db42ffcb1 regular.mk: use/efi/signed
Let's switch the UEFI SecureBoot (aka RestrictedBoot) shim on
for all the regular images.
2013-01-14 18:05:16 +02:00
Michael Shigorin
8c8d7c24d1 efi: initial signed bootloader support
The implementation goes the shim[1] way as described here[2];
many thanks to Matthew Garrett and Rod Smith.

[1] http://mjg59.dreamwidth.org/20303.html
[2] http://www.rodsbooks.com/efi-bootloaders/secureboot.html
2013-01-14 17:36:10 +02:00
Michael Shigorin
084c5af4cb regular.mk: add uvcview, powertop
All of these individual packages should get sorted out
and shifted to pkglists at some time.
2013-01-11 00:32:31 +04:00
Michael Shigorin
8c8a65a104 regular-tde: added NetworkManager
Suggested by rom_as@; see also #25713 at the moment.
2013-01-11 00:32:31 +04:00
Michael Shigorin
b7c1e3bda2 initial desktop+e17+extra pkglist
Thanks aris@ for advice again.
2013-01-11 00:32:31 +04:00
Michael Shigorin
95bc7fedd6 added desktop+e17 pkglist, use it in x11
It's not e17-default alone right now, gnome-icon-theme package
appears requisite at the moment so that menus and IBar aren't
half-empty regarding graphics.

Thanks aris@ for the advice and lots of patience with me.
2013-01-11 00:32:31 +04:00
Michael Shigorin
ed79d011b7 regular.mk: added net-tools
ifconfig(8) was requested by rom_as@ and someone at opennet too.
It's legacy but habits are valuable nevertheless.
2013-01-11 00:32:31 +04:00
Michael Shigorin
2cdb7d3df9 regular.mk: use/wireless
...instead of preliminary "statically linked" bits.
2013-01-11 00:32:31 +04:00
Michael Shigorin
61e4b26ffe initial features.in/wireless
The creeping wireless bits should be thrown together,
including kernel modules, firmware, CLI/GUI controls,
and any plumbing required.
2013-01-11 00:32:31 +04:00
Michael Shigorin
56b473b2da regular.mk: use std-def
So far it's what should be tested, after all...
and #27941 is not so clearly about the kernel.
2013-01-11 00:32:31 +04:00
Michael Shigorin
d6d7662ef8 x11: added evas_generic_loaders to e17 packages
This should really be done in e17-default but until it's there...
(thanks aris@ for advice)
2013-01-11 00:32:30 +04:00
Michael Shigorin
0b71c5fb07 regular: added rescue+extra pkglist
The things like fdisk are very useful on a livecd/liveflash
to carry in one's pocket indeed.
2013-01-11 00:32:30 +04:00
Michael Shigorin
d8de9b292b rescue+extra: postfix is a server, not a tool
Just drop it from this pkglist.
2013-01-11 00:32:30 +04:00
Michael Shigorin
24c1a45673 regular += wireless drivers
Thanks someone for feedback:
http://www.opennet.ru/openforum/vsluhforumID3/88025.html#285
2013-01-11 00:32:30 +04:00
Michael Shigorin
380dcb88d8 server.mk: add UEFI, move off el-smp
UEFI support is pretty requisite by now;
and el-smp hasn't seen updates for almost
half a year by now so an actively maintained
one is clearly preferred.
2013-01-11 00:32:30 +04:00
Denis Smirnov
7f805cdf79 Rename all scripts in */image-scripts.d to format \d\d-scriptname 2013-01-06 12:05:32 +04:00
Denis Smirnov
c509ddb954 /etc/firsttime.d support 2013-01-06 00:10:46 +04:00
Michael Shigorin
dfb2d2adef gear-store-tags 2012-12-31 22:01:27 +02:00
Michael Shigorin
29388ef555 0.9.3-alt1
- regular images
2012-12-31 21:41:19 +02:00
Michael Shigorin
d0d76633bb initial regular images
See http://www.altlinux.org/Регулярные_сборки_образов
for the idea behind this set of images; in short, it's
*not* a bunch of polished end-user distros in a moment
but rather to facilitate Sisyphus package base testing
in as-is state during branch pre-release time.
2012-12-31 21:39:31 +02:00
Michael Shigorin
43c6fce4d1 live: fix 20-locale
It shouldn't overwrite the pre-existing configuration
but should fire if there's none.
2012-12-31 21:39:31 +02:00
Michael Shigorin
d94232fb87 live: updated 40-autologin to support kdm4
Was long overdue already but let's leave that in 2012. :)
2012-12-31 21:36:04 +02:00
Michael Shigorin
a1c0e82e31 live: add use/live/repo
This one provides apt configuration for the LiveCD itself
as well as extra hooks for a livecd-install made system.
2012-12-31 22:16:57 +04:00
Michael Shigorin
78326d393a luks: it's not just BASE packages
Installable live systems can have LUKS as well
and it's welcome addition to rescue images too.
2012-12-31 18:10:12 +04:00
Michael Shigorin
bd606e6c60 build.mk: extended error regex yet again
This time it's

  xorriso : FAILURE : -volid: Text too long (33 > 32)

and todo-- as well.
2012-12-31 18:10:12 +04:00
Michael Shigorin
b9e93b699e luks: added alterator-luks
It's a separate installation step to set the LUKS password;
see also #28200 for (terse) discussion and instructions on
getting this actually working for a distro.
2012-12-31 18:10:12 +04:00
Michael Shigorin
9a86d7ec40 lists: initial desktop+nm
For MATE regular images right now
but should be more widely useful.
2012-12-31 18:10:12 +04:00
Michael Shigorin
2701a01f19 initial lxde pkglists
Thanks gns@ for his help in figuring these out;
some metapackage related optimization is still due.
2012-12-31 18:10:12 +04:00
Michael Shigorin
cf6411b3a1 desktop+xfce: refactor using metapackages
These are out there in Sisyphus and should be used
instead of copious lines in a package list.

Thanks sem@ for proposing gnome-icon-theme to supplement
the lack of icons in the default theme; note that tango
set doesn't quite cut it, even with extras.

Thunar -> thunar; xfcalendar -> orage
2012-12-31 18:10:12 +04:00
Michael Shigorin
cd9303e7b1 live: xdg-user-dirs tweak
Borrowed from m-p-d's init-xdg-user-dirs, of course.
2012-12-26 18:52:33 +02:00
Michael Shigorin
06c62ae440 live: mv 03services 03-services
Slowly fixing up the discrepancies...
2012-12-26 18:52:33 +02:00
Michael Shigorin
874c078eea x11: added use/x11/kde4
There's use/x11/kde already but that serves somewhat different
purpose as of today; the naming issue (kde vs kde4) was tersely
discussed with sin@ at the time of the merge of his KDE4 image
related bits and it's still not that clear.

Let's try this way and see if existing images would be ported
to use/x11/kde4.
2012-12-26 18:15:33 +04:00
Michael Shigorin
e7a4b39083 implement and use/x11/e17
This marks 0.17.0 hitting Sisyphus to much delight.
2012-12-26 18:15:33 +04:00
Michael Shigorin
d94ecb94d1 desktop+mate: fix build with 1.5
A few things have changed...
2012-12-26 18:15:33 +04:00
Michael Shigorin
3ae69fa5dc live.mk: live-rescue += use/efi
The whole live-rescue needs a massive facelift regarding
applications included and user experience achieved (remember
that folks are going to be stressed enough already with data
lost or system(s) not booting, and probably offline as well);
but at least it's UEFI bootable now.
2012-12-26 18:03:27 +04:00
Michael Shigorin
cd0db8d363 efi: handle rescue as well
The rescue feature intentionally doesn't pick up THE_PACKAGES
and THE_LISTS into stage2, so add EFI ones explicitly.
2012-12-26 18:02:11 +04:00
Michael Shigorin
162a824009 live.mk: rescue += EFI
It was long overdue since (U)EFI support for live images
has been there for some six weeks or so already.
2012-12-26 17:15:59 +04:00
Michael Shigorin
bad7fb53ca tags2lists: filter out vim swap files
The (funny but somewhat confusing) problem manifests itself as

  E: Couldn't find package Binary

during a build run in the profile where a tagged packagelist
referenced by a specific target being built is open with vim
(which results in .FILE.sw? temporary file lying aside).
2012-12-26 17:15:59 +04:00
Michael Shigorin
d045fe49e5 features.in: extended README a bit
The script hook naming advice and "+name" puropose explanation
seem to have been missing.
2012-12-26 17:15:59 +04:00
Michael Shigorin
b6eb7cb732 efi: skip on unsupported target architectures
There's a possibility to run into IA32 EFI but that's rather
uninteresting hardware (ancient Xeon servers and <s>outdated</s>
early Intel Mac laptops).  Just drop it on the floor.

As x86_64 UEFI support would result in "2D hybrid(r)(tm)" image
which boots with all combinations of BIOS/UEFI by CD|DVD/Flash
(or at least should boot), some downgrace seems due: use/efi will
turn use/isohybrid on non-x86_64 -- which will require further
tweaks on PPC/ARM some day.
2012-12-26 17:07:19 +04:00
Michael Shigorin
5da4b440be gear-store-tags 2012-12-17 17:57:11 +04:00
142 changed files with 1001 additions and 225 deletions

View File

@@ -1,5 +1,5 @@
Name: mkimage-profiles
Version: 0.9.2
Version: 0.9.10
Release: alt1
Summary: ALT Linux based distribution metaprofile
@@ -78,6 +78,33 @@ cp -a * %buildroot%mpdir
%doc %docs/*
%changelog
* Mon Mar 18 2013 Michael Shigorin <mike@altlinux.org> 0.9.10-alt1
- fonts: axios!
* Tue Feb 26 2013 Michael Shigorin <mike@altlinux.org> 0.9.9-alt1
- regular refactoring
* Tue Feb 19 2013 Michael Shigorin <mike@altlinux.org> 0.9.8.1-alt1
- works with make-initrd 0.8.1+ (see #28578)
* Mon Feb 18 2013 Michael Shigorin <mike@altlinux.org> 0.9.8-alt1
- live fixes/tweaks galore
* Mon Feb 11 2013 Michael Shigorin <mike@altlinux.org> 0.9.7-alt1
- going nightly
* Mon Feb 04 2013 Michael Shigorin <mike@altlinux.org> 0.9.6-alt1
- assorted fixes
* Mon Jan 21 2013 Michael Shigorin <mike@altlinux.org> 0.9.5-alt1
- homeros
* Mon Jan 14 2013 Michael Shigorin <mike@altlinux.org> 0.9.4-alt1
- restricted boot
* Mon Dec 31 2012 Michael Shigorin <mike@altlinux.org> 0.9.3-alt1
- regular images
* Mon Dec 17 2012 Michael Shigorin <mike@altlinux.org> 0.9.2-alt1
- enhanced uefi support

View File

@@ -1,6 +0,0 @@
object 919b09313f3be5702cb8e83f9d0372f4d06ed6f3
type commit
tag v0.9.1
tagger Michael Shigorin <mike@altlinux.org> 1354548428 +0200
kde4

View File

@@ -0,0 +1,6 @@
object 6605eb61bdecf70b2de7ca5cf96d0b1fa341aab6
type commit
tag v0.9.9
tagger Michael Shigorin <mike@altlinux.org> 1361826022 +0400
regular refactoring

View File

@@ -1 +1 @@
25f0420130990a8bfd7b5e91435ac54c7f8eee33 v0.9.1
432f34bfd2a6ee1047c2c7263bca2038fe14f3e7 v0.9.9

View File

@@ -35,6 +35,11 @@ $ mkdir ~/out
$ make syslinux.iso
----
список доступных целей::
----
$ make help
----
ссылки
~~~~~~
- http://www.altlinux.org/tmpfs

View File

@@ -3,13 +3,19 @@
. shell-error
INIT=
if [ "$1" = "-i" ]; then
INIT=yes
shift
fi
[ -d "$1" ] || fatal "$1 is not an existing directory"
if type -t git >&/dev/null && pushd "$1" >/dev/null; then
if [ -z "$(git config --global user.name)" ]; then
exit 0
fi
if [ ! -d .git ]; then
if [ -n "$INIT" -a ! -d .git ]; then
git init -q || fatal "git init failed"
fi
if [ -n "$(git status -s)" ]; then

View File

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

View File

@@ -6,20 +6,19 @@ 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 +vmguest
distro/.desktop-network: distro/.desktop-mini use/stage2/net-eth +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)))
distro/.desktop-extra:
@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))
distro/tde: distro/.desktop-mini +tde
@$(call set,KFLAVOURS,led-ws)
distro/kde-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde
distro/kde4-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde4-lite
@$(call set,KFLAVOURS,std-def)
distro/tde: distro/.desktop-network +tde; @:
distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
distro/ltsp-tde: distro/tde +ltsp; @:
distro/ltsp-icewm: distro/icewm +ltsp; @:

6
conf.d/homeros.mk Normal file
View File

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

View File

@@ -2,16 +2,20 @@
ifeq (distro,$(IMAGE_CLASS))
distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
distro/rescue: distro/.base use/rescue use/syslinux/ui/menu; @:
distro/rescue: distro/.base use/rescue use/syslinux/ui/menu \
use/efi/signed use/efi/refind use/efi/shell; @:
distro/syslinux: distro/.init \
use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
distro/.live-desktop: distro/.base +live use/plymouth/live; @:
distro/.live-desktop: distro/.base +live use/live/install use/stage2/net-eth \
use/plymouth/live use/efi; @:
distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:
distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
use/syslinux/timeout/1 use/cleanup +power
distro/.live-kiosk: distro/.base use/live/base use/live/autologin +power \
use/syslinux/timeout/1 use/cleanup use/stage2/net-eth
@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu)
@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
@@ -31,29 +35,35 @@ distro/live-builder: distro/live-builder-mini use/dev/repo
distro/live-install: distro/.live-base use/live/textinstall; @:
distro/.livecd-install: distro/.live-base use/live/install; @:
distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @:
distro/live-razorqt: distro/.live-desktop use/live/autologin +razorqt; @:
distro/live-icewm: distro/.live-desktop use/x11/lightdm/gtk +icewm; @:
distro/live-razorqt: distro/.live-desktop +razorqt; @:
distro/live-tde: distro/.live-desktop-ru use/live/install +tde; @:
distro/live-fvwm: distro/.live-desktop-ru use/x11/lightdm/gtk use/x11/fvwm; @:
distro/live-rescue: distro/live-icewm
distro/live-rescue: distro/live-icewm use/efi
@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
@$(call add,LIVE_LISTS,openssh \
$(call tags,(base || extra) && (archive || rescue || network)))
distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru
# 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
@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
@$(call add,LIVE_PACKAGES,livecd-webkiosk)
@$(call add,LIVE_PACKAGES,alsa-utils udev-alsa)
@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
@$(call set,KFLAVOURS,led-ws)
distro/live-webkiosk-mini: distro/.live-webkiosk
@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)
# NB: flash/java plugins are predictable security holes
distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live +vmguest
@$(call add,LIVE_PACKAGES,mozilla-plugin-adobe-flash)
@$(call add,LIVE_PACKAGES,mozilla-plugin-java-1.6.0-sun)
@$(call add,LIVE_PACKAGES,alsa-utils udev-alsa)
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-icewm use/live/sound use/x11/3d-proprietary
@$(call add,LIVE_PACKAGES,FlightGear fgo input-utils)
@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
@@ -68,8 +78,8 @@ distro/live-mate: distro/.live-desktop-ru use/live/nodm use/x11/3d-free
@$(call add,LIVE_LISTS,openssh $(call tags,(desktop || mobile) && mate))
@$(call set,KFLAVOURS,un-def) # the newest one
distro/live-enlightenment: distro/.live-desktop-ru use/live/autologin use/x11/3d-free
@$(call add,LIVE_PACKAGES,enlightenment)
distro/live-e17: distro/.live-desktop-ru use/live/autologin \
use/x11/e17 use/x11/gdm2.20; @:
distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
@$(call add,LIVE_PACKAGES,gimp tintii immix fim)
@@ -78,4 +88,6 @@ distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync)
@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)
distro/live-sugar: distro/.live-desktop-ru use/x11/sugar; @:
endif

73
conf.d/regular.mk Normal file
View File

@@ -0,0 +1,73 @@
# regular build/usage images
ifeq (distro,$(IMAGE_CLASS))
# common ground
distro/.regular-bare: distro/.base +vmguest +wireless \
use/efi/signed use/luks use/memtest use/stage2/net-eth use/kernel/net
@$(call try,SAVE_PROFILE,yes)
# WM base target
distro/.regular-base: distro/.regular-bare +live use/live/ru use/live/install \
use/live/repo use/x11/3d-free use/luks use/branding
@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
@$(call add,LIVE_LISTS,$(call tags,rescue extra))
@$(call add,THE_BRANDING,indexhtml notes alterator)
@$(call add,THE_BRANDING,graphics)
# DE base target
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
distro/.regular-desktop: distro/.regular-base \
use/systemd use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind
@$(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-icewm: distro/.regular-base use/x11/lightdm/gtk +icewm
@$(call add,LIVE_PACKAGES,xxkb mutt)
@$(call add,LIVE_PACKAGES,deepsolver deepsolver-repo)
@$(call set,KFLAVOURS,un-def)
distro/regular-wmaker: distro/.regular-desktop use/x11/lightdm/gtk \
use/x11/wmaker
@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
@$(call add,LIVE_PACKAGES,xxkb)
distro/regular-gnustep: distro/regular-wmaker use/x11/gnustep +plymouth
@$(call add,THE_BRANDING,graphics)
distro/regular-xfce: distro/.regular-gtk use/x11/xfce; @:
distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality
@$(call add,LIVE_LISTS,$(call tags,desktop nm))
distro/regular-mate: distro/.regular-gtk
@$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && (mate || nm)))
distro/regular-e17: distro/.regular-gtk use/x11/e17
@$(call add,LIVE_PACKAGES,xterm)
distro/regular-cinnamon: distro/.regular-desktop \
use/x11/cinnamon use/fonts/infinality
@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @:
distro/regular-tde: distro/.regular-desktop +tde +plymouth
@$(call add,LIVE_LISTS,$(call tags,desktop nm))
@$(call add,LIVE_PACKAGES,kdegames kdeedu)
distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \
use/fonts/zerg +plymouth
@$(call add,LIVE_LISTS,$(call tags,regular kde4))
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 \
use/syslinux/ui/menu use/hdt use/efi/refind
@$(call set,KFLAVOURS,un-def)
endif

View File

@@ -9,15 +9,16 @@ distro/server-nano: distro/.server-base \
@$(call add,BASE_LISTS,$(call tags,server network))
@$(call add,BASE_PACKAGES,dhcpcd cpio)
distro/server-mini: distro/.server-base use/server/mini use/cleanup/x11-alterator
@$(call set,KFLAVOURS,el-smp)
distro/server-mini: distro/.server-base use/server/mini use/kernel/net \
use/cleanup/x11-alterator use/efi use/stage2/net-eth
@$(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/wireless use/power/acpi/button
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,BASE_KMODULES,rtl8168 rtl8192)
@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons)
@$(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)

View File

@@ -19,9 +19,6 @@ distro/live-gns3: distro/live-icewm
@$(call add,LIVE_LISTS,gns3)
@$(call add,LIVE_KMODULES,kvm virtualbox)
distro/live-efi: distro/live-install use/efi
@$(call set,KFLAVOURS,un-def) ### CONFIG_FB_EFI
distro/icewm-efi: distro/icewm use/efi/debug use/firmware
@$(call add,INSTALL2_PACKAGES,strace)

4
doc/.gitignore vendored Normal file
View File

@@ -0,0 +1,4 @@
mkimage-profiles.chunked
docbook-xsl.css
mkimage-profiles.pdf
mkimage-profiles.html

View File

@@ -2,7 +2,12 @@
NB: пути приводятся от верхнего уровня; проект в целом предполагает
ALT Linux 6.0+ и GNU make 3.81+ (на которых и разрабатывается),
но может быть портирован вместе с mkimage.
но может быть портирован вместе с mkimage. Если что-либо не работает
или не собирается, стоит проверить на Sisyphus (mkimage, make, hasher,
собственно пакетная база), поскольку именно на нём происходит основная
разработка mkimage-profiles. Сломанная сборка на текущем стабильном
бранче считается ошибкой и подлежит исправлению, если оно технически
возможно на базе этого бранча.
* lib/report.mk
** ожидает, что каждая подлежащая трассированию цель каждого

View File

@@ -23,9 +23,14 @@
построенных на одном базовом, можно воспользоваться подкаталогом
с именем исходного базового субпрофиля (см. $src, $dst в Makefile).
Рекомендуется давать несколько различающиеся имена скриптам,
которые одна и та же фича может добавлять в различные стадии,
чтобы они не выглядели одинаково в логе сборки.
Наиболее востребованные цели можно снабжать "ярлычками" вроде
"+icewm" с тем, чтобы сделать более краткими и выразительными
использующие их правила. Просьба не злоупотреблять количеством.
использующие их правила. Просьба не злоупотреблять количеством,
такие имена предполагается показывать в интерфейсе к профилю.
Каталог lib/ является специфическим для фич, определяющих
построение конкретного вида образа -- см. build-*/.

View File

@@ -8,16 +8,13 @@ BOOT_SYSI := $(META_SYSTEM_ID)
BOOT_PUBL := $(META_PUBLISHER)
BOOT_PREP := $(META_PREPARER)
BOOT_APPI := $(META_APP_ID)
BOOT_VOLI := $(META_VOL_ID)
BOOT_VOLI := $(shell echo $(META_VOL_ID) | cut -c1-32)
BOOT_VOLS := $(META_VOL_SET)
BOOT_BIBL := $(META_BIBLIO)
BOOT_ABST := $(META_ABSTRACT)
BOOT_TYPE := isolinux
# see also ../scripts.d/01-isosort; needs mkimage-0.2.2+
MKI_SORTFILE := /tmp/isosort
all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
postprocess $(GLOBAL_CLEAN_WORKDIR)

View File

@@ -1,14 +0,0 @@
#!/bin/sh
# provide mkisofs with image contents sort order hints
### split over features or leave in a single piece?
# NB: only a single space/tab in between, no trailing whitespace
cat > /tmp/isosort <<__EOF__
ALTLinux 0
Metadata 100
altinst 700
rescue 800
live 900
syslinux 1000
__EOF__

View File

@@ -0,0 +1,3 @@
#!/bin/sh
# Run scripts from /etc/firsttime.d at first start
[ -f "/var/lock/TMP_1ST" ] || touch "/var/lock/TMP_1ST"

View File

@@ -0,0 +1,3 @@
#!/bin/sh
# Run scripts from /etc/firsttime.d at first start
[ -f "/var/lock/TMP_1ST" ] || touch "/var/lock/TMP_1ST"

View File

@@ -1,5 +1,9 @@
Фича добавляет в образы необходимое для поддержки EFI/UEFI.
Конфигурируется заданием загрузчика (EFI_BOOTLOADER)
и файла сертификата (EFI_CERT) при помощи целей;
пример использования доступен в ../../conf.d/regular.mk
См. тж.:
* http://www.altlinux.org/UEFI
* http://www.rodsbooks.com/efi-bootloaders/

View File

@@ -1,10 +1,40 @@
+efi: use/efi; @:
ifeq (x86_64,$(ARCH))
EFI_LISTS := $(call tags,base efi)
use/efi:
@$(call add_feature)
@$(call set,MKI_VER_MINIMAL,0.2.5) # see #28219
@$(call add,THE_LISTS,$(call tags,base efi))
@$(call add,INSTALL2_PACKAGES,dosfstools)
@$(call set,EFI_BOOTLOADER,elilo) ### no choice right now
@$(call add,THE_LISTS,$(EFI_LISTS))
@$(call add,RESCUE_LISTS,$(EFI_LISTS))
@$(call add,THE_PACKAGES,$$(EFI_SHELL))
@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL))
@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
@$(call try,EFI_BOOTLOADER,elilo) # default one
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)
use/efi/shell: use/efi
@$(call try,EFI_SHELL,efi-shell)
use/efi/debug: use/efi
@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
@$(call set,KFLAVOURS,led-ws)
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
endif

View File

@@ -6,6 +6,12 @@ use/firmware:
@$(call add_feature)
@$(call add,SYSTEM_PACKAGES,firmware-linux)
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
@$(call add,SYSTEM_PACKAGES,firmware-aic94xx-seq)
@$(call add,THE_PACKAGES_REGEXP,firmware-ql.*)
@@ -17,9 +23,12 @@ use/firmware/wireless: use/firmware
@$(call add,THE_KMODULES,bcmwl ndiswrapper)
@$(call add,THE_PACKAGES,firmware-acx100)
@#$(call add,THE_PACKAGES,firmware-i2400m)
@$(call add,THE_PACKAGES_REGEXP,firmware-carl9170.*)
@#$(call add,THE_PACKAGES_REGEXP,firmware-carl9170.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
@#$(call add,THE_PACKAGES_REGEXP,firmware-iwl.*)
@#$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)
@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)
use/firmware/laptop: use/firmware/wireless use/firmware/cpu
@$(call add,KMODULES,acpi_call)

View File

@@ -0,0 +1,15 @@
use/fonts:
@$(call add_feature)
@$(call xport,FONT_FEATURES_ENABLE)
@$(call xport,FONT_FEATURES_DISABLE)
# just stating that kernels and font habits are pretty individual
use/fonts/zerg: use/fonts
@$(call set,FONT_FEATURES_ENABLE,antialias lcdfilter-default \
hinting style-full sub-pixel-rgb)
@$(call set,FONT_FEATURES_DISABLE,no-antialias lcdfilter-none \
unhinted no-sub-pixel)
# nothing configured to add_feature, let's skip that this time
use/fonts/infinality:
@$(call add,THE_PACKAGES,libfreetype-infinality fontconfig-infinality)

View File

@@ -0,0 +1,33 @@
#!/bin/sh
# fontconfig-config-config
verbose="${GLOBAL_VERBOSE:+-v}"
verbose() { [ -z "$GLOBAL_VERBOSE" ] || echo "HOOK: 50-fontconfig: $@"; }
verbose "has started"
CONF_DIR="/etc/fonts/conf.d"
AVAIL_DIR="/etc/fonts/conf.avail"
list() { ls "$1"/??-"$2".conf 2>/dev/null; }
enable() {
for i in "$@"; do
if ! list "$CONF_DIR" "$i"; then
AVAIL="$(list "$AVAIL_DIR" "$i" | head -1)"
if [ -n "$AVAIL" ]; then
ln -s $verbose "$AVAIL" "$CONF_DIR/$CONF_ADD"
fi
fi
done
}
disable() {
for i in "$@"; do
$(list "$CONF_DIR" "$i") | xargs -r rm -f $verbose --
done
}
disable $GLOBAL_FONT_FEATURES_DISABLE
enable $GLOBAL_FONT_FEATURES_ENABLE
:

View File

@@ -0,0 +1,5 @@
Каталог содержит основную feature для создания адаптированного
дистрибутива Homeros. Это промежуточный вариант, при помощи которого
можно получить минимальный разговаривающий образ, но, возможно, помимо
его дальнейшего естественного развития требуется ещё осмысление с
точки зрения идей mkimage-profiles.

View File

@@ -0,0 +1,10 @@
use/homeros:
@$(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)

View File

@@ -0,0 +1,13 @@
#!/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

@@ -0,0 +1,8 @@
#!/bin/sh -e
echo 'KEYTABLE=ruwin_ct_sh-UTF-8' > /etc/sysconfig/keyboard
cat <<EOF > /etc/sysconfig/i18n
SYSFONT=UniCyr_8x16
LANG=ru_RU.UTF-8
SUPPORTED=ru_RU.UTF-8
EOF

View File

@@ -0,0 +1,4 @@
#!/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

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

View File

@@ -0,0 +1,6 @@
#!/bin/sh -e
mkdir -p /etc/sudo.d
chmod 700 /etc/sudo.d
control su public
control sudo public

View File

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

View File

@@ -0,0 +1,5 @@
#!/bin/sh -e
useradd altlinux
echo 'altlinux ALL=NOPASSWD:ALL' > /etc/sudo.d/altlinux
chmod 400 /etc/sudo.d/altlinux

View File

@@ -0,0 +1,13 @@
#!/bin/sh
subst s/'^\(1:2345:respawn.*\)$'/'#\1'/ /etc/inittab
cat <<EOF >> /etc/inittab
# yasr is always available on 1-st console;
yasr:2345:respawn:/bin/openvt -w -f -c 1 -- su -l altlinux -c /usr/local/bin/yasr-with-linux-term
EOF
cat <<EOF > /usr/local/bin/yasr-with-linux-term
#!/bin/sh
TERM=linux /usr/bin/yasr
exit \$?
EOF
chmod 755 /usr/local/bin/yasr-with-linux-term

View File

@@ -1 +1,7 @@
Эта фича привносит код, имеющий смысл при добавлении в образ ядра.
Эта фича привносит код, имеющий смысл при добавлении в образ ядра,
и задаёт начальный вариант такового.
Также занимается складированием наборов имён пакетов kernel-modules-*
с тем, чтобы избавить релиз-менеджеров от необходимости учитывать
полные списки и точные имена дополнительных модулей для поддержки,
скажем, Ethernet.

View File

@@ -1,4 +1,13 @@
###
# choose std kernel flavour for max RAM size support
ifeq (i586,$(ARCH))
BIGRAM := std-pae
else
BIGRAM := std-def
endif
use/kernel:
@$(call add_feature)
@$(call set,KFLAVOURS,un-def)
@$(call set,KFLAVOURS,std-def)
use/kernel/net:
@$(call add,THE_KMODULES,e1000e igb r8168 rtl8168)

View File

@@ -14,16 +14,23 @@ use/live/x11: use/live use/firmware use/x11/xorg
@$(call add,LIVE_PACKAGES,xinit)
# optimized out: use/x11/xorg
use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
use/live/desktop: use/live/base use/x11/wacom use/live/sound \
+vmguest +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)
@$(call add,LIVE_PACKAGES,pciutils)
@$(call add,SYSLINUX_CFG,localboot)
# preconfigure apt for both live and installed-from-live systems
use/live/repo:
@$(call add,LIVE_PACKAGES,livecd-online-repo)
@$(call add,LIVE_PACKAGES,installer-feature-online-repo)
# alterator-based permanent installation
use/live/install: use/metadata 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

View File

@@ -12,8 +12,11 @@ switch() {
esac
{
[ ! -x /bin/systemctl ] || /bin/systemctl $sc $1.service
[ ! -x /sbin/chkconfig ] || /sbin/chkconfig $1 $cc
[ ! -x /bin/systemctl ] ||
/bin/systemctl --no-reload $sc $1.service
[ ! -x /sbin/chkconfig ] ||
/sbin/chkconfig $1 $cc
} 2>/dev/null
}
@@ -30,10 +33,15 @@ livecd-hostname
livecd-save-nfs
livecd-setauth
livecd-setlocale
livecd-net-eth
livecd-install-wmaker
network
NetworkManager
connman
random
rpcbind
plymouth
avahi-daemon
"
# NB: dnsmasq: https://bugzilla.altlinux.org/show_bug.cgi?id=18799

View File

@@ -1,8 +1,10 @@
#!/bin/sh -efu
# if no means for locale setup are employed,
# it should still be somewhat reasonable
# it should still be at least marginally reasonable
# NB: keyboard layout not included!
if [ -s /etc/sysconfig/i18n ]; then exit 0; fi
mkdir -p /etc/sysconfig
cat >> /etc/sysconfig/i18n << _EOF_
# mkimage-profiles live 20-locale hook

View File

@@ -2,5 +2,11 @@
# Turn on xdg-user-dirs.
# NB: not yet available on t6/p6 hence the warning
control xdg-user-dirs enabled ||
. shell-config
if control xdg-user-dirs enabled; then
shell_config_set /etc/xdg/user-dirs.defaults MOVIES 'Documents/Videos'
shell_config_set /etc/xdg/user-dirs.defaults PHOTOS 'Documents/Pictures'
else
echo "** warning: control xdg-user-dirs failed" >&2
fi

View File

@@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/sh
if [ ! -x /usr/bin/X ]; then
echo "SKIP autologin: X not installed" >&2
@@ -15,6 +15,28 @@ add_nopasswdlogin_group()
gpasswd -a "$USER" nopasswdlogin
}
BAK=".save"
backup() {
[ -f "$1" -a ! -f "$1$BAK" ] || return 1
cp -av "$1" "$1$BAK"
}
restore_later() {
[ -n "$1" ] || return 0
local prefix="/usr/lib/alterator/hooks/livecd-preinstall.d"
[ -d "$prefix" ] || mkdir -p "$prefix"
local hook="$prefix/51-disable-autologin-again.sh"
[ -s "$hook" ] || cat >> "$hook" <<- EOF
#!/bin/sh
. livecd-functions
EOF
echo mv -v "\$destdir$1$BAK" "\$destdir$1" >> "$hook"
chmod +x "$hook"
}
## setup runlevel
INITTAB=/etc/inittab
if [ -f "$INITTAB" ]; then
@@ -23,61 +45,92 @@ if [ -f "$INITTAB" ]; then
fi
## autologin^2
AUTOLOGIN_CFG=/etc/sysconfig/autologin
if [ -x /usr/sbin/autologin ]; then
cat << E_O_F >> /etc/sysconfig/autologin
USER=$USER
AUTOLOGIN=yes
E_O_F
backup "$AUTOLOGIN_CFG"
cat >> "$AUTOLOGIN_CFG" <<- EOF
USER=$USER
AUTOLOGIN=yes
EOF
restore_later "$AUTOLOGIN_CFG"
fi
## lightdm autologin
LIGHTDM_CONF=/etc/lightdm/lightdm.conf
if [ -f "$LIGHTDM_CONF" ]; then
backup "$LIGHTDM_CONF"
sed -i \
-e "s/^#\(autologin-user=\).*$/\1$USER/" \
-e "s/^#\(autologin-user-timeout=0\)/\1/" \
"$LIGHTDM_CONF"
backup "/etc/group"
add_nopasswdlogin_group lightdm ||:
restore_later "$LIGHTDM_CONF"
restore_later "/etc/group"
fi
## gdm2 autologin
GDM_CONF=/etc/X11/gdm/custom.conf
if [ -f "$GDM_CONF" ]; then
backup "$GDM_CONF"
sed -i -e '/\[daemon\]/aAutomaticLoginEnable=true\nAutomaticLogin='$USER \
"$GDM_CONF"
backup "/etc/group"
add_nopasswdlogin_group gdm ||:
restore_later "$GDM_CONF"
restore_later "/etc/group"
fi
## kdm3 autologin
# TODO: iterate over kdm{,4} if feasible
KDMRC=/etc/X11/kdm/kdmrc
if [ -f "$KDMRC" ]; then
autologin_kdm() {
backup "$1"
sed -i \
-e '/AutoLoginEnable/ s,^.*$,AutoLoginEnable=true,' \
-e '/AutoLoginUser/ s,^.*$,AutoLoginUser='$USER',' \
"$KDMRC"
"$1"
restore_later "$1"
}
## kdm3 autologin
# FIXME: tde packages have kdmrc in /usr via an absolute symlink :-(
KDM_ETC=/etc/X11/kdm
KDM_USR=/usr/share/kde/config/kdm
if [ "$(readlink "$KDM_ETC")" = "$KDM_USR" ]; then
rm -f "$KDM_ETC"
ln -s ../.."$KDM_USR" "$KDM_ETC"
fi
KDMRC=/etc/X11/kdm/kdmrc
if [ -f "$KDMRC" ]; then autologin_kdm "$KDMRC"; fi
## kdm4 autologin
KDMRC=/etc/X11/kdm4/kdmrc
if [ -f "$KDMRC" ]; then autologin_kdm "$KDMRC"; fi
## nodm autologin (the last since the most intrusive)
# FIXME nodm and xinitrc should be modified (also in p6)
NODM_RC=/etc/sysconfig/nodm
NODM_EXE=/usr/sbin/nodm
if [ -x "$NODM_EXE" ]; then
cat << E_O_F >> "$NODM_RC"
export NODM_USER=$USER
E_O_F
backup "$NODM_RC"
cat >> "$NODM_RC" <<- EOF
export NODM_USER=$USER
EOF
restore_later "$NODM_RC"
else
exit 0
fi
# FIXME: drop when #27449 is fixed
# FIXME: drop since #27449 is fixed
PREFDM=/etc/X11/prefdm
if [ -f "$PREFDM" ] && ! grep -q nodm "$PREFDM"; then
backup "$PREFDM"
sed -i \
-e '/AUTOLOGIN_EXE=/ s,^.*$,AUTOLOGIN_EXE='$NODM_EXE',' \
-e '/AUTOLOGIN_CFG=/ s,^.*$,AUTOLOGIN_CFG='$NODM_RC',' \
"$PREFDM"
restore_later "$PREFDM"
fi
# FIXME: drop when #27451 is fixed

View File

@@ -23,6 +23,18 @@ DOMAINNAME="localdomain"
verbose "Init /etc/hosts with 127.0.0.1 localhost"
echo "127.0.0.1 localhost localhost.localdomain" > /etc/hosts
prefix="/etc/net/ifaces"
# seems like aufs bug on O_TRUNC writes:
# aufs au_lkup_neg:267:kworker/0:2[998]:
# I/O Error, resolv.conf should be negative on b0.
# OTOH lo interface is now brought up in initrd
# so this shoudn't really matter
if [ -d "$prefix"/lo ]; then
echo 'nameserver 8.8.8.8' >> "$prefix"/lo/resolv.conf
fi
find /var -name resolv.conf -or -name nsswitch.conf -delete
netcfg="/etc/sysconfig/network"
verbose "Enable networking, set hostname to $HOSTNAME, domainname to $DOMAINNAME"
@@ -30,21 +42,22 @@ shell_config_set "$netcfg" NETWORKING yes
shell_config_set "$netcfg" HOSTNAME "$HOSTNAME"
shell_config_set "$netcfg" DOMAINNAME "$DOMAINNAME"
if [ -x /usr/sbin/NetworkManager ] ; then
verbose "Setup defaults for NetworkManager"
shell_config_set /etc/net/ifaces/default/options-eth NM_CONTROLLED yes
shell_config_set /etc/net/ifaces/default/options-eth DISABLED yes
shell_config_set /etc/net/ifaces/default/options-eth BOOTPROTO dhcp
# NB: see also #28484 and livecd-net-eth for runtime configuration
defcfg="$prefix/default/options-eth"
if [ -x /usr/sbin/NetworkManager -o -x /usr/sbin/connmand ] ; then
verbose "Setup defaults for NetworkManager/connman"
shell_config_set "$defcfg" NM_CONTROLLED yes
shell_config_set "$defcfg" DISABLED yes
shell_config_set "$defcfg" BOOTPROTO dhcp
else
# attempt to autoconfigure ethernet by etcnet
if [ -x /sbin/dhcpcd -o -x /sbin/dhclient ]; then
if [ -x /lib/udev/write_net_rules ] &&
[ -x /sbin/dhcpcd -o -x /sbin/dhclient ]; then
verbose "configuring DHCP for eth0"
mkdir -p /etc/net/ifaces/eth0 && {
mkdir -p "$prefix"/eth0 && {
echo TYPE=eth
echo BOOTPROTO=dhcp
} > /etc/net/ifaces/eth0/options
} > "$prefix"/eth0/options
else
verbose "NOT configuring eth0 for DHCP"
fi

View File

@@ -0,0 +1,4 @@
#!/bin/sh
# a temporary workaround for #28669 (fall back to vesa)
rm -f /usr/lib*/X11/modules/drivers/fbdev_drv.so

View File

@@ -3,7 +3,7 @@
use/ltsp:
@$(call add_feature)
@$(call add,INSTALL2_PACKAGES,installer-feature-ltsp-stage2)
@$(call add,MAIN_LISTS,ltsp-client ltsp-client.$(ARCH))
@$(call add,MAIN_LISTS,ltsp-client)
@$(call add,BASE_LISTS,ltsp)
use/ltsp/base: use/ltsp use/firmware

View File

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

View File

@@ -35,6 +35,6 @@ metadata-.base:
metadata: metadata-.base
@mkdir -p $(METADIR); \
tar -C $(PKGDIR) -cvf - \
$(call rlist,$(MAIN_GROUPS) .base) \
$(call rgroup,$(MAIN_GROUPS)) \
$(call rlist,$(THE_GROUPS) $(MAIN_GROUPS) .base) \
$(call rgroup,$(THE_GROUPS) $(MAIN_GROUPS)) \
> $(METADIR)/pkg-groups.tar

View File

@@ -1,3 +1,9 @@
#!/bin/sh
CONFIG=/etc/plymouth/plymouthd.conf
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

View File

@@ -8,7 +8,7 @@ use/power:
# modern power management
use/power/acpi: use/power
@$(call add,COMMON_PACKAGES,acpid)
@$(call add,COMMON_PACKAGES,acpid acpi)
use/power/acpi/button: use/power/acpi
@$(call add,COMMON_PACKAGES,acpid-events-power)

View File

@@ -1,5 +1,6 @@
use/rescue: use/stage2 sub/stage2@rescue use/syslinux/sdab.cfg \
use/firmware/server use/firmware/wireless
use/firmware/full +wireless
@$(call add_feature)
@$(call add,RESCUE_LISTS, openssh \
$(call tags,(base || extra) && (rescue || network)))
$(call tags,(base || extra || server || misc) && \
(rescue || network || security)))

View File

@@ -15,7 +15,6 @@ use/slinux: use/x11/xfce use/x11/gdm2.20
@$(call add,THE_LISTS,$(call tags,base l10n))
@$(call set,META_VOL_SET,Simply Linux)
use/slinux/full: use/isohybrid use/slinux use/systemd \
use/firmware/wireless use/branding/complete \
use/x11/drm use/x11/3d-proprietary
use/slinux/full: use/isohybrid use/slinux use/systemd +wireless \
use/branding/complete use/x11/drm use/x11/3d-proprietary
@$(call add,THE_PACKAGES,apt-conf-sisyphus)

View File

@@ -18,12 +18,12 @@ sshd
"
for i in $ENABLE; do
[ -x /bin/systemctl ] && /bin/systemctl enable ${i}.service
[ -x /bin/systemctl ] && /bin/systemctl --no-reload enable ${i}.service
[ -x /sbin/chkconfig ] && /sbin/chkconfig $i on
done
for i in $DISABLE; do
[ -x /bin/systemctl ] && /bin/systemctl disable ${i}.service
[ -x /bin/systemctl ] && /bin/systemctl --no-reload disable ${i}.service
[ -x /sbin/chkconfig ] && /sbin/chkconfig $i off
done
:

View File

@@ -6,6 +6,11 @@ use/stage2: sub/stage1
use/stage2/kms:
@$(call add,STAGE1_KMODULES_REGEXP,drm.*)
# eth0 instead of enp0s3
use/stage2/net-eth: use/stage2
@$(call add,STAGE1_PACKAGES,udev-rule-generator-net)
@$(call add,STAGE2_PACKAGES,udev-rule-generator-net livecd-net-eth)
# NB: sub/stage2 isn't used standalone but rather
# as a base for various livecd modifications
# (currently install2, live, rescue)

View File

@@ -2,5 +2,13 @@
# prepare base make-initrd configuration for stage1
# see also http://www.altlinux.org/Make-initrd-propagator
sed -i 's/AUTODETECT/#&/' /etc/initrd.mk
MAKE_INITRD_VER="`make-initrd -V \
| sed -rn 's/^make-initrd version ([0-9.]+)/\1/p'`"
if [ "`rpmvercmp "$MAKE_INITRD_VER" "0.8.1"`" != "-1" ]; then
echo 'AUTODETECT =' >> /etc/initrd.mk # make-initrd >= 0.8.1
else
sed -i 's/AUTODETECT/#&/' /etc/initrd.mk # see also #28578
fi
echo 'FEATURES += propagator' >> /etc/initrd.mk

View File

@@ -82,7 +82,7 @@ bootargs: clean
clean: copy
@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \
sed -i "s,\^,," $(DSTDIR)/*.cfg; \
sed -i "s/\^//;/menu label /d" $(DSTDIR)/*.cfg; \
fi
copy: prep

View File

@@ -1,13 +1,14 @@
+vmguest: use/vmguest/virtualbox use/vmguest/kvm; @:
use/vmguest/virtualbox:
use/vmguest:
@$(call add_feature)
use/vmguest/virtualbox: use/vmguest
@$(call add,THE_KMODULES,virtualbox-addition drm)
@$(call add,THE_PACKAGES,virtualbox-guest-additions)
# NB: only reasonable for X11-bearing images
use/vmguest/kvm:
@$(call add_feature)
use/vmguest/kvm: use/vmguest
@$(call add,THE_PACKAGES,spice-vdagent)
# see also use/install2/kvm

View File

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

View File

@@ -0,0 +1,8 @@
+wireless: use/wireless/full; @:
use/wireless:
@$(call add_feature)
@$(call add,THE_KMODULES,bcmwl rt3070 rtl8192 staging)
@$(call add,THE_PACKAGES,wireless-tools rfkill crda iw)
use/wireless/full: use/wireless use/firmware/wireless; @:

View File

@@ -1,7 +1,7 @@
+icewm: use/x11/icewm; @:
+razorqt: use/x11/razorqt use/x11/lightdm/qt; @:
+razorqt: use/x11/razorqt use/x11/lightdm/razorqt; @:
+tde: use/x11/tde use/x11/kdm; @:
+kde: use/x11/kde use/x11/kdm4; @:
+kde4-lite: use/x11/kde4-lite use/x11/kdm4; @:
use/x11/xorg:
@$(call add_feature)
@@ -16,7 +16,7 @@ use/x11/drm: use/x11/xorg
use/x11/3d-free: use/x11/drm
@$(call add,THE_KMODULES,drm-nouveau)
### fglrx is broken with xorg-1.12 so far
### fglrx is broken with xorg-1.13 so far
use/x11/3d-proprietary: use/x11/xorg
@$(call add,THE_KMODULES,fglrx nvidia)
@$(call add,THE_PACKAGES,nvidia-settings nvidia-xconfig)
@@ -31,7 +31,8 @@ use/x11/xdm: use/x11/runlevel5
@$(call add,THE_PACKAGES,xdm installer-feature-no-xconsole-stage3)
### : some set()-like thing might be better?
use/x11/lightdm/qt use/x11/lightdm/gtk: use/x11/lightdm/%: use/x11/runlevel5
use/x11/lightdm/gtk use/x11/lightdm/qt use/x11/lightdm/razorqt \
use/x11/lightdm/kde: use/x11/lightdm/%: use/x11/runlevel5
@$(call add,THE_PACKAGES,lightdm-$*-greeter)
use/x11/kdm: use/x11/runlevel5
@@ -52,11 +53,35 @@ use/x11/razorqt: use/x11/xorg
use/x11/tde: use/x11/xorg
@$(call add,THE_LISTS,$(call tags,tde desktop))
use/x11/kde: use/x11/xorg
@$(call add,THE_LISTS,$(call tags,kde desktop))
use/x11/kde4-lite: use/x11/xorg
@$(call add,THE_LISTS,$(call tags,kde4 desktop))
use/x11/kde4: use/x11/xorg
@$(call add,THE_PACKAGES,kde4-default)
use/x11/xfce: use/x11/xorg
@$(call add,THE_LISTS,$(call tags,xfce desktop))
use/x11/cinnamon: use/x11/xorg use/x11/drm
@$(call add,THE_LISTS,$(call tags,cinnamon desktop))
use/x11/gnome3: use/x11/xorg use/x11/drm
@$(call add,THE_PACKAGES,gnome3-default)
use/x11/e17: use/x11/xorg use/x11/3d-free
@$(call add,THE_LISTS,$(call tags,e17 desktop))
use/x11/lxde: use/x11/xorg
@$(call add,THE_LISTS,$(call tags,lxde desktop))
use/x11/fvwm: use/x11/xorg
@$(call add,THE_LISTS,$(call tags,fvwm desktop))
use/x11/sugar: use/x11/xorg
@$(call add,THE_LISTS,$(call tags,sugar desktop))
use/x11/wmaker: use/x11/xorg
@$(call add,THE_LISTS,$(call tags,wmaker desktop))
use/x11/gnustep: use/x11/xorg
@$(call add,THE_LISTS,$(call tags,gnustep desktop))

2
image.in/.gitignore vendored
View File

@@ -1 +1,3 @@
build.log
reports
out

View File

@@ -8,7 +8,7 @@ OUT_LINK := out
# - minimal version is bumped for critical bugfixes/features
# - optimal one relates to the less universally relevant bits
MKI_VER_MINIMAL = 0.1.7
MKI_VER_OPTIMAL = 0.2.5
MKI_VER_OPTIMAL = 0.2.6
include distcfg.mk
include functions.mk
@@ -29,8 +29,11 @@ $(info warning: mkimage-$(MKI_VERSION) is suboptimal, consider upgrading)
$(warning consider upgrading mkimage to $(MKI_VER_OPTIMAL) or better)
endif
# glob it just in case
IMAGEDIR := $(wildcard $(IMAGEDIR))
# additional means to reduce havoc in IMAGEDIR
IMAGE_SORTDIR := $(SORTDIR)
IMAGE_SORTDIR := $(wildcard $(SORTDIR))
# reconstruct instead of passing yet another variable
IMAGE_OUTDIR := $(IMAGEDIR)$(IMAGE_SORTDIR:%=/%)

View File

@@ -3,7 +3,7 @@ ANSI_OK ?= 1;32
ANSI_FAIL ?= 1;31
MAX_ERRORS = 3
GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (conflicts|Depends:) .*)|(.* (Stop|failed|not found)\.))$$
GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (FAILURE|FATAL|ERROR|conflicts|Depends:) .*)|(.* (Stop|failed|not found)\.))$$
ifndef MKIMAGE_PROFILES
$(error this makefile is designed to be included in toplevel one)
@@ -42,7 +42,7 @@ IMAGEDIR ?= $(shell \
fi; \
)
LOGDIR ?= $(IMAGEDIR)
LOGDIR ?= $(wildcard $(IMAGEDIR))
# actual build starter
# NB: our output MUST go into stderr to escape POSTPROC

View File

@@ -1,10 +0,0 @@
ifndef MKIMAGE_PROFILES
$(error this makefile is designed to be included in toplevel one)
endif
# choose std kernel flavour for max RAM size support
ifeq (i586,$(ARCH))
BIGRAM := std-pae
else
BIGRAM := std-def
endif

View File

@@ -57,15 +57,17 @@ profile/init: distclean
echo; \
} $(LOG); \
if ! grep -q "\<$(ARCH)\>" $(BUILDDIR)/sources.list; then \
echo -n "requested arch '$$ARCH' unavailable" >&2; \
if [ -z "$(APTCONF)" ]; then \
echo " (no APTCONF)"; \
else \
echo; \
fi >&2; \
exit 1; \
if grep -q " noarch " $(BUILDDIR)/sources.list; then \
echo -n "requested arch '$$ARCH' unavailable" >&2; \
if [ -z "$(APTCONF)" ]; then \
echo " (no APTCONF)"; \
else \
echo; \
fi >&2; \
exit 1; \
fi; \
fi; \
mp-commit "$(BUILDDIR)" "derivative profile initialized"; \
mp-commit -i "$(BUILDDIR)" "derivative profile initialized"; \
if [ -w . ]; then \
rm -f "$(SYMLINK)" && \
ln -s "$(BUILDDIR)" "$(SYMLINK)" && \
@@ -82,8 +84,8 @@ profile/bare: profile/init
} >&2
@$(call try,MKIMAGE_PREFIX,/usr/share/mkimage)
@$(call try,GLOBAL_VERBOSE,)
@$(call try,IMAGEDIR,$(IMAGEDIR))
@$(call try,LOGDIR,$(LOGDIR))
@$(call try,IMAGEDIR,$(wildcard $(IMAGEDIR)))
@$(call try,LOGDIR,$(wildcard $(LOGDIR)))
@$(call try,BRANDING,altlinux-sisyphus)
ifeq (,$(REPO:altlinux%=))
@$(call set,IMAGE_INIT_LIST,+branding-$$(BRANDING)-release)

View File

@@ -34,6 +34,12 @@ include $(sort $(wildcard lib/*.mk))
include conf.d/*.mk
include features.in/*/config.mk
# ensure the outdir is created and globbable
ifdef IMAGEDIR
$(shell mkdir -p $(IMAGEDIR))
IMAGEDIR := $(wildcard $(IMAGEDIR))
endif
# FIXME: this is buggy since *.mk can expose parts conditionally
# (e.g. test.mk does DEBUG-only bits) and these will fail
DISTRO_TARGETS := $(shell sed -n 's,^\(distro/[^:.]\+\):.*$$,\1,p' \

View File

@@ -0,0 +1,24 @@
pam_mount
samba4-client
cifs-utils
keyutils
nfs-clients
autofs
installer-feature-auto-domain
installer-feature-nfs-client-stage3
installer-feature-start-avahi
installer-feature-network-shares-client-stage3
installer-feature-weak-passwd
libnss-fallback
libnss-mdns
settime-rfc867
krb5-ticket-watcher
alterator-browser-qt
alterator-standalone
alterator-auth
alterator-net-shares

View File

@@ -0,0 +1,2 @@
homeros-core
homeros-live-data

View File

@@ -0,0 +1,6 @@
su
sudo
net-tools
openssh-server
amixer
alsa-utils

2
pkg.in/lists/homeros/tts Normal file
View File

@@ -0,0 +1,2 @@
RHVoice
espeak

View File

@@ -0,0 +1,3 @@
voiceman-server
voiceman
voiceman-tools

View File

@@ -0,0 +1 @@
yasr

View File

@@ -2,8 +2,8 @@ ltsp-server
ltsp-server-basic
openssh-server
#alterator-ltsconf
#alterator-standalone
alterator-ltsconf
alterator-standalone
alsa-plugins
alsa-plugins-pulse

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