From a2e8ca1235ba63217552a7a5a9278270c35dc2f1 Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: Oct 17 2024 12:38:02 +0000 Subject: groups.d/010.host_deps.d/ca_certificates_host.package: point to proper repo. (oops?) Signed-off-by: Ørjan Malde --- diff --git a/groups.d/010.host_deps.d/ca_certificates_host.package b/groups.d/010.host_deps.d/ca_certificates_host.package index 3aacffc..241c4e8 100644 --- a/groups.d/010.host_deps.d/ca_certificates_host.package +++ b/groups.d/010.host_deps.d/ca_certificates_host.package @@ -1,5 +1,5 @@ : ${PKG_CA_CERTIFICATES_HOST_DEPENDS:="libressl_host"}; -: ${PKG_CA_CERTIFICATES_HOST_URLS_GIT:="ca-certificates=https://github.com/Redfoxmoon3/ca-certificates@master"}; +: ${PKG_CA_CERTIFICATES_HOST_URLS_GIT:="cacerts_host=https://dev.midipix.org/distro/cacerts.git@main"}; : ${PKG_CA_CERTIFICATES_HOST_IN_TREE:=1}; : ${PKG_CA_CERTIFICATES_HOST_CFLAGS_BUILD_EXTRA:=-I${PREFIX}/include}; : ${PKG_CA_CERTIFICATES_HOST_LDFLAGS_BUILD_EXTRA:=-L${PREFIX}/lib}; diff --git a/patches/ca_certificates_host.local.patch b/patches/ca_certificates_host.local.patch deleted file mode 100644 index a0f91b2..0000000 --- a/patches/ca_certificates_host.local.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ca-certificates/Makefile.orig 2021-08-14 20:46:04.231739572 +0200 -+++ ca-certificates/Makefile 2021-08-15 10:13:48.899745275 +0200 -@@ -21,7 +21,6 @@ - ${DESTDIR}/usr/bin \ - ${DESTDIR}/usr/sbin \ - ${DESTDIR}/usr/share/ca-certificates \ -- ${DESTDIR}/usr/local/share/ca-certificates \ - ${DESTDIR}/etc/ssl/certs - - for cert in *.crt; do \ diff --git a/vars/ca_certificates.vars b/vars/ca_certificates.vars index 3260334..c692f5c 100644 --- a/vars/ca_certificates.vars +++ b/vars/ca_certificates.vars @@ -30,7 +30,7 @@ pkg_ca_certificates_host_configure_patch_post() { }; pkg_ca_certificates_host_install_make_pre() { - "${PKG_DESTDIR}/../ca-certificates/certdata2pem_host"; + "${PKG_DESTDIR}/../cacerts_host/certdata2pem_host"; tar -C "${BUILD_WORKDIR}/ca_certificates_host-host-${PKG_TARGET}/destdir" -cpf - . | tar -C "${PKG_DESTDIR}" -xpf -; };