keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
ec8bcac5ff
mkimage-profiles/sub.in/stage1/Makefile

64 lines
2.0 KiB
Makefile
Raw Normal View History

assorted fixups - more thorough build stages inline doc - quieter BUILDDIR instantiation - branding-altlinux-sisyphus by default - prettify installer selection somewhat - mkimage #24669 fixed upstream - sub.in/stage1/modules: +drm (as in m-p-d, for KMS) - tags2lists: generalize a bit
2010-12-03 17:53:02 +03:00
# step 4: build stage1 subprofile (installer bootstrap)
kernel and BUILDDIR fixes - image.in/functions.mk: rework kpackage() + it takes two arguments explicitly now: this adds some noise for "generic" invocations but is rather less messy with recently introduced STAGE1_KFLAVOUR (which in its turn is rather cleaner than messing with KFLAVOURS, especially since soemthing changed in presumably apt and we can't rely on kernel packages being installed in the order formed). - BUILDDIR/DEBUG related fixes + Makefile: BUILDDIR initialization moved to distro.mk - build.log += git info
2011-06-12 19:06:36 +04:00
ifndef GLOBAL_BUILDDIR
$(error GLOBAL_BUILDDIR not defined)
endif
server-ovz; KDEFAULT; syslinux features reworked Renamed server-light.iso into server-ovz.iso to avoid brand dilution and confusion (rider@'s server-light rather favours kvm, anyways). Introduced KDEFAULT: a reliable default kernel chooser knob since apt's regex ordering proved pretty unreliable. Spelling things explicitly is better anyways. SYSLINUX related features undergone pretty major rewrite (that includes syslinux, hdt and memtest). The problem to tackle was features.in/syslinux/generate.mk assuming syslinux and pciids available in build *host* system; this well might not be the case (or worse yet, those can be just different). So now we're a bit less elegant and a bit more enterprise, stuffing things into chroot and working there. Bunch of other fixes along the road, including ; to name a few: - fixed memtest entry (overlooked while renaming SYSLINUX_ITEMS) - new and shiny doc/CodingStyle - gfxboot, stage1 target chain, hdt tweaks - distro.mk rehashed - README++ - TODO: dropped (integer overflow anyways) + actually moved off-tree to reduce commit spam - s,\.config\.mk,distcfg.mk,g - doc/profiles.mk.sample: sample ~/.mkimage/profiles.mk - ...and assorted fixups/additions Sorry for convoluted commit, this would have been pretty hard to rework into some really readable shape (and you might be interested in the original repo's history horrors then, anyways).
2011-05-31 02:05:33 +04:00
include $(GLOBAL_BUILDDIR)/distcfg.mk
drop autoconf, a few vars in .mk suffice A major change in approach largely thanks to discussions with Alexey Cheusov but also well aligned with my own findings: autoconf doesn't let the variables to form an inheritance. And data flow described at http://www.altlinux.org/WhiteLabel (which in its turn was born thanks to Gavin Henrick of Diva Telecom and to Alexander Bokovoy of SaM-Solutions) is really dependent on the existence of such an inheritance. Also: - distro.mk += try() - "hide" special targets - fixed wrt distro/.{base,init,metaconf}, thx gns@ - README updates + added metaconf.mk + clarifications - updated pci.ids location for hdt
2010-09-27 23:02:57 +04:00
include $(GLOBAL_BUILDDIR)/functions.mk
include $(MKIMAGE_PREFIX)/config.mk
syslinux and features - syslinux: menu.c32 works - features: initial draft + memtest - mv pkg/ pkg.in/ + server-base: include openssh-blacklist by default - mv isodata/ copy/ - README: changed to utf8, added an URL
2010-09-09 13:50:29 +04:00
kernel and BUILDDIR fixes - image.in/functions.mk: rework kpackage() + it takes two arguments explicitly now: this adds some noise for "generic" invocations but is rather less messy with recently introduced STAGE1_KFLAVOUR (which in its turn is rather cleaner than messing with KFLAVOURS, especially since soemthing changed in presumably apt and we can't rely on kernel packages being installed in the order formed). - BUILDDIR/DEBUG related fixes + Makefile: BUILDDIR initialization moved to distro.mk - build.log += git info
2011-06-12 19:06:36 +04:00
ifndef BOOTLOADER
$(error BOOTLOADER not defined)
endif
syslinux: piggybacking cleanups Avoid extra files where a variable would suffice; and use the more specific "syslinux.list" rather than a "files.list".
2012-01-04 16:17:04 +04:00
GLOBAL_BOOTLOADER := $(BOOTLOADER)
syslinux and features - syslinux: menu.c32 works - features: initial draft + memtest - mv pkg/ pkg.in/ + server-base: include openssh-blacklist by default - mv isodata/ copy/ - README: changed to utf8, added an URL
2010-09-09 13:50:29 +04:00
MKI_PACK_RESULTS = data
features' day - get rid of $dest - work on features.in/syslinux - README++
2010-09-14 14:18:53 +04:00
COPY_TREE = ./files
syslinux and features - syslinux: menu.c32 works - features: initial draft + memtest - mv pkg/ pkg.in/ + server-base: include openssh-blacklist by default - mv isodata/ copy/ - README: changed to utf8, added an URL
2010-09-09 13:50:29 +04:00
include $(MKIMAGE_PREFIX)/targets.mk
kernel and BUILDDIR fixes - image.in/functions.mk: rework kpackage() + it takes two arguments explicitly now: this adds some noise for "generic" invocations but is rather less messy with recently introduced STAGE1_KFLAVOUR (which in its turn is rather cleaner than messing with KFLAVOURS, especially since soemthing changed in presumably apt and we can't rely on kernel packages being installed in the order formed). - BUILDDIR/DEBUG related fixes + Makefile: BUILDDIR initialization moved to distro.mk - build.log += git info
2011-06-12 19:06:36 +04:00
# here we try and come up with the installer kernel/modules, if any;
prepare for multiple live images s,INSTALLER_KFLAVOUR,STAGE1_KFLAVOUR,g s,INSTALLER_KMODULES,STAGE1_KMODULES,g install2 isn't the only livecd around; so far all of these share the same kernel in m-p-d, and we'd rather need two+ kernels with dual-arch media or so; let's not complicate things too much at this point
2011-08-18 19:18:46 +04:00
# only a single kernel might be needed (STAGE1_KFLAVOUR sets explicitly);
kernel and BUILDDIR fixes - image.in/functions.mk: rework kpackage() + it takes two arguments explicitly now: this adds some noise for "generic" invocations but is rather less messy with recently introduced STAGE1_KFLAVOUR (which in its turn is rather cleaner than messing with KFLAVOURS, especially since soemthing changed in presumably apt and we can't rely on kernel packages being installed in the order formed). - BUILDDIR/DEBUG related fixes + Makefile: BUILDDIR initialization moved to distro.mk - build.log += git info
2011-06-12 19:06:36 +04:00
# kernel image copied from instrumental chroot into .work/syslinux/alt0/
prepare for multiple live images s,INSTALLER_KFLAVOUR,STAGE1_KFLAVOUR,g s,INSTALLER_KMODULES,STAGE1_KMODULES,g install2 isn't the only livecd around; so far all of these share the same kernel in m-p-d, and we'd rather need two+ kernels with dual-arch media or so; let's not complicate things too much at this point
2011-08-18 19:18:46 +04:00
STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS))
kernel and BUILDDIR fixes - image.in/functions.mk: rework kpackage() + it takes two arguments explicitly now: this adds some noise for "generic" invocations but is rather less messy with recently introduced STAGE1_KFLAVOUR (which in its turn is rather cleaner than messing with KFLAVOURS, especially since soemthing changed in presumably apt and we can't rely on kernel packages being installed in the order formed). - BUILDDIR/DEBUG related fixes + Makefile: BUILDDIR initialization moved to distro.mk - build.log += git info
2011-06-12 19:06:36 +04:00
server-ovz; KDEFAULT; syslinux features reworked Renamed server-light.iso into server-ovz.iso to avoid brand dilution and confusion (rider@'s server-light rather favours kvm, anyways). Introduced KDEFAULT: a reliable default kernel chooser knob since apt's regex ordering proved pretty unreliable. Spelling things explicitly is better anyways. SYSLINUX related features undergone pretty major rewrite (that includes syslinux, hdt and memtest). The problem to tackle was features.in/syslinux/generate.mk assuming syslinux and pciids available in build *host* system; this well might not be the case (or worse yet, those can be just different). So now we're a bit less elegant and a bit more enterprise, stuffing things into chroot and working there. Bunch of other fixes along the road, including ; to name a few: - fixed memtest entry (overlooked while renaming SYSLINUX_ITEMS) - new and shiny doc/CodingStyle - gfxboot, stage1 target chain, hdt tweaks - distro.mk rehashed - README++ - TODO: dropped (integer overflow anyways) + actually moved off-tree to reduce commit spam - s,\.config\.mk,distcfg.mk,g - doc/profiles.mk.sample: sample ~/.mkimage/profiles.mk - ...and assorted fixups/additions Sorry for convoluted commit, this would have been pretty hard to rework into some really readable shape (and you might be interested in the original repo's history horrors then, anyways).
2011-05-31 02:05:33 +04:00
# propagator needed iff stage1 kernel installed (not for e.g. syslinux.iso)
don't override targets for no reason
2011-08-22 19:31:45 +04:00
ifneq "$(STAGE1_KFLAVOUR)" ""
efi: employ mkimage The initial approach required some quite involved postprocessing as described in http://www.altlinux.org/UEFI#HOWTO; after having ironed out the kinks so that initial EFI support could be merged into mkimage proper we're better off just using it, eh?
2012-12-12 00:00:35 +04:00
PROPAGATOR_VERSION = ALT Linux
PROPAGATOR_MAR_MODULES = ./modules
PROPAGATOR_INITFS = ./initfs
don't override targets for no reason
2011-08-22 19:31:45 +04:00
BUILD_PROPAGATOR = build-propagator
prepare for multiple live images s,INSTALLER_KFLAVOUR,STAGE1_KFLAVOUR,g s,INSTALLER_KMODULES,STAGE1_KMODULES,g install2 isn't the only livecd around; so far all of these share the same kernel in m-p-d, and we'd rather need two+ kernels with dual-arch media or so; let's not complicate things too much at this point
2011-08-18 19:18:46 +04:00
INFO_STAGE1_KFLAVOUR := $(STAGE1_KFLAVOUR)
introduced THE_{KMODULES,PACKAGES,LISTS,GROUPS} As too many things started duplicating between distros proper and (e.g. corresponding) LiveCDs, it became apparent that a class of entities which end up working for THE_USER (not a sysadmin, and not a developer, just a Linux user) is in need. So THE_KMODULES will power installed basesystem and live image, while THE_PACKAGES, THE_LISTS and THE_GROUPS will participate in building those.
2011-12-19 23:28:42 +04:00
CHROOT_PACKAGES_REGEXP := $(call kpackages, \
$(STAGE1_KMODULES_REGEXP),$(STAGE1_KFLAVOUR))
server-ovz; KDEFAULT; syslinux features reworked Renamed server-light.iso into server-ovz.iso to avoid brand dilution and confusion (rider@'s server-light rather favours kvm, anyways). Introduced KDEFAULT: a reliable default kernel chooser knob since apt's regex ordering proved pretty unreliable. Spelling things explicitly is better anyways. SYSLINUX related features undergone pretty major rewrite (that includes syslinux, hdt and memtest). The problem to tackle was features.in/syslinux/generate.mk assuming syslinux and pciids available in build *host* system; this well might not be the case (or worse yet, those can be just different). So now we're a bit less elegant and a bit more enterprise, stuffing things into chroot and working there. Bunch of other fixes along the road, including ; to name a few: - fixed memtest entry (overlooked while renaming SYSLINUX_ITEMS) - new and shiny doc/CodingStyle - gfxboot, stage1 target chain, hdt tweaks - distro.mk rehashed - README++ - TODO: dropped (integer overflow anyways) + actually moved off-tree to reduce commit spam - s,\.config\.mk,distcfg.mk,g - doc/profiles.mk.sample: sample ~/.mkimage/profiles.mk - ...and assorted fixups/additions Sorry for convoluted commit, this would have been pretty hard to rework into some really readable shape (and you might be interested in the original repo's history horrors then, anyways).
2011-05-31 02:05:33 +04:00
endif
installer firmware support Thanks go to lakostis@ (see #18047) for all the aic94xx reminders and the final testing of the proposed image.
2011-06-13 00:08:42 +04:00
CHROOT_PACKAGES_REGEXP += $(STAGE1_PACKAGES_REGEXP)
COMMON_PACKAGES and SYSTEM_PACKAGES It was clear that "common" isn't very apt for packages that will get *everywhere*, and became apparent when the need for a "base+live packages" variable arrived with powerbutton feature. So: - the former COMMON_PACKAGES are now SYSTEM_PACKAGES; - COMMON_PACKAGES act as "BASE+LIVE_PACKAGES". Note that SYSTEM_PACKAGES also got factored out from stage2 based features into stage2 subprofile itself; cleanups were due as well.
2011-09-03 13:34:53 +04:00
CHROOT_PACKAGES = $(STAGE1_PACKAGES) $(SYSTEM_PACKAGES)
installer firmware support Thanks go to lakostis@ (see #18047) for all the aic94xx reminders and the final testing of the proposed image.
2011-06-13 00:08:42 +04:00
stage2: tunable squashfs compression The existing implementation would handle kernel differences just fine but a bit too automatically: if it sees xz support, that's what will end up being used (and if there's -Xbcj binary compression filter available for the target platform, it will be applied unequivocally either). It's perfectly suitabe for getting fine-tuned release images but is also a bit too resource-consuming while developing the image configuration which has no business with its compression. The one and only knob is SQUASHFS (see doc/variables.txt); to give an idea of the differences, here are some numbers for a mostly-binary (43% as per 99-elf-stats) webkiosk livecd and a rather less so (18%) flightgear one on a dual quad-core X5570 node (each mksquashfs run used up all the cores): SQUASHFS | live-webkiosk.iso | live-flightgear.iso ---------+-------------------+--------------------- fast | 3:30 / 130M | 5:11 / 852M normal * | 3:37 / 100M | 5:35 / 688M tight | 3:50 / 98M | 6:47 / 683M Thus if the knob isn't fiddled with, the defaults will allow for a reasonably fast build of a pretty slim image; if one is building a release or if a particular image is very sensitive being close to the media capacity then just add SQUASHFS=tight and see it a percent or two down on size. Please note that lzo/gzip-compressed images are also quicker to uncompress thus further helping with test iterations. Thanks to led@ and glebfm@ for helpful hints and questions.
2012-04-08 20:25:18 +04:00
# pass for use/stage2
GLOBAL_SQUASHFS := $(SQUASHFS)
make-3.82 adaptation The issue actually hit image.in/Makefile: "metadata" target in features.in/metadata/lib/50-metadata.mk wasn't reached even if features.in/build-distro/lib/90-build-distro.mk would ACK that the "whatever" actions included "metadata"; thus Metadata/pkg-groups.tar wasn't created and the installer silently failed to install the .base system. Let's armour the rest of the cases where the order of inclusion might be important as well.
2012-10-10 17:18:32 +04:00
-include $(sort $(wildcard lib/*.mk))
features.in: generalize lib/ handling From now on, subprofiles can include the lib/*.mk brought in by features just like image.in/ long did.
2012-04-25 15:08:36 +04:00
server-ovz; KDEFAULT; syslinux features reworked Renamed server-light.iso into server-ovz.iso to avoid brand dilution and confusion (rider@'s server-light rather favours kvm, anyways). Introduced KDEFAULT: a reliable default kernel chooser knob since apt's regex ordering proved pretty unreliable. Spelling things explicitly is better anyways. SYSLINUX related features undergone pretty major rewrite (that includes syslinux, hdt and memtest). The problem to tackle was features.in/syslinux/generate.mk assuming syslinux and pciids available in build *host* system; this well might not be the case (or worse yet, those can be just different). So now we're a bit less elegant and a bit more enterprise, stuffing things into chroot and working there. Bunch of other fixes along the road, including ; to name a few: - fixed memtest entry (overlooked while renaming SYSLINUX_ITEMS) - new and shiny doc/CodingStyle - gfxboot, stage1 target chain, hdt tweaks - distro.mk rehashed - README++ - TODO: dropped (integer overflow anyways) + actually moved off-tree to reduce commit spam - s,\.config\.mk,distcfg.mk,g - doc/profiles.mk.sample: sample ~/.mkimage/profiles.mk - ...and assorted fixups/additions Sorry for convoluted commit, this would have been pretty hard to rework into some really readable shape (and you might be interested in the original repo's history horrors then, anyways).
2011-05-31 02:05:33 +04:00
# scripts prepare bootloader configuration, too
sub.in/stage1/Makefile: comment fixup Referring to install2 subprofile after it got generalized and renamed to stage2 is an omission, better fix it late than never.
2012-01-11 15:23:51 +04:00
# NB: we pass tested squashfs options for ../stage2/Makefile to include
don't override targets for no reason
2011-08-22 19:31:45 +04:00
all: | debug prepare-workdir copy-tree run-scripts $(BUILD_PROPAGATOR) \
fixed stage1 for syslinux.iso squashcfk.mk is not to be attempted to copy unconditionally, if we've got no kernel for stage2 there's no data (and hook) to create it there
2011-08-21 21:45:50 +04:00
copy-$(BOOTLOADER) $(COPY_SQUASHCFG) pack-image $(GLOBAL_CLEAN_WORKDIR)
"if test ..." replaced by "if [ ... ]" Fixed up the remnants of the early style mix to correspond to the proposed doc/style.txt; the rationale being that if [ ... ]; then ... ... fi is the more readable construct among itself, if test ...; then ... ... fi and [ ... ] && { ... ... } due to the condition being more distinguishable when bracketed and the body more apparent as the one inside "if" and not any other block; the less obvious difference is that the final construct of the latter form is prone to the whole script exit status being non-zero if the condition isn't met.
2011-12-21 14:14:03 +04:00
@if [ -s $(OUTDIR)/squashcfg.mk ]; then \
fixed stage1 for syslinux.iso squashcfk.mk is not to be attempted to copy unconditionally, if we've got no kernel for stage2 there's no data (and hook) to create it there
2011-08-21 21:45:50 +04:00
cp $(OUTDIR)/squashcfg.mk $(GLOBAL_BUILDDIR)/; \
fi
server-ovz; KDEFAULT; syslinux features reworked Renamed server-light.iso into server-ovz.iso to avoid brand dilution and confusion (rider@'s server-light rather favours kvm, anyways). Introduced KDEFAULT: a reliable default kernel chooser knob since apt's regex ordering proved pretty unreliable. Spelling things explicitly is better anyways. SYSLINUX related features undergone pretty major rewrite (that includes syslinux, hdt and memtest). The problem to tackle was features.in/syslinux/generate.mk assuming syslinux and pciids available in build *host* system; this well might not be the case (or worse yet, those can be just different). So now we're a bit less elegant and a bit more enterprise, stuffing things into chroot and working there. Bunch of other fixes along the road, including ; to name a few: - fixed memtest entry (overlooked while renaming SYSLINUX_ITEMS) - new and shiny doc/CodingStyle - gfxboot, stage1 target chain, hdt tweaks - distro.mk rehashed - README++ - TODO: dropped (integer overflow anyways) + actually moved off-tree to reduce commit spam - s,\.config\.mk,distcfg.mk,g - doc/profiles.mk.sample: sample ~/.mkimage/profiles.mk - ...and assorted fixups/additions Sorry for convoluted commit, this would have been pretty hard to rework into some really readable shape (and you might be interested in the original repo's history horrors then, anyways).
2011-05-31 02:05:33 +04:00
debug:
"if test ..." replaced by "if [ ... ]" Fixed up the remnants of the early style mix to correspond to the proposed doc/style.txt; the rationale being that if [ ... ]; then ... ... fi is the more readable construct among itself, if test ...; then ... ... fi and [ ... ] && { ... ... } due to the condition being more distinguishable when bracketed and the body more apparent as the one inside "if" and not any other block; the less obvious difference is that the final construct of the latter form is prone to the whole script exit status being non-zero if the condition isn't met.
2011-12-21 14:14:03 +04:00
@if [ -n "$(GLOBAL_VERBOSE)" ]; then \
stage2 based live subprofiles, updated docs - introduced generic stage2 subprofile (non-standalone) - ported installer and rescue over to stage2/{install2,rescue} - initial stage2/live (needs more work for sure) - use make-initrd-propagator - updated and somewhat extended doc/ NB: mind #26133, #26134
2011-08-20 13:55:05 +04:00
echo "** BRANDING: $(BRANDING)"; \
echo "** IMAGE_INIT_LIST: $(IMAGE_INIT_LIST)"; \
server-ovz; KDEFAULT; syslinux features reworked Renamed server-light.iso into server-ovz.iso to avoid brand dilution and confusion (rider@'s server-light rather favours kvm, anyways). Introduced KDEFAULT: a reliable default kernel chooser knob since apt's regex ordering proved pretty unreliable. Spelling things explicitly is better anyways. SYSLINUX related features undergone pretty major rewrite (that includes syslinux, hdt and memtest). The problem to tackle was features.in/syslinux/generate.mk assuming syslinux and pciids available in build *host* system; this well might not be the case (or worse yet, those can be just different). So now we're a bit less elegant and a bit more enterprise, stuffing things into chroot and working there. Bunch of other fixes along the road, including ; to name a few: - fixed memtest entry (overlooked while renaming SYSLINUX_ITEMS) - new and shiny doc/CodingStyle - gfxboot, stage1 target chain, hdt tweaks - distro.mk rehashed - README++ - TODO: dropped (integer overflow anyways) + actually moved off-tree to reduce commit spam - s,\.config\.mk,distcfg.mk,g - doc/profiles.mk.sample: sample ~/.mkimage/profiles.mk - ...and assorted fixups/additions Sorry for convoluted commit, this would have been pretty hard to rework into some really readable shape (and you might be interested in the original repo's history horrors then, anyways).
2011-05-31 02:05:33 +04:00
echo "** STAGE1_PACKAGES: $(STAGE1_PACKAGES)"; \
installer firmware support Thanks go to lakostis@ (see #18047) for all the aic94xx reminders and the final testing of the proposed image.
2011-06-13 00:08:42 +04:00
echo "** STAGE1_PACKAGES_REGEXP: $(STAGE1_PACKAGES_REGEXP)"; \
server-ovz; KDEFAULT; syslinux features reworked Renamed server-light.iso into server-ovz.iso to avoid brand dilution and confusion (rider@'s server-light rather favours kvm, anyways). Introduced KDEFAULT: a reliable default kernel chooser knob since apt's regex ordering proved pretty unreliable. Spelling things explicitly is better anyways. SYSLINUX related features undergone pretty major rewrite (that includes syslinux, hdt and memtest). The problem to tackle was features.in/syslinux/generate.mk assuming syslinux and pciids available in build *host* system; this well might not be the case (or worse yet, those can be just different). So now we're a bit less elegant and a bit more enterprise, stuffing things into chroot and working there. Bunch of other fixes along the road, including ; to name a few: - fixed memtest entry (overlooked while renaming SYSLINUX_ITEMS) - new and shiny doc/CodingStyle - gfxboot, stage1 target chain, hdt tweaks - distro.mk rehashed - README++ - TODO: dropped (integer overflow anyways) + actually moved off-tree to reduce commit spam - s,\.config\.mk,distcfg.mk,g - doc/profiles.mk.sample: sample ~/.mkimage/profiles.mk - ...and assorted fixups/additions Sorry for convoluted commit, this would have been pretty hard to rework into some really readable shape (and you might be interested in the original repo's history horrors then, anyways).
2011-05-31 02:05:33 +04:00
echo "** CHROOT_PACKAGES: $(CHROOT_PACKAGES)"; \
echo "** CHROOT_PACKAGES_REGEXP: $(CHROOT_PACKAGES_REGEXP)"; \
echo "** BOOTLOADER: $(BOOTLOADER)"; \
fi
Reference in New Issue Copy Permalink