diff mbox series

[meta-oe] smarty: update 4.5.5 -> 5.4.2

Message ID 1736911952-10934-1-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-oe] smarty: update 4.5.5 -> 5.4.2 | expand

Commit Message

Mingyu Wang (Fujitsu) Jan. 15, 2025, 3:32 a.m. UTC
From: Wang Mingyu <wangmy@fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../smarty/{smarty_4.5.5.bb => smarty_5.4.2.bb} | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
 rename meta-oe/recipes-support/smarty/{smarty_4.5.5.bb => smarty_5.4.2.bb} (63%)

Comments

Jörg Sommer Jan. 15, 2025, 6:07 a.m. UTC | #1
wangmy via lists.openembedded.org schrieb am Mi 15. Jan, 11:32 (+0800):
>  S = "${WORKDIR}/git"

Shouldn't this be UNPACKDIR instead of WORKDIR?

S = "${UNPACKDIR}/git"

> +do_compile() {
> +	:
> +}
> +

How about:

do_compile[noexec] = "1"


Regards, Jörg
Jörg Sommer Jan. 15, 2025, 6:11 a.m. UTC | #2
wangmy via lists.openembedded.org schrieb am Mi 15. Jan, 11:32 (+0800):
> -SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=support/4"
> -
> -SRCREV = "c4851c12e34ff80073ddeb7d98b059d57dea9de2"
> +SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=master"

And could you add BUGTRACKER after HOMEPAGE?

BUGTRACKER = "https://github.com/smarty-php/smarty/issues"


Regards, Jörg
Mingyu Wang (Fujitsu) Jan. 15, 2025, 8:47 a.m. UTC | #3
Sometimes the following errors occur when executing bitbake:

DEBUG: Executing shell function do_compile
NOTE: make -j 4
php ./utilities/make-parser.php src/Parser/TemplateParser.y src/Parser/TemplateParser.php
make: php: No such file or directory
make: *** [Makefile:16: src/Parser/TemplateParser.php] Error 127
ERROR: oe_runmake failed
WARNING: exit code 1 from a shell command.

It seems that this do_compile should not be executed. To avoid this issue, I added an empty do_compile in the bb file

  --
Best Regards
---------------------------------------------------
Wang Mingyu
FUJITSU NANJING SOFTWARE TECHNOLOGY CO., LTD. (FNST)
No.6 Wenzhu Road, Nanjing, 210012, China
TEL:+86+25-86630566--8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: wangmy@fujitsu.com

> -----Original Message-----
> From: Jörg Sommer <joerg.sommer@navimatix.de>
> Sent: Wednesday, January 15, 2025 2:07 PM
> To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>
> Cc: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe] [PATCH] smarty: update 4.5.5 -> 5.4.2
> 
> wangmy via lists.openembedded.org schrieb am Mi 15. Jan, 11:32 (+0800):
> >  S = "${WORKDIR}/git"
> 
> Shouldn't this be UNPACKDIR instead of WORKDIR?
> 
> S = "${UNPACKDIR}/git"
> 
> > +do_compile() {
> > +	:
> > +}
> > +
> 
> How about:
> 
> do_compile[noexec] = "1"
> 
> 
> Regards, Jörg
> 
> --
> Ich halte ihn zwar für einen Schurken und das was er sagt für falsch – aber ich
> bin bereit mein Leben dafür einzusetzen, daß
> er seine Meinung sagen kann.            (Voltaire)
> 
> Navimatix GmbH           T: 03641 - 327 99 0
> Tatzendpromenade 2       F: 03641 - 526 306
> 07745 Jena               www.navimatix.de
> 
> Geschäftsführer: Steffen Späthe, Jan Rommeley
> Registergericht: Amtsgericht Jena, HRB 501480
Jörg Sommer Jan. 15, 2025, 9:50 a.m. UTC | #4
Mingyu Wang (Fujitsu) schrieb am Mi 15. Jan, 08:47 (+0000):
> Sometimes the following errors occur when executing bitbake:
> 
> DEBUG: Executing shell function do_compile
> NOTE: make -j 4
> php ./utilities/make-parser.php src/Parser/TemplateParser.y src/Parser/TemplateParser.php
> make: php: No such file or directory

Does it help to add php-native to DEPENDS?


> make: *** [Makefile:16: src/Parser/TemplateParser.php] Error 127
> ERROR: oe_runmake failed
> WARNING: exit code 1 from a shell command.
> 
> It seems that this do_compile should not be executed. To avoid this issue, I added an empty do_compile in the bb file
> 
>   --
> Best Regards
> ---------------------------------------------------
> Wang Mingyu
> FUJITSU NANJING SOFTWARE TECHNOLOGY CO., LTD. (FNST)
> No.6 Wenzhu Road, Nanjing, 210012, China
> TEL:+86+25-86630566--8568
> COINS: 79988548
> FAX: +86+25-83317685
> MAIL: wangmy@fujitsu.com
> 
> > -----Original Message-----
> > From: Jörg Sommer <joerg.sommer@navimatix.de>
> > Sent: Wednesday, January 15, 2025 2:07 PM
> > To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>
> > Cc: openembedded-devel@lists.openembedded.org
> > Subject: Re: [oe] [meta-oe] [PATCH] smarty: update 4.5.5 -> 5.4.2
> > 
> > wangmy via lists.openembedded.org schrieb am Mi 15. Jan, 11:32 (+0800):
> > >  S = "${WORKDIR}/git"
> > 
> > Shouldn't this be UNPACKDIR instead of WORKDIR?
> > 
> > S = "${UNPACKDIR}/git"
> > 
> > > +do_compile() {
> > > +	:
> > > +}
> > > +
> > 
> > How about:
> > 
> > do_compile[noexec] = "1"
> > 
> > 
> > Regards, Jörg
> > 
> > --
> > Ich halte ihn zwar für einen Schurken und das was er sagt für falsch – aber ich
> > bin bereit mein Leben dafür einzusetzen, daß
> > er seine Meinung sagen kann.            (Voltaire)
> > 
> > Navimatix GmbH           T: 03641 - 327 99 0
> > Tatzendpromenade 2       F: 03641 - 526 306
> > 07745 Jena               www.navimatix.de
> > 
> > Geschäftsführer: Steffen Späthe, Jan Rommeley
> > Registergericht: Amtsgericht Jena, HRB 501480
Mingyu Wang (Fujitsu) Jan. 16, 2025, 12:39 a.m. UTC | #5
Adding php-native to DEPENDS also doesn't work, it will report the same error.

Because smart5.4.2 supports installation using composer. Makefile is also used for composer, but Yocto does not support it.
Yocto can install smarty through do_install. Therefore, it is necessary to leave do_compile empty to avoid executing make.

  --
Best Regards
---------------------------------------------------
Wang Mingyu
FUJITSU NANJING SOFTWARE TECHNOLOGY CO., LTD. (FNST)
No.6 Wenzhu Road, Nanjing, 210012, China
TEL:+86+25-86630566--8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: wangmy@fujitsu.com

> -----Original Message-----
> From: Jörg Sommer <joerg.sommer@navimatix.de>
> Sent: Wednesday, January 15, 2025 5:51 PM
> To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>
> Cc: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe] [PATCH] smarty: update 4.5.5 -> 5.4.2
> 
> Mingyu Wang (Fujitsu) schrieb am Mi 15. Jan, 08:47 (+0000):
> > Sometimes the following errors occur when executing bitbake:
> >
> > DEBUG: Executing shell function do_compile
> > NOTE: make -j 4
> > php ./utilities/make-parser.php src/Parser/TemplateParser.y
> > src/Parser/TemplateParser.php
> > make: php: No such file or directory
> 
> Does it help to add php-native to DEPENDS?
> 
> 
> > make: *** [Makefile:16: src/Parser/TemplateParser.php] Error 127
> > ERROR: oe_runmake failed
> > WARNING: exit code 1 from a shell command.
> >
> > It seems that this do_compile should not be executed. To avoid this
> > issue, I added an empty do_compile in the bb file
> >
> >   --
> > Best Regards
> > ---------------------------------------------------
> > Wang Mingyu
> > FUJITSU NANJING SOFTWARE TECHNOLOGY CO., LTD. (FNST)
> > No.6 Wenzhu Road, Nanjing, 210012, China
> > TEL:+86+25-86630566--8568
> > COINS: 79988548
> > FAX: +86+25-83317685
> > MAIL: wangmy@fujitsu.com
> >
> > > -----Original Message-----
> > > From: Jörg Sommer <joerg.sommer@navimatix.de>
> > > Sent: Wednesday, January 15, 2025 2:07 PM
> > > To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>
> > > Cc: openembedded-devel@lists.openembedded.org
> > > Subject: Re: [oe] [meta-oe] [PATCH] smarty: update 4.5.5 -> 5.4.2
> > >
> > > wangmy via lists.openembedded.org schrieb am Mi 15. Jan, 11:32 (+0800):
> > > >  S = "${WORKDIR}/git"
> > >
> > > Shouldn't this be UNPACKDIR instead of WORKDIR?
> > >
> > > S = "${UNPACKDIR}/git"
> > >
> > > > +do_compile() {
> > > > +	:
> > > > +}
> > > > +
> > >
> > > How about:
> > >
> > > do_compile[noexec] = "1"
> > >
> > >
> > > Regards, Jörg
> > >
> > > --
> > > Ich halte ihn zwar für einen Schurken und das was er sagt für falsch
> > > – aber ich bin bereit mein Leben dafür einzusetzen, daß
> > > er seine Meinung sagen kann.            (Voltaire)
> > >
> > > Navimatix GmbH           T: 03641 - 327 99 0
> > > Tatzendpromenade 2       F: 03641 - 526 306
> > > 07745 Jena               www.navimatix.de
> > >
> > > Geschäftsführer: Steffen Späthe, Jan Rommeley
> > > Registergericht: Amtsgericht Jena, HRB 501480
> 
> --
> “It's been said you aren't a real UNIX system administrator until you've edited a
> sendmail.cf file. It's also been said that you are crazy if you attempted to do so
> twice.”
> 
> Navimatix GmbH           T: 03641 - 327 99 0
> Tatzendpromenade 2       F: 03641 - 526 306
> 07745 Jena               www.navimatix.de
> 
> Geschäftsführer: Steffen Späthe, Jan Rommeley
> Registergericht: Amtsgericht Jena, HRB 501480
Jörg Sommer Jan. 16, 2025, 9:50 a.m. UTC | #6
Mingyu Wang (Fujitsu) schrieb am Do 16. Jan, 00:39 (+0000):
> Adding php-native to DEPENDS also doesn't work, it will report the same error.

Yes. The problem is a (somewhat) broken make clean that removes files they
can't be rebuild without composer. But composer in meta-parallel-php and not
in meta-oe. So, I think the best is to mark clean as broken to prevent that
do_configure runs it.

Here is a patch to make all working:

diff --git meta-oe/recipes-support/smarty/smarty_5.4.2.bb meta-oe/recipes-support/smarty/smarty_5.4.2.bb
index 906b9e4ee2..25eda52690 100644
--- meta-oe/recipes-support/smarty/smarty_5.4.2.bb
+++ meta-oe/recipes-support/smarty/smarty_5.4.2.bb
@@ -1,21 +1,29 @@
-DESCRIPTION = "the compiling PHP template engine"
-SECTION = "console/network"
+SUMMARY = "Template engine for PHP"
+DESCRIPTION = "\
+    Smarty facilitates the separation of presentation (HTML/CSS) from \
+    application logic. This implies that PHP code is application logic, and is \
+    separated from the presentation. \
+"
 HOMEPAGE = "https://www.smarty.net/"
+BUGTRACKER = "https://github.com/smarty-php/smarty/issues"
 
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3"
 
-DEPENDS += "php"
-
 SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=master"
-
-S = "${WORKDIR}/git"
-
 SRCREV = "642a97adcc2bf6c1b2458d6afeeb36ae001c1c2f"
 
-do_compile() {
-	:
-}
+S = "${UNPACKDIR}/git"
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+inherit allarch
+
+# `make clean` removes files, they can't be rebuild with `make all`
+CLEANBROKEN = "1"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
 
 do_install() {
         install -d ${D}${datadir}/php/smarty3/libs/
@@ -24,6 +32,8 @@ do_install() {
         install -d ${D}${datadir}/php/smarty3/src/
         cp -rf ${S}/src/* ${D}${datadir}/php/smarty3/src/
 }
-FILES:${PN} = "${datadir}/php/smarty3/"
+FILES:${PN} += "${datadir}/php/smarty3/"
+
+RDEPENDS:${PN} = "php"
 
 CVE_STATUS[CVE-2020-10375] = "cpe-incorrect: The recipe used in the meta-openembedded is a different smarty package compared to the one which has the CVE issue."

I'm unsure about the archall, but it's PHP.

Regards, Jörg
Jörg Sommer Jan. 16, 2025, 10:16 a.m. UTC | #7
Jörg Sommer schrieb am Do 16. Jan, 10:50 (+0100):
> Mingyu Wang (Fujitsu) schrieb am Do 16. Jan, 00:39 (+0000):
> > Adding php-native to DEPENDS also doesn't work, it will report the same error.
> 
> Yes. The problem is a (somewhat) broken make clean that removes files they
> can't be rebuild without composer. But composer in meta-parallel-php and not
> in meta-oe. So, I think the best is to mark clean as broken to prevent that
> do_configure runs it.
> 
> Here is a patch to make all working:
> 
> diff --git meta-oe/recipes-support/smarty/smarty_5.4.2.bb meta-oe/recipes-support/smarty/smarty_5.4.2.bb
> index 906b9e4ee2..25eda52690 100644
> --- meta-oe/recipes-support/smarty/smarty_5.4.2.bb
> +++ meta-oe/recipes-support/smarty/smarty_5.4.2.bb
> @@ -1,21 +1,29 @@
> -DESCRIPTION = "the compiling PHP template engine"
> -SECTION = "console/network"
> +SUMMARY = "Template engine for PHP"
> +DESCRIPTION = "\
> +    Smarty facilitates the separation of presentation (HTML/CSS) from \
> +    application logic. This implies that PHP code is application logic, and is \
> +    separated from the presentation. \
> +"
>  HOMEPAGE = "https://www.smarty.net/"

I was told in
https://github.com/smarty-php/smarty/issues/1097#issuecomment-2594912113
that the new website is https://smarty-php.github.io/smarty/

> +BUGTRACKER = "https://github.com/smarty-php/smarty/issues"
>  
>  LICENSE = "GPL-3.0-only"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3"
>  
> -DEPENDS += "php"
> -
>  SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=master"
> -
> -S = "${WORKDIR}/git"
> -
>  SRCREV = "642a97adcc2bf6c1b2458d6afeeb36ae001c1c2f"
>  
> -do_compile() {
> -	:
> -}
> +S = "${UNPACKDIR}/git"
> +
> +INHIBIT_DEFAULT_DEPS = "1"
> +
> +inherit allarch
> +
> +# `make clean` removes files, they can't be rebuild with `make all`
> +CLEANBROKEN = "1"
> +
> +do_configure[noexec] = "1"
> +do_compile[noexec] = "1"
>  
>  do_install() {
>          install -d ${D}${datadir}/php/smarty3/libs/
> @@ -24,6 +32,8 @@ do_install() {
>          install -d ${D}${datadir}/php/smarty3/src/
>          cp -rf ${S}/src/* ${D}${datadir}/php/smarty3/src/
>  }
> -FILES:${PN} = "${datadir}/php/smarty3/"
> +FILES:${PN} += "${datadir}/php/smarty3/"
> +
> +RDEPENDS:${PN} = "php"
>  
>  CVE_STATUS[CVE-2020-10375] = "cpe-incorrect: The recipe used in the meta-openembedded is a different smarty package compared to the one which has the CVE issue."
> 
> I'm unsure about the archall, but it's PHP.
> 
> Regards, Jörg
> 
> -- 
> Als deutscher Tourist im Ausland steht man vor der Frage, ob man sich
> anständig benehmen muss oder ob schon deutsche Touristen dagewesen sind.
>                                                 (Kurt Tucholsky)
> 
> Navimatix GmbH           T: 03641 - 327 99 0
> Tatzendpromenade 2       F: 03641 - 526 306
> 07745 Jena               www.navimatix.de
> 
> Geschäftsführer: Steffen Späthe, Jan Rommeley
> Registergericht: Amtsgericht Jena, HRB 501480
Mingyu Wang (Fujitsu) Jan. 22, 2025, 1:32 a.m. UTC | #8
> Here is a patch to make all working:
The original patch was not found.
Can we directly modify the upgrade patch we sent earlier according to your method and resubmit it?
Or, wait for you to modify this issue?

  --
Best Regards
---------------------------------------------------
Wang Mingyu
FUJITSU NANJING SOFTWARE TECHNOLOGY CO., LTD. (FNST)
No.6 Wenzhu Road, Nanjing, 210012, China
TEL:+86+25-86630566--8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: wangmy@fujitsu.com

> -----Original Message-----
> From: Jörg Sommer <joerg.sommer@navimatix.de>
> Sent: Thursday, January 16, 2025 5:51 PM
> To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>
> Cc: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe] [PATCH] smarty: update 4.5.5 -> 5.4.2
> 
> Mingyu Wang (Fujitsu) schrieb am Do 16. Jan, 00:39 (+0000):
> > Adding php-native to DEPENDS also doesn't work, it will report the same error.
> 
> Yes. The problem is a (somewhat) broken make clean that removes files they
> can't be rebuild without composer. But composer in meta-parallel-php and not
> in meta-oe. So, I think the best is to mark clean as broken to prevent that
> do_configure runs it.
> 
> Here is a patch to make all working:
> 
> diff --git meta-oe/recipes-support/smarty/smarty_5.4.2.bb
> meta-oe/recipes-support/smarty/smarty_5.4.2.bb
> index 906b9e4ee2..25eda52690 100644
> --- meta-oe/recipes-support/smarty/smarty_5.4.2.bb
> +++ meta-oe/recipes-support/smarty/smarty_5.4.2.bb
> @@ -1,21 +1,29 @@
> -DESCRIPTION = "the compiling PHP template engine"
> -SECTION = "console/network"
> +SUMMARY = "Template engine for PHP"
> +DESCRIPTION = "\
> +    Smarty facilitates the separation of presentation (HTML/CSS) from \
> +    application logic. This implies that PHP code is application logic, and is \
> +    separated from the presentation. \
> +"
>  HOMEPAGE = "https://www.smarty.net/"
> +BUGTRACKER = "https://github.com/smarty-php/smarty/issues"
> 
>  LICENSE = "GPL-3.0-only"
>  LIC_FILES_CHKSUM =
> "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3"
> 
> -DEPENDS += "php"
> -
>  SRC_URI =
> "git://github.com/smarty-php/smarty.git;protocol=https;branch=master"
> -
> -S = "${WORKDIR}/git"
> -
>  SRCREV = "642a97adcc2bf6c1b2458d6afeeb36ae001c1c2f"
> 
> -do_compile() {
> -	:
> -}
> +S = "${UNPACKDIR}/git"
> +
> +INHIBIT_DEFAULT_DEPS = "1"
> +
> +inherit allarch
> +
> +# `make clean` removes files, they can't be rebuild with `make all`
> +CLEANBROKEN = "1"
> +
> +do_configure[noexec] = "1"
> +do_compile[noexec] = "1"
> 
>  do_install() {
>          install -d ${D}${datadir}/php/smarty3/libs/ @@ -24,6 +32,8 @@
> do_install() {
>          install -d ${D}${datadir}/php/smarty3/src/
>          cp -rf ${S}/src/* ${D}${datadir}/php/smarty3/src/  } -FILES:${PN} =
> "${datadir}/php/smarty3/"
> +FILES:${PN} += "${datadir}/php/smarty3/"
> +
> +RDEPENDS:${PN} = "php"
> 
>  CVE_STATUS[CVE-2020-10375] = "cpe-incorrect: The recipe used in the
> meta-openembedded is a different smarty package compared to the one which
> has the CVE issue."
> 
> I'm unsure about the archall, but it's PHP.
> 
> Regards, Jörg
> 
> --
> Als deutscher Tourist im Ausland steht man vor der Frage, ob man sich anständig
> benehmen muss oder ob schon deutsche Touristen dagewesen sind.
>                                                 (Kurt Tucholsky)
> 
> Navimatix GmbH           T: 03641 - 327 99 0
> Tatzendpromenade 2       F: 03641 - 526 306
> 07745 Jena               www.navimatix.de
> 
> Geschäftsführer: Steffen Späthe, Jan Rommeley
> Registergericht: Amtsgericht Jena, HRB 501480
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/smarty/smarty_4.5.5.bb b/meta-oe/recipes-support/smarty/smarty_5.4.2.bb
similarity index 63%
rename from meta-oe/recipes-support/smarty/smarty_4.5.5.bb
rename to meta-oe/recipes-support/smarty/smarty_5.4.2.bb
index e8a63a74a7..906b9e4ee2 100644
--- a/meta-oe/recipes-support/smarty/smarty_4.5.5.bb
+++ b/meta-oe/recipes-support/smarty/smarty_5.4.2.bb
@@ -7,21 +7,22 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3"
 
 DEPENDS += "php"
 
-SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=support/4"
-
-SRCREV = "c4851c12e34ff80073ddeb7d98b059d57dea9de2"
+SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=master"
 
 S = "${WORKDIR}/git"
 
+SRCREV = "642a97adcc2bf6c1b2458d6afeeb36ae001c1c2f"
+
+do_compile() {
+	:
+}
+
 do_install() {
         install -d ${D}${datadir}/php/smarty3/libs/
         install -m 0644 ${S}/libs/*.php ${D}${datadir}/php/smarty3/libs/
 
-        install -d ${D}${datadir}/php/smarty3/libs/plugins
-        install -m 0644 ${S}/libs/plugins/*.php ${D}${datadir}/php/smarty3/libs/plugins/
-
-        install -d ${D}${datadir}/php/smarty3/libs/sysplugins
-        install -m 0644 ${S}/libs/sysplugins/*.php ${D}${datadir}/php/smarty3/libs/sysplugins/
+        install -d ${D}${datadir}/php/smarty3/src/
+        cp -rf ${S}/src/* ${D}${datadir}/php/smarty3/src/
 }
 FILES:${PN} = "${datadir}/php/smarty3/"