remove incorperated patches.
Signed-off-by: Armin Kuster <akuster...@gmail.com>
---
.../tpm-tools-extendpcr.patch | 0
.../03-fix-bool-error-parseStringWithValues.patch | 30 ----------------------
.../gcc6_missleading_indent_fix.patch | 24 -----------------
.../{tpm-tools_1.3.8.bb => tpm-tools_git.bb} | 27 ++++++++++++-------
4 files changed, 18 insertions(+), 63 deletions(-)
rename recipes-tpm/tpm-tools/{tpm-tools-1.3.8 =>
files}/tpm-tools-extendpcr.patch (100%)
delete mode 100644
recipes-tpm/tpm-tools/tpm-tools-1.3.8/03-fix-bool-error-parseStringWithValues.patch
delete mode 100644
recipes-tpm/tpm-tools/tpm-tools-1.3.8/gcc6_missleading_indent_fix.patch
rename recipes-tpm/tpm-tools/{tpm-tools_1.3.8.bb => tpm-tools_git.bb} (62%)
diff --git a/recipes-tpm/tpm-tools/tpm-tools-1.3.8/tpm-tools-extendpcr.patch
b/recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch
similarity index 100%
rename from recipes-tpm/tpm-tools/tpm-tools-1.3.8/tpm-tools-extendpcr.patch
rename to recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch
diff --git
a/recipes-tpm/tpm-tools/tpm-tools-1.3.8/03-fix-bool-error-parseStringWithValues.patch
b/recipes-tpm/tpm-tools/tpm-tools-1.3.8/03-fix-bool-error-parseStringWithValues.patch
deleted file mode 100644
index 9497e89..0000000
---
a/recipes-tpm/tpm-tools/tpm-tools-1.3.8/03-fix-bool-error-parseStringWithValues.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Title: Fix boolean comparison error (and FTBFS with gcc-5)
-Date: 2015-06-28
-Author: Pierre Chifflier <pol...@debian.org>
-Bug-Debian: http://bugs.debian.org/778147
-Index: tpm-tools/src/tpm_mgmt/tpm_nvcommon.c
-===================================================================
---- tpm-tools.orig/src/tpm_mgmt/tpm_nvcommon.c
-+++ tpm-tools/src/tpm_mgmt/tpm_nvcommon.c
-@@ -140,8 +140,8 @@ int parseStringWithValues(const char *aA
- aArg);
- return -1;
- }
-- if (!aArg[offset+numbytes] == '|' &&
-- !aArg[offset+numbytes] == 0) {
-+ if (!(aArg[offset+numbytes] == '|' ||
-+ aArg[offset+numbytes] == 0)) {
- logError(_("Illegal character following
"
- "hexadecimal number in
%s\n"),
- aArg + offset);
-@@ -164,8 +164,8 @@ int parseStringWithValues(const char *aA
- return -1;
- }
-
-- if (!aArg[offset+numbytes] == '|' &&
-- !aArg[offset+numbytes] == 0) {
-+ if (!(aArg[offset+numbytes] == '|' ||
-+ aArg[offset+numbytes] == 0)) {
- logError(_("Illegal character following decimal
"
- "number in %s\n"),
- aArg + offset);
diff --git
a/recipes-tpm/tpm-tools/tpm-tools-1.3.8/gcc6_missleading_indent_fix.patch
b/recipes-tpm/tpm-tools/tpm-tools-1.3.8/gcc6_missleading_indent_fix.patch
deleted file mode 100644
index aec5e7a..0000000
--- a/recipes-tpm/tpm-tools/tpm-tools-1.3.8/gcc6_missleading_indent_fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: tpm-tools-1.3.8/src/tpm_mgmt/tpm_present.c
-===================================================================
---- tpm-tools-1.3.8.orig/src/tpm_mgmt/tpm_present.c
-+++ tpm-tools-1.3.8/src/tpm_mgmt/tpm_present.c
-@@ -349,13 +349,13 @@ int main(int argc, char **argv)
- }
- } while (flags[++i].name);
-
-- out_success:
-+out_success:
- logSuccess(argv[0]);
- iRc = 0;
-- out_close:
-+out_close:
- contextClose(hContext);
-- out:
-- if (szTpmPasswd && !isWellKnown)
-- shredPasswd( szTpmPasswd );
-- return iRc;
-+out:
-+ if (szTpmPasswd && !isWellKnown)
-+ shredPasswd( szTpmPasswd );
-+return iRc;
- }
diff --git a/recipes-tpm/tpm-tools/tpm-tools_1.3.8.bb
b/recipes-tpm/tpm-tools/tpm-tools_git.bb
similarity index 62%
rename from recipes-tpm/tpm-tools/tpm-tools_1.3.8.bb
rename to recipes-tpm/tpm-tools/tpm-tools_git.bb
index 790894a..83f1091 100644
--- a/recipes-tpm/tpm-tools/tpm-tools_1.3.8.bb
+++ b/recipes-tpm/tpm-tools/tpm-tools_git.bb
@@ -8,19 +8,28 @@ DESCRIPTION = " \
SECTION = "tpm"
LICENSE = "CPL-1.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=059e8cd6165cb4c31e351f2b69388fd9"
+
DEPENDS = "libtspi openssl"
DEPENDS_class-native = "trousers-native"
-SRC_URI += " \
-
http://downloads.sourceforge.net/project/trousers/${BPN}/${PV}/${BP}.tar.gz \
- file://tpm-tools-extendpcr.patch \
- file://03-fix-bool-error-parseStringWithValues.patch \
- file://gcc6_missleading_indent_fix.patch \
-"
+SRCREV = "80954ab83be8d091c6e3112514945556aaa09d39"
+SRC_URI = " \
+ git://git.code.sf.net/p/trousers/tpm-tools \
+ file://tpm-tools-extendpcr.patch \
+ "
+
+PV = "1.3.9+git${SRCPV}"
+
+inherit autotools-brokensep gettext
-SRC_URI[md5sum] = "85a978c4e03fefd4b73cbeadde7c4d0b"
-SRC_URI[sha256sum] =
"66eb4ff095542403db6b4bd4b574e8a5c08084fe4e9e5aa9a829ee84e20bea83"
+S = "${WORKDIR}/git"
-inherit autotools gettext
+do_configure_prepend () {
+ mkdir -p po
+ mkdir -p m4
+ cp -R po_/* po/
+ touch po/Makefile.in.in
+ touch m4/Makefile.am
+}
BBCLASSEXTEND = "native"
--
2.7.4
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
