Merge pull request #7695 from mgleung/packaging-fixes-3.26

Fix OpenStack packaging promotion and add libcap-dev and automatic de…
projectcalico · May 25, 2023 · 0f80c3c · 0f80c3c
2 parents b42d24b + 4dc9a40
commit 0f80c3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.semaphore/push-images/packaging.yaml b/.semaphore/push-images/packaging.yaml
@@ -26,6 +26,8 @@ global_job_config:
     - export SECRET_KEY=$HOME/secrets/marvin.txt
     - export GCLOUD_ARGS='--zone us-east1-c --project tigera-wp-tcp-redirect'
     - export HOST=ubuntu@binaries-projectcalico-org
+    - sudo apt-get update -y
+    - sudo apt-get install -y moreutils
 
 blocks:
   - name: 'Publish openstack packages'

diff --git a/felix/debian/control b/felix/debian/control
@@ -2,7 +2,7 @@ Source: felix
 Section: net
 Priority: optional
 Maintainer: Project Calico Maintainers <maintainers@projectcalico.org>
-Build-Depends: debhelper (>= 8.0.0), base-files (>= 11.1~) | dh-systemd, libelf-dev
+Build-Depends: debhelper (>= 8.0.0), base-files (>= 11.1~) | dh-systemd, libelf-dev, libcap-dev
 Standards-Version: 3.9.4
 
 Package: calico-common
@@ -28,7 +28,8 @@ Depends:
  ipset,
  iproute2,
  net-tools,
- ${misc:Depends}
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Project Calico virtual networking for cloud data centers.
  Project Calico is an open source solution for virtual networking in
  cloud data centers. Its IP-centric architecture offers numerous