Skip to content

snapd: fix void directory packaging #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fwerkor merged 2 commits into from
Aug 31, 2026
Merged

snapd: fix void directory packaging #137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0361cd3
snapd: fix void directory packaging
fwerkor Aug 31, 2026
cbbf899
snapd: keep void staging directory readable
fwerkor Aug 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion package/capos/snapd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=snapd
PKG_VERSION:=2.76.2
PKG_RELEASE:=6
PKG_RELEASE:=7

PKG_SOURCE:=snapd_$(PKG_VERSION).vendor.tar.xz
PKG_SOURCE_URL:=https://github.com/canonical/snapd/releases/download/$(PKG_VERSION)
Expand All @@ -28,6 +28,7 @@ define Package/snapd
TITLE:=Snap package manager daemon
URL:=https://snapcraft.io/
DEPENDS:=$(GO_ARCH_DEPENDS) @ARCH_64BIT +systemd-on-procd +libseccomp +libcap +libcap-bin +libapparmor +apparmor-parser +eudev +dbus +ca-bundle +openssh-keygen +kmod-loop +kmod-fs-squashfs +squashfs-tools-unsquashfs
FILE_MODES:=/var/lib/snapd/void:root:root:0111
endef

define Package/snapd/description
Expand Down Expand Up @@ -58,6 +59,7 @@ define Build/Configure
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--localstatedir=/var \
--libexecdir=/usr/lib/snapd \
--with-apparmorconfigdir=/etc/apparmor.d \
--with-snap-mount-dir=/var/lib/snapd/snap \
Expand Down Expand Up @@ -100,6 +102,10 @@ define Build/Compile
rm -rf $(PKG_INSTALL_DIR)
$(INSTALL_DIR) $(PKG_INSTALL_DIR)
+$(MAKE) -C $(PKG_BUILD_DIR)/cmd DESTDIR=$(PKG_INSTALL_DIR) install
# Upstream intentionally creates this directory as 0111. Keep the physical
# staging tree readable through packaging; FILE_MODES records 0111 under
# fakeroot when the final package archive is created.
chmod 0755 $(PKG_INSTALL_DIR)/var/lib/snapd/void
+$(MAKE) -C $(PKG_BUILD_DIR)/data DESTDIR=$(PKG_INSTALL_DIR) $(SNAPD_DATA_VARS) install

$(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/lib/snapd $(PKG_INSTALL_DIR)/usr/bin
Expand Down
Loading