packaging/opensuse: sync with downstream packaging #14472
Conversation
Sync changes from openSUSE packaging. Signed-off-by: Maciej Borzecki <[email protected]>
| @@ -90,45 +99,42 @@ Group: System/Packages | |||
| Url: https://%{import_path} | |||
| Source0: https://github.com/snapcore/snapd/releases/download/%{version}/%{name}_%{version}.vendor.tar.xz | |||
| Source1: snapd-rpmlintrc | |||
| Patch0: 0001-packaging-snapd.mk-drop-randomized-build-ID-generati.patch | |||
There was a problem hiding this comment.
Do you want to apply this patch upstream as well?
| BuildRequires: python3-docutils | ||
| BuildRequires: squashfs | ||
| # Due to: rpm -q --whatprovides /usr/share/pkgconfig/systemd.pc | ||
| BuildRequires: systemd | ||
| BuildRequires: pkgconfig(glib-2.0) |
| BuildRequires: fakeroot | ||
| BuildRequires: glib2-devel | ||
| BuildRequires: glibc-devel-static | ||
| BuildRequires: go >= 1.18 |
There was a problem hiding this comment.
Curious: does this mean we actually build with 1.18 on openSUSE (given that there are likely many versions in the archive?)
There was a problem hiding this comment.
We're building with the default one, which varies between releases, eg. for TW it's 1.22 atm, but for 15.6 I believe it's 1.21.
|
|
||
| #PIE static binaries are not supported on all architectures. We detect the availability of the runtime object here, and GCC's support for such binaries. | ||
| if test -e %{_libdir}/rcrt1.o && cc -static-pie -xc /dev/null -o /dev/null -S; then | ||
| patch -p1 < %SOURCE100 |
There was a problem hiding this comment.
see Source100: near the top of the file
| @@ -263,12 +267,29 @@ popd | |||
| all | |||
|
|
|||
| %check | |||
| for binary in snap-exec snap-update-ns snapctl; do | |||
| ldd $binary 2>&1 | grep 'not a dynamic executable' | |||
| #These binaries execute inside the mount namespace thus they must be built statically | |||
There was a problem hiding this comment.
Nitpick, add a space:
| #These binaries execute inside the mount namespace thus they must be built statically | |
| # These binaries execute inside the mount namespace thus they must be built statically |
| @@ -308,18 +329,22 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcsnapd.seeded | |||
| ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcsnapd.apparmor | |||
| %endif | |||
|
|
|||
| # Install Polkit configuration. | |||
| # TODO: This should be handled by data makefile. | |||
| install -pm 644 -D %{indigo_srcdir}/data/polkit/io.snapcraft.snapd.policy %{buildroot}%{_datadir}/polkit-1/actions | |||
There was a problem hiding this comment.
I just removed a bunch of this in Debian so I'm surprised this is here. Are not using the data makefiles?
| @@ -308,18 +329,22 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcsnapd.seeded | |||
| ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcsnapd.apparmor | |||
| %endif | |||
|
|
|||
| # Install Polkit configuration. | |||
| # TODO: This should be handled by data makefile. | |||
| install -pm 644 -D %{indigo_srcdir}/data/polkit/io.snapcraft.snapd.policy %{buildroot}%{_datadir}/polkit-1/actions | |||
There was a problem hiding this comment.
I just removed a bunch of this in Debian so I'm surprised this is here. Are not using the data makefiles?
Sync changes from openSUSE packaging.
Thanks for helping us make a better snapd!
Have you signed the license agreement and read the contribution guide?