aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Olsen <steffen.olsen@gmail.com>2022-09-06 17:09:39 +0200
committerArmin Kuster <akuster808@gmail.com>2022-09-22 09:45:09 -0400
commit088eaf9ea97b9f65a4629e0267ee905d33f7acee (patch)
tree86afbc9351201041a3f411f76257484f7edd81fd
parent73e66e5ea386baba17de08ef461e5e231a799aad (diff)
downloadmeta-openembedded-contrib-088eaf9ea97b9f65a4629e0267ee905d33f7acee.tar.gz
postgreql: Fix pg_config not working after buildpaths patch
The patch for removing 'QA issues' with pg_config was incomplete, it did not change the number of items supposed to be in the configdata stucture. This leads to get_configdata function asserting, and pg_config command does not work Signed-off-by: Steffen Olsen <steffen.olsen@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 730c85613ec718919bc0d155addfb9a20af112ad) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-dbs/postgresql/files/0001-config_info.c-not-expose-build-info.patch11
1 files changed, 10 insertions, 1 deletions
diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-config_info.c-not-expose-build-info.patch b/meta-oe/recipes-dbs/postgresql/files/0001-config_info.c-not-expose-build-info.patch
index 101a748776..52ca276da6 100644
--- a/meta-oe/recipes-dbs/postgresql/files/0001-config_info.c-not-expose-build-info.patch
+++ b/meta-oe/recipes-dbs/postgresql/files/0001-config_info.c-not-expose-build-info.patch
@@ -30,7 +30,16 @@ diff --git a/src/common/config_info.c b/src/common/config_info.c
index e72e729..b482c20 100644
--- a/src/common/config_info.c
+++ b/src/common/config_info.c
-@@ -123,74 +123,6 @@ get_configdata(const char *my_exec_path, size_t *configdata_len)
+@@ -38,7 +38,7 @@
+ int i = 0;
+
+ /* Adjust this to match the number of items filled below */
+- *configdata_len = 23;
++ *configdata_len = 14;
+ configdata = (ConfigData *) palloc(*configdata_len * sizeof(ConfigData));
+
+ configdata[i].name = pstrdup("BINDIR");
+@@ -123,74 +123,6 @@
configdata[i].setting = pstrdup(path);
i++;