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.

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

Jump to bottom

ceph-dev*build: Switch to using jammy pbuilder image #2067

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

ceph-dev*build: Switch to using jammy pbuilder image #2067

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
b1acf5a
ceph-dev*build: Switch to using jammy pbuilder image
Aug 31, 2022
5fe40e0
ceph-dev-build: sudo rm -rf dist
Aug 31, 2022
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
8 changes: 2 additions & 6 deletions ceph-dev-build/build/build_mingw
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#!/bin/bash
set -ex

# We need Ubuntu Focal to cross-compile Ceph for Windows.
# Previous versions provide broken Mingw packages.
# "DIST" will be set to "windows", so we're currently overriding it with
# a hardcoded value.
tmp_pbuild_script=$(mktemp /tmp/build_mingw_pbuild.XXXXXX)
cat << EOF > $tmp_pbuild_script
#!/bin/sh
Expand All @@ -17,8 +13,8 @@ EOF
chmod a+x $tmp_pbuild_script
sudo pbuilder execute \
--bindmounts "$(pwd):/mnt/ceph" \
--distribution "focal" \
--basetgz $basedir/focal.tgz \
--distribution "jammy" \
--basetgz $basedir/jammy.tgz \
-- $tmp_pbuild_script
rm $tmp_pbuild_script

Expand Down
6 changes: 3 additions & 3 deletions ceph-dev-build/build/setup_mingw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ if [ "$THROWAWAY" = false ] ; then
check_binary_existence $VENV $chacra_check_url
fi

# We need Ubuntu Focal to cross-compile Ceph for Windows.
# Previous versions provide broken Mingw packages.
# We need Ubuntu >= Jammy to cross-compile Ceph for Windows.
# Previous versions provide broken Mingw packages/too old gcc.
# "DIST" will be set to "windows", so we're currently overriding it with
# a hardcoded value.
DIST="focal"
DIST="jammy"
setup_pbuilder use_gcc
DIST="$NORMAL_DISTRO"
2 changes: 1 addition & 1 deletion ceph-dev-build/config/definitions/ceph-dev-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
builders:
- shell: |
echo "Cleaning up top-level workarea (shared among workspaces)"
rm -rf dist
sudo rm -rf dist
rm -rf venv
rm -rf release
- copyartifact:
Expand Down
8 changes: 2 additions & 6 deletions ceph-dev-new-build/build/build_mingw
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#!/bin/bash
set -ex

# We need Ubuntu Focal to cross-compile Ceph for Windows.
# Previous versions provide broken Mingw packages.
# "DIST" will be set to "windows", so we're currently overriding it with
# a hardcoded value.
tmp_pbuild_script=$(mktemp /tmp/build_mingw_pbuild.XXXXXX)
cat << EOF > $tmp_pbuild_script
#!/bin/sh
Expand All @@ -17,8 +13,8 @@ EOF
chmod a+x $tmp_pbuild_script
sudo pbuilder execute \
--bindmounts "$(pwd):/mnt/ceph" \
--distribution "focal" \
--basetgz $basedir/focal.tgz \
--distribution "jammy" \
--basetgz $basedir/jammy.tgz \
-- $tmp_pbuild_script
rm $tmp_pbuild_script

Expand Down
6 changes: 3 additions & 3 deletions ceph-dev-new-build/build/setup_mingw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ if [ "$THROWAWAY" = false ] ; then
check_binary_existence $VENV $chacra_check_url
fi

# We need Ubuntu Focal to cross-compile Ceph for Windows.
# Previous versions provide broken Mingw packages.
# We need Ubuntu >= Jammy to cross-compile Ceph for Windows.
# Previous versions provide broken Mingw packages/too old gcc.
# "DIST" will be set to "windows", so we're currently overriding it with
# a hardcoded value.
DIST="focal"
DIST="jammy"
setup_pbuilder use_gcc
DIST="$NORMAL_DISTRO"