Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11035646
D8075.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
8 KB
Referenced Files
None
Subscribers
None
D8075.id.diff
View Options
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,6 +1,6 @@
libapparmor.so.1
libc.so.6
libcap.so.2
-libgcc_s.so.1
libpthread.so.0
+libseccomp.so.2
libudev.so.1
diff --git a/files/snapd.tmpfiles b/files/snapd.tmpfiles
--- a/files/snapd.tmpfiles
+++ b/files/snapd.tmpfiles
@@ -1,19 +1,21 @@
-d /var/cache/snapd 0755 root root -
d /var/lib/snapd 0755 root root -
-d /var/lib/snapd/apparmor/snap-confine 0755 root root -
-d /var/lib/snapd/apparmor/snap-confine.d 0755 root root -
d /var/lib/snapd/apparmor/profiles 0755 root root -
+d /var/lib/snapd/apparmor/snap-confine 0755 root root -
d /var/lib/snapd/assertions 0755 root root -
-d /var/lib/snapd/desktop 0755 root root -
+d /var/lib/snapd/cache 0755 root root -
+d /var/lib/snapd/cookie 0755 root root -
d /var/lib/snapd/desktop/applications 0755 root root -
d /var/lib/snapd/device 0755 root root -
d /var/lib/snapd/hostfs 0755 root root -
-d /var/lib/snapd/mount 0755 root root -
-d /var/lib/snapd/seccomp/bpf 0755 root root -
-d /var/lib/snapd/snaps 0755 root root -
d /var/lib/snapd/lib/gl 0755 root root -
d /var/lib/snapd/lib/gl32 0755 root root -
d /var/lib/snapd/lib/vulkan 0755 root root -
d /var/lib/snapd/lib/glvnd 0755 root root -
-d /var/lib/snapd/void 000 root root -
-d /run/lock/snapd 0755 root root -
\ No newline at end of file
+d /var/lib/snapd/mount 0755 root root -
+d /var/lib/snapd/seccomp/bpf 0755 root root -
+d /var/lib/snapd/sequence 0755 root root -
+d /var/lib/snapd/snap/bin 0755 root root -
+d /var/lib/snapd/snaps 0755 root root -
+d /var/lib/snapd/void 0755 root root -
+d /run/lock/snapd 0755 root root -
+d /var/cache/snapd 0755 root root -
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,7 +1,7 @@
name : snapd
version : 2.39.3
homepage : https://snapcraft.io/
-release : 53
+release : 54
source :
- https://github.com/snapcore/snapd/releases/download/2.39.3/snapd_2.39.3.vendor.tar.xz : 035c75b14ec3347b5953076ff763d2ab3306c1bd8f689806675995054faf53fe
license : GPL-3.0-only
@@ -24,49 +24,60 @@
- libselinux
- squashfs-tools
environment: |
- export snapddir=src/github.com/snapcore/snapd
- export commands=(snap snapctl snapd snap-failure)
- export stacommands=(snap-update-ns snap-seccomp snap-exec)
- export bincommands=(snap snapctl)
- export dcommands=(snapd snap-exec snap-failure snap-update-ns snap-seccomp)
+ export import_path=github.com/snapcore/snapd
+ export go_binaries=(snap snapctl snap-seccomp snap-update-ns snap-exec snapd)
+ export static_binaries=(snap-update-ns snap-exec snapctl)
+ export bincommands=(snap)
+ export dcommands=(snapctl snapd snap-exec snap-update-ns snap-seccomp)
+
setup : |
mkdir -p src/github.com/snapcore
- ln -s `pwd` ${snapddir}
+ ln -s `pwd` src/github.com/snapcore/snapd
- pushd ${snapddir}
+ pushd src/${import_path}
./mkversion.sh "$version"
%apply_patches
pushd cmd
- %reconfigure --enable-nvidia-biarch
+ %reconfigure \
+ --enable-nvidia-biarch \
+ --enable-merged-usr \
+ --with-snap-mount-dir=/snap
+ popd
build : |
- for snapvar in ${commands[@]}; do
- GOPATH="`pwd`" go install github.com/snapcore/snapd/cmd/$snapvar
+ %make -C src/${import_path}/cmd
+
+ for snapvar in ${go_binaries[@]}; do
+ GOPATH="`pwd`" go build -o bin/$snapvar -buildmode=pie --ldflags "-extldflags '$LDFLAGS'" ${import_path}/cmd/$snapvar
done
- for staticpath in ${stacommands[@]} ; do
- GOPATH="`pwd`" go build -o bin/$staticpath --ldflags '-extldflags "-static"' github.com/snapcore/snapd/cmd/$staticpath
+ for staticpath in ${static_binaries[@]} ; do
+ GOPATH="`pwd`" go build -o bin/$staticpath -buildmode=pie --ldflags "-extldflags '$LDFLAGS -static'" ${import_path}/cmd/$staticpath
done
-
- %make -C ${snapddir}/cmd
install : |
- %make_install -C ${snapddir}/cmd
+ %make_install -C src/${import_path}/cmd
+
# Golang binaries
- for tgtbin in ${bincommands[@]} ; do
- install -m00755 bin/$tgtbin $installdir/usr/bin/.
+ for snap_bin in ${bincommands[@]} ; do
+ install -m00755 bin/$snap_bin $installdir/usr/bin/.
done
- for tgtbin in ${dcommands[@]} ; do
- install -m00755 bin/$tgtbin $installdir/%libdir%/$package/.
+ for snap_lib in ${dcommands[@]} ; do
+ install -m00755 bin/$snap_lib $installdir/%libdir%/$package/.
done
+ # snapctl is run from inside the snap
+ ln -s /%libdir%/$package/snapctl $installdir/usr/bin/snapctl
+
# Move into the base dir so we can install stuff
- pushd ${snapddir}
+ pushd src/${import_path}
%make_install -C data/systemd \
LIBEXECDIR="%libdir%" \
SYSTEMDSYSTEMUNITDIR="%libdir%/systemd/system"
+ SNAP_MOUNT_DIR=/snap
install -Ddm00755 $installdir/usr/src
install -dm00755 $installdir/%libdir%/systemd/system/sockets.target.wants
ln -sv ../snapd.socket $installdir/%libdir%/systemd/system/sockets.target.wants/snapd.socket
+
install -Dm00644 data/info $installdir/%libdir%/$package/info
install -Dm00644 data/polkit/io.snapcraft.snapd.policy $installdir/usr/share/polkit-1/actions/io.snapcraft.snapd.policy
install -Dm00644 $pkgfiles/snapd.tmpfiles $installdir/%libdir%/tmpfiles.d/snapd.conf
@@ -76,8 +87,9 @@
install -Dm00644 data/completion/snap $installdir/usr/share/bash-completion/completions/snap
install -Dm00644 data/completion/complete.sh $installdir/%libdir%/snapd/complete.sh
install -Dm00644 data/completion/etelpmoc.sh $installdir/%libdir%/snapd/etelpmoc.sh
+
# remove unneeded stuff
rm -rf $installdir/var
rm -rf $installdir/usr/bin/ubuntu-core-launcher
rm -rf $installdir/%libdir%/snapd/{system-shutdown,snapd.core-fixup.sh}
- rm -rf $installdir/%libdir%/systemd/system/{snapd.system-shutdown.service,snapd.snap-repair.*,snapd.core-fixup.*}
+ rm -rf $installdir/%libdir%/systemd/system/{snapd.system-shutdown.service,snapd.autoimport.service,snapd.snap-repair.*,snapd.core-fixup.*}
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,8 +3,8 @@
<Name>snapd</Name>
<Homepage>https://snapcraft.io/</Homepage>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Friedrich von Gellhorn</Name>
+ <Email>friedrich@vongellhorn.ch</Email>
</Packager>
<License>GPL-3.0-only</License>
<PartOf>desktop.util</PartOf>
@@ -34,16 +34,15 @@
<Path fileType="library">/usr/lib64/snapd/snap-device-helper</Path>
<Path fileType="library">/usr/lib64/snapd/snap-discard-ns</Path>
<Path fileType="library">/usr/lib64/snapd/snap-exec</Path>
- <Path fileType="library">/usr/lib64/snapd/snap-failure</Path>
<Path fileType="library">/usr/lib64/snapd/snap-gdb-shim</Path>
<Path fileType="library">/usr/lib64/snapd/snap-mgmt</Path>
<Path fileType="library">/usr/lib64/snapd/snap-seccomp</Path>
<Path fileType="library">/usr/lib64/snapd/snap-update-ns</Path>
+ <Path fileType="library">/usr/lib64/snapd/snapctl</Path>
<Path fileType="library">/usr/lib64/snapd/snapd</Path>
<Path fileType="library">/usr/lib64/snapd/snapd-apparmor</Path>
<Path fileType="library">/usr/lib64/snapd/snapd.run-from-snap</Path>
<Path fileType="library">/usr/lib64/systemd/system/snapd.apparmor.service</Path>
- <Path fileType="library">/usr/lib64/systemd/system/snapd.autoimport.service</Path>
<Path fileType="library">/usr/lib64/systemd/system/snapd.failure.service</Path>
<Path fileType="library">/usr/lib64/systemd/system/snapd.seeded.service</Path>
<Path fileType="library">/usr/lib64/systemd/system/snapd.service</Path>
@@ -60,12 +59,12 @@
</Files>
</Package>
<History>
- <Update release="53">
- <Date>2020-01-16</Date>
+ <Update release="54">
+ <Date>2020-01-17</Date>
<Version>2.39.3</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Friedrich von Gellhorn</Name>
+ <Email>friedrich@vongellhorn.ch</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Aug 10, 6:07 PM (1 d, 2 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5821619
Default Alt Text
D8075.id.diff (8 KB)
Attached To
Mode
D8075: Clean up snapd package.yml
Attached
Detach File
Event Timeline
Log In to Comment