From b9c123de30fe62aa1c70bc85c1bf537fb6832eea Mon Sep 17 00:00:00 2001 From: mhiretskiy Date: Wed, 6 May 2009 10:38:42 +0000 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20calcualte-squashfs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.calculate.ru/overlay@1325 c91db197-33c1-4113-bf15-f8a5c547ca64 --- sys-fs/calculate-squashfs/Manifest | 4 ++-- .../calculate-squashfs-2.6.28.10-r1.ebuild | 21 +++++++++++------- .../calculate-squashfs-2.6.28.9-r1.ebuild | 22 ++++++++++++------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/sys-fs/calculate-squashfs/Manifest b/sys-fs/calculate-squashfs/Manifest index 25222714a..d029c632c 100644 --- a/sys-fs/calculate-squashfs/Manifest +++ b/sys-fs/calculate-squashfs/Manifest @@ -5,5 +5,5 @@ DIST patch-2.6.28.10.bz2 203102 RMD160 b1573d047e4247a5419cb95b2b23d8bd47a41f67 DIST patch-2.6.28.9.bz2 173005 RMD160 226641938d0e9bd137b7388a4a015ebfa5216c55 SHA1 80de4c8dba6122fc8dfa5987b617090acf6842e0 SHA256 2d9342ac09e2c69a98ab000ee1313596e2bb9692cbe52ae52c43f913a7a03682 DIST sqlzma3.4-457.tar.bz2 17470 RMD160 7654ece88117300023b2d552e6f1f1fc5630dfb3 SHA1 6f34274e15ae17082d074d7c36b9ba739cb9f2e2 SHA256 856beef4e09c41f2c1b9b60417f66db3876703724ae226273b254ccab07641f6 DIST squashfs3.4.tar.gz 352660 RMD160 e75c9a9e5220e80a8e321536f8fe8372bfe5d830 SHA1 6933a8f3098d94f93ec4002a54026b15a6e11640 SHA256 9ea1a9b3bd4f387ca11b5e96f00f8ae996fb81c4c7ad41f7c7f359917628a339 -EBUILD calculate-squashfs-2.6.28.10-r1.ebuild 3995 RMD160 1369251ab40d66a356beb503e00c6b691c705de8 SHA1 ad0b9ead47766f8321d2215788fc2ccc130d9009 SHA256 7e057e57759ebb569a196f89026be62c99e3722255c8fa9e68fa641a915f2216 -EBUILD calculate-squashfs-2.6.28.9-r1.ebuild 3941 RMD160 06c441757b4da77bdfe72f82901e93d7e05160dd SHA1 138cb575b307f00ea6a4169df1e8446b1ad3b815 SHA256 0027f877458e0b9c2e180d44e7c53199bedf2a1ae7ac57fa3e1dc2d3e963c0ff +EBUILD calculate-squashfs-2.6.28.10-r1.ebuild 4092 RMD160 b958ce46a1f5136ec5cd0909c224d31d91062ec8 SHA1 67870b12f7eeb1d344555527a7c0944dd6a86787 SHA256 58d6d35d35d36e04be83e6b78834db93241e5696325763c322f7ebf487c3a507 +EBUILD calculate-squashfs-2.6.28.9-r1.ebuild 4092 RMD160 b958ce46a1f5136ec5cd0909c224d31d91062ec8 SHA1 67870b12f7eeb1d344555527a7c0944dd6a86787 SHA256 58d6d35d35d36e04be83e6b78834db93241e5696325763c322f7ebf487c3a507 diff --git a/sys-fs/calculate-squashfs/calculate-squashfs-2.6.28.10-r1.ebuild b/sys-fs/calculate-squashfs/calculate-squashfs-2.6.28.10-r1.ebuild index 4f9b98768..c071bc10f 100644 --- a/sys-fs/calculate-squashfs/calculate-squashfs-2.6.28.10-r1.ebuild +++ b/sys-fs/calculate-squashfs/calculate-squashfs-2.6.28.10-r1.ebuild @@ -9,14 +9,18 @@ LZMA_PV="lzma457" SQ_PV=${SQUASH_PV/#squashfs} SQLZMA_PV="sqlzma${SQ_PV}-${LZMA_PV/#lzma}" -[[ ${PV} =~ ([0-9]+)\.([0-9]+)\.([0-9]+)\.?([0-9]+)? ]] -# version kernel -KV_MAJOR=${BASH_REMATCH[1]} -KV_MINOR=${BASH_REMATCH[2]} -KV_PATCH=${BASH_REMATCH[3]} -KV_TYPE=${BASH_REMATCH[4]} -OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" -KV_LOCAL="-calculate" +get_kernel_version_from_pv() { + [[ ${PV} =~ ([0-9]+)\.([0-9]+)\.([0-9]+)\.?([0-9]+)? ]] + # version kernel + KV_MAJOR=${BASH_REMATCH[1]} + KV_MINOR=${BASH_REMATCH[2]} + KV_PATCH=${BASH_REMATCH[3]} + KV_TYPE=${BASH_REMATCH[4]} + OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" + KV_LOCAL="-calculate" +} + +get_kernel_version_from_pv DESCRIPTION="Tool for creating compressed filesystem type squashfs" HOMEPAGE="http://squashfs.sourceforge.net http://www.squashfs-lzma.org" @@ -48,6 +52,7 @@ pkg_setup() { fi linux-mod_pkg_setup + get_kernel_version_from_pv KV_FULL="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.${KV_TYPE}${KV_LOCAL}" append-ldflags -Wl,--no-as-needed } diff --git a/sys-fs/calculate-squashfs/calculate-squashfs-2.6.28.9-r1.ebuild b/sys-fs/calculate-squashfs/calculate-squashfs-2.6.28.9-r1.ebuild index 54c47582f..c071bc10f 100644 --- a/sys-fs/calculate-squashfs/calculate-squashfs-2.6.28.9-r1.ebuild +++ b/sys-fs/calculate-squashfs/calculate-squashfs-2.6.28.9-r1.ebuild @@ -9,14 +9,18 @@ LZMA_PV="lzma457" SQ_PV=${SQUASH_PV/#squashfs} SQLZMA_PV="sqlzma${SQ_PV}-${LZMA_PV/#lzma}" -[[ ${PV} =~ ([0-9]+)\.([0-9]+)\.([0-9]+)\.?([0-9]+)? ]] -# version kernel -KV_MAJOR=${BASH_REMATCH[1]} -KV_MINOR=${BASH_REMATCH[2]} -KV_PATCH=${BASH_REMATCH[3]} -KV_TYPE=${BASH_REMATCH[4]} -OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" -KV_LOCAL="-calculate" +get_kernel_version_from_pv() { + [[ ${PV} =~ ([0-9]+)\.([0-9]+)\.([0-9]+)\.?([0-9]+)? ]] + # version kernel + KV_MAJOR=${BASH_REMATCH[1]} + KV_MINOR=${BASH_REMATCH[2]} + KV_PATCH=${BASH_REMATCH[3]} + KV_TYPE=${BASH_REMATCH[4]} + OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" + KV_LOCAL="-calculate" +} + +get_kernel_version_from_pv DESCRIPTION="Tool for creating compressed filesystem type squashfs" HOMEPAGE="http://squashfs.sourceforge.net http://www.squashfs-lzma.org" @@ -32,6 +36,7 @@ DEPEND="=sys-kernel/calculate-sources-${OKV}.${KV_TYPE}" RDEPEND="!sys-fs/squashfs-tools" LICENSE="GPL-2 LGPL-2.1" +SLOT="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.${KV_TYPE}" KEYWORDS="~amd64 ~x86" BUILD_TARGETS="all" [[ ${ARCH} == "amd64" ]] && ARCH="x86_64" @@ -47,6 +52,7 @@ pkg_setup() { fi linux-mod_pkg_setup + get_kernel_version_from_pv KV_FULL="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.${KV_TYPE}${KV_LOCAL}" append-ldflags -Wl,--no-as-needed }