summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Dengler <dengler@linutronix.de>2017-12-07 11:06:03 +0100
committerJia Zhang <qianyue.zj@alibaba-inc.com>2017-12-09 11:28:27 +0800
commit0c4d9a8268561154b784bca595b65589f1f259d1 (patch)
treec6627266f94869d178093fd6fcbe5b8ef828bc9c
parent00324b6b3e2bb7f13e840471e21bc2db8ed8732d (diff)
downloadmeta-secure-core-0c4d9a8268561154b784bca595b65589f1f259d1.tar.gz
util-linux: Fix package name extension
Yocto (pyro) uses the character "_" to separate the package name from the version number. If this character is used in the package name or in a package name extension, the build will fail. Replacing the "_" with one of the allowed characters fixes the problem. Signed-off-by: Holger Dengler <dengler@linutronix.de>
-rw-r--r--meta-integrity/recipes-base/packagegroups/packagegroup-ima.bb2
-rw-r--r--meta-integrity/recipes-core/util-linux/util-linux_%.bbappend4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta-integrity/recipes-base/packagegroups/packagegroup-ima.bb b/meta-integrity/recipes-base/packagegroups/packagegroup-ima.bb
index b9a87ad..c9a99bd 100644
--- a/meta-integrity/recipes-base/packagegroups/packagegroup-ima.bb
+++ b/meta-integrity/recipes-base/packagegroups/packagegroup-ima.bb
@@ -9,7 +9,7 @@ DEPENDS += "\
9 9
10RDEPENDS_${PN} += "\ 10RDEPENDS_${PN} += "\
11 attr \ 11 attr \
12 util-linux-switch_root.static \ 12 util-linux-switch-root.static \
13" 13"
14 14
15# Note any private key is not available if user key signing model used. 15# Note any private key is not available if user key signing model used.
diff --git a/meta-integrity/recipes-core/util-linux/util-linux_%.bbappend b/meta-integrity/recipes-core/util-linux/util-linux_%.bbappend
index 9634f4b..954183c 100644
--- a/meta-integrity/recipes-core/util-linux/util-linux_%.bbappend
+++ b/meta-integrity/recipes-core/util-linux/util-linux_%.bbappend
@@ -12,6 +12,6 @@ do_install_append_class-target() {
12 "${D}${sbindir}/switch_root.static" 12 "${D}${sbindir}/switch_root.static"
13} 13}
14 14
15PACKAGES =+ "${PN}-switch_root.static" 15PACKAGES =+ "${PN}-switch-root.static"
16 16
17FILES_${PN}-switch_root.static = "${sbindir}/switch_root.static" 17FILES_${PN}-switch-root.static = "${sbindir}/switch_root.static"