From a092468b55b81da596b5365518c474572418fab3 Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Thu, 21 Nov 2013 20:36:15 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BF=D0=B0=D1=82=D1=87=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?calculate-builder.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys-apps/calculate-builder/Manifest | 2 +- .../files/calculate-builder-2.2.31-fix_version2.patch | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/sys-apps/calculate-builder/Manifest b/sys-apps/calculate-builder/Manifest index 3845d2091..bf1674ba8 100644 --- a/sys-apps/calculate-builder/Manifest +++ b/sys-apps/calculate-builder/Manifest @@ -2,7 +2,7 @@ AUX calculate-builder-2.2.31-discard_clt.patch 1188 SHA256 a031bd16155be1148d1b0 AUX calculate-builder-2.2.31-fix_isohybrid.patch 1083 SHA256 ef4c83ab9eb7bae56c890dbe4433b1c2c886131820cb12853095c6e041aeb927 SHA512 fb30171ab20e62cff5a60b7e7a01610fbf4ca156db073c6ca63e6da1ea57d63516bc24d41bc64f25e561a899a814a179d1bee505386915a3b177f874927ec650 WHIRLPOOL 3ea158aafc3f2fd87a2d293bc8d77f5c23939c21bc6a2dc051b84ea4b25d253531e23772d56a35ef6d212130d8e89dfc7c273a5367b28da3d3e65784682d97d7 AUX calculate-builder-2.2.31-fix_layoutconf.patch 1265 SHA256 d97e17d1bfee64f9e5acf39f0e47f93cbde4be1e17f706246998c92a27a9acaf SHA512 4b1bb74be5e32914a5f0b41a0ba88fe43d56403a723ed5e8eae85a084e6e4be130ade1ce7aeee94dc97427f5e8bef44f1b55decaeae8f3a74ebfdb723ab5c55e WHIRLPOOL b1a23f0dc6d0e98d65203417d284d7ac5dfe3af52b903d77280c9afe1b272d58998e5b56662103282b28b2dc558460dae92e6e8e0143de1408917c7ad13a312f AUX calculate-builder-2.2.31-fix_version.patch 490 SHA256 0cb649bec5a26beb75cae7faf5963a778ae37ea43270fbda92c0fe04e6c5db38 SHA512 420649875895790bc7c73dfb0ef295f4675ce13bfc41aa3c43b63e484daf4c642546a17c008a3c42efb55fef105d216f28035788a2bba9cf0305748112df9207 WHIRLPOOL 44cc2a54e306560a736e46826ba7e2db1bd4e449755e641192a1c6ce86791d93187691528e7f28a8138fe48cd41b1452d8bb76916e39dd60663f2fa21b44571e -AUX calculate-builder-2.2.31-fix_version2.patch 1132 SHA256 4bb3387948d57a19dd5955778c41c12a48d1475767e36df233c0cb4bd0f87380 SHA512 51e591250c5304eb59a7b0e5620f509f4682e3e33a5a249debde9166d27735337e7172a87404abca4e854e513f0ed950963e17cfb8737c5f2f91afe4c39e6445 WHIRLPOOL df1eac86e2608683dc43b9b6e4d23d2b358290bdd7d68a882e3cca0fc576fa39b9f114d2758790155cf0e4b754513b09c445762733fa0472703fe9a5d0909b31 +AUX calculate-builder-2.2.31-fix_version2.patch 629 SHA256 f6dde3182e18ac86096ae7d0a77492b8c82d547a3816add27a92237a78ebcdf9 SHA512 f0498849ce80a00c93b64504c57683b5e3b1a131850a3988bba5b528bb3d8d25f97a83d3493318919b97c3e8bb1fc99ac48644a59ec32de7d46c13b1d08b4407 WHIRLPOOL 26526ad63840f1f7857deb7be02b46529085cd27c92998254db7e256645cc04edbd72f9fe76fddec8c9155d33fc8040127d7e8b5defbb8c42c0be87a6ddad66f AUX calculate-builder-2.2.31-fiximage.patch 644 SHA256 9943cdf1a5f38a7e1408c85e5b250f2a92e41f327771bf66e863eb79add4ad9a SHA512 55b8247a90b221f3589b4daafe9f7c63297cd02c876009b4153f83c70bd53c113202d5a3a36885510a57ccbd92166998de221fdb548ba38592314b39f75cc68e WHIRLPOOL 9473515d46620616f6802b5eeff0ca148e2f38bdf475fcba81522ca3e6fb3a01b95e05f1110fa282df12cfb7728c7af4bbc940dc78152e9ade53d79c1c26aa3c AUX calculate-builder-2.2.31-grub2.patch 785 SHA256 1c67842caaa4abbbba17a69ba9cb84d6b847e3d4aa2b561adcab30b0042d3994 SHA512 f4f0f22488eecca434f82e4aaf73c86169d022e95ed0dddfe2dc8ce5c41989e9839cbe6b815c5e77a80175399dd228523aaca01252686a97ef3b37256840fdd5 WHIRLPOOL de8781e9ff03193a6f3ec4e99f94fabc7158fa25d67e0196a4d614423020b75d86b48b68003a933310e81cb2eebd28f08e8f77a1b17daf0f98042a62c4903220 AUX calculate-builder-2.2.31-r4.patch 2756 SHA256 8ba7ff17f887f205ed403bca4d824d22e0d810d33fe2be5cbe83828f080043de SHA512 8719191f27590c53275b1758be1b0c690576e3c3260bda15cafeca998ff02003c552f23240745a43ba49a6d498f73ad38e6ceba6605c94bb54dffde7cda6a939 WHIRLPOOL 620d1bac4119d7deaf1251253143127a5847a64e6e66ff22ca44b444a583d5867fb5ed0f354374a6ade65e2bdb467ef22123e22486d9c09f19144d48a1e8736f diff --git a/sys-apps/calculate-builder/files/calculate-builder-2.2.31-fix_version2.patch b/sys-apps/calculate-builder/files/calculate-builder-2.2.31-fix_version2.patch index 3e2f73bfd..6391cc666 100644 --- a/sys-apps/calculate-builder/files/calculate-builder-2.2.31-fix_version2.patch +++ b/sys-apps/calculate-builder/files/calculate-builder-2.2.31-fix_version2.patch @@ -11,14 +11,3 @@ index a56a518..7f3d13d 100644 reRes = filter(reVer.search,verList) if reRes: return reRes[0] -@@ -400,7 +400,9 @@ class fillVars(object, varsShare): - return "" - - def get_cl_builder_iso_path(self): -- directory = "/var/calculate/tmp/iso" -+ directory = \ -+ "/var/calculate/tmp/iso-%s-%s"%(self.Get('os_builder_linux_shortname'), -+ self.Get('os_builder_arch_machine')) - newDirectoryName = directory - while path.exists(newDirectoryName): - newDirectoryName = "%s.%s"%(directory,genpassword(8))