summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2021-01-24 21:31:21 +0000
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2021-01-24 21:31:21 +0000
commit757437495b91f66e7cb4f192ed0135e845e7e05a (patch)
treebb566b44a383ce66aef48fc787bd89bf47ce417b
parentc0590b19ae944f4017a52bf036490cf8af682a9f (diff)
downloadmidipix_build-757437495b91f66e7cb4f192ed0135e845e7e05a.tar.bz2
midipix_build-757437495b91f66e7cb4f192ed0135e845e7e05a.tar.xz
groups/241.native_packages_inet.group:ca_certificates:${PKG_URLS_GIT}: use non-conflicting directory name.
vars/ca_certificates.vars:pkg_ca_certificates_install_make_pre(): updated.
-rw-r--r--groups/241.native_packages_inet.group2
-rw-r--r--vars/ca_certificates.vars2
2 files changed, 2 insertions, 2 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 29d3faad..cf7682fe 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -25,7 +25,7 @@ proxytunnel rsync socat thttpd w3m weechat wget whois")";
: ${PKG_BIND_CONFIGURE_ARGS_EXTRA:="--with-libtool --disable-backtrace --with-eddsa=no --with-ecdsa=yes --with-gssapi=no --with-libxml2=no --with-libjson=no --with-openssl=${PREFIX_NATIVE} BUILD_CC=gcc"};
: ${PKG_BIND_MAKEFLAGS_BUILD:=-j1};
: ${PKG_CA_CERTIFICATES_DEPENDS:="libressl"};
-: ${PKG_CA_CERTIFICATES_URLS_GIT:="ca-certificates=https://dev.midipix.org/distro/cacerts.git@main"};
+: ${PKG_CA_CERTIFICATES_URLS_GIT:="cacerts=https://dev.midipix.org/distro/cacerts.git@main"};
: ${PKG_CA_CERTIFICATES_IN_TREE:=1};
: ${PKG_CA_CERTIFICATES_CFLAGS_BUILD_EXTRA:=-I${PREFIX_NATIVE}/include};
: ${PKG_CA_CERTIFICATES_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib};
diff --git a/vars/ca_certificates.vars b/vars/ca_certificates.vars
index 59701414..c87ba41f 100644
--- a/vars/ca_certificates.vars
+++ b/vars/ca_certificates.vars
@@ -3,7 +3,7 @@
#
pkg_ca_certificates_install_make_pre() {
- "${PKG_DESTDIR}/../ca-certificates/certdata2pem_host";
+ "${PKG_DESTDIR}/../cacerts/certdata2pem_host";
tar -C "${BUILD_WORKDIR}/ca_certificates_host-host-${PKG_TARGET}/destdir" -cpf - . | tar -C "${PKG_DESTDIR}" -xpf -;
};