diff options
Diffstat (limited to 'app-containers/snapd')
-rw-r--r-- | app-containers/snapd/Manifest | 10 | ||||
-rw-r--r-- | app-containers/snapd/snapd-2.55.4.ebuild | 183 | ||||
-rw-r--r-- | app-containers/snapd/snapd-2.56.2.ebuild (renamed from app-containers/snapd/snapd-2.55.2.ebuild) | 47 | ||||
-rw-r--r-- | app-containers/snapd/snapd-2.56.ebuild (renamed from app-containers/snapd/snapd-2.55.3.ebuild) | 47 |
4 files changed, 46 insertions, 241 deletions
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest index 413cd6c1e8c1..a84d1ac12cfa 100644 --- a/app-containers/snapd/Manifest +++ b/app-containers/snapd/Manifest @@ -1,8 +1,6 @@ AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00 -DIST snapd-2.55.2.tar.xz 6659212 BLAKE2B a76cec2bf0f3c44212a20c8b0744e4327a725b28a0055be49dfbe638020532f4933c20edda3bdab20290d38f602459fd0962413a9c58400cdc8d6ef3b4634a41 SHA512 8fee8bb6ff52d3cbd5f0a9f206e7c93dea1b6c0ade9c2b6fbd7b0d729b6eeeb1fb01a28dab53543671c42ceac25d6d8932a8b4b9349332b0cde9b9226f6ec063 -DIST snapd-2.55.3.tar.xz 6673552 BLAKE2B 8a34a568a1563c786e6975fb44d6a23f8a943906ff16b4c587fcca9e1d6ae033d8389b069235e62449a327dff8f1d11e83528fecf02768c730aede72b6cd6790 SHA512 e9dbdc47a9b83792f32fa66d558b0602100ac2b7cfd02ea96e4346fe1bdda7aa5fbe23cfba090e1ba61430ce9cfb0e9bd015c420c13bdca282a500c6ab222817 -DIST snapd-2.55.4.tar.xz 6669776 BLAKE2B 024c03d163f23da8a26076dfb9fd2edc44807731c40b74b554132753b20ff6a7ae454dfee4f20e05bbf7f596e09bbd7378cbe5d8625c3dfb43e94d84578b8e81 SHA512 990266ac37e0d0da433ea3dacdd97806cc3ea5d1d94e068e5b945da54d87d965860ad290799c0bca29dab35069a449fa483b4f51c1cbab83d7745ec7a6cabd9e -EBUILD snapd-2.55.2.ebuild 5346 BLAKE2B 7ef48c06aab0a4acb0218c63721b9d20915f2cbc9be176211eb842f3e12835e1b159d6e90605ff88971e6fbf703a5a75dbed116605e09dff6a29660f0299e48c SHA512 9ab04af937a4af1b5ee3a6054fc84bc5fea342a7aba590e653d8f54dcd928d791b8f3e9417cef5c53e010eeee37f3aabf3ea06f53e0f242bcad56826e0909212 -EBUILD snapd-2.55.3.ebuild 5346 BLAKE2B 7ef48c06aab0a4acb0218c63721b9d20915f2cbc9be176211eb842f3e12835e1b159d6e90605ff88971e6fbf703a5a75dbed116605e09dff6a29660f0299e48c SHA512 9ab04af937a4af1b5ee3a6054fc84bc5fea342a7aba590e653d8f54dcd928d791b8f3e9417cef5c53e010eeee37f3aabf3ea06f53e0f242bcad56826e0909212 -EBUILD snapd-2.55.4.ebuild 5346 BLAKE2B 7ef48c06aab0a4acb0218c63721b9d20915f2cbc9be176211eb842f3e12835e1b159d6e90605ff88971e6fbf703a5a75dbed116605e09dff6a29660f0299e48c SHA512 9ab04af937a4af1b5ee3a6054fc84bc5fea342a7aba590e653d8f54dcd928d791b8f3e9417cef5c53e010eeee37f3aabf3ea06f53e0f242bcad56826e0909212 +DIST snapd-2.56.2.tar.xz 6740504 BLAKE2B e8bf0ab85038b5127fd81f434ef369ac53ec7915a454f8fd24046b6e3a5303bf3924fce04fb2400b0ccdc1a8939809ca20e091ac99a04fe6899dfacdfd3cf299 SHA512 16a57ea828ea875ebe5073cca0975ef74562f095823e980be7096ea6b9e83f6a3f434373065781d6342e805c18ee5adadaab29074440759ed3891691441472b0 +DIST snapd-2.56.tar.xz 6737568 BLAKE2B 662fa682895501df71396095e22fb4587a97cfe4e156b998118ff524ef3a22bf4e60420111167c263c2815ff34a05b026180e41e926324756450e22a1571fc92 SHA512 d2e9949b449ff65122f1202b2048ed63e3ff404aebd71d9877030c7b23130b6be2f1ef62f47b8b0044344fb4826b2b0c81dbcf5cd464ca16f5b3b170735b6039 +EBUILD snapd-2.56.2.ebuild 5139 BLAKE2B 20516cbcae2220067ff8a8c344d92896d3fced3b857938c4742673663ecddf9aac2131da305bcaee57e954073da7d17dc7df286147882409d9f5299134dc6cf7 SHA512 8f188d7671940c9dd2af180e6bdd08430111641255a7a4c44cd2221dcd5878d3a8c7846372be091a9ef65282e486ea94e8a17447bb764aec93b563efcf8020fe +EBUILD snapd-2.56.ebuild 5139 BLAKE2B 20516cbcae2220067ff8a8c344d92896d3fced3b857938c4742673663ecddf9aac2131da305bcaee57e954073da7d17dc7df286147882409d9f5299134dc6cf7 SHA512 8f188d7671940c9dd2af180e6bdd08430111641255a7a4c44cd2221dcd5878d3a8c7846372be091a9ef65282e486ea94e8a17447bb764aec93b563efcf8020fe MISC metadata.xml 520 BLAKE2B cdca3f5b58c81ddf5796b174756e1497382390ea4f7411b2aa7a3c794fcafd7fbd919cae00c7cf5ff2251f4c837f5188026d0f5f61986834aee661724afb050d SHA512 2c26112a8808cd73c5575b525eb33129ab5fab8a5fdefba5de3760e568659264a864bf80c2397cf70bb2f9b0e6709e953185af9048cddde9082b040e4a0ee00f diff --git a/app-containers/snapd/snapd-2.55.4.ebuild b/app-containers/snapd/snapd-2.55.4.ebuild deleted file mode 100644 index 4e8c75f7a53b..000000000000 --- a/app-containers/snapd/snapd-2.55.4.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_PN="github.com/snapcore/${PN}" -inherit autotools bash-completion-r1 flag-o-matic golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils - -DESCRIPTION="Service and tools for management of snap packages" -HOMEPAGE="http://snapcraft.io/" - -MY_S="${S}/src/github.com/snapcore/${PN}" - -SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz" -MY_PV=${PV} -KEYWORDS="~amd64" - -LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT" -SLOT="0" -IUSE="apparmor +forced-devmode gtk kde systemd" -REQUIRED_USE="!forced-devmode? ( apparmor ) systemd" - -CONFIG_CHECK="~CGROUPS - ~CGROUP_DEVICE - ~CGROUP_FREEZER - ~NAMESPACES - ~SQUASHFS - ~SQUASHFS_ZLIB - ~SQUASHFS_LZO - ~SQUASHFS_XZ - ~BLK_DEV_LOOP - ~SECCOMP - ~SECCOMP_FILTER" - -RDEPEND=" - sys-libs/libseccomp:= - apparmor? ( - sec-policy/apparmor-profiles - sys-apps/apparmor:= - ) - dev-libs/glib - virtual/libudev - systemd? ( sys-apps/systemd ) - sys-libs/libcap:= - sys-fs/squashfs-tools[lzma]" - -DEPEND="${RDEPEND}" - -BDEPEND=" - >=dev-lang/go-1.9 - dev-python/docutils - sys-devel/gettext - sys-fs/xfsprogs" - -PDEPEND="sys-auth/polkit[gtk?,kde?]" - -README_GENTOO_SUFFIX="" - -pkg_setup() { - if use apparmor; then - CONFIG_CHECK+=" ~SECURITY_APPARMOR" - fi - linux-info_pkg_setup - - # Seems to have issues building with -O3, switch to -O2 - replace-flags -O3 -O2 -} - -src_prepare() { - default - # Update apparmor profile to allow libtinfow.so* - sed -i 's/libtinfo/libtinfo{,w}/' \ - "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die - - if ! use forced-devmode; then - sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \ - -i "${MY_S}/sandbox/forcedevmode.go" || die - grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode" - fi - - sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die - - pushd "${MY_S}" >/dev/null || die - ./mkversion.sh "${PV}" - popd >/dev/null || die - pushd "${MY_S}/cmd" >/dev/null || die - eautoreconf -} - -src_configure() { - SNAPD_MAKEARGS=( - "BINDIR=${EPREFIX}/usr/bin" - "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services" - "LIBEXECDIR=${EPREFIX}/usr/lib" - "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap" - "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)" - ) - export CGO_ENABLED="1" - export CGO_CFLAGS="${CFLAGS}" - export CGO_CPPFLAGS="${CPPFLAGS}" - export CGO_CXXFLAGS="${CXXFLAGS}" - - pushd "${MY_S}/cmd" >/dev/null || die - econf --libdir="${EPREFIX}/usr/lib" \ - --libexecdir="${EPREFIX}/usr/lib/snapd" \ - $(use_enable apparmor) \ - --enable-nvidia-biarch \ - --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap" -} - -src_compile() { - export -n GOCACHE XDG_CACHE_HOME - export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}" - - local file - for file in "${MY_S}/po/"*.po; do - msgfmt "${file}" -o "${file%.po}.mo" || die - done - - emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}" - - local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath) - local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath) - - local cmd - for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do - go build -o "${GOBIN}/${cmd}" "${flags[@]}" \ - -v -x "github.com/snapcore/${PN}/cmd/${cmd}" - [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}" - done - for cmd in snapctl snap-exec snap-update-ns; do - go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \ - -v -x "github.com/snapcore/${PN}/cmd/${cmd}" - [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}" - done -} - -src_install() { - emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}" - emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}" - - if use apparmor; then - mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die - keepdir /var/lib/snapd/apparmor/profiles - fi - keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void} - fperms 700 /var/lib/snapd/{cache,cookie} - - dobin "${GOBIN}/"{snap,snapctl} - ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die - - exeinto /usr/lib/snapd - doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \ - "${MY_S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \ - "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,} - - dobashcomp "${MY_S}/data/completion/bash/snap" - - insinto /usr/share/zsh/site-functions - doins "${MY_S}/data/completion/zsh/_snap" - - insinto "/usr/share/polkit-1/actions" - doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy" - - dodoc "${MY_S}/packaging/ubuntu-16.04/changelog" - domo "${MY_S}/po/"*.mo - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - xdg_desktop_database_update - - if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles && - $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then - apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real" - fi -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/app-containers/snapd/snapd-2.55.2.ebuild b/app-containers/snapd/snapd-2.56.2.ebuild index 4e8c75f7a53b..7e134a2b558e 100644 --- a/app-containers/snapd/snapd-2.55.2.ebuild +++ b/app-containers/snapd/snapd-2.56.2.ebuild @@ -3,14 +3,11 @@ EAPI=7 -EGO_PN="github.com/snapcore/${PN}" -inherit autotools bash-completion-r1 flag-o-matic golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils +inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd xdg-utils DESCRIPTION="Service and tools for management of snap packages" HOMEPAGE="http://snapcraft.io/" -MY_S="${S}/src/github.com/snapcore/${PN}" - SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz" MY_PV=${PV} KEYWORDS="~amd64" @@ -70,20 +67,18 @@ src_prepare() { default # Update apparmor profile to allow libtinfow.so* sed -i 's/libtinfo/libtinfo{,w}/' \ - "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die + "cmd/snap-confine/snap-confine.apparmor.in" || die if ! use forced-devmode; then sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \ - -i "${MY_S}/sandbox/forcedevmode.go" || die - grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode" + -i "sandbox/forcedevmode.go" || die + grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode" fi - sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die + sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die - pushd "${MY_S}" >/dev/null || die ./mkversion.sh "${PV}" - popd >/dev/null || die - pushd "${MY_S}/cmd" >/dev/null || die + pushd "cmd" >/dev/null || die eautoreconf } @@ -100,7 +95,7 @@ src_configure() { export CGO_CPPFLAGS="${CPPFLAGS}" export CGO_CXXFLAGS="${CXXFLAGS}" - pushd "${MY_S}/cmd" >/dev/null || die + pushd "${S}/cmd" >/dev/null || die econf --libdir="${EPREFIX}/usr/lib" \ --libexecdir="${EPREFIX}/usr/lib/snapd" \ $(use_enable apparmor) \ @@ -110,34 +105,34 @@ src_configure() { src_compile() { export -n GOCACHE XDG_CACHE_HOME - export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}" + export GOBIN="${S}/bin" local file - for file in "${MY_S}/po/"*.po; do + for file in "${S}/po/"*.po; do msgfmt "${file}" -o "${file%.po}.mo" || die done - emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}" + emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}" local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath) local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath) local cmd for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do - go build -o "${GOBIN}/${cmd}" "${flags[@]}" \ + go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \ -v -x "github.com/snapcore/${PN}/cmd/${cmd}" [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}" done for cmd in snapctl snap-exec snap-update-ns; do - go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \ + go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \ -v -x "github.com/snapcore/${PN}/cmd/${cmd}" [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}" done } src_install() { - emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}" - emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}" + emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}" + emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}" if use apparmor; then mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die @@ -151,19 +146,19 @@ src_install() { exeinto /usr/lib/snapd doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \ - "${MY_S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \ - "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,} + "${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \ + "${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,} - dobashcomp "${MY_S}/data/completion/bash/snap" + dobashcomp "${S}/data/completion/bash/snap" insinto /usr/share/zsh/site-functions - doins "${MY_S}/data/completion/zsh/_snap" + doins "${S}/data/completion/zsh/_snap" insinto "/usr/share/polkit-1/actions" - doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy" + doins "${S}/data/polkit/io.snapcraft.snapd.policy" - dodoc "${MY_S}/packaging/ubuntu-16.04/changelog" - domo "${MY_S}/po/"*.mo + dodoc "${S}/packaging/ubuntu-16.04/changelog" + domo "${S}/po/"*.mo readme.gentoo_create_doc } diff --git a/app-containers/snapd/snapd-2.55.3.ebuild b/app-containers/snapd/snapd-2.56.ebuild index 4e8c75f7a53b..7e134a2b558e 100644 --- a/app-containers/snapd/snapd-2.55.3.ebuild +++ b/app-containers/snapd/snapd-2.56.ebuild @@ -3,14 +3,11 @@ EAPI=7 -EGO_PN="github.com/snapcore/${PN}" -inherit autotools bash-completion-r1 flag-o-matic golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils +inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd xdg-utils DESCRIPTION="Service and tools for management of snap packages" HOMEPAGE="http://snapcraft.io/" -MY_S="${S}/src/github.com/snapcore/${PN}" - SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz" MY_PV=${PV} KEYWORDS="~amd64" @@ -70,20 +67,18 @@ src_prepare() { default # Update apparmor profile to allow libtinfow.so* sed -i 's/libtinfo/libtinfo{,w}/' \ - "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die + "cmd/snap-confine/snap-confine.apparmor.in" || die if ! use forced-devmode; then sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \ - -i "${MY_S}/sandbox/forcedevmode.go" || die - grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode" + -i "sandbox/forcedevmode.go" || die + grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode" fi - sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die + sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die - pushd "${MY_S}" >/dev/null || die ./mkversion.sh "${PV}" - popd >/dev/null || die - pushd "${MY_S}/cmd" >/dev/null || die + pushd "cmd" >/dev/null || die eautoreconf } @@ -100,7 +95,7 @@ src_configure() { export CGO_CPPFLAGS="${CPPFLAGS}" export CGO_CXXFLAGS="${CXXFLAGS}" - pushd "${MY_S}/cmd" >/dev/null || die + pushd "${S}/cmd" >/dev/null || die econf --libdir="${EPREFIX}/usr/lib" \ --libexecdir="${EPREFIX}/usr/lib/snapd" \ $(use_enable apparmor) \ @@ -110,34 +105,34 @@ src_configure() { src_compile() { export -n GOCACHE XDG_CACHE_HOME - export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}" + export GOBIN="${S}/bin" local file - for file in "${MY_S}/po/"*.po; do + for file in "${S}/po/"*.po; do msgfmt "${file}" -o "${file%.po}.mo" || die done - emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}" + emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}" local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath) local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath) local cmd for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do - go build -o "${GOBIN}/${cmd}" "${flags[@]}" \ + go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \ -v -x "github.com/snapcore/${PN}/cmd/${cmd}" [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}" done for cmd in snapctl snap-exec snap-update-ns; do - go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \ + go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \ -v -x "github.com/snapcore/${PN}/cmd/${cmd}" [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}" done } src_install() { - emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}" - emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}" + emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}" + emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}" if use apparmor; then mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die @@ -151,19 +146,19 @@ src_install() { exeinto /usr/lib/snapd doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \ - "${MY_S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \ - "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,} + "${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \ + "${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,} - dobashcomp "${MY_S}/data/completion/bash/snap" + dobashcomp "${S}/data/completion/bash/snap" insinto /usr/share/zsh/site-functions - doins "${MY_S}/data/completion/zsh/_snap" + doins "${S}/data/completion/zsh/_snap" insinto "/usr/share/polkit-1/actions" - doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy" + doins "${S}/data/polkit/io.snapcraft.snapd.policy" - dodoc "${MY_S}/packaging/ubuntu-16.04/changelog" - domo "${MY_S}/po/"*.mo + dodoc "${S}/packaging/ubuntu-16.04/changelog" + domo "${S}/po/"*.mo readme.gentoo_create_doc } |