From 2f26da887f04c639e0e0bb405dfb8f87c174e627 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 23 Jul 2022 12:50:00 -0300 Subject: qoriq-cst: rename cst to qoriq-cst The QoriQ SoCs use a different cst tool for secure boot than i.MX SoCs so we should name it with SoC family prefix to avoid confusion. Signed-off-by: Otavio Salvador --- ...Mark-struct-input_field-file_field-extern.patch | 43 ---------------------- recipes-devtools/cst/cst_git.bb | 43 ---------------------- ...Mark-struct-input_field-file_field-extern.patch | 43 ++++++++++++++++++++++ recipes-devtools/qoriq-cst/qoriq-cst_git.bb | 43 ++++++++++++++++++++++ 4 files changed, 86 insertions(+), 86 deletions(-) delete mode 100644 recipes-devtools/cst/cst/0001-tools-Mark-struct-input_field-file_field-extern.patch delete mode 100644 recipes-devtools/cst/cst_git.bb create mode 100644 recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch create mode 100644 recipes-devtools/qoriq-cst/qoriq-cst_git.bb (limited to 'recipes-devtools') diff --git a/recipes-devtools/cst/cst/0001-tools-Mark-struct-input_field-file_field-extern.patch b/recipes-devtools/cst/cst/0001-tools-Mark-struct-input_field-file_field-extern.patch deleted file mode 100644 index d25675aa..00000000 --- a/recipes-devtools/cst/cst/0001-tools-Mark-struct-input_field-file_field-extern.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 81ec65e72f357fb2c395e40c5195434bbaddf7f7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 16 May 2020 08:21:52 -0700 -Subject: [PATCH] tools: Mark struct input_field file_field extern - -This struct is already defined in common/parse_utils.c - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - tools/header_generation/create_hdr_common.c | 2 +- - tools/pbi_creation/create_pbi_common.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/header_generation/create_hdr_common.c b/tools/header_generation/create_hdr_common.c -index bfa90a3..edf632c 100644 ---- a/tools/header_generation/create_hdr_common.c -+++ b/tools/header_generation/create_hdr_common.c -@@ -39,7 +39,7 @@ - #include - - extern struct g_data_t gd; --struct input_field file_field; -+extern struct input_field file_field; - - extern char line_data[]; - static struct option long_options[] = { -diff --git a/tools/pbi_creation/create_pbi_common.c b/tools/pbi_creation/create_pbi_common.c -index ff2ed84..bd976da 100644 ---- a/tools/pbi_creation/create_pbi_common.c -+++ b/tools/pbi_creation/create_pbi_common.c -@@ -57,7 +57,7 @@ static char *parse_list[] = { - - extern struct g_data_t gd; - extern char line_data[]; --struct input_field file_field; -+extern struct input_field file_field; - - #define NUM_PARSE_LIST (sizeof(parse_list) / sizeof(char *)) - --- -2.26.2 - diff --git a/recipes-devtools/cst/cst_git.bb b/recipes-devtools/cst/cst_git.bb deleted file mode 100644 index b9ac3e9e..00000000 --- a/recipes-devtools/cst/cst_git.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "utility for security boot" -SECTION = "cst" -LICENSE = "BSD-3-Clause" - -LIC_FILES_CHKSUM = "file://COPYING;md5=e959d5d617e33779d0e90ce1d9043eff" - -DEPENDS += "openssl cst-native" -RDEPENDS:${PN} = "bash" - -GENKEYS ?= "${STAGING_BINDIR_NATIVE}/cst/gen_keys" -GENKEYS:class-native = "./gen_keys" - -inherit kernel-arch - -# specify the non default keys pair for secure boot if needed -#SECURE_PRI_KEY = "/path/srk.pri" -#SECURE_PUB_KEY = "/path/srk.pub" - -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/cst;nobranch=1 \ - file://0001-tools-Mark-struct-input_field-file_field-extern.patch \ -" -SRCREV = "dfe30d3f05cfe281896482839e57ed49c52f2088" - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}"' -CFLAGS:append = ' -Wno-deprecated-declarations' - -PARALLEL_MAKE = "" - -do_install () { - oe_runmake install DESTDIR=${D} BIN_DEST_DIR=${bindir} - - if [ -n "${SECURE_PRI_KEY}" ]; then - cp -f ${SECURE_PRI_KEY} ${D}/${bindir}/cst/srk.pri - cp -f ${SECURE_PUB_KEY} ${D}/${bindir}/cst/srk.pub - elif [ ! -f ${D}/${bindir}/cst/srk.pri -o ! ${D}/${bindir}/cst/srk.pub ]; then - cd ${D}/${bindir}/cst && ${GENKEYS} 1024 - fi -} - -FILES:${PN}-dbg += "${bindir}/cst/.debug" -BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch b/recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch new file mode 100644 index 00000000..d25675aa --- /dev/null +++ b/recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch @@ -0,0 +1,43 @@ +From 81ec65e72f357fb2c395e40c5195434bbaddf7f7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 16 May 2020 08:21:52 -0700 +Subject: [PATCH] tools: Mark struct input_field file_field extern + +This struct is already defined in common/parse_utils.c + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + tools/header_generation/create_hdr_common.c | 2 +- + tools/pbi_creation/create_pbi_common.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/header_generation/create_hdr_common.c b/tools/header_generation/create_hdr_common.c +index bfa90a3..edf632c 100644 +--- a/tools/header_generation/create_hdr_common.c ++++ b/tools/header_generation/create_hdr_common.c +@@ -39,7 +39,7 @@ + #include + + extern struct g_data_t gd; +-struct input_field file_field; ++extern struct input_field file_field; + + extern char line_data[]; + static struct option long_options[] = { +diff --git a/tools/pbi_creation/create_pbi_common.c b/tools/pbi_creation/create_pbi_common.c +index ff2ed84..bd976da 100644 +--- a/tools/pbi_creation/create_pbi_common.c ++++ b/tools/pbi_creation/create_pbi_common.c +@@ -57,7 +57,7 @@ static char *parse_list[] = { + + extern struct g_data_t gd; + extern char line_data[]; +-struct input_field file_field; ++extern struct input_field file_field; + + #define NUM_PARSE_LIST (sizeof(parse_list) / sizeof(char *)) + +-- +2.26.2 + diff --git a/recipes-devtools/qoriq-cst/qoriq-cst_git.bb b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb new file mode 100644 index 00000000..ca0f35fb --- /dev/null +++ b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb @@ -0,0 +1,43 @@ +SUMMARY = "utility for security boot" +SECTION = "cst" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://COPYING;md5=e959d5d617e33779d0e90ce1d9043eff" + +DEPENDS += "openssl qoriq-cst-native" +RDEPENDS:${PN} = "bash" + +GENKEYS ?= "${STAGING_BINDIR_NATIVE}/cst/gen_keys" +GENKEYS:class-native = "./gen_keys" + +inherit kernel-arch + +# specify the non default keys pair for secure boot if needed +#SECURE_PRI_KEY = "/path/srk.pri" +#SECURE_PUB_KEY = "/path/srk.pub" + +SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/cst;nobranch=1 \ + file://0001-tools-Mark-struct-input_field-file_field-extern.patch \ +" +SRCREV = "dfe30d3f05cfe281896482839e57ed49c52f2088" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}"' +CFLAGS:append = ' -Wno-deprecated-declarations' + +PARALLEL_MAKE = "" + +do_install () { + oe_runmake install DESTDIR=${D} BIN_DEST_DIR=${bindir} + + if [ -n "${SECURE_PRI_KEY}" ]; then + cp -f ${SECURE_PRI_KEY} ${D}/${bindir}/cst/srk.pri + cp -f ${SECURE_PUB_KEY} ${D}/${bindir}/cst/srk.pub + elif [ ! -f ${D}/${bindir}/cst/srk.pri -o ! ${D}/${bindir}/cst/srk.pub ]; then + cd ${D}/${bindir}/cst && ${GENKEYS} 1024 + fi +} + +FILES:${PN}-dbg += "${bindir}/cst/.debug" +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf