diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,7 +1,7 @@ name : snapd version : '2.38' homepage : https://snapcraft.io/ -release : 39 +release : 40 source : - https://github.com/snapcore/snapd/releases/download/2.38/snapd_2.38.vendor.tar.xz : 64ac100e5da2f588824a963eb2358663326d468e38d5556b289ffd9f100c1176 license : GPL-3.0-only @@ -35,19 +35,18 @@ # Now configure C portion pushd cmd - %autogen - %configure --enable-nvidia-biarch + %reconfigure --enable-nvidia-biarch build : | - commands=(snap snapctl snapd) + commands=(snap snapctl snapd snap-failure) for snapcracklepop in ${commands[@]}; do GOPATH="`pwd`" go install -v github.com/snapcore/snapd/cmd/$snapcracklepop done - # snap-update-ns needs to be static. - GOPATH="`pwd`" go build -o bin/snap-update-ns --ldflags '-extldflags "-static"' -v github.com/snapcore/snapd/cmd/snap-update-ns - # as does snap-seccomp - GOPATH="`pwd`" go build -o bin/snap-seccomp --ldflags '-extldflags "-static"' -v github.com/snapcore/snapd/cmd/snap-seccomp - # as snap-exec - GOPATH="`pwd`" go build -o bin/snap-exec --ldflags '-extldflags "-static"' -v github.com/snapcore/snapd/cmd/snap-exec + # snap-update-ns, snap-seccomp and snap-exec needs to be static. + pathcommands=(update-ns seccomp exec) + for staticpath in ${pathcommands[@]} ; do + GOPATH="`pwd`" go build -o bin/snap-$staticpath --ldflags '-extldflags "-static"' -v github.com/snapcore/snapd/cmd/snap-$staticpath + done + %make -C src/github.com/snapcore/snapd/cmd install : | # C portions @@ -55,7 +54,7 @@ # Golang binaries bincommands=(snap snapctl) - dcommands=(snapd snap-exec snap-update-ns snap-seccomp) + dcommands=(snapd snap-exec snap-failure snap-update-ns snap-seccomp) for tgtbin in ${bincommands[@]} ; do install -m00755 bin/$tgtbin $installdir/usr/bin/. done @@ -71,7 +70,7 @@ rm -vf $installdir/usr/bin/ubuntu-core-launcher # Polkit - install -m00644 -D data/polkit/io.snapcraft.snapd.policy $installdir/usr/share/polkit-1/actions/io.snapcraft.snapd.policy + install -Dm00644 data/polkit/io.snapcraft.snapd.policy $installdir/usr/share/polkit-1/actions/io.snapcraft.snapd.policy # systemd %make_install -C data/systemd \ diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -34,6 +34,7 @@ /usr/lib64/snapd/snap-device-helper /usr/lib64/snapd/snap-discard-ns /usr/lib64/snapd/snap-exec + /usr/lib64/snapd/snap-failure /usr/lib64/snapd/snap-gdb-shim /usr/lib64/snapd/snap-mgmt /usr/lib64/snapd/snap-seccomp @@ -65,8 +66,8 @@ - - 2019-03-30 + + 2019-03-31 2.38 Packaging update F. von Gellhorn