Skip to content

Commit

Permalink
compatibility for building on ubuntu noble
Browse files Browse the repository at this point in the history
  • Loading branch information
piax93 committed Jun 26, 2024
1 parent 5cb4238 commit 024da6d
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ EXTRA_DOCKER_ARGS ?=
DOCKER_ARGS = $(EXTRA_DOCKER_ARGS) -v /etc/passwd:/etc/passwd:ro --privileged --cap-add sys_admin --pid host
DOCKER_BASE_IMAGE_TMPL ?= ubuntu:OS_RELEASE_PH
HOST_OS_RELEASE = $(or $(shell cat /etc/lsb-release 2>/dev/null | grep -Po '(?<=CODENAME=)(.+)'), bionic)
SUPPORTED_UBUNTU_RELEASES = bionic focal jammy
UPSTREAM_BCC_RELEASES = jammy
SUPPORTED_UBUNTU_RELEASES = bionic focal jammy noble
UPSTREAM_BCC_RELEASES = jammy noble
VERSION_FILE = $(PWD)/pidtree_bcc/__init__.py
EDITOR ?= vi

Expand Down
2 changes: 1 addition & 1 deletion itest/itest_generic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function main {
-v $TOPLEVEL/itest/dist/$1/:/work/dist \
pidtree-itest-$1 /work/entrypoint_deb_package.sh run -c /work/config.yml -f /work/outfile
else
echo "ERROR: '$@' is not a supported argument (see 'itest/itest.sh' for options)" >&2
echo "ERROR: '$@' is not a supported argument (see 'itest/itest_generic.sh' for options)" >&2
exit 1
fi
echo "Sleeping $SPIN_UP_TIME seconds for pidtree-bcc to start"
Expand Down
9 changes: 8 additions & 1 deletion packaging/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ else
python_bcc = python3-bcc
endif

ifeq ($(shell (. /etc/lsb-release && dpkg --compare-versions $$DISTRIB_RELEASE "le" "18.04" && echo yes || echo no)),yes)
# bionic does not support newer pip/setuptools
requirements_bootstrap = -rrequirements-bootstrap-bionic.txt
else
requirements_bootstrap = -rrequirements-bootstrap.txt
endif

# for some $reason this prevents virtualenv to spit a bunch of errors
export VIRTUALENV_NO_PERIODIC_UPDATE = true

Expand All @@ -20,4 +27,4 @@ override_dh_gencontrol:
dh_gencontrol -- -VpythonBCC:Depends="$(python_bcc)"

override_dh_virtualenv:
dh_virtualenv --python python3 --use-system-packages --no-test --preinstall=-rrequirements-bootstrap.txt
dh_virtualenv --python python3 --use-system-packages --no-test --preinstall=$(requirements_bootstrap)
3 changes: 3 additions & 0 deletions requirements-bootstrap-bionic.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
pip==21.3.1
setuptools==49.2.1
wheel==0.37.0
6 changes: 3 additions & 3 deletions requirements-bootstrap.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pip==21.3.1
setuptools==49.2.1
wheel==0.37.0
pip==24.1
setuptools==70.1.1
wheel==0.43.0

0 comments on commit 024da6d

Please sign in to comment.