gear-store-tags

- mktmpdir: fixed sort key

.gear/mkimage-profiles.spec

@@ -1,6 +1,6 @@
 Name: mkimage-profiles
-Version: 0.6.2
+Version: 0.6.2.3
-Release: alt1
+Release: alt0.M60T.1
 
 Summary: ALT Linux based distribution metaprofile
 License: GPLv2+
@@ -61,6 +61,15 @@ cp -a * %buildroot%mpdir
 %doc README QUICKSTART
 
 %changelog
+* Mon Sep 07 2015 Michael Shigorin <mike@altlinux.org> 0.6.2.3-alt0.M60T.1
+- mktmpdir: fixed sort key
+
+* Mon Feb 02 2015 Michael Shigorin <mike@altlinux.org> 0.6.2.2-alt0.M60T.1
+- backported pkg/lists fix (and the commit before it)
+
+* 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

.gear/tags/12e0dda4cb428dca632a2509216780cc97c7ca48

@@ -0,0 +1,6 @@
+object 958f37028be0c29383d254639f0010908368397d
+type commit
+tag v0.6.2.3
+tagger Michael Shigorin <mike@altlinux.org> 1441659606 +0300
+
+mktmpdir fixup

.gear/tags/5b441e948d3bca3360d062ec7a36cdfa348f67f7

@@ -1,6 +0,0 @@
-object 5347d342cca7ad1c23b866a81a70735b7b59616f
-type commit
-tag v0.6.2
-tagger Michael Shigorin <mike@altlinux.org> 1333380199 +0300
-
-webkiosk

.gear/tags/list

@@ -1 +1 @@
-5b441e948d3bca3360d062ec7a36cdfa348f67f7 v0.6.2
+12e0dda4cb428dca632a2509216780cc97c7ca48 v0.6.2.3

bin/mktmpdir

@@ -45,7 +45,7 @@ choose_tmpdir() {
 		echo -n "$i "
 		df -Tl "$i" | tail -1
 	done \
-	| sort -unk6 \
+	| sort -unk5 \
 	| while read dir dev fstype size used free percent mnt; do
 		check_options "$dev" "$mnt" || continue
 		[ "$free" -gt "$MINSIZE" ] || continue

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)

conf.d/t6.mk

@@ -0,0 +1,7 @@
+# t6 base kits
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/altlinux-t6-server-ovz: distro/server-ovz; @:
+
+endif

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))
 

pkg.in/lists/Makefile

@@ -25,13 +25,12 @@ all: $(TARGET) $(GLOBAL_DEBUG) $(DOTBASE) copy-lists copy-groups
 		cd - >&/dev/null; \
 	fi
 
+# env | sort -u | grep _LISTS | xargs cp
 copy-lists:
-	@# env | sort -u | grep _LISTS | xargs cp
+	@cp --parents -at $(TARGET) -- \
-	@$(foreach V, \
+		$(foreach V, \
 			$(filter %_LISTS,$(sort $(.VARIABLES))), \
-		$(if $(filter environment% file,$(origin $V)),\
+			$(if $(filter environment% file,$(origin $V)),$($V)))
-			$(shell cp --parents -at $(TARGET) \
-				-- $(value $V))))
 
 copy-groups:
 	@if [ -n "$(THE_GROUPS)$(MAIN_GROUPS)" ]; then \
@@ -63,4 +62,5 @@ debug:
 	@echo -e $(foreach V, \
 		$(filter %_LISTS,$(sort $(.VARIABLES))), \
 		$(if $(filter environment% file,$(origin $V)),\
-			$(shell echo '\\n"**"' $V: $(value $V)))) '\n'
+			$(shell echo '\\n"**"' $V: $($V)))) '\n'
+