1.0.2-alt0.M70T.1

- backported adaptations to handle EFI signed binaries the current way
efi: drop -signed subpackages
2013-12-23 14:16:23 +04:00 · 2013-12-23 12:02:14 +02:00 · 2013-11-25 21:07:30 +04:00 · 2013-11-25 21:06:01 +04:00 · 2013-11-25 09:33:54 +04:00
6 changed files with 30 additions and 22 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,6 +1,6 @@
 Name: mkimage-profiles
-Version: 1.0.0
-Release: alt1
+Version: 1.0.2
+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

--- a/.gear/tags/5f4103e2678b4db8760eda8622f094f694f9cdcd
+++ b/.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
--- a/.gear/tags/f13525a33f0d85a02deda42b7fd5f45c98dc2911
+++ b/.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
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-5f4103e2678b4db8760eda8622f094f694f9cdcd v1.0.0
+f13525a33f0d85a02deda42b7fd5f45c98dc2911 v1.0.1
--- a/features.in/efi/config.mk
+++ b/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
--- a/features.in/metadata/lib/50-metadata.mk
+++ b/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
-define dump-THEM
-if [ -n "$($(1)_$(2))" ]; then echo -e "\n## $(1)_$(2)"; $(3) $($(1)_$(2)); fi;
+# args: type, name
+define dump
+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"; \
-		$(foreach p,SYSTEM COMMON THE BASE,$(call dump-PACKAGES,$(p))) \
-		$(foreach l,THE BASE,$(call dump-LISTS,$(l))) \
+		echo "## generated by features.in/metadata/lib/50-metadata.mk";\
+		$(foreach p,SYSTEM COMMON THE BASE,$(call dump,PACKAGES,$(p))) \
+		$(foreach l,THE BASE,$(call dump,LISTS,$(l))) \
 		if [ -n "$(DOT_BASE)" ]; then \
 			echo -e "\n## DOT_BASE\n$(DOT_BASE)"; \
 		fi; \
Author	SHA1	Message	Date
Michael Shigorin	d9f11e6fee	1.0.2-alt0.M70T.1 - backported adaptations to handle EFI signed binaries the current way	2013-12-23 14:16:23 +04:00
Michael Shigorin	7bb22cce78	efi: drop -signed subpackages We chose to provide methods to sign packages but to avoid signing these by default (with some arbitrary test keys) the signatures are being added after the build by means of rpmrebuild-pesign; all of this is made significantly more complicated if there are separate -signed subpackages. So these are being dropped in the packages; account for that.	2013-12-23 12:02:14 +02:00
Michael Shigorin	f716669bc1	gear-store-tags	2013-11-25 21:07:30 +04:00
Michael Shigorin	3b2a0649bf	1.0.1-alt0.M70T.1 - important bugfix: THE_PACKAGES weren't getting through to .base (backported from 1.1.14)	2013-11-25 21:06:01 +04:00
Michael Shigorin	7929f61cad	metadata: fix THE_PACKAGES processing Actually the issue was worse in general: *_PACKAGES weren't quoted when put into .base thus resulting in a potentially broken echo command (silent one). The macro scheme used was overgeneralized; stuffing quoting differentiation into it was doable but ugly (unless one is able to pass an unquoted quote sign as a function's parameter in some elegant manner), let's just make it straightforward.	2013-11-25 09:33:54 +04:00