packaging/opensuse: Refactor packaging to support all openSUSE targets #5219
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| opensuse |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| opensuse |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| opensuse |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| opensuse |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| opensuse |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| # spec file for package snapd | ||
| # | ||
| # Copyright (c) 2017 Zygmunt Krynicki <zygmunt.krynicki@canonical.com> | ||
| # Copyright (c) 2018 Neal Gompa <ngompa13@gmail.com> | ||
| # | ||
| # All modifications and additions to the file contributed by third parties | ||
| # remain the property of their copyright owners, unless otherwise agreed | ||
|
|
@@ -15,6 +16,22 @@ | |
|
|
||
| %bcond_with testkeys | ||
|
|
||
| # Enable AppArmor on openSUSE Tumbleweed (post 15.0) or higher | ||
| %if 0%{?suse_version} >= 1550 | ||
|
There was a problem hiding this comment. Had to double check the version macros https://en.opensuse.org/openSUSE:Packaging_for_Leap#RPM_Distro_Version_Macros There was a problem hiding this comment. What is the version macro for tumbleweed? Is it always increasing? E.g. once Leap 16 is out will tumbleweed move to 1650? There was a problem hiding this comment. hmm there's a note:
There was a problem hiding this comment. It will increase to something, yes. It might be 1660, hell if I know. Basically, just rely on |
||
| %bcond_without apparmor | ||
| %else | ||
| %bcond_with apparmor | ||
| %endif | ||
|
|
||
| # Compat macros | ||
| %{!?make_build: %global make_build %{__make} %{?_smp_mflags}} | ||
|
|
||
| # This is fixed in SUSE Linux 15 | ||
| # Cf. https://build.opensuse.org/package/rdiff/Base:System/rpm?linkrev=base&rev=396 | ||
| %if 0%{?suse_version} < 1500 | ||
| %global _sharedstatedir %{_localstatedir}/lib | ||
| %endif | ||
|
|
||
| %global provider github | ||
| %global provider_tld com | ||
| %global project snapcore | ||
|
|
@@ -30,7 +47,15 @@ | |
| %global with_test_keys 0 | ||
| %endif | ||
|
|
||
| # Set if multilib is enabled for supported arches | ||
| %ifarch x86_64 aarch64 %{power64} s390x | ||
| %global with_multilib 1 | ||
| %endif | ||
|
|
||
| %global systemd_services_list snapd.socket snapd.service %{?with_apparmor:snapd.apparmor.service} | ||
|
|
||
| %global snap_mount_dir /snap | ||
|
|
||
| Name: snapd | ||
| Version: 2.32.9 | ||
| Release: 0 | ||
|
|
@@ -40,8 +65,9 @@ Group: System/Packages | |
| Url: https://%{import_path} | ||
| Source0: https://github.com/snapcore/snapd/releases/download/%{version}/%{name}_%{version}.vendor.tar.xz | ||
| Source1: snapd-rpmlintrc | ||
| %if (0%{?sle_version} >= 120200 || 0%{?suse_version} >= 1500) && 0%{?is_opensuse} | ||
| BuildRequires: ShellCheck | ||
| %endif | ||
| BuildRequires: autoconf | ||
| BuildRequires: automake | ||
| BuildRequires: glib2-devel | ||
|
|
@@ -67,7 +93,7 @@ BuildRequires: xfsprogs-devel | |
| BuildRequires: xz | ||
|
|
||
| # Make sure we are on Leap 42.2/SLE 12 SP2 or higher | ||
| %if 0%{?sle_version} >= 120200 || 0%{?suse_version} >= 1500 | ||
| BuildRequires: systemd-rpm-macros | ||
| %endif | ||
|
|
||
|
|
@@ -79,9 +105,7 @@ Requires: gpg2 | |
| Requires: openssh | ||
| Requires: squashfs | ||
|
|
||
| %{?systemd_requires} | ||
|
|
||
| # TODO strip the C executables but don't strip the go executables | ||
| # as that breaks the world in some ways. | ||
|
|
@@ -96,13 +120,13 @@ principles. Bundle your dependencies, run in a predictable environment, use | |
| moder kernel features for setting up the execution environment and security. | ||
| The same binary snap package can be installed and used on many diverse systems | ||
| such as Debian, Fedora and OpenSUSE as well as their multiple derivatives. | ||
|
|
||
|
|
||
| This package contains the official build, endorsed by snapd developers. It is | ||
| updated as soon as new upstream releases are made and is designed to live in | ||
| the system:snappy repository. | ||
|
|
||
| %prep | ||
| %setup -q | ||
|
There was a problem hiding this comment.
|
||
|
|
||
| # Set the version that is compiled into the various executables | ||
| ./mkversion.sh %{version}-%{release} | ||
|
|
@@ -118,12 +142,15 @@ CXXFLAGS="$RPM_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now" | |
| export CFLAGS | ||
| export CXXFLAGS | ||
|
|
||
| # N.B.: Prior to openSUSE Tumbleweed in May 2018, the AppArmor userspace in SUSE | ||
| # did not support what we needed to be able to turn on basic integration. | ||
| %configure \ | ||
| %{!?with_apparmor:--disable-apparmor} \ | ||
|
There was a problem hiding this comment. Makes me wonder if we should have an explicit --enable-apparmor switch rather than rely on autodetection for the case when we want it supported? There was a problem hiding this comment. @bboozzoo, It'd be nicer if it did, but since snapd assumes Ubuntu AppArmor anyway, it's probably not going to happen. Maybe it would if snapd gained some SELinux integration leveraging |
||
| --libexecdir=%{_libexecdir}/snapd \ | ||
| --enable-nvidia-biarch \ | ||
| %{?with_multilib:--with-32bit-libdir=%{_prefix}/lib} \ | ||
| --with-snap-mount-dir=%{snap_mount_dir} \ | ||
| --enable-merged-usr | ||
|
There was a problem hiding this comment. This is the problem, don't pass There was a problem hiding this comment. openSUSE uses There was a problem hiding this comment. So maybe the test needs an update. Let me look into this. There was a problem hiding this comment. @Conan-Kudo Looks like I can't push to your branch. Can you pick up this patch? bboozzoo@48352a6 |
||
|
|
||
| %build | ||
| # Build golang executables | ||
|
|
@@ -159,86 +186,86 @@ sed -e "s/-Bstatic -lseccomp/-Bstatic/g" -i %{_builddir}/go/src/%{provider_prefi | |
| %gobuild cmd/snap-seccomp | ||
|
|
||
| # Build C executables | ||
| %make_build -C cmd | ||
|
|
||
| %check | ||
| %{gotest} %{import_path}/... | ||
| %make_build -C cmd check | ||
|
|
||
| %install | ||
| # Install all the go stuff | ||
| %goinstall | ||
| # TODO: instead of removing it move this to a dedicated golang package | ||
| rm -rf %{buildroot}%{_libdir}/go | ||
| # Move snapd, snap-exec, snap-seccomp and snap-update-ns into %{_libexecdir}/snapd | ||
| install -m 755 -d %{buildroot}%{_libexecdir}/snapd | ||
| mv %{buildroot}%{_bindir}/snapd %{buildroot}%{_libexecdir}/snapd/snapd | ||
| mv %{buildroot}%{_bindir}/snap-exec %{buildroot}%{_libexecdir}/snapd/snap-exec | ||
| mv %{buildroot}%{_bindir}/snap-update-ns %{buildroot}%{_libexecdir}/snapd/snap-update-ns | ||
| mv %{buildroot}%{_bindir}/snap-seccomp %{buildroot}%{_libexecdir}/snapd/snap-seccomp | ||
|
|
||
| # Install all systemd and dbus units, and env files | ||
| %make_install -C data BINDIR=%{_bindir} LIBEXECDIR=%{_libexecdir} \ | ||
| SYSTEMDSYSTEMUNITDIR=%{_unitdir} \ | ||
| SNAP_MOUNT_DIR=%{snap_mount_dir} | ||
|
|
||
| # Generate and install man page for snap command | ||
| install -m 755 -d %{buildroot}%{_mandir}/man1 | ||
| %{buildroot}%{_bindir}/snap help --man > %{buildroot}%{_mandir}/man1/snap.1 | ||
|
|
||
| # TODO: enable gosrc | ||
| # TODO: enable gofilelist | ||
|
|
||
| # Install all the C executables | ||
| %make_install -C cmd | ||
| # Undo special permissions of the void directory | ||
| chmod 755 %{buildroot}%{_sharedstatedir}/snapd/void | ||
| # Remove traces of ubuntu-core-launcher. It is a phased-out executable that is | ||
| # still partially present in the tree but should be removed in the subsequent | ||
| # release. | ||
| rm -f %{buildroot}%{_bindir}/ubuntu-core-launcher | ||
| # NOTE: we don't want to ship system-shutdown helper, it is just a helper on | ||
| # ubuntu-core systems that exclusively use snaps. It is used during the | ||
| # shutdown process and thus can be left out of the distribution package. | ||
| rm -f %{buildroot}%{_libexecdir}/snapd/system-shutdown | ||
| # Install the directories that snapd creates by itself so that they can be a part of the package | ||
| install -d %{buildroot}%{_sharedstatedir}/snapd/{assertions,desktop/applications,device,hostfs,mount,apparmor/profiles,seccomp/bpf,snaps} | ||
|
|
||
| install -d %{buildroot}%{_sharedstatedir}/snapd/{lib/gl,lib/gl32,lib/vulkan} | ||
| install -d %{buildroot}%{_localstatedir}/cache/snapd | ||
| install -d %{buildroot}%{snap_mount_dir}/bin | ||
| # Install local permissions policy for snap-confine. This should be removed | ||
| # once snap-confine is added to the permissions package. This is done following | ||
| # the recommendations on | ||
| # https://en.opensuse.org/openSUSE:Package_security_guidelines | ||
| install -m 644 -D packaging/opensuse/permissions %{buildroot}%{_sysconfdir}/permissions.d/snapd | ||
| install -m 644 -D packaging/opensuse/permissions.paranoid %{buildroot}%{_sysconfdir}/permissions.d/snapd.paranoid | ||
| # Remove unwanted systemd units | ||
| for s in snapd.autoimport.service snapd.system-shutdown.service snapd.snap-repair.timer snapd.snap-repair.service snapd.core-fixup.service; do | ||
| rm -f %{buildroot}%{_unitdir}/$s | ||
| done | ||
| # Remove snappy core specific scripts | ||
| rm -f %{buildroot}%{_libexecdir}/snapd/snapd.core-fixup.sh | ||
|
|
||
| # See https://en.opensuse.org/openSUSE:Packaging_checks#suse-missing-rclink for details | ||
| install -d %{buildroot}%{_sbindir} | ||
| ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcsnapd | ||
| ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcsnapd.refresh | ||
| # Install the "info" data file with snapd version | ||
| install -m 644 -D data/info %{buildroot}%{_libexecdir}/snapd/info | ||
| # Install bash completion for "snap" | ||
| install -m 644 -D data/completion/snap %{buildroot}%{_datadir}/bash-completion/completions/snap | ||
| install -m 644 -D data/completion/complete.sh %{buildroot}%{_libexecdir}/snapd | ||
| install -m 644 -D data/completion/etelpmoc.sh %{buildroot}%{_libexecdir}/snapd | ||
| # move snapd-generator | ||
| install -m 755 -d %{buildroot}%{_prefix}/lib/systemd/system-generators/ | ||
| mv %{buildroot}%{_libexecdir}/snapd/snapd-generator %{buildroot}%{_prefix}/lib/systemd/system-generators/ | ||
|
|
||
| # Don't ship apparmor helper service when AppArmor is not enabled | ||
| %if ! %{with apparmor} | ||
| rm -f %{buildroot}%{_unitdir}/snapd.apparmor.service | ||
| rm -f %{buildroot}%{_libexecdir}/snapd/snapd-apparmor | ||
| %endif | ||
|
|
||
| %verifyscript | ||
| %verify_permissions -e %{_libexecdir}/snapd/snap-confine | ||
|
|
@@ -267,58 +294,63 @@ fi | |
| %service_del_postun %{systemd_services_list} | ||
|
|
||
| %files | ||
| %config %{_sysconfdir}/permissions.d/snapd | ||
| %config %{_sysconfdir}/permissions.d/snapd.paranoid | ||
| %config %{_sysconfdir}/profile.d/snapd.sh | ||
| %dir %attr(0000,root,root) %{_sharedstatedir}/snapd/void | ||
| %dir %{snap_mount_dir} | ||
| %dir %{snap_mount_dir}/bin | ||
| %dir %{_libexecdir}/snapd | ||
| %dir %{_sharedstatedir}/snapd | ||
| %dir %{_sharedstatedir}/snapd/apparmor | ||
| %dir %{_sharedstatedir}/snapd/apparmor/profiles | ||
| %dir %{_sharedstatedir}/snapd/apparmor/snap-confine | ||
| %dir %{_sharedstatedir}/snapd/assertions | ||
| %dir %{_sharedstatedir}/snapd/desktop | ||
| %dir %{_sharedstatedir}/snapd/desktop/applications | ||
| %dir %{_sharedstatedir}/snapd/device | ||
| %dir %{_sharedstatedir}/snapd/hostfs | ||
| %dir %{_sharedstatedir}/snapd/mount | ||
| %dir %{_sharedstatedir}/snapd/seccomp | ||
| %dir %{_sharedstatedir}/snapd/seccomp/bpf | ||
| %dir %{_sharedstatedir}/snapd/snaps | ||
| %dir %{_sharedstatedir}/snapd/lib | ||
| %dir %{_sharedstatedir}/snapd/lib/gl | ||
| %dir %{_sharedstatedir}/snapd/lib/gl32 | ||
| %dir %{_sharedstatedir}/snapd/lib/vulkan | ||
| %dir %{_localstatedir}/cache/snapd | ||
| %verify(not user group mode) %attr(06755,root,root) %{_libexecdir}/snapd/snap-confine | ||
| %{_mandir}/man1/snap-confine.1.* | ||
| %{_mandir}/man5/snap-discard-ns.5.* | ||
| %{_unitdir}/snapd.service | ||
| %{_unitdir}/snapd.socket | ||
| %{_unitdir}/snapd.seeded.service | ||
| %if %{with apparmor} | ||
| %{_unitdir}/snapd.apparmor.service | ||
| %endif | ||
| %{_bindir}/snap | ||
| %{_bindir}/snapctl | ||
| %{_sbindir}/rcsnapd | ||
| %{_sbindir}/rcsnapd.refresh | ||
| %{_libexecdir}/snapd/info | ||
| %{_libexecdir}/snapd/snap-discard-ns | ||
| %{_libexecdir}/snapd/snap-update-ns | ||
| %{_libexecdir}/snapd/snap-exec | ||
| %{_libexecdir}/snapd/snap-seccomp | ||
| %{_libexecdir}/snapd/snapd | ||
| %if %{with apparmor} | ||
| %{_libexecdir}/snapd/snapd-apparmor | ||
| %endif | ||
| %{_libexecdir}/snapd/snap-mgmt | ||
| %{_libexecdir}/snapd/snap-gdb-shim | ||
| %{_libexecdir}/snapd/snap-device-helper | ||
| %{_datadir}/bash-completion/completions/snap | ||
| %{_libexecdir}/snapd/complete.sh | ||
| %{_libexecdir}/snapd/etelpmoc.sh | ||
| %{_prefix}/lib/systemd/system-generators/snapd-generator | ||
| %{_mandir}/man1/snap.1.* | ||
| %{_datadir}/dbus-1/services/io.snapcraft.Launcher.service | ||
| %{_datadir}/dbus-1/services/io.snapcraft.Settings.service | ||
| %{_sysconfdir}/xdg/autostart/snap-userd-autostart.desktop | ||
|
|
||
| %changelog | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❤️, thank you :-)