diff options
Diffstat (limited to 'meta-networking/recipes-daemons/postfix/files/install.patch')
-rw-r--r-- | meta-networking/recipes-daemons/postfix/files/install.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/meta-networking/recipes-daemons/postfix/files/install.patch b/meta-networking/recipes-daemons/postfix/files/install.patch new file mode 100644 index 000000000..a3fe089c2 --- /dev/null +++ b/meta-networking/recipes-daemons/postfix/files/install.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | Change fixed postconf to a variable for cross-compiling | ||
2 | |||
3 | Upstreamstatus: Inappropriate [embedded specific] | ||
4 | |||
5 | Signed-off-by: Yao Zhao <yao.zhao@windriver.com> | ||
6 | --- | ||
7 | diff --git a/postfix-install b/postfix-install | ||
8 | index 49225ac..2e4c292 100644 | ||
9 | --- a/postfix-install | ||
10 | +++ b/postfix-install | ||
11 | @@ -201,8 +201,8 @@ test -z "$non_interactive" -a ! -t 0 && { | ||
12 | exit 1 | ||
13 | } | ||
14 | |||
15 | -test -x bin/postconf || { | ||
16 | - echo $0: Error: no bin/postconf file. Did you forget to run \"make\"? 1>&2 | ||
17 | +test -x "$POSTCONF" || { | ||
18 | + echo $0: Error: no $POSTCONF file. Did you forget to run \"make\"? 1>&2 | ||
19 | exit 1 | ||
20 | } | ||
21 | |||
22 | @@ -363,7 +363,7 @@ HTML files. Specify \"no\" if you do not want to install these files." | ||
23 | |||
24 | : ${install_root=/} | ||
25 | : ${tempdir=`pwd`} | ||
26 | -: ${config_directory=`bin/postconf -c conf -h -d config_directory`} | ||
27 | +: ${config_directory=`$POSTCONF -c conf -h -d config_directory`} | ||
28 | |||
29 | # Find out the location of installed configuration files. | ||
30 | |||
31 | @@ -433,7 +433,7 @@ test -f $CONFIG_DIRECTORY/main.cf && { | ||
32 | case "$junk" in | ||
33 | "") eval unset $name;; | ||
34 | esac | ||
35 | - eval : \${$name=\`bin/postconf -c $CONFIG_DIRECTORY -h $name\`} || | ||
36 | + eval : \${$name=\`$POSTCONF -c $CONFIG_DIRECTORY -h $name\`} || | ||
37 | exit 1 | ||
38 | done | ||
39 | } | ||
40 | @@ -446,7 +446,7 @@ do | ||
41 | case "$junk" in | ||
42 | "") eval unset $name;; | ||
43 | esac | ||
44 | - eval : \${$name=\`bin/postconf -c conf -d -h $name\`} || exit 1 | ||
45 | + eval : \${$name=\`$POSTCONF -c conf -d -h $name\`} || exit 1 | ||
46 | done | ||
47 | |||
48 | # Override settings manually. | ||
49 | @@ -565,6 +565,8 @@ HTML_DIRECTORY=$install_root$html_directory | ||
50 | MANPAGE_DIRECTORY=$install_root$manpage_directory | ||
51 | README_DIRECTORY=$install_root$readme_directory | ||
52 | |||
53 | +test "x$POSTCONF" != "x" || POSTCONF="bin/postconf" | ||
54 | + | ||
55 | # Avoid repeated tests for existence of these; default permissions suffice. | ||
56 | |||
57 | test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1 | ||
58 | @@ -724,7 +726,7 @@ do | ||
59 | # Postfix releases, and software should not suddenly be installed in | ||
60 | # the wrong place when Postfix is being upgraded. | ||
61 | |||
62 | -bin/postconf -c $CONFIG_DIRECTORY -e \ | ||
63 | +"$POSTCONF" -c $CONFIG_DIRECTORY -e \ | ||
64 | "daemon_directory = $daemon_directory" \ | ||
65 | "data_directory = $data_directory" \ | ||
66 | "command_directory = $command_directory" \ | ||