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

Fix packaging #6

Merged
merged 3 commits into from
Jul 15, 2021
Merged

Fix packaging #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdfa74c
Fixes to ZenFS packaging for Deb
Jul 13, 2021
92f45b9
Merge pull request #1 from Sudokamikaze/dev/PS-7757-8.0-zenfs-changes
EvgeniyPatlan Jul 14, 2021
7db1ce2
Fix zenfs build
EvgeniyPatlan Jul 14, 2021
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
10 changes: 5 additions & 5 deletions build-ps/debian-zenfs/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,16 @@ endif

cd $(builddir) && $(MAKE) -j$(NCPU) VERBOSE=1

touch $@

cd $(builddir); \
mkdir storage/rocksdb/rocksdb/plugin/; ln -s storage/rocksdb/rocksdb_plugins/zenfs/ storage/rocksdb/rocksdb/plugin/; \
cd $(builddir)/../; \
ls; mkdir -p $(CURDIR)/storage/rocksdb/rocksdb/plugin/; ln -s $(CURDIR)/storage/rocksdb/rocksdb_plugins/zenfs/ $(CURDIR)/storage/rocksdb/rocksdb/plugin/; \
cd storage/rocksdb/rocksdb/; \
CC=clang-12 CXX=clang++-12 make -j$(NCPU) DISABLE_WARNING_AS_ERROR=1 PREFIX=$(CURDIR)/rocksdb-root/usr OBJ_DIR=$(CURDIR)/rocksdb-build ROCKSDB_PLUGINS=zenfs install-static; \
cd plugin/zenfs/util; \
PKG_CONFIG_PATH=$(CURDIR)/rocksdb-root/usr/lib/pkgconfig CC=clang-12 CXX=clang++-12 make -j$(NCPU)

touch $@

override_dh_auto_install:
@echo "RULES.$@"

Expand Down Expand Up @@ -201,8 +202,7 @@ override_dh_auto_install:
# install AppArmor profile for Percona Server
install -d $(TMP)/etc/apparmor.d
install -d $(TMP)/etc/apparmor.d/local

install -m 0755 $(builddir)/rocksdb-source/plugin/zenfs/util/zenfs $(TMP)/usr/bin/zenfs
install -m 0755 storage/rocksdb/rocksdb/plugin/zenfs/util/zenfs $(TMP)/usr/bin/zenfs

override_dh_strip:
dh_strip --dbg-package=percona-server-dbg-zenfs
Expand Down
3 changes: 2 additions & 1 deletion build-ps/percona-server-8.0_builder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ enable_zenfs() {
mkdir builddir
rm -rf debian
mv build-ps/debian-zenfs debian
dch -D unstable --force-distribution -v "${VERSION}-${RELEASE}-${DEB_RELEASE}" "Update to new upstream release Percona Server ${VERSION}-${RELEASE}-1"

sed -i "s:@@PERCONA_VERSION_EXTRA@@:${MYSQL_VERSION_EXTRA#-}:g" debian/rules
sed -i "s:@@REVISION@@:${REVISION}:g" debian/rules
Expand Down Expand Up @@ -750,11 +751,11 @@ build_deb(){

cd ${DIRNAME}

dch -b -m -D "$DEBIAN_VERSION" --force-distribution -v "${VERSION}-${RELEASE}-${DEB_RELEASE}.${DEBIAN_VERSION}" 'Update distribution'

if [[ ${WITH_ZENFS} == "1" ]]; then
enable_zenfs debian
fi
dch -b -m -D "$DEBIAN_VERSION" --force-distribution -v "${VERSION}-${RELEASE}-${DEB_RELEASE}.${DEBIAN_VERSION}" 'Update distribution'

if [ ${DEBIAN_VERSION} != trusty -a ${DEBIAN_VERSION} != xenial -a ${DEBIAN_VERSION} != jessie -a ${DEBIAN_VERSION} != stretch -a ${DEBIAN_VERSION} != artful -a ${DEBIAN_VERSION} != bionic -a ${DEBIAN_VERSION} != focal -a "${DEBIAN_VERSION}" != disco -a "${DEBIAN_VERSION}" != buster -a "${DEBIAN_VERSION}" != hirsute ]; then
gcc47=$(which gcc-4.7 2>/dev/null || true)
Expand Down