[ptxdist] [PATCH 0/3] code signing and OOT build cleanups

[ptxdist] [PATCH 0/3] code signing and OOT build cleanups

[Marc Kleine-Budde]

Hello,

here are some cleanup patches regarding the code signing and OOT build.

regards,
Marc



_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 1/3] ptxdist-set-keys-hsm: set_imx_habv4_keys(): declare variable r as local

[Marc Kleine-Budde]

Fixes: b1afc61b4447 ("package templates: add code-signing-provider template")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 rules/templates/code-signing-provider/ptxdist-set-keys-hsm.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/templates/code-signing-provider/ptxdist-set-keys-hsm.sh b/rules/templates/code-signing-provider/ptxdist-set-keys-hsm.sh
index 6bbe830f2a2d..bcd531d69572 100755
--- a/rules/templates/code-signing-provider/ptxdist-set-keys-hsm.sh
+++ b/rules/templates/code-signing-provider/ptxdist-set-keys-hsm.sh
@@ -18,6 +18,8 @@ set_rauc_keys() {
 }
 
 set_imx_habv4_keys() {
+	local r
+
 	# HSM use case, assuming it contains only 1st CSF/IMG key
 	for i in 1 2 3 4; do
 		r="imx-habv4-srk${i}"
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 2/3] ptxd_lib_code_signing: remove double space

[Marc Kleine-Budde]

Fixes: 8f41183e0afe ("Add initial code signing support")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 scripts/lib/ptxd_lib_code_signing.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/ptxd_lib_code_signing.sh b/scripts/lib/ptxd_lib_code_signing.sh
index 65ce62dd0a32..3e1654bb36e4 100644
--- a/scripts/lib/ptxd_lib_code_signing.sh
+++ b/scripts/lib/ptxd_lib_code_signing.sh
@@ -178,7 +178,7 @@ export -f cs_import_cert_from_pem
 # with SoftHSM.
 #
 cs_import_pubkey_from_pem() {
-    local  -a openssl_keyopt
+    local -a openssl_keyopt
     local role="${1}"
     local pem="${2}"
     cs_init_variables
@@ -202,7 +202,7 @@ export -f cs_import_pubkey_from_pem
 # with SoftHSM.
 #
 cs_import_privkey_from_pem() {
-    local  -a openssl_keyopt
+    local -a openssl_keyopt
     local role="${1}"
     local pem="${2}"
     cs_init_variables
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 3/3] ptxd_make_world_common: ptxd_make_world_init: pkg_build_oot: add missing option KEEP to error message

[Marc Kleine-Budde]

Fixes: de79ed905942 ("ptxd_make_world_prepare_init: allow keeping the build tree during prepare for oot packages")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 scripts/lib/ptxd_make_world_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh
index 9329c317686d..59ab32646dc4 100644
--- a/scripts/lib/ptxd_make_world_common.sh
+++ b/scripts/lib/ptxd_make_world_common.sh
@@ -406,7 +406,7 @@ ptxd_make_world_init() {
 	case "${pkg_build_oot}" in
 	    "YES"|"KEEP") pkg_build_dir="${pkg_dir}-build" ;;
 	    "NO")  pkg_build_dir="${pkg_conf_dir}" ;;
-	    *)     ptxd_bailout "<PKG>_BUILD_OOT: please set to YES or NO" ;;
+	    *)     ptxd_bailout "<PKG>_BUILD_OOT: please set to KEEP, YES or NO" ;;
 	esac
     fi
 
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] ptxdist-set-keys-hsm: set_imx_habv4_keys(): declare variable r as local

[Michael Olbrich]

Thanks, applied as 5af077fa90de4a19639d03d3affa22d971d91464.

Michael

[sent from post-receive hook]

On Fri, 17 Jul 2020 13:57:05 +0200, Marc Kleine-Budde <mkl@pengutronix.de> wrote:
> Fixes: b1afc61b4447 ("package templates: add code-signing-provider template")
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> Message-Id: <20200715084327.30201-2-mkl@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/templates/code-signing-provider/ptxdist-set-keys-hsm.sh b/rules/templates/code-signing-provider/ptxdist-set-keys-hsm.sh
> index 6bbe830f2a2d..bcd531d69572 100755
> --- a/rules/templates/code-signing-provider/ptxdist-set-keys-hsm.sh
> +++ b/rules/templates/code-signing-provider/ptxdist-set-keys-hsm.sh
> @@ -18,6 +18,8 @@ set_rauc_keys() {
>  }
>  
>  set_imx_habv4_keys() {
> +	local r
> +
>  	# HSM use case, assuming it contains only 1st CSF/IMG key
>  	for i in 1 2 3 4; do
>  		r="imx-habv4-srk${i}"

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] ptxd_lib_code_signing: remove double space

[Michael Olbrich]

Thanks, applied as 46d128c5b4845a7efec94103e035c039ab5caa41.

Michael

[sent from post-receive hook]

On Fri, 17 Jul 2020 13:57:05 +0200, Marc Kleine-Budde <mkl@pengutronix.de> wrote:
> Fixes: 8f41183e0afe ("Add initial code signing support")
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> Message-Id: <20200715084327.30201-3-mkl@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/scripts/lib/ptxd_lib_code_signing.sh b/scripts/lib/ptxd_lib_code_signing.sh
> index 65ce62dd0a32..3e1654bb36e4 100644
> --- a/scripts/lib/ptxd_lib_code_signing.sh
> +++ b/scripts/lib/ptxd_lib_code_signing.sh
> @@ -178,7 +178,7 @@ export -f cs_import_cert_from_pem
>  # with SoftHSM.
>  #
>  cs_import_pubkey_from_pem() {
> -    local  -a openssl_keyopt
> +    local -a openssl_keyopt
>      local role="${1}"
>      local pem="${2}"
>      cs_init_variables
> @@ -202,7 +202,7 @@ export -f cs_import_pubkey_from_pem
>  # with SoftHSM.
>  #
>  cs_import_privkey_from_pem() {
> -    local  -a openssl_keyopt
> +    local -a openssl_keyopt
>      local role="${1}"
>      local pem="${2}"
>      cs_init_variables

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] ptxd_make_world_common: ptxd_make_world_init: pkg_build_oot: add missing option KEEP to error message

[Michael Olbrich]

Thanks, applied as af80016213136cf127ad8c0cabbfc27a06c3dd26.

Michael

[sent from post-receive hook]

On Fri, 17 Jul 2020 13:57:06 +0200, Marc Kleine-Budde <mkl@pengutronix.de> wrote:
> Fixes: de79ed905942 ("ptxd_make_world_prepare_init: allow keeping the build tree during prepare for oot packages")
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> Message-Id: <20200715084327.30201-4-mkl@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh
> index 9329c317686d..59ab32646dc4 100644
> --- a/scripts/lib/ptxd_make_world_common.sh
> +++ b/scripts/lib/ptxd_make_world_common.sh
> @@ -406,7 +406,7 @@ ptxd_make_world_init() {
>  	case "${pkg_build_oot}" in
>  	    "YES"|"KEEP") pkg_build_dir="${pkg_dir}-build" ;;
>  	    "NO")  pkg_build_dir="${pkg_conf_dir}" ;;
> -	    *)     ptxd_bailout "<PKG>_BUILD_OOT: please set to YES or NO" ;;
> +	    *)     ptxd_bailout "<PKG>_BUILD_OOT: please set to KEEP, YES or NO" ;;
>  	esac
>      fi
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de