diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-08-30 14:49:51 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-01 22:33:07 +0100 |
commit | 2100fbe529e3031e4b0f7997acbfe781f25104dd (patch) | |
tree | 2922a2514805934f57ee8b5a30117eedf745b5c7 /meta/recipes-support/ca-certificates | |
parent | 58e85c60cd15cf4c0b47cddcf507543461c1a328 (diff) | |
download | poky-2100fbe529e3031e4b0f7997acbfe781f25104dd.tar.gz |
ca-certificates: use python 3 for builds
(From OE-Core rev: 8157c6d32e2af67211eb8fcd048a0771f10f7b26)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/ca-certificates')
-rw-r--r-- | meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch | 37 | ||||
-rw-r--r-- | meta/recipes-support/ca-certificates/ca-certificates_20190110.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch b/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch new file mode 100644 index 0000000000..aa2c85ff43 --- /dev/null +++ b/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From b6d18ca77f131cdcaa10d0eaa9d303399767edf6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 28 Aug 2019 19:18:14 +0200 | ||
4 | Subject: [PATCH] certdata2pem.py: use python3 | ||
5 | |||
6 | Comments in that file imply it is already py3 compatible. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | mozilla/Makefile | 2 +- | ||
12 | mozilla/certdata2pem.py | 2 +- | ||
13 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/mozilla/Makefile b/mozilla/Makefile | ||
16 | index 6f46118..f98877c 100644 | ||
17 | --- a/mozilla/Makefile | ||
18 | +++ b/mozilla/Makefile | ||
19 | @@ -3,7 +3,7 @@ | ||
20 | # | ||
21 | |||
22 | all: | ||
23 | - python certdata2pem.py | ||
24 | + python3 certdata2pem.py | ||
25 | |||
26 | clean: | ||
27 | -rm -f *.crt | ||
28 | diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py | ||
29 | index 0b02b2a..7d796f1 100644 | ||
30 | --- a/mozilla/certdata2pem.py | ||
31 | +++ b/mozilla/certdata2pem.py | ||
32 | @@ -1,4 +1,4 @@ | ||
33 | -#!/usr/bin/python | ||
34 | +#!/usr/bin/python3 | ||
35 | # vim:set et sw=4: | ||
36 | # | ||
37 | # certdata2pem.py - splits certdata.txt into multiple files | ||
diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb b/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb index 7d87da10bb..ce3cb217a1 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb +++ b/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb | |||
@@ -23,6 +23,7 @@ SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \ | |||
23 | file://default-sysroot.patch \ | 23 | file://default-sysroot.patch \ |
24 | file://sbindir.patch \ | 24 | file://sbindir.patch \ |
25 | file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \ | 25 | file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \ |
26 | file://0001-certdata2pem.py-use-python3.patch \ | ||
26 | " | 27 | " |
27 | 28 | ||
28 | S = "${WORKDIR}/git" | 29 | S = "${WORKDIR}/git" |