keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
698c5e314a
mkimage-profiles/conf.d/live.mk

79 lines
3.4 KiB
Makefile
Raw Normal View History

introduced conf.d/ for distro, ve config snippets This was asked for by Leo-sp50 and torabora, and seems quite reasonable: let's provide means to keep at least some distribution configurations a bit apart, so that these can be considered more standalone in terms of hard warranted functionality but at the same time enjoying the common infrastructure. Considering lib/distro.mk: it's now experimentally pulled apart so that parallel development of different distro families can go on without major merge hassles. *Please* don't abuse with massive copy-paste. And before you ask: this might get extended to allow for "private" out-of-tree configurations being included since apparently there are goals with no meaning outside of some very particular context... but otherwise I'd like to encourage getting reusable bits in-tree.
2011-10-31 14:40:02 +04:00
# live images
ifeq (distro,$(IMAGE_CLASS))
distro/installer related graph cleanup As was duly noted by Leo-sp50, both server.mk and desktop.mk duplicate a few bits layered over bare distro/installer which happened to be both a dependency (thus should reduce redundancy) and a "real distro" target (well, it doesn't just work yet, need to provide networking and sources.list in install2 by hand). Fixed by moving a "node" to distro/.installer along with typical additions and leaving a bare installer as is by now; there's a need to get it working at least for DHCP/ftp.altlinux.org case.
2012-02-09 11:33:39 +04:00
distro/syslinux: distro/.init \
syslinux configuration revisited - incompatible change (to fix the rather broken early style): use/syslinux/ui-% is now use/syslinux/ui/%; - default timeout changed to 9 seconds (long enough and keeps the countdown in a single figure); - added totaltimeout of 300 seconds; - provided live kiosk images with almost-instant boot by default; ...and some other assorted tweaks here and there, sorry.
2012-03-30 23:41:19 +04:00
use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
distro/installer related graph cleanup As was duly noted by Leo-sp50, both server.mk and desktop.mk duplicate a few bits layered over bare distro/installer which happened to be both a dependency (thus should reduce redundancy) and a "real distro" target (well, it doesn't just work yet, need to provide networking and sources.list in install2 by hand). Fixed by moving a "node" to distro/.installer along with typical additions and leaving a bare installer as is by now; there's a need to get it working at least for DHCP/ftp.altlinux.org case.
2012-02-09 11:33:39 +04:00
syslinux configuration revisited - incompatible change (to fix the rather broken early style): use/syslinux/ui-% is now use/syslinux/ui/%; - default timeout changed to 9 seconds (long enough and keeps the countdown in a single figure); - added totaltimeout of 300 seconds; - provided live kiosk images with almost-instant boot by default; ...and some other assorted tweaks here and there, sorry.
2012-03-30 23:41:19 +04:00
distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
distro/rescue: distro/.base use/rescue use/syslinux/ui/menu; @:
plant SHELL beacons into all config-forming rules As noted in doc/assumptions.txt, the SHELL based target tracing only works for rules with recipes, even empty but present ones. The simplest thing to do is hooking "; @:" onto the rule's tail (one-liner with a non-printing shell builting "true" command).
2012-03-19 15:25:31 +04:00
distro/live-systemd: distro/.base use/live/base use/systemd; @:
introduced live-install support It was actually trivial given that the script was already maintained as a package by enp@ and msp@; its usage requires one to manually partition the target disk and optionally mkswap in advance.
2011-11-23 14:31:19 +04:00
plant SHELL beacons into all config-forming rules As noted in doc/assumptions.txt, the SHELL based target tracing only works for rules with recipes, even empty but present ones. The simplest thing to do is hooking "; @:" onto the rule's tail (one-liner with a non-printing shell builting "true" command).
2012-03-19 15:25:31 +04:00
distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
live-tde += plymouth, use/live/install These tweaks were suggested by rom_as@ based on his continued m-p-d work. distro/.live-desktop also changed to depend on use/plymouth/live
2012-06-14 02:00:43 +04:00
distro/.live-desktop: distro/.base +live use/plymouth/live; @:
live-webkiosk-mini.iso: 85M is enough Thanks to a reviewer who came with useful feedback and a goal: http://www.opennet.ru/openforum/vsluhforumID3/83728.html#136 the live-webkiosk image got forked into a separate one: - dropped DRI, virtualbox GA, mc & co, docs, rpmdb; - added Russian keyboard layout (ctrl+shift to toggle); - rebased live-webkiosk onto live-webkiosk-mini ;-) Maybe vbox guest additions will get back but rpmdb is a bit impractical on a kiosk squashfs image, even in presence of aufs rw overlay.
2012-03-31 00:51:04 +04:00
syslinux configuration revisited - incompatible change (to fix the rather broken early style): use/syslinux/ui-% is now use/syslinux/ui/%; - default timeout changed to 9 seconds (long enough and keeps the countdown in a single figure); - added totaltimeout of 300 seconds; - provided live kiosk images with almost-instant boot by default; ...and some other assorted tweaks here and there, sorry.
2012-03-30 23:41:19 +04:00
distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
use/syslinux/timeout/1 use/cleanup +power
live-webkiosk-mini.iso: 85M is enough Thanks to a reviewer who came with useful feedback and a goal: http://www.opennet.ru/openforum/vsluhforumID3/83728.html#136 the live-webkiosk image got forked into a separate one: - dropped DRI, virtualbox GA, mc & co, docs, rpmdb; - added Russian keyboard layout (ctrl+shift to toggle); - rebased live-webkiosk onto live-webkiosk-mini ;-) Maybe vbox guest additions will get back but rpmdb is a bit impractical on a kiosk squashfs image, even in presence of aufs rw overlay.
2012-03-31 00:51:04 +04:00
@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu)
@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
conf.d/live.mk: factor commons into distro/.live-x11 It's rather unexpected that someone would do an X11 LiveCD without user autologin -- but even if that's the case, then this waypoint is just not used for it.
2012-01-25 01:58:31 +04:00
initial isomd5sum feature This is a base for "media check" to become available: using this feature will implant a checksum into the image so that it can be verified during install. Also added a test/demo distro/live-isomd5sum target. For real distros an alterator module is probably due.
2011-11-10 23:15:50 +04:00
distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
@$(call add,LIVE_PACKAGES,livecd-isomd5sum)
conf/live.mk: minor refactoring distro/live-builder target used to employ a few duplicated packages that might make it to a list but as the list would have only a single user so far these were moved to a target- specific variable (hm, weird but "private" modifier broke).
2011-11-28 13:21:47 +04:00
distro/live-builder: pkgs := livecd-tmpfs livecd-online-repo mkimage-profiles
initial "+shortcut" support and refactoring It looks like the intermediate targets aren't all equal: some define a finished feature while some create a common lower level piece of configuration. Let's do shortcuts for the former so that a distro line can be more terse and descriptive; help targets in features.in/ tweaked accordingly.
2012-03-16 22:26:58 +04:00
distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo
introduced lib/kernel.mk helper makefile Sometimes it's desirable to provide the kernel supporting maximal amount of RAM on the system; bad news is that x86 has a kludge named PAE, good news is that x86_64 doesn't need it at all; but now we must be able to choose between those. BIGRAM will hold the flavour needed.
2012-04-23 13:45:06 +04:00
@$(call set,KFLAVOURS,$(BIGRAM))
live-builder distro: your self-hosted livecd If you make distro/live-builder.iso, the result is an image containing almost everything (short of actual full enough repository) to rebuild itself. It will attempt to configure eth0 with DHCP and reach http://ftp.altlinux.org for packages. RAM requirements start with 2Gb, self-build is accomplished on a 4Gb host with "make CLEAN=1 distro/live-builder.iso". Packages required for "make distro/syslinux.iso" get included. (some due fixups all over the place too)
2011-10-31 12:34:15 +04:00
@$(call add,LIVE_LISTS,$(call tags,base && (server || builder)))
initial "+shortcut" support and refactoring It looks like the intermediate targets aren't all equal: some define a finished feature while some create a common lower level piece of configuration. Let's do shortcuts for the former so that a distro line can be more terse and descriptive; help targets in features.in/ tweaked accordingly.
2012-03-16 22:26:58 +04:00
@$(call add,LIVE_PACKAGES,zsh sudo)
conf/live.mk: minor refactoring distro/live-builder target used to employ a few duplicated packages that might make it to a list but as the list would have only a single user so far these were moved to a target- specific variable (hm, weird but "private" modifier broke).
2011-11-28 13:21:47 +04:00
@$(call add,LIVE_PACKAGES,$(pkgs))
@$(call add,MAIN_PACKAGES,$(pkgs))
initial "+shortcut" support and refactoring It looks like the intermediate targets aren't all equal: some define a finished feature while some create a common lower level piece of configuration. Let's do shortcuts for the former so that a distro line can be more terse and descriptive; help targets in features.in/ tweaked accordingly.
2012-03-16 22:26:58 +04:00
@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ mkisofs)
live-builder distro: your self-hosted livecd If you make distro/live-builder.iso, the result is an image containing almost everything (short of actual full enough repository) to rebuild itself. It will attempt to configure eth0 with DHCP and reach http://ftp.altlinux.org for packages. RAM requirements start with 2Gb, self-build is accomplished on a 4Gb host with "make CLEAN=1 distro/live-builder.iso". Packages required for "make distro/syslinux.iso" get included. (some due fixups all over the place too)
2011-10-31 12:34:15 +04:00
live: factored out installation options After having added metadata dependency livecd-install started to look more like a feature than like an intermediate distribution target; so things were shuffled a bit that way.
2012-05-08 20:34:00 +04:00
distro/live-install: distro/.live-base use/live/textinst; @:
distro/.livecd-install: distro/.live-base use/live/install; @:
add dummy distro/livecd-install sub.in/stage2/image-scripts.d/99cleanup-boot, livecd-install need /boot files too
2012-04-09 15:44:55 +04:00
plant SHELL beacons into all config-forming rules As noted in doc/assumptions.txt, the SHELL based target tracing only works for rules with recipes, even empty but present ones. The simplest thing to do is hooking "; @:" onto the rule's tail (one-liner with a non-printing shell builting "true" command).
2012-03-19 15:25:31 +04:00
distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @:
live-razorqt: lightdm tweaks lightdm-1.1+ handling had to be corrected regarding the separate greeters.
2012-05-16 19:22:32 +04:00
distro/live-razorqt: distro/.live-desktop use/live/autologin +razorqt; @:
live-tde += plymouth, use/live/install These tweaks were suggested by rom_as@ based on his continued m-p-d work. distro/.live-desktop also changed to depend on use/plymouth/live
2012-06-14 02:00:43 +04:00
distro/live-tde: distro/.live-desktop use/live/ru use/live/install +tde; @:
distro/live-plymouth: distro/.live-base use/plymouth/live; @:
initial TDE distros A minimal live, tiny desktop system and a test LTSP installer; all of these work.
2012-03-09 22:50:33 +04:00
stop abusing use/live/* Some parts of *image* configuration started slipping down into the *feature* configuration, and that was wrong; fixed. Also introduced proper use/live/x11 (via use/x11/xorg with added wacom support for the sake of #26723/#26724) and rebased the pre-existing descendants onto it.
2011-12-19 23:40:19 +04:00
distro/live-rescue: distro/live-icewm
@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
factor out openssh packages There's no need to repeat the typical openssh-* triade all over the place; those who need server and client are better off pulling in "openssh" pkglist, and those needing a particular package should specify it.
2012-06-25 16:32:13 +04:00
@$(call add,LIVE_LISTS,openssh \
stop abusing use/live/* Some parts of *image* configuration started slipping down into the *feature* configuration, and that was wrong; fixed. Also introduced proper use/live/x11 (via use/x11/xorg with added wacom support for the sake of #26723/#26724) and rebased the pre-existing descendants onto it.
2011-12-19 23:40:19 +04:00
$(call tags,(base || extra) && (archive || rescue || network)))
live-webkiosk-mini.iso: 85M is enough Thanks to a reviewer who came with useful feedback and a goal: http://www.opennet.ru/openforum/vsluhforumID3/83728.html#136 the live-webkiosk image got forked into a separate one: - dropped DRI, virtualbox GA, mc & co, docs, rpmdb; - added Russian keyboard layout (ctrl+shift to toggle); - rebased live-webkiosk onto live-webkiosk-mini ;-) Maybe vbox guest additions will get back but rpmdb is a bit impractical on a kiosk squashfs image, even in presence of aufs rw overlay.
2012-03-31 00:51:04 +04:00
distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru
@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
conf.d/live.mk: initial live-webkiosk This one starts up a Firefox session in kiosk mode (there are several extensions, I find hsv@'s one preferable) and tries to browse /image/index.html which corresponds to index.html in the image root (could be edited by means of e.g. isomaster).
2012-01-25 02:01:00 +04:00
@$(call add,LIVE_PACKAGES,livecd-webkiosk)
live-webkiosk-mini.iso: 85M is enough Thanks to a reviewer who came with useful feedback and a goal: http://www.opennet.ru/openforum/vsluhforumID3/83728.html#136 the live-webkiosk image got forked into a separate one: - dropped DRI, virtualbox GA, mc & co, docs, rpmdb; - added Russian keyboard layout (ctrl+shift to toggle); - rebased live-webkiosk onto live-webkiosk-mini ;-) Maybe vbox guest additions will get back but rpmdb is a bit impractical on a kiosk squashfs image, even in presence of aufs rw overlay.
2012-03-31 00:51:04 +04:00
@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
live.mk: added live-webkiosk-flash This one was requested by Andrew Churashev; please note that the image in use must contain recent flash plugin so that at least the already known vulnerabilities are more or less plugged in it... and Sun Java plugin isn't going to get secure either.
2012-06-21 18:21:09 +04:00
# 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)
live-webkiosk-mini.iso: 85M is enough Thanks to a reviewer who came with useful feedback and a goal: http://www.opennet.ru/openforum/vsluhforumID3/83728.html#136 the live-webkiosk image got forked into a separate one: - dropped DRI, virtualbox GA, mc & co, docs, rpmdb; - added Russian keyboard layout (ctrl+shift to toggle); - rebased live-webkiosk onto live-webkiosk-mini ;-) Maybe vbox guest additions will get back but rpmdb is a bit impractical on a kiosk squashfs image, even in presence of aufs rw overlay.
2012-03-31 00:51:04 +04:00
distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:
conf.d/live.mk: initial live-webkiosk This one starts up a Firefox session in kiosk mode (there are several extensions, I find hsv@'s one preferable) and tries to browse /image/index.html which corresponds to index.html in the image root (could be edited by means of e.g. isomaster).
2012-01-25 02:01:00 +04:00
live-flightgear.iso lacked sound Thanks snejok@ for spotting the missing, I didn't get around to tests with headphones... Also fixed nouveau getting in after target shuffling, and tweaked firefox homepage to be useful in this context.
2012-03-31 18:01:07 +04:00
distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary
conf.d/live.mk: add joystick calibration tools Thanks Chernetsky Andrey for testing and suggesting it. (NB: currently only t6 build is proper, see input-utils bugs)
2012-04-05 14:38:26 +04:00
@$(call add,LIVE_PACKAGES,FlightGear fgo input-utils)
live-flightgear.iso lacked sound Thanks snejok@ for spotting the missing, I didn't get around to tests with headphones... Also fixed nouveau getting in after target shuffling, and tweaked firefox homepage to be useful in this context.
2012-03-31 18:01:07 +04:00
@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
initial live-flightgear.iso This one should help (erm... hope not the other way around!) testing both 3D setup and FlightGear packages I happen to maintain in a known clean environment.
2012-03-28 00:22:44 +04:00
initial cinnamon support and livecd Thanks slava@ for the packages and inspiration, and aris@ for the useful advice and fixups.
2012-04-12 02:01:40 +04:00
distro/live-cinnamon: distro/.live-desktop use/live/autologin use/live/ru \
initial live-mate The second shot at an image worked out; MATE packages are not in Sisyphus yet, use rpm http://autoimports.altlinux.org/pub/ALTLinux/autoimports/Sisyphus $ARCH autoimports rpm http://autoimports.altlinux.org/pub/ALTLinux/autoimports/Sisyphus noarch autoimports
2012-05-02 01:03:22 +04:00
use/x11/cinnamon use/x11/3d-proprietary; @:
live-mate.iso: move to nodm autologin won't register a consolekit session, and gnomes are too greedy regarding sessions to let us go unmolested... This particular image isn't production ready when built on current Sisyphus yet due to unresolved NM/dbus problems but I decided to at least archive the reached state.
2012-05-28 21:23:20 +04:00
distro/live-mate: distro/.live-desktop use/live/nodm use/live/ru use/x11/3d-free
@$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && mate))
initial cinnamon support and livecd Thanks slava@ for the packages and inspiration, and aris@ for the useful advice and fixups.
2012-04-12 02:01:40 +04:00
live-razorqt: lightdm tweaks lightdm-1.1+ handling had to be corrected regarding the separate greeters.
2012-05-16 19:22:32 +04:00
distro/live-enlightenment: distro/.live-desktop use/live/autologin \
use/live/ru use/x11/3d-free
initial live-enlightenment E17 has a lil' bit too thorough setup sequence for a LiveCD but hey it's worth it anyways :)
2012-05-05 00:28:31 +04:00
@$(call add,LIVE_PACKAGES,enlightenment)
initial live-gimp It's actually convenient to test new software (moreso stacks) in a known clean isolated environment ;-) Thanks "asd" at opennet for the motivation to do it all: http://www.opennet.ru/openforum/vsluhforumID3/84402.html#109
2012-05-04 23:08:28 +04:00
distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
@$(call add,LIVE_PACKAGES,gimp tintii immix fim)
@$(call add,LIVE_PACKAGES,cvltonemap darktable geeqie rawstudio ufraw)
@$(call add,LIVE_PACKAGES,macrofusion python-module-pygtk-libglade)
@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync)
@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)
introduced conf.d/ for distro, ve config snippets This was asked for by Leo-sp50 and torabora, and seems quite reasonable: let's provide means to keep at least some distribution configurations a bit apart, so that these can be considered more standalone in terms of hard warranted functionality but at the same time enjoying the common infrastructure. Considering lib/distro.mk: it's now experimentally pulled apart so that parallel development of different distro families can go on without major merge hassles. *Please* don't abuse with massive copy-paste. And before you ask: this might get extended to allow for "private" out-of-tree configurations being included since apparently there are goals with no meaning outside of some very particular context... but otherwise I'd like to encourage getting reusable bits in-tree.
2011-10-31 14:40:02 +04:00
endif
Reference in New Issue Copy Permalink