Skip to content
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.

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

Add support for build Debian 12 packages #3500

Merged
merged 2 commits into from
Feb 6, 2025

Conversation

pepone
Copy link
Member

@pepone pepone commented Feb 5, 2025

This PR add support for building the DEB packages using Debian 12 (bookworm).

I have to exclude the Python3 packages because bookworm doesn't provide Python 3.12 which is the minimum required release for Ice 3.8.

@@ -8,9 +8,9 @@ Build-Depends: debhelper,
dh-exec,
dh-php (>= 0.20),
dh-python,
libbluetooth-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
libbluetooth-dev <!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64>,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this exclusion list was bogus, it should use < instead of [.

@@ -21,8 +21,8 @@ Build-Depends: debhelper,
openssl,
php-all-dev,
php-cli,
python3 (>= 3.12),
python3-dev (>= 3.12),
python3 (>= 3.12) <!no-python312>,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This allow to build with no-python312 build profile, without depending on python3.12+

python3 (>= 3.12),
python3-dev (>= 3.12),
python3 (>= 3.12) <!no-python312>,
python3-dev (>= 3.12) <!no-python312>,
python3-setuptools,
python3-passlib
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still keep passlib for the tests, we can probably remove setuptools.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd be inclined to remove passlib as it's not a real dependency.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debian packaging has a target to run the tests, those are run for example when we upload to the debian repositories.

dh-exec dh-php dh-python locales-all php-all-dev python3-setuptools \
build-essential \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get clean
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would be best to install build dependencies dynamically when building the package, I leave that for a follow-up PR.

This will ensure that the package build dependencies are correct.

python3 (>= 3.12),
python3-dev (>= 3.12),
python3 (>= 3.12) <!no-python312>,
python3-dev (>= 3.12) <!no-python312>,
python3-setuptools,
python3-passlib
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd be inclined to remove passlib as it's not a real dependency.

@@ -9,7 +9,7 @@ fi

# Generate the upstream tarball
echo "Creating tarball for ICE_VERSION=$ICE_VERSION"
tar -czf /workspace/zeroc-ice_${ICE_VERSION}.orig.tar.gz -C /workspace/ice .
tar -czf /workspace/zeroc-ice_${ICE_VERSION}.orig.tar.gz --exclude=.git -C /workspace/ice .
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use git archive this to make this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no good reason, I'm just not familiar with it.

@@ -21,8 +21,8 @@ Build-Depends: debhelper,
openssl,
php-all-dev,
php-cli,
python3 (>= 3.12),
python3-dev (>= 3.12),
python3 (>= 3.12) <!no-python312>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a way to do this without double negation?

Comment on lines 26 to 27
python3-setuptools,
python3-passlib
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should remove both.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need python to run the tests in any case, so passlib or not doesn't change much.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, but tests doesn't need 3.12

Comment on lines 26 to 27
python3-setuptools,
python3-passlib
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need python to run the tests in any case, so passlib or not doesn't change much.

@pepone pepone merged commit 797830c into zeroc-ice:main Feb 6, 2025
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants