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

55 lines
1.7 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 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
moved stage1 scripts into feature.in/installer All the three scripts depend on installer kernel presence in fact. When live/rescue are in place, these should be adjusted correspondingly, probably by moving them to some commonly used intermediate place. Changed stage1 banner too.
2011-06-16 20:01:58 +04:00
PROPAGATOR_VERSION = ALT Linux
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
PROPAGATOR_MAR_MODULES = ./modules
PROPAGATOR_INITFS = ./initfs
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)
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
ifeq "$(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
build-propagator:
@echo "** skipping build-propagator target, no kernel installed"
else
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
CHROOT_PACKAGES_REGEXP := $(call kpackages,$(STAGE1_KMODULES_REGEXP),$(STAGE1_KFLAVOUR))
INFO_STAGE1_KFLAVOUR := $(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)
CHROOT_PACKAGES = $(STAGE1_PACKAGES) $(COMMON_PACKAGES)
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
pass squashfs options from stage1 test to install2 This looks a bit weird (two subprofiles become a bit more tightly coupled) but in fact install2 does depend on stage1, and if stage1 doesn't create squashcfg.mk then install2 is just fine with defaults (provided they fit the installer kernel used). A proper mkimage test infrastructure might be handy though. Also there: - 01-initfs: partial cleanup (bootsplash is obsolete anyways) - regarding 03-test-kernel's errorlevel test: if 0, 1 and 2 need to be distinguished, "!" MUST NOT be used as it negates so that 0 becomes 1 and the rest becomes 0
2011-06-14 18:25:55 +04:00
# NB: we pass tested squashfs options for ../install2/Makefile
stage1/Makefile: serialize prereqs The problem rarely manifested itself on 8-way server in the form of attempt to copy ./syslinux while it wasn't there yet. The proper fix should include interdependencies but this kluge works either; didn't observe this with other subprofiles.
2011-06-13 19:24:31 +04:00
all: | debug prepare-workdir copy-tree run-scripts build-propagator \
clean.mk and friends: introduced CLEAN control variable make CLEAN=1 will prune workdirs after packing their results, so disk (or preferably tmpfs) usage will be lower
2011-08-16 00:30:20 +04:00
copy-$(BOOTLOADER) pack-image $(GLOBAL_CLEAN_WORKDIR)
pass squashfs options from stage1 test to install2 This looks a bit weird (two subprofiles become a bit more tightly coupled) but in fact install2 does depend on stage1, and if stage1 doesn't create squashcfg.mk then install2 is just fine with defaults (provided they fit the installer kernel used). A proper mkimage test infrastructure might be handy though. Also there: - 01-initfs: partial cleanup (bootsplash is obsolete anyways) - regarding 03-test-kernel's errorlevel test: if 0, 1 and 2 need to be distinguished, "!" MUST NOT be used as it negates so that 0 becomes 1 and the rest becomes 0
2011-06-14 18:25:55 +04:00
@cp $(OUTDIR)/squashcfg.mk $(GLOBAL_BUILDDIR)/
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 -n "$(GLOBAL_VERBOSE)"; then \
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