0.6.2.1-alt0.M60T.1

- altlinux-t6-server-ovz
install2: added branding-*-notes
2014-03-24 16:35:23 +04:00 · 2014-03-24 15:58:25 +04:00 · 2014-03-24 15:41:22 +04:00 · 2014-03-24 15:41:22 +04:00
4 changed files with 14 additions and 2 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,6 +1,6 @@
 Name: mkimage-profiles
-Version: 0.6.2
-Release: alt1
+Version: 0.6.2.1
+Release: alt0.M60T.1

 Summary: ALT Linux based distribution metaprofile
 License: GPLv2+
@@ -61,6 +61,9 @@ cp -a * %buildroot%mpdir
 %doc README QUICKSTART

 %changelog
+* Mon Mar 24 2014 Michael Shigorin <mike@altlinux.org> 0.6.2.1-alt0.M60T.1
+- altlinux-t6-server-ovz
+
 * Mon Apr 02 2012 Michael Shigorin <mike@altlinux.org> 0.6.2-alt1
 - better live-webkiosk and initial live-flightgear
 - cleanup, syslinux, xorg feature tweaks
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -21,6 +21,7 @@ distro/server-systemd: distro/server-mini use/systemd use/bootloader/lilo; @:

 distro/server-ovz: distro/server-mini use/install2/net \
 	use/hdt use/rescue use/firmware/server use/power/acpi/button
+	@$(call set,INSTALLER,desktop)
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(call set,KFLAVOURS,std-def ovz-el)
 	@$(call add,BASE_KMODULES,rtl8168 rtl8192)
--- a/conf.d/t6.mk
+++ b/conf.d/t6.mk
@@ -0,0 +1,7 @@
+# t6 base kits
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/altlinux-t6-server-ovz: distro/server-ovz; @:
+
+endif
--- a/features.in/install2/config.mk
+++ b/features.in/install2/config.mk
@@ -2,6 +2,7 @@ use/install2: use/stage2 sub/stage2/install2 use/cleanup/installer
 	@$(call add_feature)
 	@$(call set,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
 	@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
+	@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-notes)
 	@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
 	@$(call add,BASE_LISTS,$(call tags,basesystem))
Author	SHA1	Message	Date
Michael Shigorin	71c4404c4e	0.6.2.1-alt0.M60T.1 - altlinux-t6-server-ovz	2014-03-24 16:35:23 +04:00
Michael Shigorin	ed2d904ef0	install2: added branding-*-notes Fix "License file not found" at the second step.	2014-03-24 15:58:25 +04:00
Michael Shigorin	b356d98baa	t6.mk: barebones name proxy Just like p7.mk in 1.1.x/1.0.x, this file is a kludge serving to "rename" a particular image.	2014-03-24 15:41:22 +04:00
Michael Shigorin	33e6100d02	server.mk: more complete installer to server-ovz It's not about "desktop vs server" but about installer-steps included; hiddenman@ badly needs network and users setup, those have been dropped from installer-distro-altlinux-generic to trim testing cycles and -desktop has those.	2014-03-24 15:41:22 +04:00