mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 20:07:25 +00:00
Changqing Li
ad0f53d2bb
* Refresh patch to mute patch-fuzz
* Remove 0001-makedefs-Account-for-linux-7.x-version.patch
* This upgrade include the following commit, which make postfix can
compile on latest stable ubuntu 26.04, which have Linux 7.x kernel
Postfix works on Linux 7.x kernels. Frank Scheiner. Files:
makedefs, util/sys_defs.h.
Changes:
https://www.ftp.saix.net/MTA/postfix/official/postfix-3.11.2.HISTORY
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
105 lines
3.4 KiB
Diff
105 lines
3.4 KiB
Diff
From ce8deeaac8ca5d7329e1923790a1f35798953799 Mon Sep 17 00:00:00 2001
|
|
From: Li xin <lixin.fnst@cn.fujitsu.com>
|
|
Date: Fri, 19 Jun 2015 17:14:58 +0900
|
|
Subject: [PATCH] Change fixed postconf to a variable for cross-compiling
|
|
|
|
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
|
|
---
|
|
Makefile.in | 2 +-
|
|
postfix-install | 18 ++++++++++--------
|
|
2 files changed, 11 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index 8d7501a..d2a85e8 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -23,7 +23,7 @@ META = meta/main.cf.proto meta/master.cf.proto meta/postfix-files \
|
|
EXPAND = sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \
|
|
-e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);"
|
|
SHLIB_DIR_OVERRIDE = \
|
|
- $${shlib_directory:-`$(SHLIB_ENV) bin/postconf -dhx shlib_directory`}
|
|
+ $${shlib_directory:-`$(SHLIB_ENV) $(POSTCONF) -dhx shlib_directory`}
|
|
|
|
default: update
|
|
|
|
diff --git a/postfix-install b/postfix-install
|
|
index 563ee27..00d4651 100644
|
|
--- a/postfix-install
|
|
+++ b/postfix-install
|
|
@@ -249,8 +249,8 @@ test -z "$non_interactive" -a ! -t 0 && {
|
|
exit 1
|
|
}
|
|
|
|
-test -x bin/postconf || {
|
|
- echo $0: Error: no bin/postconf file. Did you forget to run \"make\"? 1>&2
|
|
+test -x "$POSTCONF" || {
|
|
+ echo $0: Error: no $POSTCONF file. Did you forget to run \"make\"? 1>&2
|
|
exit 1
|
|
}
|
|
|
|
@@ -271,7 +271,7 @@ do
|
|
case "$junk" in
|
|
*MAIL_VERSION*)
|
|
case "$mail_version" in
|
|
- "") mail_version="`bin/postconf -dhx mail_version`" || exit 1
|
|
+ "") mail_version="`$POSTCONF -dhx mail_version`" || exit 1
|
|
esac
|
|
val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1
|
|
case "$val" in
|
|
@@ -459,7 +459,7 @@ template files main.cf.proto and master.cf.proto."
|
|
|
|
: ${install_root=/}
|
|
: ${tempdir=`pwd`}
|
|
-: ${config_directory=`bin/postconf -c conf -h -d config_directory`}
|
|
+: ${config_directory=`$POSTCONF -c conf -h -d config_directory`}
|
|
|
|
# Find out the location of installed configuration files.
|
|
|
|
@@ -525,7 +525,7 @@ test -f $CONFIG_DIRECTORY/main.cf && {
|
|
case "$junk" in
|
|
"") eval unset $name;;
|
|
esac
|
|
- eval : \${$name=\`bin/postconf -qc $CONFIG_DIRECTORY -hx $name\`} ||
|
|
+ eval : \${$name=\`$POSTCONF -qc $CONFIG_DIRECTORY -hx $name\`} ||
|
|
exit 1
|
|
done
|
|
}
|
|
@@ -538,7 +538,7 @@ do
|
|
case "$junk" in
|
|
"") eval unset $name;;
|
|
esac
|
|
- eval : \${$name=\`bin/postconf -c conf -d -hx $name\`} || exit 1
|
|
+ eval : \${$name=\`$POSTCONF -c conf -d -hx $name\`} || exit 1
|
|
done
|
|
|
|
# Override settings manually.
|
|
@@ -675,6 +675,8 @@ README_DIRECTORY=$install_root$readme_directory
|
|
SHLIB_DIRECTORY=$install_root$shlib_directory
|
|
META_DIRECTORY=$install_root$meta_directory
|
|
|
|
+test "x$POSTCONF" != "x" || POSTCONF="bin/postconf"
|
|
+
|
|
# Avoid repeated tests for existence of these; default permissions suffice.
|
|
|
|
test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1
|
|
@@ -846,7 +848,7 @@ IFS="$BACKUP_IFS"
|
|
# the wrong place when Postfix is being upgraded.
|
|
|
|
case "$mail_version" in
|
|
-"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
|
|
+"") mail_version="`$POSTCONF -c $CONFIG_DIRECTORY -dhx mail_version`" || exit 1
|
|
esac
|
|
|
|
# Undo MAIL_VERSION expansion at the end of a parameter value. If
|
|
@@ -866,7 +868,7 @@ do
|
|
esac
|
|
done
|
|
|
|
-bin/postconf -qc $CONFIG_DIRECTORY -e \
|
|
+"$POSTCONF" -qc $CONFIG_DIRECTORY -e \
|
|
"daemon_directory = $daemon_directory" \
|
|
"data_directory = $data_directory" \
|
|
"command_directory = $command_directory" \
|