diff options
| -rw-r--r-- | dist/dist_minipix.dist | 6 | ||||
| -rw-r--r-- | groups/800.minipix.group | 14 | ||||
| -rw-r--r-- | vars/ca_certificates.vars | 8 | ||||
| l--------- | vars/ca_certificates_minipix.vars | 1 |
4 files changed, 23 insertions, 6 deletions
diff --git a/dist/dist_minipix.dist b/dist/dist_minipix.dist index 81fc4a02..029d4e41 100644 --- a/dist/dist_minipix.dist +++ b/dist/dist_minipix.dist @@ -42,6 +42,12 @@ pkg_dist_minipix_all() { return 1; fi; done; + for _pname in etc/ca-certificates.conf etc/ssl/certs/ca-certificates.crt share/ca-certificates; do + if [ -e "${PREFIX}/minipix_dist/${_pname}" ]\ + && ! tar -C "${PREFIX}/minipix_dist" -cpf - "${_pname}" | tar -C "${PREFIX_MINIPIX}" -xpf -; then + return 1; + fi; + done; for _fname in nano vim; do if [ -e "${PREFIX}/minipix_dist/share/${_fname}" ]\ && rtl_is_newer "${PREFIX}/minipix_dist/share/${_fname}" "${PREFIX_MINIPIX}/share/${_fname}"\ diff --git a/groups/800.minipix.group b/groups/800.minipix.group index b7f94877..dd398b27 100644 --- a/groups/800.minipix.group +++ b/groups/800.minipix.group @@ -10,12 +10,13 @@ MINIPIX_LDFLAGS_BUILD="--sysroot=${PREFIX_NATIVE} -mvrfs"; MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE} -mvrfs"; MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix="; MINIPIX_PACKAGES=" -bash_minipix bzip2_minipix coreutils_minipix dash_minipix -diffutils_minipix dropbear_minipix findutils_minipix gawk_minipix -gdb_minipix grep_minipix gzip_minipix infounzip_minipix infozip_minipix -less_minipix libz_minipix nano_minipix patch_minipix python2_minipix -sed_minipix tar_minipix tpax_minipix vim_minipix wget_minipix which_minipix xz_minipix -mintty_minipix ntctty_minipix ntux_minipix perk_minipix ptycon_minipix toksvc_minipix"; +bash_minipix bzip2_minipix ca_certificates_minipix coreutils_minipix +dash_minipix diffutils_minipix dropbear_minipix findutils_minipix +gawk_minipix gdb_minipix grep_minipix gzip_minipix infounzip_minipix +infozip_minipix less_minipix libz_minipix nano_minipix patch_minipix +python2_minipix sed_minipix tar_minipix tpax_minipix vim_minipix +wget_minipix which_minipix xz_minipix mintty_minipix ntctty_minipix +ntux_minipix perk_minipix ptycon_minipix toksvc_minipix"; MINIPIX_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig"; MINIPIX_PKGLIST_DISABLE=1; MINIPIX_PREFIX="${PREFIX}/minipix_dist"; @@ -30,6 +31,7 @@ MINIPIX_RPM_DISABLE=1; : ${PKG_BZIP2_MINIPIX_BUILD_STEPS_DISABLE:="install_make"}; : ${PKG_BZIP2_MINIPIX_INSTALL_FILES:="../bzip2-${PKG_BZIP2_VERSION}/bzip2=bin/ @bzip2=bin/bunzip2 @bzip2=bin/bzcat @bzip2=bin/bzip2recover @bzip2=bin/bzgrep @bzip2=bin/bzmore @bzip2=bin/bzdiff"}; : ${PKG_BZIP2_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="-f Makefile"}; +: ${PKG_CA_CERTIFICATES_MINIPIX_INHERIT_FROM:=ca_certificates}; : ${PKG_COREUTILS_MINIPIX_INHERIT_FROM:=coreutils}; : ${PKG_COREUTILS_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS}; : ${PKG_COREUTILS_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:=INSTALL_PROGRAM=${DEFAULT_TARGET}-install-strip}; diff --git a/vars/ca_certificates.vars b/vars/ca_certificates.vars index f25b98ba..59701414 100644 --- a/vars/ca_certificates.vars +++ b/vars/ca_certificates.vars @@ -38,4 +38,12 @@ pkg_ca_certificates_host_install_make_post() { set +o noglob; rtl_fileop rm "${PKG_DESTDIR}/bin"/* "${PKG_DESTDIR}/sbin"/*; set -o noglob; }; +pkg_ca_certificates_minipix_install_make_pre() { + pkg_ca_certificates_install_make_pre "${@}"; +}; + +pkg_ca_certificates_minipix_install_make_post() { + pkg_ca_certificates_install_make_post "${@}"; +}; + # vim:filetype=sh textwidth=0 diff --git a/vars/ca_certificates_minipix.vars b/vars/ca_certificates_minipix.vars new file mode 120000 index 00000000..242754d1 --- /dev/null +++ b/vars/ca_certificates_minipix.vars @@ -0,0 +1 @@ +ca_certificates.vars
\ No newline at end of file |