diff mbox series

[meta-oe,walnascar[PATCH,1/4] php: sort PACKAGECONFIG options

Message ID 20250730123111.3858530-1-praveen.kumar@windriver.com
State New
Headers show
Series [meta-oe,walnascar[PATCH,1/4] php: sort PACKAGECONFIG options | expand

Commit Message

Praveen Kumar July 30, 2025, 12:31 p.m. UTC
From: Jeroen Hofstee <jhofstee@victronenergy.com>

This backports commit bb896f6b6f92 ("php: sort PACKAGECONFIG options"),
which was missing in 8.4.5 and helps in reducing unnecessary diffs in
future upgrades.

Reference:
https://git.openembedded.org/meta-openembedded/commit/meta-oe?id=bb896f6b6f92863e8f5c49e5a1f7d9bcb2578db0

Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com>
---
 meta-oe/recipes-devtools/php/php_8.4.6.bb | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

Comments

Jeroen Hofstee July 30, 2025, 7:08 p.m. UTC | #1
Hi Praveen,

On 7/30/25 14:31, Praveen Kumar wrote:
> [You don't often get email from praveen.kumar@windriver.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
>
> From: Jeroen Hofstee <jhofstee@victronenergy.com>
>
> This backports commit bb896f6b6f92 ("php: sort PACKAGECONFIG options"),
> which was missing in 8.4.5 and helps in reducing unnecessary diffs in
> future upgrades.

This isn't missing anything. Cleanups like this are not
supposed to be backported.

With kind regards,

Jeroen
Praveen Kumar Aug. 1, 2025, 9:41 a.m. UTC | #2
Hi Jeroen,

Thanks for the feedback.

I understand this is a cleanup, but we are actively maintaining this branch, having the PACKAGECONFIG options sorted makes it easier to manage. It helps reduce unnecessary diff when we compare the same with the master branch or apply future updates.

Keeping this patch would help us avoid conflicts later and make upgrades easier. Will it be fine to keep this patch for easier upgradation and maintenance?

Please suggest your views on this, can we keep this patch for better alignment of future upgradation or do I need to resend the v2 of this upgrade without this patch.

Thanks,
Praveen
Jeroen Hofstee Aug. 1, 2025, 7:18 p.m. UTC | #3
Hi Praveen,

I have no strong feelings about this. I just purposely didn't
sent it to older branches, since it doesn't fix a php issue or
CVE, just readability and for future maintenance , so in that
sense there isn't anything missing, nothing is broken without
this patch.

If you are cherry-picking patches back, which I understand
you are doing, I understand you want to include that patch,
else you get in a lot of silly, unnecessary conflicts.

But for other meta changes, like lets say more PACKAGES,
but without according recommends you can break things
with meta-data alone.

I guess it is just up to the maintainers,

With kind regards,
Jeroen

On 8/1/25 11:41, Kumar, Praveen wrote:

> Thanks for the feedback.
>
> I understand this is a cleanup, but we are actively maintaining this 
> branch, having the PACKAGECONFIG options sorted makes it easier to 
> manage. It helps reduce unnecessary diff when we compare the same with 
> the master branch or apply future updates.
>
> Keeping this patch would help us avoid conflicts later and make 
> upgrades easier. Will it be fine to keep this patch for easier 
> upgradation and maintenance?
>
> Please suggest your views on this, can we keep this patch for better 
> alignment of future upgradation or do I need to resend the v2 of this 
> upgrade without this patch.
>
> Thanks,
> Praveen
> ------------------------------------------------------------------------
> *From:* Jeroen Hofstee <jhofstee@victronenergy.com>
> *Sent:* Thursday, July 31, 2025 12:38 AM
> *To:* Kumar, Praveen <Praveen.Kumar@windriver.com>; 
> openembedded-devel@lists.openembedded.org 
> <openembedded-devel@lists.openembedded.org>
> *Subject:* Re: [oe][meta-oe][walnascar[PATCH 1/4] php: sort 
> PACKAGECONFIG options
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender 
> and know the content is safe.
>
> Hi Praveen,
>
> On 7/30/25 14:31, Praveen Kumar wrote:
> > [You don't often get email from praveen.kumar@windriver.com. Learn 
> why this is important at https://aka.ms/LearnAboutSenderIdentification ]
> >
> > From: Jeroen Hofstee <jhofstee@victronenergy.com>
> >
> > This backports commit bb896f6b6f92 ("php: sort PACKAGECONFIG options"),
> > which was missing in 8.4.5 and helps in reducing unnecessary diffs in
> > future upgrades.
>
> This isn't missing anything. Cleanups like this are not
> supposed to be backported.
>
> With kind regards,
>
> Jeroen
>
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/php/php_8.4.6.bb b/meta-oe/recipes-devtools/php/php_8.4.6.bb
index 5629a3dd3d..1b8c019a5d 100644
--- a/meta-oe/recipes-devtools/php/php_8.4.6.bb
+++ b/meta-oe/recipes-devtools/php/php_8.4.6.bb
@@ -92,27 +92,25 @@  PACKAGECONFIG ??= "mysql sqlite3 opcache openssl \
 "
 PACKAGECONFIG:class-native = ""
 
-PACKAGECONFIG[zip] = "--with-zip --with-zlib-dir=${STAGING_EXECPREFIXDIR},,libzip"
-
+PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+PACKAGECONFIG[mbregex] = "--enable-mbregex, --disable-mbregex, oniguruma"
+PACKAGECONFIG[mbstring] = "--enable-mbstring,,"
 PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \
                         --with-pdo-mysql=mysqlnd \
                         ,--without-mysqli --without-pdo-mysql \
                         ,mysql5"
-
+PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache"
+PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
+PACKAGECONFIG[pam] = ",,libpam"
+PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql"
+PACKAGECONFIG[soap] = "--enable-soap, --disable-soap, libxml2"
 PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \
                           --with-pdo-sqlite=${STAGING_LIBDIR}/.. \
                           ,--without-sqlite3 --without-pdo-sqlite \
                           ,sqlite3"
-PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql"
-PACKAGECONFIG[soap] = "--enable-soap, --disable-soap, libxml2"
-PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2"
-PACKAGECONFIG[pam] = ",,libpam"
-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache"
-PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
 PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind"
-PACKAGECONFIG[mbregex] = "--enable-mbregex, --disable-mbregex, oniguruma"
-PACKAGECONFIG[mbstring] = "--enable-mbstring,,"
+PACKAGECONFIG[zip] = "--with-zip --with-zlib-dir=${STAGING_EXECPREFIXDIR},,libzip"
 
 export HOSTCC = "${BUILD_CC}"
 export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"