diff options
Diffstat (limited to 'external/poky/meta/recipes-support/ca-certificates')
2 files changed, 43 insertions, 3 deletions
diff --git a/external/poky/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch b/external/poky/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch new file mode 100644 index 00000000..aa2c85ff --- /dev/null +++ b/external/poky/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch @@ -0,0 +1,37 @@ +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 diff --git a/external/poky/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb b/external/poky/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb index b9f57900..ce3cb217 100644 --- a/external/poky/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb +++ b/external/poky/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=aeb420429b1659507e0a5a1b123e8308 DEPENDS = "" DEPENDS_class-native = "openssl-native" DEPENDS_class-nativesdk = "openssl-native" -# Need c_rehash from openssl and run-parts from debianutils +# Need rehash from openssl and run-parts from debianutils PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" SRCREV = "c28799b138b044c963d24c4a69659b6e5486e3be" @@ -23,6 +23,7 @@ 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 \ " S = "${WORKDIR}/git" @@ -53,7 +54,7 @@ do_install () { echo "# Lines starting with ! will remove certificate on next update" echo "#" find ${D}${datadir}/ca-certificates -type f -name '*.crt' | \ - sed 's,^${D}${datadir}/ca-certificates/,,' + sed 's,^${D}${datadir}/ca-certificates/,,' | sort } >${D}${sysconfdir}/ca-certificates.conf } @@ -82,6 +83,8 @@ do_install_append_class-native () { SYSROOT="${D}${base_prefix}" ${D}${sbindir}/update-ca-certificates } -RDEPENDS_${PN} += "openssl" +RDEPENDS_${PN}_class-target = "openssl-bin" +RDEPENDS_${PN}_class-native = "openssl-native" +RDEPENDS_${PN}_class-nativesdk = "nativesdk-openssl-bin" BBCLASSEXTEND = "native nativesdk" |