diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-20 11:59:12 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-20 11:59:12 +0000 |
| commit | 349b4242a7a0e800fafc28c77a2aa0868b99a971 (patch) | |
| tree | 934edc6785582177e8e46a6fe13c500f4861a268 /main/lxc | |
| parent | aa5e512833c517b59570326b5eee07f177256d98 (diff) | |
| download | aports-349b4242a7a0e800fafc28c77a2aa0868b99a971.tar.bz2 aports-349b4242a7a0e800fafc28c77a2aa0868b99a971.tar.xz | |
main/lxc: fix .so version
Fix version to a format that apk-tools understands
Diffstat (limited to 'main/lxc')
| -rw-r--r-- | main/lxc/APKBUILD | 8 | ||||
| -rw-r--r-- | main/lxc/version.patch | 17 |
2 files changed, 23 insertions, 2 deletions
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 36537eca4d..7f2cb0807d 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -3,7 +3,7 @@ pkgname=lxc pkgver=1.0.0_rc4 _mypkgver=${pkgver/_rc/.rc} -pkgrel=0 +pkgrel=1 pkgdesc="linux containers - tools" url="http://lxc.sourceforge.net/" arch="all" @@ -17,6 +17,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lvm lua5.2-lxc:_lua52 source="https://github.com/lxc/lxc/archive/lxc-$_mypkgver.tar.gz 0001-lua-Do-not-link-Lua-module-to-the-Lua-core-library.patch 0002-lxc-alpine-add-support-for-architecture-arm.patch + version.patch lxc.initd " @@ -46,7 +47,7 @@ build() { --with-lua-pc=lua5.2 \ --with-distro=alpine \ || return 1 - make || return 1 + make VERSION=$pkgver || return 1 } package() { @@ -81,12 +82,15 @@ templates() { md5sums="6d9297d795dedc28c89e8517dc620872 lxc-1.0.0.rc4.tar.gz 5efd75de6d122e1a1734537e96a4bd7c 0001-lua-Do-not-link-Lua-module-to-the-Lua-core-library.patch 9fda3e60b50507139856fec83f7ec036 0002-lxc-alpine-add-support-for-architecture-arm.patch +79e90616b5049a472ccdcb5b1dcdd8b1 version.patch 9f780f761dcaec3ce40d083c6df044d4 lxc.initd" sha256sums="7b39c519b8eca6e502453f7e494ac6ce55b0850d526e1ed12ba9f44ef548b2fe lxc-1.0.0.rc4.tar.gz a245d3c218fba2f281c7326f3f25e67f82fcbdee78bd7588c2f57c0593550a77 0001-lua-Do-not-link-Lua-module-to-the-Lua-core-library.patch d2a266cbe7f877e41406381079a9d2a24151e0532d61ad3a6630bcbb3106bc52 0002-lxc-alpine-add-support-for-architecture-arm.patch +b6d85fb23940d2511b3951de56b2532843c0e03ec1613548366361cc0c1a46b9 version.patch 8bdb64ecf100b648396456f6765230aab8649665bfcf320baede529ce6c5484d lxc.initd" sha512sums="838d709c96002426069f8eea9c2153f06fe964516998408753ffefdcdefc16c30819c0c40923572f842f7448403134c3cbbc46a6bd17085e16d410bce402ba39 lxc-1.0.0.rc4.tar.gz 910d37d794435753c69729e83f258ed7f6acc38b5d8c07446bc5937b2ebacb09cc0282ed8f24bbf587236e0dfbad81e40860a2b9bf24c868df867b9cebb24f20 0001-lua-Do-not-link-Lua-module-to-the-Lua-core-library.patch 16429f40fa3a6a8dc7f4198cc780f4003c14fd67a2796c09624ef951f879d238f345ab5a645c4c4ab1f029626e2d3f9e7c237378188b7c92b5af289987eee50e 0002-lxc-alpine-add-support-for-architecture-arm.patch +e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def version.patch e3aa39c60db6ba73cbe3fcb27170dd83a03a0a175d8a28513f242a81eef5cb0e90b78dc63fc8da5c7160e60bc780111679fd6d0e401a0d6626e574c328c5afb0 lxc.initd" diff --git a/main/lxc/version.patch b/main/lxc/version.patch new file mode 100644 index 0000000000..6f61d8257a --- /dev/null +++ b/main/lxc/version.patch @@ -0,0 +1,17 @@ +Fix version so apk-tools understand the .so version +(1.0.0.rc4 -> 1.0.0_rc4) + +diff --git a/configure.ac b/configure.ac +index 498d69a..f52bf8c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8,7 +8,8 @@ m4_define([lxc_version_beta], [rc4]) + + m4_define([lxc_version_base], [lxc_version_major.lxc_version_minor.lxc_version_micro]) + m4_define([lxc_version], +- [ifelse(lxc_version_beta, [], [lxc_version_base], [lxc_version_base.lxc_version_beta])]) ++ [ifelse(lxc_version_beta, [], [lxc_version_base], ++ [lxc_version_base[_]lxc_version_beta])])]) + + AC_INIT([lxc], [lxc_version]) + |