Skip to content

Commit

Permalink
packaging: bump Cockpit requirement for send-acks
Browse files Browse the repository at this point in the history
The fsreplace1 send-acks feature was added in 316, Debian-testing does
not yet have a newer Cockpit so temporarily we install Cockpit from
unstable.
  • Loading branch information
jelly authored and allisonkarlitskaya committed Jun 4, 2024
1 parent 05e6a31 commit 2fe12b8
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
9 changes: 8 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,17 @@ VM_DEPENDS = $(COCKPIT_WHEEL)
VM_CUSTOMIZE_FLAGS = --install $(COCKPIT_WHEEL)
endif

# HACK: temporary bump Cockpit on Debian-testing to get > 316
ifeq ("$(TEST_OS)","debian-testing")
VM_CUSTOMIZE_FLAGS = --run-command "apt update && apt-get install -y -t unstable cockpit"
else
VM_CUSTOMIZE_FLAGS = --no-network
endif

# build a VM with locally built distro pkgs installed
# disable networking, VM images have mock/pbuilder with the common build dependencies pre-installed
$(VM_IMAGE): $(TARFILE) $(NODE_CACHE) packaging/arch/PKGBUILD bots test/vm.install $(VM_DEPENDS)
bots/image-customize --no-network --fresh \
bots/image-customize --fresh \
$(VM_CUSTOMIZE_FLAGS) \
--upload $(NODE_CACHE):/var/tmp/ --build $(TARFILE) \
--script $(CURDIR)/test/vm.install $(TEST_OS)
Expand Down
2 changes: 1 addition & 1 deletion packaging/arch/PKGBUILD.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pkgdesc='A filesystem browser for Cockpit'
arch=('any')
url='https://github.com/cockpit-project/cockpit-files'
license=(LGPL)
depends=("cockpit>=310.1")
depends=("cockpit>=316")
source=("SOURCE")
sha256sums=('SKIP')

Expand Down
2 changes: 1 addition & 1 deletion packaging/cockpit-files.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ BuildRequires: gettext
BuildRequires: libappstream-glib-devel
%endif

Requires: cockpit-bridge >= 310
Requires: cockpit-bridge >= 316

%{NPM_PROVIDES}

Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Package: cockpit-files
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends},
cockpit-bridge (>= 310.1),
cockpit-bridge (>= 316),
Description: A filesystem browser for Cockpit
The Cockpit Web Console enables users to administer GNU/Linux servers using a
web browser.
Expand Down

0 comments on commit 2fe12b8

Please sign in to comment.