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

41 lines
1.2 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 install2 subprofile (installer "live" part)
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
working installer iso image - s/stage2/install2/g - added pkg/lists - initial README (ru_RU.KOI8-R) - mkimage topdir is in image.in/, really (off-tree build) + initial bin/mktmpdir + BUILDDIR (works) - s/cd/iso/ - drop --with-distro (considered harmful)
2010-08-28 20:28:42 +04:00
default: all
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
working installer iso image - s/stage2/install2/g - added pkg/lists - initial README (ru_RU.KOI8-R) - mkimage topdir is in image.in/, really (off-tree build) + initial bin/mktmpdir + BUILDDIR (works) - s/cd/iso/ - drop --with-distro (considered harmful)
2010-08-28 20:28:42 +04:00
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
# this might have been prepared by ../stage1/scripts.d/03-test-kernel
-include $(GLOBAL_BUILDDIR)/squashcfg.mk
sub.in/install2/Makefile: enforce a kernel A bit earlier the situation where there was a stage1 fallback for INSTALLER_KFLAVOUR as the last of KFLAVOURS, so we'd have an installer kernel or build would break; now the situration got somewhat twisted: there could be a vmlinuz in stage1 but no corresponding modules in install2 -- which can lead to different surprises but at least alterator-vm would complain about "Operation not permitted" on partition layout commit. The fallback is a copypaste from sub.in/stage1/Makefile though and should be redone properly somewhere. The question so far is, where exactly?
2011-07-14 02:44:23 +04:00
# here we also try and come up with the installer kernel/modules, if any;
# no kernel flavour specified will result in no modules for stage1 vmlinuz
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))
sub.in/install2/Makefile: enforce a kernel A bit earlier the situation where there was a stage1 fallback for INSTALLER_KFLAVOUR as the last of KFLAVOURS, so we'd have an installer kernel or build would break; now the situration got somewhat twisted: there could be a vmlinuz in stage1 but no corresponding modules in install2 -- which can lead to different surprises but at least alterator-vm would complain about "Operation not permitted" on partition layout commit. The fallback is a copypaste from sub.in/stage1/Makefile though and should be redone properly somewhere. The question so far is, where exactly?
2011-07-14 02:44:23 +04:00
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)" ""
$(error STAGE1_KFLAVOUR is utterly empty; cannot guess either)
sub.in/install2/Makefile: enforce a kernel A bit earlier the situation where there was a stage1 fallback for INSTALLER_KFLAVOUR as the last of KFLAVOURS, so we'd have an installer kernel or build would break; now the situration got somewhat twisted: there could be a vmlinuz in stage1 but no corresponding modules in install2 -- which can lead to different surprises but at least alterator-vm would complain about "Operation not permitted" on partition layout commit. The fallback is a copypaste from sub.in/stage1/Makefile though and should be redone properly somewhere. The question so far is, where exactly?
2011-07-14 02:44:23 +04:00
endif
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
# need kernel modules only (which require corresponding kernel-image);
# these go into work chroot; NB: no vmlinuz there
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
IMAGE_PACKAGES_REGEXP = $(call kpackages,$(STAGE1_KMODULES),$(STAGE1_KFLAVOUR))
kernel day - drop hardwired kernel flavour from pkglists - today's std-ng lacks aufs, let's switch to un-def - second assault at KERNEL_PACKAGES_REGEXP - re-introduced kpackages (builds ok) PS: base lists: switch to grub, add udev, cleanup
2010-10-29 13:11:03 +04:00
IMAGE_PACKAGES = $(COMMON_PACKAGES) \
--as-needed for pkg/lists As not every package list is useful for every distro, only the needed lists should be copied for a particular one.
2010-09-08 16:47:06 +04:00
$(INSTALL2_PACKAGES) \
./packages
working installer iso image - s/stage2/install2/g - added pkg/lists - initial README (ru_RU.KOI8-R) - mkimage topdir is in image.in/, really (off-tree build) + initial bin/mktmpdir + BUILDDIR (works) - s/cd/iso/ - drop --with-distro (considered harmful)
2010-08-28 20:28:42 +04:00
MKI_PACK_RESULTS = squash:altinst
include $(MKIMAGE_PREFIX)/targets.mk
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
all: | $(GLOBAL_DEBUG) build-image run-image-scripts pack-image \
$(GLOBAL_CLEAN_WORKDIR)
debug:
@echo "** install2: IMAGE_PACKAGES: $(IMAGE_PACKAGES)"
@echo "** install2: IMAGE_PACKAGES_REGEXP: $(IMAGE_PACKAGES_REGEXP)"
Reference in New Issue Copy Permalink