mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-17 04:37:19 +00:00
postgresql: Fix the buildpaths issue
Fixes:
WARNING: postgresql-14.4-r0 do_package_qa: QA Issue: File /usr/bin/postgres in package postgresql contains reference to TMPDIR
File /usr/bin/pg_config in package postgresql contains reference to TMPDIR [buildpaths]
WARNING: postgresql-14.4-r0 do_package_qa: QA Issue: File /usr/include/pg_config.h in package libpq-dev contains reference to TMPDIR [buildpaths]
WARNING: postgresql-14.4-r0 do_package_qa: QA Issue: File /usr/include/postgresql/server/pg_config.h in package postgresql-server-dev contains reference to TMPDIR
File /usr/lib/postgresql/pgxs/src/Makefile.global in package postgresql-server-dev contains reference to TMPDIR [buildpaths]
WARNING: postgresql-14.4-r0 do_package_qa: QA Issue: File /usr/lib/libpgcommon.a in package postgresql-staticdev contains reference to TMPDIR
File /usr/lib/libpgcommon_shlib.a in package postgresql-staticdev contains reference to TMPDIR [buildpaths]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 59eff6269c)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
@@ -0,0 +1,110 @@
|
|||||||
|
From b92eebe8b0760fee7bd55c6c22318620c2c07579 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mingli Yu <mingli.yu@windriver.com>
|
||||||
|
Date: Mon, 1 Aug 2022 15:44:38 +0800
|
||||||
|
Subject: [PATCH] config_info.c: not expose build info
|
||||||
|
|
||||||
|
Don't collect the build information to fix the buildpaths issue.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe specific]
|
||||||
|
|
||||||
|
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||||
|
---
|
||||||
|
configure.ac | 2 +-
|
||||||
|
src/common/config_info.c | 68 ----------------------------------------
|
||||||
|
2 files changed, 1 insertion(+), 69 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 0eb595b..508487b 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 1996-2021, PostgreSQL Global Development Group])
|
||||||
|
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
|
||||||
|
AC_CONFIG_AUX_DIR(config)
|
||||||
|
AC_PREFIX_DEFAULT(/usr/local/pgsql)
|
||||||
|
-AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["$ac_configure_args"], [Saved arguments from configure])
|
||||||
|
+AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["ac_configure_args"], [Saved arguments from configure])
|
||||||
|
|
||||||
|
[PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`]
|
||||||
|
[PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`]
|
||||||
|
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)
|
||||||
|
configdata[i].setting = pstrdup(path);
|
||||||
|
i++;
|
||||||
|
|
||||||
|
- configdata[i].name = pstrdup("CONFIGURE");
|
||||||
|
- configdata[i].setting = pstrdup(CONFIGURE_ARGS);
|
||||||
|
- i++;
|
||||||
|
-
|
||||||
|
- configdata[i].name = pstrdup("CC");
|
||||||
|
-#ifdef VAL_CC
|
||||||
|
- configdata[i].setting = pstrdup(VAL_CC);
|
||||||
|
-#else
|
||||||
|
- configdata[i].setting = pstrdup(_("not recorded"));
|
||||||
|
-#endif
|
||||||
|
- i++;
|
||||||
|
-
|
||||||
|
- configdata[i].name = pstrdup("CPPFLAGS");
|
||||||
|
-#ifdef VAL_CPPFLAGS
|
||||||
|
- configdata[i].setting = pstrdup(VAL_CPPFLAGS);
|
||||||
|
-#else
|
||||||
|
- configdata[i].setting = pstrdup(_("not recorded"));
|
||||||
|
-#endif
|
||||||
|
- i++;
|
||||||
|
-
|
||||||
|
- configdata[i].name = pstrdup("CFLAGS");
|
||||||
|
-#ifdef VAL_CFLAGS
|
||||||
|
- configdata[i].setting = pstrdup(VAL_CFLAGS);
|
||||||
|
-#else
|
||||||
|
- configdata[i].setting = pstrdup(_("not recorded"));
|
||||||
|
-#endif
|
||||||
|
- i++;
|
||||||
|
-
|
||||||
|
- configdata[i].name = pstrdup("CFLAGS_SL");
|
||||||
|
-#ifdef VAL_CFLAGS_SL
|
||||||
|
- configdata[i].setting = pstrdup(VAL_CFLAGS_SL);
|
||||||
|
-#else
|
||||||
|
- configdata[i].setting = pstrdup(_("not recorded"));
|
||||||
|
-#endif
|
||||||
|
- i++;
|
||||||
|
-
|
||||||
|
- configdata[i].name = pstrdup("LDFLAGS");
|
||||||
|
-#ifdef VAL_LDFLAGS
|
||||||
|
- configdata[i].setting = pstrdup(VAL_LDFLAGS);
|
||||||
|
-#else
|
||||||
|
- configdata[i].setting = pstrdup(_("not recorded"));
|
||||||
|
-#endif
|
||||||
|
- i++;
|
||||||
|
-
|
||||||
|
- configdata[i].name = pstrdup("LDFLAGS_EX");
|
||||||
|
-#ifdef VAL_LDFLAGS_EX
|
||||||
|
- configdata[i].setting = pstrdup(VAL_LDFLAGS_EX);
|
||||||
|
-#else
|
||||||
|
- configdata[i].setting = pstrdup(_("not recorded"));
|
||||||
|
-#endif
|
||||||
|
- i++;
|
||||||
|
-
|
||||||
|
- configdata[i].name = pstrdup("LDFLAGS_SL");
|
||||||
|
-#ifdef VAL_LDFLAGS_SL
|
||||||
|
- configdata[i].setting = pstrdup(VAL_LDFLAGS_SL);
|
||||||
|
-#else
|
||||||
|
- configdata[i].setting = pstrdup(_("not recorded"));
|
||||||
|
-#endif
|
||||||
|
- i++;
|
||||||
|
-
|
||||||
|
- configdata[i].name = pstrdup("LIBS");
|
||||||
|
-#ifdef VAL_LIBS
|
||||||
|
- configdata[i].setting = pstrdup(VAL_LIBS);
|
||||||
|
-#else
|
||||||
|
- configdata[i].setting = pstrdup(_("not recorded"));
|
||||||
|
-#endif
|
||||||
|
- i++;
|
||||||
|
-
|
||||||
|
configdata[i].name = pstrdup("VERSION");
|
||||||
|
configdata[i].setting = pstrdup("PostgreSQL " PG_VERSION);
|
||||||
|
i++;
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
@@ -215,6 +215,14 @@ do_install:append() {
|
|||||||
install -m 0644 ${WORKDIR}/postgresql.service ${D}${systemd_unitdir}/system
|
install -m 0644 ${WORKDIR}/postgresql.service ${D}${systemd_unitdir}/system
|
||||||
sed -i -e 's,@BINDIR@,${bindir},g' \
|
sed -i -e 's,@BINDIR@,${bindir},g' \
|
||||||
${D}${systemd_unitdir}/system/postgresql.service
|
${D}${systemd_unitdir}/system/postgresql.service
|
||||||
|
# Remove the build path
|
||||||
|
if [ -f ${D}${libdir}/${BPN}/pgxs/src/Makefile.global ]; then
|
||||||
|
sed -i -e 's#${RECIPE_SYSROOT}##g' \
|
||||||
|
-e 's#${RECIPE_SYSROOT_NATIVE}##g' \
|
||||||
|
-e 's#${WORKDIR}##g' \
|
||||||
|
-e 's#${TMPDIR}##g' \
|
||||||
|
${D}${libdir}/${BPN}/pgxs/src/Makefile.global
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
SSTATE_SCAN_FILES += "Makefile.global"
|
SSTATE_SCAN_FILES += "Makefile.global"
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ SRC_URI += "\
|
|||||||
file://0001-Improve-reproducibility.patch \
|
file://0001-Improve-reproducibility.patch \
|
||||||
file://0001-configure.ac-bypass-autoconf-2.69-version-check.patch \
|
file://0001-configure.ac-bypass-autoconf-2.69-version-check.patch \
|
||||||
file://remove_duplicate.patch \
|
file://remove_duplicate.patch \
|
||||||
|
file://0001-config_info.c-not-expose-build-info.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "c23b6237c5231c791511bdc79098617d6852e9e3bdf360efd8b5d15a1a3d8f6a"
|
SRC_URI[sha256sum] = "c23b6237c5231c791511bdc79098617d6852e9e3bdf360efd8b5d15a1a3d8f6a"
|
||||||
|
|||||||
Reference in New Issue
Block a user