gear-store-tags

0.6.2.3-alt0.M60T.1
- mktmpdir: fixed sort key
2015-09-08 00:00:11 +03:00 · 2015-09-07 23:57:07 +03:00 · 2015-09-07 23:46:16 +03:00 · 2015-02-02 23:51:50 +03:00 · 2015-02-02 23:51:33 +03:00 · 2015-02-02 23:50:41 +03:00
9 changed files with 35 additions and 17 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.3
+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
--- a/.gear/tags/12e0dda4cb428dca632a2509216780cc97c7ca48
+++ b/.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
--- a/.gear/tags/5b441e948d3bca3360d062ec7a36cdfa348f67f7
+++ b/.gear/tags/5b441e948d3bca3360d062ec7a36cdfa348f67f7
@ -1,6 +0,0 @@
-object 5347d342cca7ad1c23b866a81a70735b7b59616f
-type commit
-tag v0.6.2
-tagger Michael Shigorin <mike@altlinux.org> 1333380199 +0300
-
-webkiosk
--- a/.gear/tags/list
+++ b/.gear/tags/list
@ -1 +1 @@
-5b441e948d3bca3360d062ec7a36cdfa348f67f7 v0.6.2
+12e0dda4cb428dca632a2509216780cc97c7ca48 v0.6.2.3
--- a/bin/mktmpdir
+++ b/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
--- 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))

--- a/pkg.in/lists/Makefile
+++ b/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
-	@$(foreach V, \
-		$(filter %_LISTS,$(sort $(.VARIABLES))), \
-		$(if $(filter environment% file,$(origin $V)),\
-			$(shell cp --parents -at $(TARGET) \
-				-- $(value $V))))
+	@cp --parents -at $(TARGET) -- \
+		$(foreach V, \
+			$(filter %_LISTS,$(sort $(.VARIABLES))), \
+			$(if $(filter environment% file,$(origin $V)),$($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'
+
Author	SHA1	Message	Date
Michael Shigorin	9e5c9ef272	gear-store-tags	2015-09-08 00:00:11 +03:00
Michael Shigorin	958f37028b	0.6.2.3-alt0.M60T.1 - mktmpdir: fixed sort key	2015-09-07 23:57:07 +03:00
Michael Shigorin	32c1bcaa23	mktmpdir: fixed sort key The sort key field value has been off-by-one apparently, "6" corresponds to "capacity" field of df -PT output while the "available" one was meant: Filesystem Type 1024-blocks Used Available Capacity Mounted on /dev/sda9 ext4 15350768 12799972 1747980 88% / tmpfs tmpfs 1967204 27396 1939808 2% /tmp 1 2 3 4 5 6 This lapse has been five years old, looks like it's only been masked by lower available space limit and filesystem ordering by type so far. It didn't hit me even now, rather inspected the code while implementing volumes-profile-starterkit...	2015-09-07 23:46:16 +03:00
Michael Shigorin	f3c47f0730	gear-store-tags	2015-02-02 23:51:50 +03:00
Michael Shigorin	0950c70adc	0.6.2.2-alt0.M60T.1 - backported pkg/lists fix (and the commit before it)	2015-02-02 23:51:33 +03:00
Michael Shigorin	a0d39e2ed1	pkg/lists: uncrustify Makefile The problem with the changed piece of code is that it would - both call cp(1) multiple times if multiple *_LIST variables were non-empty (which is usually the case), and - try to evaluate stdout of the called commands as a shell script (which would be empty unless someone passed e.g. -v to that cp(1) but it's crazy to rely on things like this). So the functions should prepare arguments for a single copy command that is predictable and could be made verbose. Ouch.	2015-02-02 23:50:41 +03:00
Michael Shigorin	33d35de8fb	pkg/lists: tweak Makefile to expand variables The issue at hand is the hack to be employed in the init feature: @$(call add,THE_LISTS,$$(INIT_TYPE)) where INIT_TYPE is set separately; $(value $V) would leave that kind of substitution unmolested while we would actually need it done.	2015-02-02 23:50:26 +03:00
Michael Shigorin	51e0fb762e	gear-store-tags	2014-03-25 00:00:25 +04:00
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