Skip to content

Fix DEB packaging to support multi-arch builds #1576

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
tuhaihe merged 2 commits into from
Feb 13, 2026
Merged

Fix DEB packaging to support multi-arch builds #1576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
632490e
Fix DEB packaging to support multi-arch builds
tuhaihe Feb 13, 2026
af35cee
Update workflow to support new deb format
tuhaihe Feb 13, 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
11 changes: 9 additions & 2 deletions .github/workflows/build-deb-cloudberry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,8 +554,15 @@ jobs:
exit 1
fi

ARCH="amd64"
CBDB_PKG_VERSION=${CBDB_VERSION}-${BUILD_NUMBER}-$(git --git-dir=.git rev-list HEAD --count).$(git --git-dir=.git rev-parse --short HEAD)
ARCH=$(dpkg --print-architecture)
# Detect OS distribution (e.g., ubuntu22.04, debian12)
if [ -f /etc/os-release ]; then
. /etc/os-release
OS_DISTRO=$(echo "${ID}${VERSION_ID}" | tr '[:upper:]' '[:lower:]')
else
OS_DISTRO="unknown"
fi
CBDB_PKG_VERSION=${CBDB_VERSION}-${BUILD_NUMBER}-${OS_DISTRO}

echo "Produced artifacts"
ls -l ../
Expand Down
12 changes: 11 additions & 1 deletion devops/build/packaging/deb/build-deb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,17 @@ if [ -z ${BUILD_USER+x} ]; then
export BUILD_USER=github
fi

export CBDB_PKG_VERSION=${CBDB_FULL_VERSION}-${BUILD_NUMBER}-$(git --git-dir=.git rev-list HEAD --count).$(git --git-dir=.git rev-parse --short HEAD)
# Detect OS distribution (e.g., ubuntu22.04, debian12)
if [ -z ${OS_DISTRO+x} ]; then
if [ -f /etc/os-release ]; then
. /etc/os-release
OS_DISTRO=$(echo "${ID}${VERSION_ID}" | tr '[:upper:]' '[:lower:]')
else
OS_DISTRO="unknown"
fi
fi

export CBDB_PKG_VERSION=${CBDB_FULL_VERSION}-${BUILD_NUMBER}-${OS_DISTRO}

# Check if required commands are available
check_commands
Expand Down
2 changes: 1 addition & 1 deletion devops/build/packaging/deb/ubuntu22.04/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Build-Depends: debhelper (>= 9),

Package: apache-cloudberry-db-incubating
Provides: apache-cloudberry-db
Architecture: amd64
Architecture: any
Depends: curl,
cgroup-tools,
iputils-ping,
Expand Down
4 changes: 2 additions & 2 deletions devops/build/packaging/deb/ubuntu22.04/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ include /usr/share/dpkg/default.mk
dh $@ --parallel

gpinstall:
make install
make install DESTDIR=${DEBIAN_DESTINATION} prefix=

override_dh_auto_install: gpinstall
# the staging directory for creating a debian is NOT the right GPHOME.
Expand All @@ -43,7 +43,7 @@ override_dh_gencontrol:
dh_gencontrol -- -v${CBDB_PKG_VERSION} -p${PACKAGE_CBDB}

override_dh_shlibdeps:
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu/libfakeroot:${DEBIAN_DESTINATION}/lib dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/$(DEB_HOST_MULTIARCH)/libfakeroot:${DEBIAN_DESTINATION}/lib dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info

clean_dev_local:
rm -rf ${DEBIAN_DESTINATION}
Loading