diff options
Diffstat (limited to 'meta')
| -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_20210119.bb (renamed from meta/recipes-support/ca-certificates/ca-certificates_20200601.bb) | 3 |
2 files changed, 1 insertions, 39 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 @@ | |||
| 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_20200601.bb b/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb index 6f39df7985..888a235c1a 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates_20200601.bb +++ b/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb | |||
| @@ -14,7 +14,7 @@ DEPENDS_class-nativesdk = "openssl-native" | |||
| 14 | # Need rehash from openssl and run-parts from debianutils | 14 | # Need rehash from openssl and run-parts from debianutils |
| 15 | PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" | 15 | PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" |
| 16 | 16 | ||
| 17 | SRCREV = "b3a8980b781bc9a370e42714a605cd4191bb6c0b" | 17 | SRCREV = "181be7ebd169b4a6fb5d90c3e6dc791e90534144" |
| 18 | 18 | ||
| 19 | SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \ | 19 | SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \ |
| 20 | file://0002-update-ca-certificates-use-SYSROOT.patch \ | 20 | file://0002-update-ca-certificates-use-SYSROOT.patch \ |
| @@ -23,7 +23,6 @@ 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 \ | ||
| 27 | " | 26 | " |
| 28 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+)" | 27 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+)" |
| 29 | 28 | ||
