diff mbox series

[meta-oe] psqlodbc: upgrade 17.00.0007 -> 17.00.0010

Message ID 20260402065652.14800-3-liuyd.fnst@fujitsu.com
State New
Headers show
Series [meta-oe] psqlodbc: upgrade 17.00.0007 -> 17.00.0010 | expand

Commit Message

Liu Yiding April 2, 2026, 6:56 a.m. UTC
Update psqlodbc-fix-for-ptest-support.patch for 17.00.0010

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
---
 .../psqlodbc-fix-for-ptest-support.patch      | 26 ++++++++++++-------
 ...c_17.00.0007.bb => psqlodbc_17.00.0010.bb} |  2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)
 rename meta-oe/recipes-dbs/psqlodbc/{psqlodbc_17.00.0007.bb => psqlodbc_17.00.0010.bb} (97%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch
index a1f60b2692..b28aa104c4 100644
--- a/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch
+++ b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch
@@ -1,6 +1,6 @@ 
-From b0175d6124ae0460fbeaf34c964aff587fa978c2 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Tue, 5 Sep 2017 10:24:10 +0800
+From dbd40a22367ae5cc24ec75d704226b68e856df4f Mon Sep 17 00:00:00 2001
+From: Liu Yiding <liuyd.fnst@fujitsu.com>
+Date: Thu, 2 Apr 2026 06:43:39 +0000
 Subject: [PATCH] psqlodbc: fixes for ptest support
 
 * Fix the LIBODBC since we don't use ODBC_CONFIG.
@@ -12,6 +12,9 @@  Subject: [PATCH] psqlodbc: fixes for ptest support
 Upstream-Status: Inappropriate [OE ptest specific]
 
 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+
+Update for 17.00.0010
+Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
 ---
  test/Makefile.in    |  2 +-
  test/odbcini-gen.sh | 10 +++++-----
@@ -19,7 +22,7 @@  Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
  3 files changed, 16 insertions(+), 16 deletions(-)
 
 diff --git a/test/Makefile.in b/test/Makefile.in
-index 3f9a9af..09406ae 100644
+index 969839d..1d53299 100644
 --- a/test/Makefile.in
 +++ b/test/Makefile.in
 @@ -19,7 +19,7 @@ CPPFLAGS = @CPPFLAGS@ -I..	# config.h
@@ -68,7 +71,7 @@  index 2eaba35..d7c03ba 100755
  RowVersioning           = No
  ShowSystemTables                = No
 diff --git a/test/runsuite.c b/test/runsuite.c
-index 6ac3709..023ac1d 100644
+index bc3000b..dd65795 100644
 --- a/test/runsuite.c
 +++ b/test/runsuite.c
 @@ -55,7 +55,7 @@ bailout(const char *fmt, ...)
@@ -89,16 +92,16 @@  index 6ac3709..023ac1d 100644
  		return;
  	}
  
-@@ -131,7 +131,7 @@ int main(int argc, char **argv)
+@@ -139,7 +139,7 @@ int main(int argc, char **argv)
  	failures = 0;
  	for (i = 1, j = 1; i <= numtests; i++, j++)
  	{
 -		parse_argument(argv[j], testname, binname);
-+		parse_argument(argv[j], testname, binname, inputdir);
- 		if (runtest(binname, testname, i, inputdir) != 0)
++ 		parse_argument(argv[j], testname, binname, inputdir);
+ 		if (runtest(binname, testname, i, inputdir, server_version) != 0)
  			failures++;
  	}
-@@ -161,29 +161,29 @@ runtest(const char *binname, const char *testname, int testno, const char *input
+@@ -169,29 +169,29 @@ runtest(const char *binname, const char *testname, int testno, const char *input
  #ifndef WIN32
  	snprintf(cmdline, sizeof(cmdline),
  			 "ODBCSYSINI=. ODBCINSTINI=./odbcinst.ini ODBCINI=./odbc.ini "
@@ -115,7 +118,7 @@  index 6ac3709..023ac1d 100644
  #endif
  	rc = system(cmdline);
  
- 	diff = rundiff(testname, inputdir);
+ 	diff = rundiff(testname, inputdir, server_version);
  	if (rc != 0)
  	{
 -		printf("not ok %d - %s test returned %d\n", testno, testname, rc);
@@ -135,3 +138,6 @@  index 6ac3709..023ac1d 100644
  		ret = 0;
  	}
  	fflush(stdout);
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0007.bb b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0010.bb
similarity index 97%
rename from meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0007.bb
rename to meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0010.bb
index 92ee2594f9..7450c3178c 100644
--- a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0007.bb
+++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0010.bb
@@ -26,7 +26,7 @@  SRC_URI = "git://github.com/postgresql-interfaces/psqlodbc.git;protocol=https;br
            file://run-ptest \
            "
 
-SRCREV = "8038cee43d6dff468320008ea928f3eaa1186726"
+SRCREV = "6be815ea5e16ed86033c673ffef98c07c91f865a"
 PV_WITH_USCORE = "${@d.getVar('PV').replace('.', '_')}"
 
 DEPENDS += "postgresql unixodbc"