From fb6424156ae87693f8cd2294e9ecb2345a0ac2ae Mon Sep 17 00:00:00 2001 From: Jinfeng Wang Date: Wed, 16 Jul 2025 13:17:58 +0800 Subject: [PATCH] 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.8.6.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..50d0073262 --- /dev/null +++ b/meta-networking/recipes-daemons/postfix/files/0006-postfix-add-preliminary-setting.patch @@ -0,0 +1,31 @@ +From c09d377cd3b91c4c4360ebfab5be37f6296ff26a Mon Sep 17 00:00:00 2001 +From: Jinfeng Wang +Date: Wed, 16 Jul 2025 02:54:28 +0000 +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 2ee7996..0c208e6 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.31.3 + diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb b/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb index 3ec7f22ad3..b0ac51a9dd 100644 --- a/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb +++ b/meta-networking/recipes-daemons/postfix/postfix_3.8.6.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] = "4b6e17c826cc438cc3016a9c0a55ea7e77c6cbafba7dd57241d81b690b0e9774"