mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-17 20:59:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

ca-certificates: upgrade 20200601 -> 20210119

Browse Source 
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>
This commit is contained in:
zhengruoqin
2021-01-28 18:05:52 +08:00
committed by Richard Purdie
parent b924e8f887
commit 4b4d1dac11
2 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch
View File

@@ -1,37 +0,0 @@
From b6d18ca77f131cdcaa10d0eaa9d303399767edf6 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 28 Aug 2019 19:18:14 +0200
Subject: [PATCH] certdata2pem.py: use python3
Comments in that file imply it is already py3 compatible.
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
mozilla/Makefile | 2 +-
mozilla/certdata2pem.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mozilla/Makefile b/mozilla/Makefile
index 6f46118..f98877c 100644
--- a/mozilla/Makefile
+++ b/mozilla/Makefile
@@ -3,7 +3,7 @@
#
all:
- python certdata2pem.py
+ python3 certdata2pem.py
clean:
-rm -f *.crt
diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py
index 0b02b2a..7d796f1 100644
--- a/mozilla/certdata2pem.py
+++ b/mozilla/certdata2pem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# vim:set et sw=4:
#
# certdata2pem.py - splits certdata.txt into multiple files

3
meta/recipes-support/ca-certificates/ca-certificates_20200601.bb → meta/recipes-support/ca-certificates/ca-certificates_20210119.bb
View File

@@ -14,7 +14,7 @@ DEPENDS_class-nativesdk = "openssl-native"
# Need rehash from openssl and run-parts from debianutils
PACKAGE_WRITE_DEPS += "openssl-native debianutils-native"
SRCREV = "b3a8980b781bc9a370e42714a605cd4191bb6c0b"
SRCREV = "181be7ebd169b4a6fb5d90c3e6dc791e90534144"
SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \
file://0002-update-ca-certificates-use-SYSROOT.patch \
@@ -23,7 +23,6 @@ SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \
file://default-sysroot.patch \
file://sbindir.patch \
file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \
file://0001-certdata2pem.py-use-python3.patch \
"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+)"