From 6b9b9658e67e14b20cee33572f5dac0ec02e5496 Mon Sep 17 00:00:00 2001 From: Jinfeng Wang Date: Thu, 3 Jul 2025 08:10:15 +0800 Subject: postfix: fix rootfs file difference Rootfs file differs with the same project configure, add preliminary setting to avoid this. Signed-off-by: Jinfeng Wang Signed-off-by: Armin Kuster --- .../0006-postfix-add-preliminary-setting.patch | 31 ++++++++++++++++++++++ .../recipes-daemons/postfix/postfix_3.10.1.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta-networking/recipes-daemons/postfix/files/0006-postfix-add-preliminary-setting.patch diff --git a/meta-networking/recipes-daemons/postfix/files/0006-postfix-add-preliminary-setting.patch b/meta-networking/recipes-daemons/postfix/files/0006-postfix-add-preliminary-setting.patch new file mode 100644 index 0000000000..62b3cf0c05 --- /dev/null +++ b/meta-networking/recipes-daemons/postfix/files/0006-postfix-add-preliminary-setting.patch @@ -0,0 +1,31 @@ +From a5863e19d298789328e11057c469636aa8775847 Mon Sep 17 00:00:00 2001 +From: Jinfeng Wang +Date: Wed, 2 Jul 2025 10:55:53 +0800 +Subject: [PATCH] postfix: add preliminary setting + +post-install call postconf commands to modify main.cf. When multiple +parameters to postconf, the order of those parameters in main.cf is random. +Then it will reproduce random results in rootfs file(sample-main.cf). To +fix this, add preliminary setting in main.cf. + +Upstream-Status: Inappropriate [this is the use of post-install, +upstream is not affected] + +Signed-off-by: Jinfeng Wang +--- + conf/main.cf | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/conf/main.cf b/conf/main.cf +index 1d2c8c2..50398ba 100644 +--- a/conf/main.cf ++++ b/conf/main.cf +@@ -683,3 +683,5 @@ sample_directory = + # + readme_directory = + inet_protocols = ipv4 ++shlib_directory = ++meta_directory = +-- +2.34.1 + diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.10.1.bb b/meta-networking/recipes-daemons/postfix/postfix_3.10.1.bb index 89502d5044..06e56f0f96 100644 --- a/meta-networking/recipes-daemons/postfix/postfix_3.10.1.bb +++ b/meta-networking/recipes-daemons/postfix/postfix_3.10.1.bb @@ -26,6 +26,7 @@ SRC_URI = "http://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${P file://0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch \ file://0004-Fix-icu-config.patch \ file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ + file://0006-postfix-add-preliminary-setting.patch \ " SRC_URI[sha256sum] = "75868db7a8ed252cd3a14c13a3ce383ddd42563160c02027d061202ee36799bf" -- cgit v1.2.3-54-g00ecf