Skip to content

Commit 418d1be

Browse files
authored
Random fixes to support PXF builds (#24)
* Random fixes to support PXF builds * use `/usr/cloudberry-db` path for cloudberry
1 parent 8e5ea8d commit 418d1be

11 files changed

Lines changed: 23 additions & 32 deletions

File tree

packaging/deb/cbdb_jammy/debian/changelog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
greenplum-db-cb (1.0.0) jammy; urgency=medium
1+
greenplum-db-cb (1.6.0) jammy; urgency=medium
22

33
* Development release.
44

packaging/deb/cbdb_jammy/debian/control

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Build-Depends: debhelper (>= 9),
3535
libssl3,
3636
ninja-build,
3737
python-setuptools,
38-
python2.7,
39-
python2.7-dev,
38+
python3,
39+
python3-dev,
4040
unzip,
4141
wget,
4242
zlib1g-dev,
@@ -70,25 +70,14 @@ Depends: curl,
7070
openssh-client,
7171
openssh-server,
7272
openssl,
73-
python2.7,
74-
python2.7-dev,
75-
python-lockfile,
76-
python-paramiko,
77-
python-psutil,
78-
python-yaml,
79-
python-pip,
80-
python-behave,
81-
python-epydoc,
82-
python-ldap,
83-
python-mock,
73+
python3,
74+
python3-dev,
75+
python3-pip,
8476
python-six,
85-
python-parse,
86-
python-is-python2,
8777
rsync,
8878
wget,
8979
zlib1g,
90-
libuv1,
91-
libxerces-c3.2
80+
libuv1
9281
Description: Cloudberry Database
9382
Cloudberry Database (CBDB or CloudberryDB for short) is created by a bunch
9483
of original Greenplum Database developers and ASF committers.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
debian/build/* /opt/greenplum-db-6
1+
debian/build/* /usr/cloudberry-db

packaging/deb/cbdb_jammy/debian/postinst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
set -e
44

55
OWNER=root
6-
GPHOME=/opt/greenplum-db-cb
6+
GPHOME=/usr/cloudberry-db
77

88
if [ "$1" = configure ]; then
99

1010
/sbin/ldconfig
11-
fi
11+
fi
12+
13+
# add alternative location for the database binaries
14+
ln -s /opt/greenplum-db-cb /usr/cloudberry-db

packaging/deb/cbdb_jammy/debian/preinst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
GPADMIN=gpadmin
6-
GPHOME=/opt/greenplum-db-cb
6+
GPHOME=/usr/cloudberry-db
77

88
case $1 in
99
install|upgrade)

packaging/deb/jammy/debian/changelog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
greenplum-db-6 (6.10.1) bionic; urgency=medium
1+
greenplum-db-6 (6.10.1) jammy; urgency=medium
22

33
* Initial release.
44

packaging/deb/pxf_6_bionic/debian/rules

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@ DEBIAN_DESTINATION := ${PXF_SRC_DIR}/debian/build
99
export JAVA_HOME := /usr/lib/jvm/java-1.11.0-openjdk-amd64
1010
export GPHOME := ${DEBIAN_DESTINATION}/gp
1111

12-
export GOROOT := ${PXF_SRC_DIR}/go
13-
export GOPATH := ${PXF_SRC_DIR}/cli/go
14-
export PATH := $(GOPATH)/bin:$(GOROOT)/bin:$(GPHOME)/bin:$(PATH)
12+
export PATH := $(GPHOME)/bin:$(PATH)
1513

16-
$(info GOPATH is $(GOPATH))
1714
$(info PATH is $(PATH))
1815
$(info GPVAR is $(GP_PATH_SCRIPT))
1916
$(info GOROOT is $(GOROOT))

packaging/deb/pxf_cb_jammy/debian/changelog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
greenplum-pxf-6 (6.10.0) jammy; urgency=medium
1+
greenplum-pxf-cb (1.0.0) jammy; urgency=medium
22

33
* Development release.
44

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
debian/build/gp/pxf/* /opt/greenplum-pxf-cb
2-
debian/build/gp/lib/postgresql/pxf.so /opt/greenplum-db-cb/lib/postgresql
3-
debian/build/gp/share/postgresql/extension/pxf* /opt/greenplum-db-cb/share/postgresql/extension
2+
debian/build/gp/lib/postgresql/pxf.so /usr/cloudberry-db/lib/postgresql
3+
debian/build/gp/share/postgresql/extension/pxf* /usr/cloudberry-db/share/postgresql/extension

packaging/deb/pxf_cb_jammy/debian/postinst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
OWNER=root
66
PXFVER=1
77
PXFHOME=/opt/greenplum-pxf-${PXFVER}
8-
GPHOME=/opt/greenplum-db-1
8+
GPHOME=/usr/cloudberry-db
99

1010
chown -R ${OWNER}:${OWNER} ${PXFHOME}
1111
chown ${OWNER}:${OWNER} ${GPHOME}/lib/postgresql/pxf.so

0 commit comments

Comments
 (0)