Skip to content

Moved PostgreSQL to WORKDIR/PostgreSQL/<psql-major-version> to help with hub package upgrades migration #1510

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

Closed
craigcomstock wants to merge 2 commits into from
Closed

Moved PostgreSQL to WORKDIR/PostgreSQL/<psql-major-version> to help with hub package upgrades migration #1510

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
b050c96
Moved PostgreSQL to WORKDIR/PostgreSQL/<psql-major-version> to help w…
craigcomstock Oct 15, 2024
3d8ba4e
FP4
craigcomstock Oct 15, 2024
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
9 changes: 8 additions & 1 deletion deps-packaging/postgresql/cfbuild-postgresql.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
%define postgresql_major_version 17
%define postgresql_minor_version 0
%define postgresql_version ${postgresql_major_version}.${postgresql_minor_version}
%define postgresql_version 17.0

Summary: CFEngine Build Automation -- postgresql
Expand All @@ -13,10 +16,14 @@ BuildRoot: %{_topdir}/BUILD/%{name}-%{version}-%{release}-buildroot

AutoReqProv: no

%define prefix %{buildprefix}
# Build PostgreSQL in a major-version named dir so that binaries are linked to the specific major version.
# This makes pg_upgrade work more easily.
# In the past we simply used the main prefix: /var/cfengine by default and this caused trouble with symbols when using pg_upgrade because both old and new postgresql binaries linked to /var/cfengine/lib/libpq.so and similar.
%define prefix %{buildprefix}/PostgreSQL/${postgresql_major_version}

%prep
mkdir -p %{_builddir}
mkdir -p ${prefix} # maybe not needed?
%setup -q -n postgresql-%{postgresql_version}

%build
Expand Down
4 changes: 0 additions & 4 deletions deps-packaging/postgresql/debian/cfbuild-postgresql-devel.install
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions deps-packaging/postgresql/debian/cfbuild-postgresql.install
View file
Open in desktop

This file was deleted.

19 changes: 11 additions & 8 deletions deps-packaging/postgresql/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/make -f

POSTGRESQL_MAJOR_VERSION=17
POSTGRESQL_MINOR_VERSION=0
BUILD_PREFIX=$(PREFIX)/PostgreSQL/$(POSTGRESQL_MAJOR_VERSION)
PREFIX=$(BUILDPREFIX)

clean:
Expand All @@ -12,7 +15,7 @@ build: build-stamp
build-stamp:
dh_testdir

LD_LIBRARY_PATH=$(PREFIX)/lib CPPFLAGS=-I$(PREFIX)/include ./configure --prefix=$(PREFIX) --without-zlib --without-readline --with-openssl --without-icu
LD_LIBRARY_PATH=$(PREFIX)/lib CPPFLAGS=-I$(PREFIX)/include ./configure --prefix=$(BUILD_PREFIX) --without-zlib --without-readline --with-openssl --without-icu
# force generated-headers in src/backend because the headers are needed for other things and somehow dependencies don't work properly
make -C ./src/backend generated-headers
make
Expand All @@ -26,13 +29,13 @@ install: build
dh_installdirs
make install DESTDIR=$(CURDIR)/debian/tmp
make -C contrib install DESTDIR=$(CURDIR)/debian/tmp
rm -f $(CURDIR)/debian/tmp$(PREFIX)/share/postgresql/postgresl.conf.cfengine
patch -d $(CURDIR)/debian/tmp$(PREFIX)/share/postgresql/ -o postgresql.conf.cfengine < $(CURDIR)/postgresql.conf.cfengine.patch
patch $(CURDIR)/debian/tmp$(PREFIX)/share/postgresql/postgresql.conf.sample $(CURDIR)/postgresql.conf.sample.patch
chmod --reference $(CURDIR)/debian/tmp$(PREFIX)/share/postgresql/postgresql.conf.sample $(CURDIR)/debian/tmp$(PREFIX)/share/postgresql/postgresql.conf.cfengine
chown --reference $(CURDIR)/debian/tmp$(PREFIX)/share/postgresql/postgresql.conf.sample $(CURDIR)/debian/tmp$(PREFIX)/share/postgresql/postgresql.conf.cfengine
patch $(CURDIR)/debian/tmp$(PREFIX)/share/postgresql/pg_hba.conf.sample $(CURDIR)/pg_hba.conf.sample.patch
rm -f $(CURDIR)/debian/tmp$(PREFIX)/lib/*.a
rm -f $(CURDIR)/debian/tmp$(BUILD_PREFIX)/share/postgresql/postgresl.conf.cfengine
patch -d $(CURDIR)/debian/tmp$(BUILD_PREFIX)/share/postgresql/ -o postgresql.conf.cfengine < $(CURDIR)/postgresql.conf.cfengine.patch
patch $(CURDIR)/debian/tmp$(BUILD_PREFIX)/share/postgresql/postgresql.conf.sample $(CURDIR)/postgresql.conf.sample.patch
chmod --reference $(CURDIR)/debian/tmp$(BUILD_PREFIX)/share/postgresql/postgresql.conf.sample $(CURDIR)/debian/tmp$(BUILD_PREFIX)/share/postgresql/postgresql.conf.cfengine
chown --reference $(CURDIR)/debian/tmp$(BUILD_PREFIX)/share/postgresql/postgresql.conf.sample $(CURDIR)/debian/tmp$(BUILD_PREFIX)/share/postgresql/postgresql.conf.cfengine
patch $(CURDIR)/debian/tmp$(BUILD_PREFIX)/share/postgresql/pg_hba.conf.sample $(CURDIR)/pg_hba.conf.sample.patch
rm -f $(CURDIR)/debian/tmp$(BUILD_PREFIX)/lib/*.a

binary-indep: build install

Expand Down