diff options
| -rw-r--r-- | vars/build.vars | 14 | ||||
| -rw-r--r-- | vars/gdb.vars | 4 | ||||
| l--------- | vars/gdb_minipix.vars | 1 | ||||
| -rw-r--r-- | vars/invariants_minipix.vars | 9 | ||||
| -rw-r--r-- | vars/python2.vars | 4 | ||||
| l--------- | vars/python2_minipix.vars | 1 |
6 files changed, 23 insertions, 10 deletions
diff --git a/vars/build.vars b/vars/build.vars index 8ebdaced..ad3fe8d7 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1884,12 +1884,11 @@ 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 grep_minipix gzip_minipix infounzip_minipix -infozip_minipix less_minipix nano_minipix patch_minipix -sed_minipix tar_minipix vim_minipix wget_minipix which_minipix -xz_minipix mintty_minipix ntctty_minipix ntux_minipix perk_minipix -ptycon_minipix"; +diffutils_minipix dropbear_minipix findutils_minipix gawk_minipix +gdb_minipix grep_minipix gzip_minipix infounzip_minipix infozip_minipix +less_minipix nano_minipix patch_minipix python2_minipix sed_minipix +tar_minipix vim_minipix wget_minipix which_minipix xz_minipix +mintty_minipix ntctty_minipix ntux_minipix perk_minipix ptycon_minipix"; MINIPIX_PARALLELISE=1; MINIPIX_PKGLIST_DISABLE=1; MINIPIX_PREFIX="${PREFIX}/minipix_dist"; @@ -1914,6 +1913,7 @@ MINIPIX_RPM_DISABLE=1; : ${PKG_DROPBEAR_MINIPIX_INSTALL_FILES:=sbin/dropbear=bin/dropbear}; : ${PKG_FINDUTILS_MINIPIX_INHERIT_FROM:=findutils}; : ${PKG_GAWK_MINIPIX_INHERIT_FROM:=gawk}; +: ${PKG_GDB_MINIPIX_INHERIT_FROM:=gdb}; : ${PKG_GREP_MINIPIX_INHERIT_FROM:=grep}; : ${PKG_GZIP_MINIPIX_INHERIT_FROM:=gzip}; : ${PKG_GZIP_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS}; @@ -1925,6 +1925,8 @@ MINIPIX_RPM_DISABLE=1; : ${PKG_LESS_MINIPIX_INHERIT_FROM:=less}; : ${PKG_NANO_MINIPIX_INHERIT_FROM:=nano}; : ${PKG_PATCH_MINIPIX_INHERIT_FROM:=patch}; +: ${PKG_PYTHON2_MINIPIX_INHERIT_FROM:=python2}; +: ${PKG_PYTHON2_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/python2-minipix-${DEFAULT_TARGET}}; : ${PKG_SED_MINIPIX_INHERIT_FROM:=sed}; : ${PKG_TAR_MINIPIX_INHERIT_FROM:=tar}; : ${PKG_TAR_MINIPIX_MAKEFLAGS_INSTALL:="-C src install-binPROGRAMS"}; diff --git a/vars/gdb.vars b/vars/gdb.vars index f022178d..2a7e9957 100644 --- a/vars/gdb.vars +++ b/vars/gdb.vars @@ -13,4 +13,8 @@ pkg_gdb_host_configure_patch_post() { pkg_gdb_configure_patch_post "${@}"; }; +pkg_gdb_minipix_configure_patch_post() { + pkg_gdb_configure_patch_post "${@}"; +}; + # vim:filetype=sh diff --git a/vars/gdb_minipix.vars b/vars/gdb_minipix.vars new file mode 120000 index 00000000..ee41c557 --- /dev/null +++ b/vars/gdb_minipix.vars @@ -0,0 +1 @@ +gdb.vars
\ No newline at end of file diff --git a/vars/invariants_minipix.vars b/vars/invariants_minipix.vars index eec5e467..89e66488 100644 --- a/vars/invariants_minipix.vars +++ b/vars/invariants_minipix.vars @@ -33,10 +33,11 @@ pkg_invariants_minipix_all() { ex_rtl_fileop cp_follow "${_pname}" "${PREFIX_MINIPIX}/bin"; fi; done; - for _fname in libc.so libcrypto.so.45 liblzma.so.5 libmagic.so.1 \ - libncursesw.so.6 libpcre.so.1 libpsxscl.so libreadline.so.7 \ - libu16ports.so.0 libssl.so.47 libtinfo.so.6 libtinfow.so.6 \ - libunistring.so.2 libuuid.so.1 libz.so.1; do + for _fname in libc.so libcrypto.so.45 libexpat.so.1 liblzma.so.5 libmagic.so.1 \ + libncurses.so.6 libncursesw.so.6 libpcre.so.1 libperk.so.0 \ + libpsxscl.so libpython2.7.so.1 libreadline.so.7 libssl.so.47 \ + libu16ports.so.0 libtinfo.so.6 libtinfow.so.6 libunistring.so.2 \ + libuuid.so.1 libz.so.1; do if pkgp_invariants_minipix_is_newer "${PREFIX_NATIVE}/lib/${_fname}" "${PREFIX_MINIPIX}/bin"; then ex_rtl_fileop cp_follow \ "${PREFIX_NATIVE}/lib/${_fname}" "${PREFIX_MINIPIX}/bin"; diff --git a/vars/python2.vars b/vars/python2.vars index c25bac41..01a8729b 100644 --- a/vars/python2.vars +++ b/vars/python2.vars @@ -9,4 +9,8 @@ pkg_python2_fetch_download() { ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract; }; +pkg_python2_minipix_fetch_download() { + pkg_python2_fetch_download "${@}"; +}; + # vim:filetype=sh diff --git a/vars/python2_minipix.vars b/vars/python2_minipix.vars new file mode 120000 index 00000000..2eb322d5 --- /dev/null +++ b/vars/python2_minipix.vars @@ -0,0 +1 @@ +python2.vars
\ No newline at end of file |