From 80a5c9bcdb0199c8b0e608695fd04faa464cf6a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luc=C3=ADa=20Andrea=20Illanes=20Albornoz?= Date: Fri, 31 Mar 2023 07:49:57 +0200 Subject: Make dist/*.dist regular vars files beneath vars.dist/. --- dist/dist_gitref.dist | 20 --------- dist/dist_minipix.dist | 103 -------------------------------------------- dist/dist_zipdist.dist | 72 ------------------------------- pkgtool.sh | 2 +- subr.ex/ex_pkg.subr | 15 ++++--- subr.ex/ex_pkg_env.subr | 24 +++++++---- vars.dist/dist_gitref.vars | 20 +++++++++ vars.dist/dist_minipix.vars | 103 ++++++++++++++++++++++++++++++++++++++++++++ vars.dist/dist_zipdist.vars | 72 +++++++++++++++++++++++++++++++ 9 files changed, 221 insertions(+), 210 deletions(-) delete mode 100644 dist/dist_gitref.dist delete mode 100644 dist/dist_minipix.dist delete mode 100644 dist/dist_zipdist.dist create mode 100644 vars.dist/dist_gitref.vars create mode 100644 vars.dist/dist_minipix.vars create mode 100644 vars.dist/dist_zipdist.vars diff --git a/dist/dist_gitref.dist b/dist/dist_gitref.dist deleted file mode 100644 index e1f2152c..00000000 --- a/dist/dist_gitref.dist +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Lucía Andrea Illanes Albornoz -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_dist_gitref_all() { - local _pdga_group_name="${1}" _pdga_pkg_name="${2}" _pdga_restart_at="${3}"; - - (rtl_fileop cd "${MIDIPIX_BUILD_PWD}" &&\ - git rev-parse HEAD > "${PREFIX}/build.gitref"); - if [ "${?}" -eq 0 ]; then - ex_pkg_dispatch_send "step" "${_pdga_group_name}" "${_pdga_pkg_name}" "finish"; - ex_pkg_state_set "${_pdga_pkg_name}" "finish"; - return 0; - else - return 1; - fi; -}; - -# vim:filetype=sh textwidth=0 diff --git a/dist/dist_minipix.dist b/dist/dist_minipix.dist deleted file mode 100644 index 8d9d330a..00000000 --- a/dist/dist_minipix.dist +++ /dev/null @@ -1,103 +0,0 @@ -# -# Copyright (c) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Lucía Andrea Illanes Albornoz -# set +o errexit -o noglob -o nounset is assumed. -# - -: ${PKG_DIST_MINIPIX_INSTALL_FILES_V2:=" \ - /=%[_minipix]/bin \ - /=%[_minipix]/etc \ - /=%[_minipix]/etc/ssl/certs \ - /=%[_minipix]/lib \ - /=%[_minipix]/share \ - /=%[_minipix]/share/terminfo \ - \ - +%[_native]/bin/clear=%[_minipix]/bin/clear \ - +%[_native]/bin/reset=%[_minipix]/bin/reset \ - +%[_native]/bin/tset=%[_minipix]/bin/tset \ - +%[_minipix_dist]/bin/%<*>=%[_minipix]/bin/%[FNAME] \ - \ - +%[_native]/lib/libassuan.so.0=%[_minipix]/bin/libassuan.so.0 \ - +%[_native]/lib/libbz2.so.1=%[_minipix]/bin/libbz2.so.1 \ - +%[_native]/lib/libcrypto.so.50=%[_minipix]/bin/libcrypto.so.50 \ - +%[_native]/lib/libc.so=%[_minipix]/bin/libc.so \ - +%[_native]/lib/libcurl.so.4=%[_minipix]/bin/libcurl.so.4 \ - +%[_native]/lib/libexpat.so.1=%[_minipix]/bin/libexpat.so.1 \ - +%[_native]/lib/libgmp.so.10=%[_minipix]/bin/libgmp.so.10 \ - +%[_native]/lib/libgnutls.so.30=%[_minipix]/bin/libgnutls.so.30 \ - +%[_native]/lib/libgpgme.so.11=%[_minipix]/bin/libgpgme.so.11 \ - +%[_native]/lib/libgpg-error.so.0=%[_minipix]/bin/libgpg-error.so.0 \ - +%[_native]/lib/libhogweed.so.6=%[_minipix]/bin/libhogweed.so.6 \ - +%[_native]/lib/libiconv.so.2=%[_minipix]/bin/libiconv.so.2 \ - +%[_native]/lib/libidn2.so.0=%[_minipix]/bin/libidn2.so.0 \ - +%[_native]/lib/liblzma.so.5=%[_minipix]/bin/liblzma.so.5 \ - +%[_native]/lib/libmagic.so.1=%[_minipix]/bin/libmagic.so.1 \ - +%[_native]/lib/libmetalink.so.3=%[_minipix]/bin/libmetalink.so.3 \ - +%[_native]/lib/libmpfr.so.4=%[_minipix]/bin/libmpfr.so.4 \ - +%[_native]/lib/libncurses.so.6=%[_minipix]/bin/libncurses.so.6 \ - +%[_native]/lib/libncursesw.so.6=%[_minipix]/bin/libncursesw.so.6 \ - +%[_native]/lib/libnettle.so.8=%[_minipix]/bin/libnettle.so.8 \ - +%[_native]/lib/libpcre2-8.so.0=%[_minipix]/bin/libpcre2-8.so.0 \ - +%[_native]/lib/libpcre.so.1=%[_minipix]/bin/libpcre.so.1 \ - +%[_native]/lib/libperk.so.0=%[_minipix]/bin/libperk.so.0 \ - +%[_native]/lib/libpsl.so.5=%[_minipix]/bin/libpsl.so.5 \ - +%[_native]/lib/libpsxscl.so=%[_minipix]/bin/libpsxscl.so \ - +%[_native]/lib/libpython2.7.so.1=%[_minipix]/bin/libpython2.7.so.1 \ - +%[_native]/lib/libreadline.so.8=%[_minipix]/bin/libreadline.so.8 \ - +%[_native]/lib/libssl.so.53=%[_minipix]/bin/libssl.so.53 \ - +%[_native]/lib/libtasn1.so.6=%[_minipix]/bin/libtasn1.so.6 \ - +%[_native]/lib/libtinfo.so.6=%[_minipix]/bin/libtinfo.so.6 \ - +%[_native]/lib/libtinfow.so.6=%[_minipix]/bin/libtinfow.so.6 \ - +%[_native]/lib/libu16ports.so.0=%[_minipix]/bin/libu16ports.so.0 \ - +%[_native]/lib/libunistring.so.5=%[_minipix]/bin/libunistring.so.5 \ - +%[_native]/lib/libuuid.so.1=%[_minipix]/bin/libuuid.so.1 \ - +%[_native]/lib/libz.so.1=%[_minipix]/bin/libz.so.1 \ - \ - +%[_minipix_dist]/lib/python2.7/=%[_minipix]/lib/python2.7/ \ - \ - +%[_minipix_dist]/etc/ca-certificates.conf=%[_minipix]/etc/ca-certificates.conf \ - +%[_minipix_dist]/etc/ssl/certs/ca-certificates.crt=%[_minipix]/etc/ssl/certs/ca-certificates.crt \ - +%[_minipix_dist]/share/ca-certificates/=%[_minipix]/share/ca-certificates/ \ - \ - +%[_minipix_dist]/share/nano/=%[_minipix]/share/nano/ \ - @nano/nanorc.nanorc=%[_minipix]/share/nanorc \ - +%[_minipix_dist]/share/vim/=%[_minipix]/share/vim/ \ - @vim/vim74/vimrc_example.vim=%[_minipix]/share/vimrc \ - \ - /=%[_minipix]/share/terminfo \ - /=%[_minipix]/share/terminfo/p \ - +%[_native]/share/terminfo/p/putty=%[_minipix]/share/terminfo/p/putty \ - +%[_native]/share/terminfo/p/putty-256color=%[_minipix]/share/terminfo/p/putty-256color \ - /=%[_minipix]/share/terminfo/s \ - +%[_native]/share/terminfo/s/screen=%[_minipix]/share/terminfo/s/screen \ - +%[_native]/share/terminfo/s/screen-256color=%[_minipix]/share/terminfo/s/screen-256color \ - /=%[_minipix]/share/terminfo/x \ - +%[_native]/share/terminfo/x/xterm=%[_minipix]/share/terminfo/x/xterm \ - +%[_native]/share/terminfo/x/xterm-256color=%[_minipix]/share/terminfo/x/xterm-256color \ -"}; - -pkg_dist_minipix_all() { - local _pdma_group_name="${1}" _pdma_pkg_name="${2}" _pdma_restart_at="${3}" \ - _pdma_status="" _pdma_vflag=""; - - if rtl_lmatch \$ARG_VERBOSE_TAGS "install" ","; then - _pdma_vflag="-v"; - fi; - - if rtl_lmatch \$ARG_DIST "minipix" "," \ - && ! rtl_install_v2 \ - \$_pdma_status \ - -p "_minipix=${PREFIX_MINIPIX##*/}" \ - -p "_minipix_dist=${PREFIX}/minipix_dist" \ - -p "_native=${PREFIX_NATIVE##*/}" \ - ${_pdma_vflag} -- "${PREFIX}" \ - "${PKG_INSTALL_FILES_V2}"; then - return 1; - fi; - - ex_pkg_dispatch_send "step" "${_pdma_group_name}" "${_pdma_pkg_name}" "finish"; - ex_pkg_state_set "${_pdma_pkg_name}" "finish"; - - return 0; -}; - -# vim:filetype=sh textwidth=0 diff --git a/dist/dist_zipdist.dist b/dist/dist_zipdist.dist deleted file mode 100644 index 51e8dad0..00000000 --- a/dist/dist_zipdist.dist +++ /dev/null @@ -1,72 +0,0 @@ -# -# Copyright (c) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Lucía Andrea Illanes Albornoz -# set +o errexit -o noglob -o nounset is assumed. -# - -pkg_dist_zipdist_all() { - local _pdza_group_name="${1}" _pdza_pkg_name="${2}" _pdza_restart_at="${3}" \ - _pdza_dist_fname="" _pdza_pkg_name="" _pdza_pkglist_fname="${PREFIX}/pkglist.native"; - - if ! rtl_lmatch \$ARG_DIST "zipdist" ","; then - return 0; - fi; - - ex_pkg_dispatch_send "msg_pkg" "dist" "dist_zipdist" "${MSG_zipdist_begin}"; - rtl_log_msgV "zipdist" "${MSG_zipdist_begin}"; - - for _pdza_pkg_name in $(cat "${_pdza_pkglist_fname}"); do - if [ ! -e "${BUILD_WORKDIR}/${_pdza_pkg_name}-native-${DEFAULT_TARGET}" ]; then - rtl_log_msgV "fatalexit" "${MSG_zipdist_missing_pkg_build_dir}" "${_pdza_pkg_name}"; - fi; - done; - - _pdza_dist_fname="${DEFAULT_ZIPDIST_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.zip"; - - if [ -e "${BUILD_WORKDIR}/zipdist" ]\ - && ! rtl_fileop rm "${BUILD_WORKDIR}/zipdist"; then - return 1; - elif ! rtl_fileop mkdir "${BUILD_WORKDIR}/zipdist"; then - return 1; - elif ! "${BUILD_WORKDIR}/mpackage/mpackage.sh" \ - --defroot="${DEFAULT_ZIPDIST_DEFROOT}" \ - --flysyms \ - --minroot="${PREFIX_MINIPIX}" \ - --objroot="${BUILD_WORKDIR}" \ - --pkgroot="${BUILD_WORKDIR}/zipdist/pkgroot" \ - --product=Midipix \ - --subset="${_pdza_pkglist_fname}" \ - --symbols \ - --sysroot="${BUILD_WORKDIR}/zipdist/sysroot" \ - --target="${DEFAULT_TARGET}" \ - --tmproot="${BUILD_WORKDIR}/zipdist/tmproot" \ - --zipfile="${PREFIX}/${_pdza_dist_fname}"; then - return 1; - fi; - - ex_pkg_dispatch_send "msg_pkg" "dist" "dist_zipdist" "${MSG_zipdist_finished}"; - rtl_log_msgV "zipdist" "${MSG_zipdist_finished}"; - - if [ "${DEFAULT_ZIPDIST_SIGN_GPG_KEY:+}" = 1 ]\ - && command which gpg >/dev/null 2>&1\ - && gpg --list-keys "${DEFAULT_ZIPDIST_SIGN_GPG_KEY}" >/dev/null 2>&1; - then - ex_pkg_dispatch_send "msg_pkg" "dist" "dist_zipdist" "${MSG_zipdist_signing}"; - rtl_log_msgV "zipdist" "${MSG_zipdist_signing}"; - - if ! gpg --armor --passphrase-file /dev/null \ - --local-user "${DEFAULT_ZIPDIST_SIGN_GPG_KEY}" \ - --sign "${PREFIX}/${_pdza_dist_fname}"; then - return 1; - fi; - - ex_pkg_dispatch_send "msg_pkg" "dist" "dist_zipdist" "${MSG_zipdist_signed}"; - rtl_log_msgV "zipdist" "${MSG_zipdist_signed}"; - fi; - - ex_pkg_dispatch_send "step" "${_pdza_group_name}" "${_pdza_pkg_name}" "finish"; - ex_pkg_state_set "${_pdza_pkg_name}" "finish"; - - return 0; -}; - -# vim:filetype=sh textwidth=0 diff --git a/pkgtool.sh b/pkgtool.sh index 9e26cc34..615ce39f 100755 --- a/pkgtool.sh +++ b/pkgtool.sh @@ -353,7 +353,7 @@ pkgtoolp_info_single() { \$_ppis_fname "${_ppis_patch_idx}" \ "${_ppis_pkg_name}" \ "${_ppis_pkg_version}" \ - "vars_file patches_pre patches" \ + "vars_files patches_pre patches" \ && [ "${_ppis_fname:+1}" = 1 ]; do : $((_ppis_patch_idx += 1)); diff --git a/subr.ex/ex_pkg.subr b/subr.ex/ex_pkg.subr index 3b3bba21..feec47f8 100644 --- a/subr.ex/ex_pkg.subr +++ b/subr.ex/ex_pkg.subr @@ -83,15 +83,15 @@ ex_pkg_find_package() { # @_default_idx: one-based single default value index # @_pkg_name: single package name # @_pkg_version: single package version -# @_ldefault: SP-separated list of default value names (any of: patches, patches_pre, vars_file) +# @_ldefault: SP-separated list of default value names (any of: patches, patches_pre, vars_files) # # Returns: zero (0) on success, non-zero (>0) on invalid default value name or unknown package. # ex_pkg_get_default() { local _epgd_rdefault="${1#\$}" _epgd_default_idx="${2}" _epgd_pkg_name="${3}" \ _epgd_pkg_version="${4}" _epgd_ldefault="${5}" \ - _epgd_default="" _epgd_patch_fname="" _epgd_pkg_name_full="" \ - _epgd_pkg_patches_extra="" _epgd_rc=0; + _epgd_default="" _epgd_group_name="" _epgd_patch_fname="" \ + _epgd_pkg_name_full="" _epgd_pkg_patches_extra="" _epgd_rc=0; set --; _epgd_pkg_name_full="${_epgd_pkg_name}${_epgd_pkg_version:+-${_epgd_pkg_version}}"; @@ -118,9 +118,11 @@ ex_pkg_get_default() { "${MIDIPIX_BUILD_PWD}/patches/${_epgd_pkg_name_full}_pre.local@${BUILD_HNAME}.patch"; ;; - vars_file) - set -- \ - "vars/${_epgd_pkg_name}.vars"; + vars_files) + rtl_get_var_unsafe \$_epgd_group_name -u "PKG_${_epgd_pkg_name}_GROUP"; + set -- \ + "vars/${_epgd_pkg_name}.vars" \ + "vars.${_epgd_group_name}/${_epgd_pkg_name}.vars"; ;; *) @@ -296,6 +298,7 @@ ex_pkg_load_groups() { if [ "${_eplg_group_noautofl}" -eq 0 ]; then for _eplg_pkg_name in ${_eplg_pkg_names}; do + rtl_set_var_unsafe -u "PKG_${_eplg_pkg_name}_GROUP" "${_eplg_group}"; rtl_set_var_unsafe -u "PKG_${_eplg_pkg_name}_GROUP_FNAME" "${_eplg_fname}"; done; fi; diff --git a/subr.ex/ex_pkg_env.subr b/subr.ex/ex_pkg_env.subr index bf5425d7..7c4d7daf 100644 --- a/subr.ex/ex_pkg_env.subr +++ b/subr.ex/ex_pkg_env.subr @@ -117,8 +117,8 @@ ex_pkg_env() { local _epe_build_steps_default="${1}" _epe_build_vars_default="${2}" \ _epe_group_name="${3}" _epe_pkg_name="${4}" _epe_restart_at="${5}" \ _epe_workdir="${6}" \ - _epe_inherit_from="" _epe_pkg_version="" _epe_vars_file="" \ - _epe_vars_file_parent="" _epe_vname=""; + _epe_file_idx=0 _epe_inherit_from="" _epe_pkg_version="" \ + _epe_vars_file="" _epe_vars_file_parent="" _epe_vname=""; if rtl_get_var_unsafe \$_epe_inherit_from -u "PKG_${_epe_pkg_name}_INHERIT_FROM"\ && [ "${_epe_inherit_from:+1}" = 1 ]; then @@ -133,14 +133,22 @@ ex_pkg_env() { if [ "${_epe_vars_file:+1}" != 1 ]; then rtl_get_var_unsafe \$_epe_pkg_version -u "PKG_${_epe_pkg_name}_VERSION"; - ex_pkg_get_default \ - \$_epe_vars_file 1 \ - "${_epe_pkg_name}" "${_epe_pkg_version}" \ - "vars_file" \ - || return 1; + _epe_file_idx=1; + while ex_pkg_get_default \ + \$_epe_vars_file "${_epe_file_idx}" \ + "${_epe_pkg_name}" \ + "${_epe_pkg_version}" \ + "vars_files" \ + && [ "${_epe_vars_file:+1}" = 1 ]; + do + : $((_epe_file_idx += 1)); + rtl_fileop source_opt "${_epe_vars_file}"; + done; + else + rtl_fileop source_opt \ + "${_epe_vars_file}"; fi; - rtl_fileop source_opt "${_epe_vars_file}" "${_epe_group_name}/${_epe_pkg_name}.${_epe_group_name}"; if ! exp_pkg_env_set "${_epe_build_vars_default}" "${_epe_group_name}" "${_epe_pkg_name}"\ || ! exp_pkg_env_defaults "${_epe_build_steps_default}" "${_epe_pkg_name}" "${_epe_workdir}"; then return 1; diff --git a/vars.dist/dist_gitref.vars b/vars.dist/dist_gitref.vars new file mode 100644 index 00000000..e1f2152c --- /dev/null +++ b/vars.dist/dist_gitref.vars @@ -0,0 +1,20 @@ +# +# Copyright (c) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Lucía Andrea Illanes Albornoz +# set +o errexit -o noglob -o nounset is assumed. +# + +pkg_dist_gitref_all() { + local _pdga_group_name="${1}" _pdga_pkg_name="${2}" _pdga_restart_at="${3}"; + + (rtl_fileop cd "${MIDIPIX_BUILD_PWD}" &&\ + git rev-parse HEAD > "${PREFIX}/build.gitref"); + if [ "${?}" -eq 0 ]; then + ex_pkg_dispatch_send "step" "${_pdga_group_name}" "${_pdga_pkg_name}" "finish"; + ex_pkg_state_set "${_pdga_pkg_name}" "finish"; + return 0; + else + return 1; + fi; +}; + +# vim:filetype=sh textwidth=0 diff --git a/vars.dist/dist_minipix.vars b/vars.dist/dist_minipix.vars new file mode 100644 index 00000000..8d9d330a --- /dev/null +++ b/vars.dist/dist_minipix.vars @@ -0,0 +1,103 @@ +# +# Copyright (c) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Lucía Andrea Illanes Albornoz +# set +o errexit -o noglob -o nounset is assumed. +# + +: ${PKG_DIST_MINIPIX_INSTALL_FILES_V2:=" \ + /=%[_minipix]/bin \ + /=%[_minipix]/etc \ + /=%[_minipix]/etc/ssl/certs \ + /=%[_minipix]/lib \ + /=%[_minipix]/share \ + /=%[_minipix]/share/terminfo \ + \ + +%[_native]/bin/clear=%[_minipix]/bin/clear \ + +%[_native]/bin/reset=%[_minipix]/bin/reset \ + +%[_native]/bin/tset=%[_minipix]/bin/tset \ + +%[_minipix_dist]/bin/%<*>=%[_minipix]/bin/%[FNAME] \ + \ + +%[_native]/lib/libassuan.so.0=%[_minipix]/bin/libassuan.so.0 \ + +%[_native]/lib/libbz2.so.1=%[_minipix]/bin/libbz2.so.1 \ + +%[_native]/lib/libcrypto.so.50=%[_minipix]/bin/libcrypto.so.50 \ + +%[_native]/lib/libc.so=%[_minipix]/bin/libc.so \ + +%[_native]/lib/libcurl.so.4=%[_minipix]/bin/libcurl.so.4 \ + +%[_native]/lib/libexpat.so.1=%[_minipix]/bin/libexpat.so.1 \ + +%[_native]/lib/libgmp.so.10=%[_minipix]/bin/libgmp.so.10 \ + +%[_native]/lib/libgnutls.so.30=%[_minipix]/bin/libgnutls.so.30 \ + +%[_native]/lib/libgpgme.so.11=%[_minipix]/bin/libgpgme.so.11 \ + +%[_native]/lib/libgpg-error.so.0=%[_minipix]/bin/libgpg-error.so.0 \ + +%[_native]/lib/libhogweed.so.6=%[_minipix]/bin/libhogweed.so.6 \ + +%[_native]/lib/libiconv.so.2=%[_minipix]/bin/libiconv.so.2 \ + +%[_native]/lib/libidn2.so.0=%[_minipix]/bin/libidn2.so.0 \ + +%[_native]/lib/liblzma.so.5=%[_minipix]/bin/liblzma.so.5 \ + +%[_native]/lib/libmagic.so.1=%[_minipix]/bin/libmagic.so.1 \ + +%[_native]/lib/libmetalink.so.3=%[_minipix]/bin/libmetalink.so.3 \ + +%[_native]/lib/libmpfr.so.4=%[_minipix]/bin/libmpfr.so.4 \ + +%[_native]/lib/libncurses.so.6=%[_minipix]/bin/libncurses.so.6 \ + +%[_native]/lib/libncursesw.so.6=%[_minipix]/bin/libncursesw.so.6 \ + +%[_native]/lib/libnettle.so.8=%[_minipix]/bin/libnettle.so.8 \ + +%[_native]/lib/libpcre2-8.so.0=%[_minipix]/bin/libpcre2-8.so.0 \ + +%[_native]/lib/libpcre.so.1=%[_minipix]/bin/libpcre.so.1 \ + +%[_native]/lib/libperk.so.0=%[_minipix]/bin/libperk.so.0 \ + +%[_native]/lib/libpsl.so.5=%[_minipix]/bin/libpsl.so.5 \ + +%[_native]/lib/libpsxscl.so=%[_minipix]/bin/libpsxscl.so \ + +%[_native]/lib/libpython2.7.so.1=%[_minipix]/bin/libpython2.7.so.1 \ + +%[_native]/lib/libreadline.so.8=%[_minipix]/bin/libreadline.so.8 \ + +%[_native]/lib/libssl.so.53=%[_minipix]/bin/libssl.so.53 \ + +%[_native]/lib/libtasn1.so.6=%[_minipix]/bin/libtasn1.so.6 \ + +%[_native]/lib/libtinfo.so.6=%[_minipix]/bin/libtinfo.so.6 \ + +%[_native]/lib/libtinfow.so.6=%[_minipix]/bin/libtinfow.so.6 \ + +%[_native]/lib/libu16ports.so.0=%[_minipix]/bin/libu16ports.so.0 \ + +%[_native]/lib/libunistring.so.5=%[_minipix]/bin/libunistring.so.5 \ + +%[_native]/lib/libuuid.so.1=%[_minipix]/bin/libuuid.so.1 \ + +%[_native]/lib/libz.so.1=%[_minipix]/bin/libz.so.1 \ + \ + +%[_minipix_dist]/lib/python2.7/=%[_minipix]/lib/python2.7/ \ + \ + +%[_minipix_dist]/etc/ca-certificates.conf=%[_minipix]/etc/ca-certificates.conf \ + +%[_minipix_dist]/etc/ssl/certs/ca-certificates.crt=%[_minipix]/etc/ssl/certs/ca-certificates.crt \ + +%[_minipix_dist]/share/ca-certificates/=%[_minipix]/share/ca-certificates/ \ + \ + +%[_minipix_dist]/share/nano/=%[_minipix]/share/nano/ \ + @nano/nanorc.nanorc=%[_minipix]/share/nanorc \ + +%[_minipix_dist]/share/vim/=%[_minipix]/share/vim/ \ + @vim/vim74/vimrc_example.vim=%[_minipix]/share/vimrc \ + \ + /=%[_minipix]/share/terminfo \ + /=%[_minipix]/share/terminfo/p \ + +%[_native]/share/terminfo/p/putty=%[_minipix]/share/terminfo/p/putty \ + +%[_native]/share/terminfo/p/putty-256color=%[_minipix]/share/terminfo/p/putty-256color \ + /=%[_minipix]/share/terminfo/s \ + +%[_native]/share/terminfo/s/screen=%[_minipix]/share/terminfo/s/screen \ + +%[_native]/share/terminfo/s/screen-256color=%[_minipix]/share/terminfo/s/screen-256color \ + /=%[_minipix]/share/terminfo/x \ + +%[_native]/share/terminfo/x/xterm=%[_minipix]/share/terminfo/x/xterm \ + +%[_native]/share/terminfo/x/xterm-256color=%[_minipix]/share/terminfo/x/xterm-256color \ +"}; + +pkg_dist_minipix_all() { + local _pdma_group_name="${1}" _pdma_pkg_name="${2}" _pdma_restart_at="${3}" \ + _pdma_status="" _pdma_vflag=""; + + if rtl_lmatch \$ARG_VERBOSE_TAGS "install" ","; then + _pdma_vflag="-v"; + fi; + + if rtl_lmatch \$ARG_DIST "minipix" "," \ + && ! rtl_install_v2 \ + \$_pdma_status \ + -p "_minipix=${PREFIX_MINIPIX##*/}" \ + -p "_minipix_dist=${PREFIX}/minipix_dist" \ + -p "_native=${PREFIX_NATIVE##*/}" \ + ${_pdma_vflag} -- "${PREFIX}" \ + "${PKG_INSTALL_FILES_V2}"; then + return 1; + fi; + + ex_pkg_dispatch_send "step" "${_pdma_group_name}" "${_pdma_pkg_name}" "finish"; + ex_pkg_state_set "${_pdma_pkg_name}" "finish"; + + return 0; +}; + +# vim:filetype=sh textwidth=0 diff --git a/vars.dist/dist_zipdist.vars b/vars.dist/dist_zipdist.vars new file mode 100644 index 00000000..51e8dad0 --- /dev/null +++ b/vars.dist/dist_zipdist.vars @@ -0,0 +1,72 @@ +# +# Copyright (c) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Lucía Andrea Illanes Albornoz +# set +o errexit -o noglob -o nounset is assumed. +# + +pkg_dist_zipdist_all() { + local _pdza_group_name="${1}" _pdza_pkg_name="${2}" _pdza_restart_at="${3}" \ + _pdza_dist_fname="" _pdza_pkg_name="" _pdza_pkglist_fname="${PREFIX}/pkglist.native"; + + if ! rtl_lmatch \$ARG_DIST "zipdist" ","; then + return 0; + fi; + + ex_pkg_dispatch_send "msg_pkg" "dist" "dist_zipdist" "${MSG_zipdist_begin}"; + rtl_log_msgV "zipdist" "${MSG_zipdist_begin}"; + + for _pdza_pkg_name in $(cat "${_pdza_pkglist_fname}"); do + if [ ! -e "${BUILD_WORKDIR}/${_pdza_pkg_name}-native-${DEFAULT_TARGET}" ]; then + rtl_log_msgV "fatalexit" "${MSG_zipdist_missing_pkg_build_dir}" "${_pdza_pkg_name}"; + fi; + done; + + _pdza_dist_fname="${DEFAULT_ZIPDIST_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.zip"; + + if [ -e "${BUILD_WORKDIR}/zipdist" ]\ + && ! rtl_fileop rm "${BUILD_WORKDIR}/zipdist"; then + return 1; + elif ! rtl_fileop mkdir "${BUILD_WORKDIR}/zipdist"; then + return 1; + elif ! "${BUILD_WORKDIR}/mpackage/mpackage.sh" \ + --defroot="${DEFAULT_ZIPDIST_DEFROOT}" \ + --flysyms \ + --minroot="${PREFIX_MINIPIX}" \ + --objroot="${BUILD_WORKDIR}" \ + --pkgroot="${BUILD_WORKDIR}/zipdist/pkgroot" \ + --product=Midipix \ + --subset="${_pdza_pkglist_fname}" \ + --symbols \ + --sysroot="${BUILD_WORKDIR}/zipdist/sysroot" \ + --target="${DEFAULT_TARGET}" \ + --tmproot="${BUILD_WORKDIR}/zipdist/tmproot" \ + --zipfile="${PREFIX}/${_pdza_dist_fname}"; then + return 1; + fi; + + ex_pkg_dispatch_send "msg_pkg" "dist" "dist_zipdist" "${MSG_zipdist_finished}"; + rtl_log_msgV "zipdist" "${MSG_zipdist_finished}"; + + if [ "${DEFAULT_ZIPDIST_SIGN_GPG_KEY:+}" = 1 ]\ + && command which gpg >/dev/null 2>&1\ + && gpg --list-keys "${DEFAULT_ZIPDIST_SIGN_GPG_KEY}" >/dev/null 2>&1; + then + ex_pkg_dispatch_send "msg_pkg" "dist" "dist_zipdist" "${MSG_zipdist_signing}"; + rtl_log_msgV "zipdist" "${MSG_zipdist_signing}"; + + if ! gpg --armor --passphrase-file /dev/null \ + --local-user "${DEFAULT_ZIPDIST_SIGN_GPG_KEY}" \ + --sign "${PREFIX}/${_pdza_dist_fname}"; then + return 1; + fi; + + ex_pkg_dispatch_send "msg_pkg" "dist" "dist_zipdist" "${MSG_zipdist_signed}"; + rtl_log_msgV "zipdist" "${MSG_zipdist_signed}"; + fi; + + ex_pkg_dispatch_send "step" "${_pdza_group_name}" "${_pdza_pkg_name}" "finish"; + ex_pkg_state_set "${_pdza_pkg_name}" "finish"; + + return 0; +}; + +# vim:filetype=sh textwidth=0 -- cgit v1.2.3