diff options
Diffstat (limited to 'app-emulation/lxd')
| -rw-r--r-- | app-emulation/lxd/Manifest | 7 | ||||
| -rw-r--r-- | app-emulation/lxd/files/ptbr-translation-newline.patch | 19 | ||||
| -rw-r--r-- | app-emulation/lxd/lxd-3.14.ebuild | 2 | ||||
| -rw-r--r-- | app-emulation/lxd/lxd-3.16.ebuild (renamed from app-emulation/lxd/lxd-3.12.ebuild) | 60 |
4 files changed, 46 insertions, 42 deletions
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest index 22dfd3172d8a..4fd252de5b35 100644 --- a/app-emulation/lxd/Manifest +++ b/app-emulation/lxd/Manifest @@ -2,9 +2,8 @@ AUX de-translation-newline-1.patch 432 BLAKE2B 2b546cd7200f0d736bffd255bbb79d4e9 AUX lxd.confd 538 BLAKE2B f020d83375bddc3e88f752d4be49c65893901893eaa572f212c655f4d3c5631b41238ed917c70f16b4c092d82ced13011edd6e91140cda251ebf8745591cd886 SHA512 9ea61647a8da82bc595f78882adf5a6c71483c7adf8965d7d32016a67a0da6510f8dc3d09fd29f77d5f6d5f18282bca3b3b5c2abffaa67265a4fd4ddb07f31a8 AUX lxd.initd 853 BLAKE2B 0b48de1a596767db356850adcb5682c5c351e7477b0d49d81aebf857a01e4eb75067087d323ba4b5d6fbf8765a76cf161ad2cfaa0eba480fb86e91fdb95b0e79 SHA512 960aceb2845cc3b454b2f916c73273f4b1ec6f87e5d569c27c8c58e0db153c084e03addbdcc91dc8761fc6f0e306261d87db73f8610fda197e55f9ec6756fd56 AUX lxd.service 174 BLAKE2B 8686d57a79fbc3a9ec2e1a3197012599a5d6b81b62188e779cdb9a86f9f413fa485090c79dab8c4aa8891e0e35604b85fb1cdb1da313918b34a974b61699b24a SHA512 6f9d71d5c08c49653f28511bc793d1365604af6bf105789caea27f4685d721fbb283f888e3b7310997b73ff2fc5bb1a47e7500c4678cb3d39124cab723523140 -AUX ptbr-translation-newline.patch 599 BLAKE2B a60e323bfcbdde55bb82f930165a56f0806975370ea090d30a2f40057445b7552b1ff368aac4518e3539f2a4f9b66bd474498f7797002c9bf92d0d837cb72246 SHA512 07c7682ac24b138da10e1a24da02b0cf6144d911200d89ae74d4a03c16fd2a75a22f5956902d071fb93ae1b9b74aacd4ad98e98764678881e19773ab64561581 -DIST lxd-3.12.tar.gz 27365315 BLAKE2B 2b371ef4e9703a7a0494ca009b3c04a3051d76ba0bc87566b90871059cce04f80c5d941d639a53762b219f658379bbffb8ed844cee4271bb756aecb2742ce1d0 SHA512 fd56ee2a2114b338cfb8b575775530b34c7dcc978c95f9bc3b0dced91cf7f01558012c357eb3f8220bc6fa6aa5ecaca67d47b300b67c0d193f11c5088ce6330e DIST lxd-3.14.tar.gz 26141949 BLAKE2B 69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe SHA512 3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff -EBUILD lxd-3.12.ebuild 6891 BLAKE2B 91296155f7a1d53ae46e594a9171945fc371c5d03276b28734d180d3eeb4a6b1ef973cdf47abadfdc2d580b5879c1aab77d517c1a9034070b64f6c43aec1c55c SHA512 a3f8525e2da1cba2c1ce2ed4f05ec13f78faa7c76a90e08d11eea5d7d3840b34c2bd0f6e3edff6759cb037974ea7c9f9b9f527fef8bafad314995c42d64fbcd1 -EBUILD lxd-3.14.ebuild 6839 BLAKE2B 939781e111424f59cee080925c822bd8574953c311a7a15906482eb69613e03ff161e85149890724191fe3b01eb4ef877ebb7440826155a9438bccbefd89cdf8 SHA512 13d4537a75ef22eb92a8da9053b46ec48ff033bec6a01bf7ee6b63b5c7dc611bd729b718b646b406c7c5de54dad06236ea9ae63afd304bb8baf6034627eebb03 +DIST lxd-3.16.tar.gz 24863601 BLAKE2B 0087c00d86ea3f623ea31bc008176e4232bb432f5c431c288f5c5ff3e1658abe4e310509088ddc6b23d8db68f8e93997522b8a5c0b19fd243abee13e11d3deb9 SHA512 11c6c5c49ceb23c31979829937e1baad340b8920481ef5b89b2b6d0b6b05967ec1f446f8b0330c11008f6fecea077eed0858af7fe802c50b52148757584fdfb9 +EBUILD lxd-3.14.ebuild 6838 BLAKE2B 19767cc66314b0faa5270a51fb0f5db7264c6f55bec02ddbed3673b3c051d16f9556d59da592b55b638b0e93d76fe549ac1ab24a5fe997d0af19c71f0ae4cb47 SHA512 8f7309e0eb05b64e6dbaf2c048511737d7df96d35bb1d0a340c9e80b2a025b3d49a37795303b02b4c0429fdfb43e881be22d1f4b555949a25c4e51b9607f3dbd +EBUILD lxd-3.16.ebuild 8078 BLAKE2B 48585fc59909c1d404fbc1cb44e4c7ed4c49b78e2685dac1a542c9be44efffdd679c6bea7997cc0e52f0e434a4d96d1cedaf3ff53fc9e2bf96018da770484780 SHA512 03cd8e9a1e2da16f6f1b6720556fe781c96bd9376135cfdfca17bbd4028d31a71ff490bae8a6317e8bfea89394a87fd5b9505a8803fd80cdecd60f03764f96a4 MISC metadata.xml 925 BLAKE2B 74a89f515bf441f62686a9a2fc2576ec8986705b681e52c9e8267acd6839b06fdafe82dd27df43c39b5e09bba87e63bbb27cc4da18ed31931393946b90add05b SHA512 e4fc6d70a790e164366349e4980f5161db0ca1b4d1996c1ce32223a75926a38ea46f8e08e6c708c6f41c2c81aebde3dbe0d0ce5c63f9340f7ae6f895b5fde144 diff --git a/app-emulation/lxd/files/ptbr-translation-newline.patch b/app-emulation/lxd/files/ptbr-translation-newline.patch deleted file mode 100644 index 92d78ca14270..000000000000 --- a/app-emulation/lxd/files/ptbr-translation-newline.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- /po/pt_BR.po.orig 2018-10-13 23:27:01.523645894 -0500 -+++ /po/pt_BR.po 2018-10-13 23:28:04.730644762 -0500 -@@ -95,7 +95,6 @@ - "###\n" - "### Note that the name is shown but cannot be changed" - msgstr "" --"\n" - "### Esta é uma representação em yaml da configuração.\n" - "### Qualquer linha começando com '#' será ignorada.\n" - "###\n" -@@ -112,7 +111,7 @@ - "### type: disk\n" - "### ephemeral: false\n" - "###\n" --"### Observe que o nome é exibido mas não pode ser modificado\n" -+"### Observe que o nome é exibido mas não pode ser modificado" - - #: lxc/config_metadata.go:63 - msgid "" diff --git a/app-emulation/lxd/lxd-3.14.ebuild b/app-emulation/lxd/lxd-3.14.ebuild index 80bccb3ac766..4d7ff49b9d13 100644 --- a/app-emulation/lxd/lxd-3.14.ebuild +++ b/app-emulation/lxd/lxd-3.14.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/" LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="+daemon +ipv6 +dnsmasq nls test tools" diff --git a/app-emulation/lxd/lxd-3.12.ebuild b/app-emulation/lxd/lxd-3.16.ebuild index a330cfbac4e1..8c7e5f94a4d8 100644 --- a/app-emulation/lxd/lxd-3.12.ebuild +++ b/app-emulation/lxd/lxd-3.16.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/" LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="~amd64" IUSE="+daemon +ipv6 +dnsmasq nls test tools" @@ -91,29 +91,47 @@ EGO_PN="github.com/lxc/lxd" src_prepare() { eapply_user eapply "${FILESDIR}/de-translation-newline-1.patch" - eapply "${FILESDIR}/ptbr-translation-newline.patch" - cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir" + cd "${S}/_dist/deps/raft" || die "Can't cd to raft dir" + # Workaround for " * ACCESS DENIED: open_wr: /dev/zfs" + sed -i 's#zfs version | cut -f 2#< /sys/module/zfs/version cut -f 1#' configure.ac || die "Can't sed configure.ac for raft" eautoreconf + + cd "${S}/_dist/deps/dqlite" || die "Can't cd to dqlite dir" + eautoreconf + } src_configure() { - export GOPATH="${S}/dist" - cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" + export GOPATH="${S}/_dist" + cd "${GOPATH}/deps/sqlite" || die "Can't cd to sqlite dir" econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd" - cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" + cd "${GOPATH}/deps/raft" || die "Can't cd to raft dir" + PKG_CONFIG_PATH="${GOPATH}/raft/" econf --libdir=${EPREFIX}/usr/lib/lxd + + cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir" + export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/" + export RAFT_LIBS="${GOPATH}/deps/raft/.libs" + export CO_CFLAGS="-I${GOPATH}/deps/libco/" + export CO_LIBS="${GOPATH}/deps/libco/" PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=${EPREFIX}/usr/lib/lxd } src_compile() { - export GOPATH="${S}/dist" + export GOPATH="${S}/_dist" - cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" + cd "${GOPATH}/deps/sqlite" || die "Can't cd to sqlite dir" emake - cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" - emake CFLAGS="-I${GOPATH}/sqlite" LDFLAGS="-L${GOPATH}/sqlite" + cd "${GOPATH}/deps/raft" || die "Can't cd to raft dir" + emake + + cd "${GOPATH}/deps/libco" || die "Can't cd to libco dir" + emake + + cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir" + emake CFLAGS="-I${GOPATH}/deps/sqlite -I${GOPATH}/deps/raft/include" LDFLAGS="-L${GOPATH}/deps/sqlite -L${GOPATH}/deps/raft" # We don't use the Makefile here because it builds targets with the # assumption that `pwd` is in a deep gopath namespace, which we're not. @@ -125,9 +143,9 @@ src_compile() { # LXD depends on a patched, bundled sqlite with replication # capabilities. - export CGO_CFLAGS="-I${GOPATH}/sqlite/ -I${GOPATH}/dqlite/include/" - export CGO_LDFLAGS="-L${GOPATH}/sqlite/.libs/ -L${GOPATH}/dqlite/.libs/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd" - export LD_LIBRARY_PATH="${GOPATH}/sqlite/.libs/:${GOPATH}/dqlite/.libs/" + export CGO_CFLAGS="${CGO_CFLAGS} -I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/dqlite/include/ -I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/libco/" + export CGO_LDFLAGS="${CGO_LDFLAGS} -L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/dqlite/.libs/ -L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/libco/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd" + export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs/:${GOPATH}/deps/raft/.libs:${GOPATH}/deps/libco/:${LD_LIBRARY_PATH}" go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon" fi @@ -144,7 +162,7 @@ src_compile() { src_test() { if use daemon; then - export GOPATH="${S}/dist" + export GOPATH="${S}/_dist" # This is mostly a copy/paste from the Makefile's "check" rule, but # patching the Makefile to work in a non "fully-qualified" go namespace # was more complicated than this modest copy/paste. @@ -160,15 +178,21 @@ src_test() { } src_install() { - local bindir="dist/bin" + local bindir="_dist/bin" dobin ${bindir}/lxc if use daemon; then - export GOPATH="${S}/dist" - cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" + export GOPATH="${S}/_dist" + cd "${GOPATH}/deps/sqlite" || die "Can't cd to sqlite dir" emake DESTDIR="${D}" install - cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" + cd "${GOPATH}/deps/raft" || die "Can't cd to raft dir" + emake DESTDIR="${D}" install + + cd "${GOPATH}/deps/libco" || die "Can't cd to libco dir" + dolib.so libco.so || die "Can't install libco.so" + + cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir" emake DESTDIR="${D}" install # Must only install libs |