diff options
Diffstat (limited to 'meta-tpm')
-rw-r--r-- | meta-tpm/recipes-tpm/swtpm/files/ioctl_h.patch | 22 | ||||
-rw-r--r-- | meta-tpm/recipes-tpm/swtpm/swtpm_0.7.3.bb (renamed from meta-tpm/recipes-tpm/swtpm/swtpm_0.7.1.bb) | 3 |
2 files changed, 1 insertions, 24 deletions
diff --git a/meta-tpm/recipes-tpm/swtpm/files/ioctl_h.patch b/meta-tpm/recipes-tpm/swtpm/files/ioctl_h.patch deleted file mode 100644 index d736bc6..0000000 --- a/meta-tpm/recipes-tpm/swtpm/files/ioctl_h.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | tpm_ioctl: fix musl for missing ioctl | ||
2 | |||
3 | tpm_ioctl.c: In function 'ioctl_to_cmd': | ||
4 | tpm_ioctl.c:86:26: error: '_IOC_NRSHIFT' undeclared (first use in this function) | ||
5 | return ((ioctlnum >> _IOC_NRSHIFT) & _IOC_NRMASK) + 1; | ||
6 | |||
7 | |||
8 | Upstream-status: | ||
9 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
10 | |||
11 | Index: git/src/swtpm_ioctl/tpm_ioctl.c | ||
12 | =================================================================== | ||
13 | --- git.orig/src/swtpm_ioctl/tpm_ioctl.c | ||
14 | +++ git/src/swtpm_ioctl/tpm_ioctl.c | ||
15 | @@ -58,6 +58,7 @@ | ||
16 | #include <fcntl.h> | ||
17 | #include <unistd.h> | ||
18 | #include <sys/ioctl.h> | ||
19 | +#include <asm/ioctl.h> | ||
20 | #include <getopt.h> | ||
21 | #include <sys/un.h> | ||
22 | #include <sys/types.h> | ||
diff --git a/meta-tpm/recipes-tpm/swtpm/swtpm_0.7.1.bb b/meta-tpm/recipes-tpm/swtpm/swtpm_0.7.3.bb index 03899d8..55d83f9 100644 --- a/meta-tpm/recipes-tpm/swtpm/swtpm_0.7.1.bb +++ b/meta-tpm/recipes-tpm/swtpm/swtpm_0.7.3.bb | |||
@@ -6,9 +6,8 @@ SECTION = "apps" | |||
6 | # expect-native, socat-native, coreutils-native and net-tools-native are reportedly only required for the tests | 6 | # expect-native, socat-native, coreutils-native and net-tools-native are reportedly only required for the tests |
7 | DEPENDS = "libtasn1 coreutils-native expect-native socat-native glib-2.0 net-tools-native libtpm json-glib" | 7 | DEPENDS = "libtasn1 coreutils-native expect-native socat-native glib-2.0 net-tools-native libtpm json-glib" |
8 | 8 | ||
9 | SRCREV = "92a7035f45d9b08aa7c6b8bd6fa4c6916ef07a9e" | 9 | SRCREV = "f2268eebb0d1adf89bad83fa4cf91e37b4e3fa53" |
10 | SRC_URI = "git://github.com/stefanberger/swtpm.git;branch=stable-0.7-next;protocol=https \ | 10 | SRC_URI = "git://github.com/stefanberger/swtpm.git;branch=stable-0.7-next;protocol=https \ |
11 | file://ioctl_h.patch \ | ||
12 | " | 11 | " |
13 | PE = "1" | 12 | PE = "1" |
14 | 13 | ||