summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/ca-certificates/ca-certificates
diff options
context:
space:
mode:
authorzhengruoqin <zhengrq.fnst@cn.fujitsu.com>2021-01-28 18:05:52 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-10 23:55:53 +0000
commit4b4d1dac11ad3d53df50a4dd220a3a9b0219ab34 (patch)
treef9a91becbc416bdf8551b115f3586077d915f043 /meta/recipes-support/ca-certificates/ca-certificates
parentb924e8f88754f8d7688fc92812c8288bee0df01f (diff)
downloadpoky-4b4d1dac11ad3d53df50a4dd220a3a9b0219ab34.tar.gz
ca-certificates: upgrade 20200601 -> 20210119
0001-certdata2pem.py-use-python3.patch removed since it is included in 20210119 (From OE-Core rev: 2a558ee61a2452a209d39cd1528a309c549c0f4e) Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit afd86357e07f69090eaff4c5db2c517867dd4ccf) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/ca-certificates/ca-certificates')
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch37
1 files changed, 0 insertions, 37 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
deleted file mode 100644
index aa2c85ff43..0000000000
--- a/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From b6d18ca77f131cdcaa10d0eaa9d303399767edf6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 28 Aug 2019 19:18:14 +0200
4Subject: [PATCH] certdata2pem.py: use python3
5
6Comments in that file imply it is already py3 compatible.
7
8Upstream-Status: Pending
9Signed-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
15diff --git a/mozilla/Makefile b/mozilla/Makefile
16index 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
28diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py
29index 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