helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-10-02 05:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

postgresql: upgrade 13.1 -> 13.2

Browse Source 
-License-Update: Copyright year updated to 2021.

Upgrade patches to fix

ERROR: postgresql-13.2-r0 do_patch: Fuzz detected:

Applying patch 0001-configure.in-bypass-autoconf-2.69-version-check.patch
patching file configure.in
Hunk #1 succeeded at 19 with fuzz 2.

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
zhengruoqin 2021-02-22 15:45:05 +08:00 committed by Khem Raj
parent fe6187fed9
commit cb3f4cffe9
5 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch
View File

@ -9,8 +9,6 @@ extending the existing aarch64 macro works.
src/include/storage/s_lock.h | 5 +++-- src/include/storage/s_lock.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-) 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 3fe29ce..7cd578f 100644
--- a/src/include/storage/s_lock.h --- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h
@@ -316,11 +316,12 @@ tas(volatile slock_t *lock) @@ -316,11 +316,12 @@ tas(volatile slock_t *lock)
@ -36,6 +34,3 @@ index 3fe29ce..7cd578f 100644
/* S/390 and S/390x Linux (32- and 64-bit zSeries) */ /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
--
2.9.3

7
meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch
View File

@ -22,11 +22,9 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
src/common/Makefile | 3 --- src/common/Makefile | 3 ---
1 file changed, 3 deletions(-) 1 file changed, 3 deletions(-)
diff --git a/src/common/Makefile b/src/common/Makefile
index 16619e4..665eaa1 100644
--- a/src/common/Makefile --- a/src/common/Makefile
+++ b/src/common/Makefile +++ b/src/common/Makefile
@@ -31,9 +31,6 @@ include $(top_builddir)/src/Makefile.global @@ -31,9 +31,6 @@ include $(top_builddir)/src/Makefile.glo
# don't include subdirectory-path-dependent -I and -L switches # don't include subdirectory-path-dependent -I and -L switches
STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS)) STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS)) STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
@ -36,6 +34,3 @@ index 16619e4..665eaa1 100644
override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\"" override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\"" override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
--
2.17.1

9
meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch
View File

@ -12,13 +12,11 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
configure.in | 4 ---- configure.in | 4 ----
1 file changed, 4 deletions(-) 1 file changed, 4 deletions(-)
diff --git a/configure.in b/configure.in
index 8d4e9ac..75203c2 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un
AC_INIT([PostgreSQL], [13.1], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) AC_INIT([PostgreSQL], [13.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not -Untested combinations of 'autoconf' and PostgreSQL versions are not
@ -27,6 +25,3 @@ index 8d4e9ac..75203c2 100644
AC_COPYRIGHT([Copyright (c) 1996-2020, PostgreSQL Global Development Group]) AC_COPYRIGHT([Copyright (c) 1996-2020, PostgreSQL Global Development Group])
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
--
2.29.2

7
meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch
View File

@ -19,11 +19,9 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
configure.in | 2 +- configure.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.in b/configure.in
index b98b9bb..8584677 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -2211,7 +2211,7 @@ Use --without-tcl to disable building PL/Tcl.]) @@ -2206,7 +2206,7 @@ Use --without-tcl to disable building PL
fi fi
# check for <perl.h> # check for <perl.h>
@ -32,6 +30,3 @@ index b98b9bb..8584677 100644
ac_save_CPPFLAGS=$CPPFLAGS ac_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $perl_includespec" CPPFLAGS="$CPPFLAGS $perl_includespec"
AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])], AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])],
--
2.7.4

4
meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb → meta-oe/recipes-dbs/postgresql/postgresql_13.2.bb
View File

@ -1,6 +1,6 @@
require postgresql.inc require postgresql.inc
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc4ce21960f0c561460d750bc270d11f" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=255f15687738db8068fbe9b938c90217"
SRC_URI += "\ SRC_URI += "\
file://not-check-libperl.patch \ file://not-check-libperl.patch \
@ -9,4 +9,4 @@ SRC_URI += "\
file://0001-configure.in-bypass-autoconf-2.69-version-check.patch \ file://0001-configure.in-bypass-autoconf-2.69-version-check.patch \
" "
SRC_URI[sha256sum] = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f" SRC_URI[sha256sum] = "5fd7fcd08db86f5b2aed28fcfaf9ae0aca8e9428561ac547764c2a2b0f41adfc"