calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests 1 Releases Wiki Activity

sys-apps/calculate-utils: обновление

Browse Source 
* исправлена одновременная настройка пакета и установка его в систему
* добавлена возможность использовать FEATURES="userpriv" при сборке
пакетов
* сортировка списка собираемых дистрибутивов
mhiretskiy
Хирецкий Михаил 4 years ago
parent c482b55b77
commit 3dc554b86a
5 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File

5
profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/30-update-cache
Unescape View File

@ -15,6 +15,11 @@ update_cache() {
/usr/libexec/calculate/cl-pkg-cache
}
calculate_configurable_package() {
! [[ -f /var/lib/calculate/calculate-core/cache/merge-setup.list ]] ||
grep ${CATEGORY}/${PN} /var/lib/calculate/calculate-core/cache/merge-setup.list &>/dev/null
}
if [[ ${EBUILD_PHASE} == "setup" ]]
then
if tail -5 /var/log/emerge.log | grep -P "\(1 of.*${CATEGORY}/${P}" &>/dev/null

28
profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/35-locking
Unescape View File

@ -0,0 +1,28 @@
# Calculate comment=# protected
# vim: set syntax=sh
#
# Copyright 2020 Calculate Ltd. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
calculate_lockfile=/var/calculate/tmp/portage/$CATEGORY/.$PN.calculate_lockfile
calculate_lock_setup() {
if calculate_configurable_package
then
flock -x -w 120 $calculate_lockfile true
fi
}
calculate_unlock_setup() {
if calculate_configurable_package
then
rm $calculate_lockfile
fi
}
[[ $EBUILD_PHASE == "instprep" ]] && calculate_lock_setup

8
profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-post-setup-package
Unescape View File

@ -24,7 +24,12 @@ post_setup_package() {
if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-setup.list ]] ||
grep ${category}/${pkgname} /var/lib/calculate/calculate-core/cache/merge-setup.list &>/dev/null
then
CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${RUN_CORE} ${CORE_METHOD} --no-progress --pkg-name $pkgname --pkg-category $category --pkg-path "/"
pkg_lockfile=/var/calculate/tmp/portage/$category/.${pkgname}.calculate_lockfile
(
flock -x -w 1 73 || exit 1;
fuser /var/db/pkg/$category/.${pkgname}*.portage_lockfile &>/dev/null || CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${RUN_CORE} ${CORE_METHOD} --no-progress --pkg-name $pkgname --pkg-category $category --pkg-path "/";
rm $pkg_lockfile
) 73>$pkg_lockfile
fi
IFS=/
done < <(sort /var/lib/calculate/-postmerge | uniq)
@ -54,4 +59,5 @@ fix_kernel_symlink() {
post_pkg_postinst() {
[[ "$PN" == "calculate-sources" ]] && fix_kernel_symlink
post_setup_package
calculate_unlock_setup
}

5
sys-apps/calculate-utils/Manifest
Unescape View File

@ -2,6 +2,7 @@ DIST calculate-builder-3.6.6.tar.bz2 42245 BLAKE2B 057af155170b485478914a03a89f7
DIST calculate-builder-3.6.7.1.tar.bz2 42254 BLAKE2B b6bff3e878d645ed96f027fde773a21cb0e9f398a5b362dc2195e8c6b978ffa9ed0dfe67276922f7b534884e3b5b380d36d43f862c81401a691362eec32fc8ad SHA512 5b9ad7e175c9504ddd8756a4208f0fb8d6414f35f1b36ecb585c94d81404ab4638e387e81fa8f9f14626ff332a9845c46c6981ee9c89911267cd0f69e2953e05
DIST calculate-builder-3.6.7.2.tar.bz2 42246 BLAKE2B 9a50f937bb7fedd075f1647c6019783ab0c9fd8817b3f6f068d72825961c7c8997c7c88bde3318d40e5f05a78012108234b49edb4d713a5e869925e0f4478eac SHA512 8e5426bf54a32730efee5af6e6b2ca0adc22ba77a8edaed5e14e0ef28982b22b0608872cd9df9eb349f184318b74b53a8f69388a8f948bd85e2c2038c5a53dcf
DIST calculate-builder-3.6.7.3.tar.bz2 42285 BLAKE2B a7f9eb51602f941d6f9eb0f4254c436667703ebc869b3d47ba01f2be87628dee80d205e398e88ae621086317894fef48548b58e619d0a5c2ecf559afefcb0579 SHA512 9cb844dd706d40ed00e9ad20090dbbacf81018f8339be5cc0dc16791f0c610db32a649bcd52bf5a8798f7c332b71e968677528ce08382c2b35300fad6dec2fbf
DIST calculate-builder-3.6.7.4.tar.bz2 42207 BLAKE2B 326484b2987cc390c728a575eb5568a26d317d1948cbcc2908a65fd42c6723369f65d9c25b9e89264ba626ad6d490417eb125eb26d9ffcb7dec35eec81da2413 SHA512 beffe8d79ce0265f53a81fd8f994d6fad647e6909581d14b11f90d2f834fdabc1fbcf1f58cb3a07c7d06bb90127f9f1290225e88249c7e9baec49286509e7902
DIST calculate-builder-3.6.7.tar.bz2 42193 BLAKE2B 385c9623a0f21300af1d6eeb4ae8715f96a9f5f2c254b71de7a892cb715250f12a28ee4fc227f713820de326430a870808e59aa351e8337160d1881857e062ed SHA512 c3c6e7bb1ba8466a7682c768d981b8c26f177f1bde47fd43a2bf413321a3808d44e4c78fa169f2662f3cdf539d3124aa70eaba041f951e44430b8eee8b8a2f72
DIST calculate-client-3.6.6.tar.bz2 31581 BLAKE2B 696084086d6c7add8a9129ee5ee97d9b28d4c674cc5d1e72ba6c7c3efb347d9a4e1a4a896fefa581502ac147958d5f96762cad10fce683707b0dd8fea371ae06 SHA512 07aba4a1deef7f3571e9122d69e27a39ae6628c0281d47416640c6b7902388215406a6f108389d2b10db5856f0aef02e6a0bb84887e7f1639c482738e6cc6474
DIST calculate-client-3.6.7.tar.bz2 31605 BLAKE2B 08686043d8607fdb1fff2edd5c45028f5e6ab6eb2720d48aab668582d33b2ad6385e570987c86aaacfd027e1f459eb9cc1a482f58df4c87a7e70d3d9707a7cc8 SHA512 97e1066c2d5ae90c86ede695c4f3746634b9ec64db9de84a7d7402d773290967eaac5ea75286c0caf573e6899f585dd719aed7412d2cbf04eaf8e7b33892d61f
@ -11,6 +12,7 @@ DIST calculate-console-gui-3.6.6.tar.bz2 414958 BLAKE2B 3975345e93cde99d4e478e2b
DIST calculate-console-gui-3.6.7.tar.bz2 415026 BLAKE2B 43f4a62f7fcfa465f4d6f9c4f95cf05d65269f4a550a3e44159277339fc756d95526a6f290516316ecaa3c86820e86ca134d3b04e0ba8b54ea3cb70ad3caed56 SHA512 21b743d42db5b47465ad61b0a6ca55f4200b0960550108fffca8231ca525c2f9647171bfb2fd2f002ed6715140961dc3f96d4328c42ae1d7c2a2052b05119177
DIST calculate-core-3.6.6.tar.bz2 98450 BLAKE2B f15acce07c376c22db4a9c36a7d9b665742d082668a0982e972ef208509b260cd4103526aebfe0c40f4ec11c0d73d0d7deaf657b11757225e2450060ba4c0577 SHA512 5769d62b0c25f15804c563429fb03be8d72c2be90a57f31f7726ad149b162874cba07dbfdaafcde179210c0e2688075434032e56f4eca60f9a381b7088d351c8
DIST calculate-core-3.6.7.1.tar.bz2 98861 BLAKE2B 2305d4d2fb7c6b8ff0f282fd258f3cf6b55bd9e05b8dcfbe138f94d5b7b9529b39b8198c1b2a18e8af8ccaec397e9eb8db5fe9dfca9d2271d31656e1fbc953c3 SHA512 80f41f4acb6ed229e753633d535e00b2476a83c7bcba9310745cfddb5570330504ad6b00037d2c7943245cd5bc1c50b29cec8206d10905f62134ea5805fd7ef4
DIST calculate-core-3.6.7.3.tar.bz2 98937 BLAKE2B 040a3ce08161458f036d6a71030c30991e07517b151b8121c46a119dea0cdbcb27548f549da262385e5c1d39e28195ad83e1571c67c978d6972c71d48915a7dd SHA512 fbd437a17b7266b522d1b78a4982e34f73b38e20223c6736444d8cc8bd4f184fed2d0c2913f792ec542d5c1042dba08d7b830c222eb7c94172d15d7a3862cc0f
DIST calculate-core-3.6.7.tar.bz2 99045 BLAKE2B 7939e01bd539fb7d318ea6ff7b2988ae8cb4c257890111bd3a0f92c8177074a7c43d98713fda0ad7759b0cb195ddb2437c290c478e98b8c73cd25ccec214ac23 SHA512 ddb9f6f10da1dfbb77579212e35807842b3c3e6aea16e6094bdb683d7c8d37e2ebd669b17bda0ef08518c9783c2d1b71a939224be55cb9ad05daca3ac4bf456f
DIST calculate-desktop-3.6.6.tar.bz2 18605 BLAKE2B 961e8a9ec3303be1debca7a9ed0148f4accdff13ade7eb9295c34cb4780e7f3d398f17a0b8c679474320743f589e53e333b834d4107a8c9f3c51a384b735e5d0 SHA512 62cee7cec51f7597c5415f2167759c62d9ec967309347acba1dc2fb1a00ce37762e3f980ff64d29c0ff7abb94aa6adb6a17ff063945cbf0d8c94bb05cc2c2277
DIST calculate-desktop-3.6.7.tar.bz2 18600 BLAKE2B 042e570e8d2be2784ffcb20b2725062e290f6732183d412bea9e35d7cc1588c1705424d41d86a16625d932174b3eaed64af76d39576d251ecc7db1abc176e688 SHA512 090c5a7faf34b86fb89ec889c4cc77005451deb895e1d536f501f41e0c63d7c1bf1b4de93b88d18d9b1e50b46d14806999468771c062954fa9ae4ffac68795d1
@ -18,6 +20,7 @@ DIST calculate-i18n-3.6.6.1.tar.bz2 578900 BLAKE2B bfcd1d26d3a74dab2af5621724258
DIST calculate-i18n-3.6.7.1.tar.bz2 579685 BLAKE2B fdefaa6d7f89f2cbc8ed5ef795d742f70d6646a7546e5d9a5b7558a931f4b6f2159372537e84b5005dd12e1bf49953730143983a053562f985a2bbaae234f0c4 SHA512 69cc2a83008ae9d64cf6305f078fccfaf0d38366734a1bd435d9827a583cfca1774692d5f5dba9ae37e6625669eb18d55f75deab6f16df8759e8043a99cd6d69
DIST calculate-i18n-3.6.7.2.tar.bz2 580145 BLAKE2B 03927a9eae7748ea689618dae2277dfea21f1e987ea32ddc25dccc49aedbeee5f70fd408f10367bde815928a89e4bbe79d1682beec21e69a7948d64da322634e SHA512 6d29929aedd184fb5124c6dc55ec342d6e1b4f24d104974cbf461b39b73e88efb97b51b61868412a2405bbecd463a4efe4cbd260570d9523d87065a78f75a14f
DIST calculate-i18n-3.6.7.3.tar.bz2 600765 BLAKE2B fec87fd6ef43c7ff6f2b851003c1bdb8fe09a5ab6e0082dd23e15776fcd6f6ff4ca46a0efc1e5a78c89e96f7e011332a6be62c82d81168626234309735060d39 SHA512 f66bd71abbf5ce68e0c2122d113e487feff742df5465bfdf43e5c818106c31c981ceadf11744736b63e88ba3262630e16bdb22b3a777a227a45c4887956a901b
DIST calculate-i18n-3.6.7.4.tar.bz2 600686 BLAKE2B 7a44a7e1d4387e3f27f660d9125abc7072ed8be584dc6cbe571b9a04925c27ad08a400c4d8f01a6f794d54f6b28a406288932bd2adff8a7d0a5b7b59a9babfaa SHA512 9fdad58bbd383a1ef1b7977bf6b2dfbfac3ef4c1febb2bb5a5a64d5df18beb27a1dd8f80f381cba4c2570358da1e4a45b23f83a416af1131fadfac28e9d5fffc
DIST calculate-install-3.6.6.1.tar.bz2 83962 BLAKE2B 7e9a7008a0ac7930e39319c07257ea9b8606c16f64809ca72e11e1b8fdab00b5652bff124007d36072df298861184cecaefac4a6c2f349545d3fe1ec192c49ec SHA512 b19836312590c464c4a6c30525a38a8aed725a4802f15ad1c08b64ae7fed06dfbd420a95f5fe8a55d87ee1896e7a5669a3af8367d8a1c143f22ec2e4e2d389da
DIST calculate-install-3.6.6.2.tar.bz2 84032 BLAKE2B 2829c9018538c9d971098b137a7c74e4e40c6393746004de8dd6fc2b8e6e99bcaa6031da8e5db00f3598aff863ff55b389f44776970e78c2e6410e342308c60f SHA512 f72c3b09399195f663e4b9b5de37ca3c4b48d25d69e59816028042bcb47838a97f663644e604651996627988f8022a5d1afe3fcf2856d1989c43b9a6ca41cbf6
DIST calculate-install-3.6.6.3.tar.bz2 84314 BLAKE2B 21cdfdf9cce5981735571b654f86bc5b430f36db5e42a35151b6023c4544763b7c6704537df2ccc5f75649e79b795990e3ca5d615154f37e80dac2eb42f43d82 SHA512 5ed96e0e92e0a5739ec93340f86fccb480c815654b5971f6f89489769f0d80c1b5a8f8dcbaeaa00305b40af331f1394b7ef077408f38729dc1f6c15b54c13ca9
@ -39,6 +42,7 @@ DIST calculate-lib-3.6.7.3.tar.bz2 205651 BLAKE2B 98ba4803e10d5a9b86171022a2abdc
DIST calculate-lib-3.6.7.4.tar.bz2 205935 BLAKE2B 3540f277008840fcd30b10eefe1cdcbce2b8f31a202e7383d361175f5708dad8c5257acb1657d27effd819177309f0281ffccba75c035662b1911ff1533f1c4c SHA512 9d060d4284eae2f84ffc8b9576d0c2c4c27c515d1ed12c04accb78a74bfb644ecee4b40f67a746e3233fb5e5e8e98d71c19ddd6bf3d7ebfd894cdd221b966eb8
DIST calculate-lib-3.6.7.7.tar.bz2 206000 BLAKE2B 9c664379bf9aa8d3519dcd3f5ac4ed9dec27a77498443eb2592b9eeb0a92d539f4237a2c0818872bf0043e355b3af7cb2cc9d8df545fdf4bc0328aaeed650537 SHA512 2d913bc292f973833a27068bb2bb414e8c64949424be75ffcaa1618f416d927794ab4ee1fbce9419d5b93cb29450232e2cfc5f3ea5d355c2dc35f9fe98f2fe26
DIST calculate-lib-3.6.7.8.tar.bz2 206038 BLAKE2B 4eb6fe48281cab06e4c4fef051249ea5725b872e1c64fed4a96170b4f0c76018bff495d7f93944ad64ccb304d3903a3a8a62558652705cc155f8fb188801c3d1 SHA512 55e62e0db9f77573248d5f31851bf1799b1f48b9a7bc012e9929f8f9e92dcfd0f54766336d57791495761e3c93d7e21339c6ba78b5b3942aba54ee8e23e5abeb
DIST calculate-lib-3.6.7.9.tar.bz2 206628 BLAKE2B 05f5d5b14a70d2fa732930e9d14fcbbbe9e89fdffbbcfdc8c6f071c53626d1192f756f27bd3b5b075a7add067c1157ac33b2a2a01a0e1ae3ae784777a74cd263 SHA512 a5bcf70b07bd73dc110a16488f1238e93e083d051f56a856690766b825bae066151cda5720e251aa9b4859cc96ed25b94cb6f2c0e81adeb686d7c894b3d1cd00
DIST calculate-lib-3.6.7.tar.bz2 205800 BLAKE2B 678d6ce5a9ce748946879c90d04ba8eba9abd4815be7ade08231bd01bf95fee0e9a41c789dc42527f5900ce22ea92184a165c89105e2661dab24ea0d2ad68420 SHA512 ae44150949214fa8f2883ca2fd129e60524c3d85e3098e9b5db3dc1ede7127bed11c8b7fe1848e184fceb2d50ff45393565eeacbe1f45e9418bc6039e4185915
DIST calculate-server-3.6.6.tar.bz2 6660 BLAKE2B 57c2c024b899e09efb58225b41d1aae6679d10158ada5459258fe48066a8a77d088b8686487d3a339a42f4947d40f2fb4cfec1d971f4731caf6fb8c1bdeb0bc2 SHA512 e22bd14f5c82339cda3caf0b87836b04ad489be1dd16185d1b158563ff0c019cd8a9305498df42496924a0f2f1a47ea53aed17e0fb3cbebf60aa58aec31e7161
DIST calculate-server-3.6.7.tar.bz2 6637 BLAKE2B 2b071f241b712466667fd1757b59955a8345257ce9c44e6f870ef02b754a34260c605391dec9956349c43b8d869b8020662a54b44d89570f6483dce55d796c36 SHA512 1ccd1ce1acea05acaef14bb1341d91551a5d9e7bfa997c94bf441862dcdc4df64bf3c83b1c033ce841178809f2ab709fee2ace3ea43c34199085b216eb7db563
@ -46,4 +50,5 @@ DIST calculate-unix-3.6.6.tar.bz2 21725 BLAKE2B 73c4e0affbdca21d3e0d8d35f42194d5
DIST calculate-unix-3.6.7.tar.bz2 21737 BLAKE2B 8dafee85031cc56b6c171236f37aca9f7942213d930e6c4e4596243163c0599334a19b1cd708cab48468a841c5e2716d714426cc07de113ef66fa87592a55463 SHA512 a6dd3760b139f025499ed095ad981bb73cc0b0529ee0da4a893bbf9af5f9817e199d5d1f27ffe9d00bca9fb435afd804a23737e55ac9c7a93eea5048f6204855
DIST calculate-update-3.6.6.1.tar.bz2 37698 BLAKE2B b791584a26ef7fef4a6fe8a71eb44e689aef854a25e29d7ac8334a561f861e0794c8317478bd5794185921c9999429d53863ed42733e19cce00376dddcb3df40 SHA512 1d6e9a5156b89f526da121747bdf28a0fc1929f64a690af4675c328d6e0c03099a5f126332b2a718494a45f7c40890676e579d85b4c91b77186be85f75298568
DIST calculate-update-3.6.7.1.tar.bz2 37553 BLAKE2B 184a18ac2d61f290aa7dfa392bde4d13e068a661be2bc02ca29bede07a6b8500f22ffc5625247534abf1858fbee998f7d7f69abd040804e1354c3f7b7cd8daf9 SHA512 3b16d8b2ee893eb860da82dd2f153883b7e6eda16d1f4c5f1d812722f073ece52d7e474a1e817653bf680f2d35dea9c5d52f66c3f6b8a65004d96c57c97e52ef
DIST calculate-update-3.6.7.2.tar.bz2 37736 BLAKE2B 2b36681eb1ca6789b389b25948ffc5553f0449602e74122b183cf99c4833abeb433416067fc1795636306ba97f439e9e8e494477e800b85d345064ebf2e8c44e SHA512 22d727017a3751558bff833b5928b4162051993df0c90299819f692c8f4aa90ef7a6e70a8ce7244308c42a145ac4527bfd0d5594964d2900891af8ae28294e17
DIST calculate-update-3.6.7.tar.bz2 37559 BLAKE2B 5d79d2eec45a9f1cfd7c278b4bd88cd99c66e35416d53d2fbdd78ddf2063438c3ca7ac3e420d41b7d8974489594e42d91af9882d9abebc99fda9f6f08414449f SHA512 7979eae7d0a703e7c2e95fada9d258801bf45f8b121d80f0718e83d096fc004f534d36c4cc61573f42cef2a2c221380ea0e4c44c996c44757302048ce8870dd9

25
sys-apps/calculate-utils/calculate-utils-3.6.7.9.ebuild
Unescape View File

@ -0,0 +1,25 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
declare -A CALCULATE_MODULES=(
["lib"]="3.6.7.9"
["install"]="3.6.7.7"
["core"]="3.6.7.3"
["i18n"]="3.6.7.4"
["update"]="3.6.7.2"
["builder"]="3.6.7.4"
)
inherit calculate-utils-r6
DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="x86 amd64"
Write Preview
Loading…
Cancel
Save