1.0.2-alt0.M70T.1

- backported adaptations to handle EFI signed binaries the current way

.gear/mkimage-profiles.spec

@@ -1,6 +1,6 @@
 Name: mkimage-profiles
-Version: 1.0.0
+Version: 1.0.2
-Release: alt1
+Release: alt0.M70T.1
 
 Summary: ALT Linux based distribution metaprofile
 License: GPLv2+
@@ -16,7 +16,7 @@ BuildRequires: /proc
 
 Requires: rsync git-core
 Requires: time schedutils sfdisk
-Requires: mkimage >= 0.2.5
+Requires: mkimage >= 0.2.12
 
 # Recommends: graphviz qemu-img
 
@@ -78,6 +78,13 @@ cp -a * %buildroot%mpdir
 %doc %docs/*
 
 %changelog
+* Mon Dec 23 2013 Michael Shigorin <mike@altlinux.org> 1.0.2-alt0.M70T.1
+- backported adaptations to handle EFI signed binaries the current way
+
+* Mon Nov 25 2013 Michael Shigorin <mike@altlinux.org> 1.0.1-alt0.M70T.1
+- important bugfix: THE_PACKAGES weren't getting through to .base
+  (backported from 1.1.14)
+
 * Mon Jun 17 2013 Michael Shigorin <mike@altlinux.org> 1.0.0-alt1
 - 1.0
 

.gear/tags/5f4103e2678b4db8760eda8622f094f694f9cdcd

@@ -1,6 +0,0 @@
-object 5ffd07c65e360561c7a04f41aff746d9caa165cd
-type commit
-tag v1.0.0
-tagger Michael Shigorin <mike@altlinux.org> 1371463392 +0400
-
-1.0

.gear/tags/f13525a33f0d85a02deda42b7fd5f45c98dc2911

@@ -0,0 +1,6 @@
+object 3b2a0649bf39199b177979e143a3497ba7dff9c0
+type commit
+tag v1.0.1
+tagger Michael Shigorin <mike@altlinux.org> 1385399240 +0400
+
+THE_PACKAGES

.gear/tags/list

@@ -1 +1 @@
-5f4103e2678b4db8760eda8622f094f694f9cdcd v1.0.0
+f13525a33f0d85a02deda42b7fd5f45c98dc2911 v1.0.1

features.in/efi/config.mk

@@ -18,11 +18,9 @@ use/efi/refind: use/efi
 	@$(call set,EFI_BOOTLOADER,refind)
 
 use/efi/signed: use/efi
-	@$(call set,MKI_VER_MINIMAL,0.2.7)	# refind->elilo handoff
+	@$(call set,MKI_VER_MINIMAL,0.2.7)	# refind->elilo handoff ### 0.2.11
 	@$(call set,EFI_CERT,altlinux)
 	@$(call add,THE_PACKAGES,shim-signed)
-	@$(call set,EFI_SHELL,efi-shell-signed)	# even more useful
-	@$(call add,RESCUE_PACKAGES,refind-signed)
 	@$(call add,RESCUE_PACKAGES,openssl sbsigntools)
 
 use/efi/shell: use/efi

features.in/metadata/lib/50-metadata.mk

@@ -9,22 +9,25 @@ WHATEVER += metadata
 # handle these too
 DOT_BASE += $(BASE_PACKAGES_REGEXP)
 
-# args: name, suffix, command
+# args: type, name
-define dump-THEM
+define dump
-if [ -n "$($(1)_$(2))" ]; then echo -e "\n## $(1)_$(2)"; $(3) $($(1)_$(2)); fi;
+if [ -n "$($(2)_$(1))" ]; then \
+	echo -e "\n## $(2)_$(1)"; \
+	case "$(1)" in \
+	PACKAGES) echo "$($(2)_$(1))";; \
+	LISTS) cat $($(2)_$(1));; \
+	esac; \
+fi;
 endef
 
-dump-PACKAGES = $(call dump-THEM,$(1),PACKAGES,echo)
-dump-LISTS = $(call dump-THEM,$(1),LISTS,cat)
-
 # BASE_PACKAGES, BASE_LISTS and whatever else goes into base install;
 # thus construct requisite .base packagelist for alterator-pkg
 metadata-.base:
 	@cd $(call list,/); \
 	{ \
-		echo "## generated by features.in/metadata/lib/metadata.mk"; \
+		echo "## generated by features.in/metadata/lib/50-metadata.mk";\
-		$(foreach p,SYSTEM COMMON THE BASE,$(call dump-PACKAGES,$(p))) \
+		$(foreach p,SYSTEM COMMON THE BASE,$(call dump,PACKAGES,$(p))) \
-		$(foreach l,THE BASE,$(call dump-LISTS,$(l))) \
+		$(foreach l,THE BASE,$(call dump,LISTS,$(l))) \
 		if [ -n "$(DOT_BASE)" ]; then \
 			echo -e "\n## DOT_BASE\n$(DOT_BASE)"; \
 		fi; \