[Buildroot] [PATCH 1/3] package/containerd: drop CONTAINERD_CPE_ID_VENDOR

[Buildroot] [PATCH 1/3] package/containerd: drop CONTAINERD_CPE_ID_VENDOR

[Fabrice Fontaine]

Commit 35af2bb8011ea57642777acf5613afa244d325d7 set
CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as
CONTAINERD_CPE_ID_PRODUCT will be set to the package name
(i.e. containerd) by default

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/containerd/containerd.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk
index 61a8472ddd..d3ca102797 100644
--- a/package/containerd/containerd.mk
+++ b/package/containerd/containerd.mk
@@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION))
 CONTAINERD_LICENSE = Apache-2.0
 CONTAINERD_LICENSE_FILES = LICENSE
 CONTAINERD_CPE_ID_VENDOR = linuxfoundation
-CONTAINERD_CPE_ID_PRODUCT = containerd
 
 CONTAINERD_GOMOD = github.com/containerd/containerd
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/3] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT

[Fabrice Fontaine]

Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set
LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as
LIBCURL_CPE_ID_PRODUCT will be set to the package name
(i.e. libcurl) by default

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/libcurl/libcurl.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index 3ecc587a52..83845b8e87 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \
 LIBCURL_LICENSE = curl
 LIBCURL_LICENSE_FILES = COPYING
 LIBCURL_CPE_ID_VENDOR = haxx
-LIBCURL_CPE_ID_PRODUCT = libcurl
 LIBCURL_INSTALL_STAGING = YES
 
 # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb')
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set
 > LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as
 > LIBCURL_CPE_ID_PRODUCT will be set to the package name
 > (i.e. libcurl) by default

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2023.02.x and 2023.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 3/3] utils/checkpackagelib: add RemoveDefaultPackageCpeIdProductVariable

[Fabrice Fontaine]

As advised by Yann E. Morin [1], add
RemoveDefaultPackageCpeIdProductVariable

[1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240204103204.1415592-1-fontaine.fabrice@gmail.com

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
index 551c87168f..b5cfdd7f41 100644
--- a/utils/checkpackagelib/lib_mk.py
+++ b/utils/checkpackagelib/lib_mk.py
@@ -227,6 +227,24 @@ class RemoveDefaultPackageSourceVariable(_CheckFunction):
                     text]
 
 
+class RemoveDefaultPackageCpeIdProductVariable(_CheckFunction):
+    def before(self):
+        package, _ = os.path.splitext(os.path.basename(self.filename))
+        package_upper = package.replace("-", "_").upper()
+        self.package = package
+        self.FIND_CPE_ID_PRODUCT = re.compile(
+            r"^{}_CPE_ID_PRODUCT\s*=\s*{}$"
+            .format(package_upper, package, package_upper))
+
+    def check_line(self, lineno, text):
+        if self.FIND_CPE_ID_PRODUCT.search(text):
+
+            return ["{}:{}: remove default value of _CPE_ID_PRODUCT variable "
+                    "({}#generic-package-reference)"
+                    .format(self.filename, lineno, self.url_to_manual),
+                    text]
+
+
 class SpaceBeforeBackslash(_CheckFunction):
     TAB_OR_MULTIPLE_SPACES_BEFORE_BACKSLASH = re.compile(r"^.*(  |\t ?)\\$")
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 3/3] utils/checkpackagelib: add RemoveDefaultPackageCpeIdProductVariable

[Yann E. MORIN]

Fabrice, All,

Thanks for working on my suggestion! Sorry, I was not quick enough that
I was tackling it on my side... See below for some comments...

On 2024-02-04 14:35 +0100, Fabrice Fontaine spake thusly:
> As advised by Yann E. Morin [1], add
> RemoveDefaultPackageCpeIdProductVariable
> 
> [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240204103204.1415592-1-fontaine.fabrice@gmail.com
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
> index 551c87168f..b5cfdd7f41 100644
> --- a/utils/checkpackagelib/lib_mk.py
> +++ b/utils/checkpackagelib/lib_mk.py
> @@ -227,6 +227,24 @@ class RemoveDefaultPackageSourceVariable(_CheckFunction):
>                      text]
>  
>  
> +class RemoveDefaultPackageCpeIdProductVariable(_CheckFunction):
> +    def before(self):
> +        package, _ = os.path.splitext(os.path.basename(self.filename))
> +        package_upper = package.replace("-", "_").upper()
> +        self.package = package
> +        self.FIND_CPE_ID_PRODUCT = re.compile(
> +            r"^{}_CPE_ID_PRODUCT\s*=\s*{}$"
> +            .format(package_upper, package, package_upper))
> +
> +    def check_line(self, lineno, text):
> +        if self.FIND_CPE_ID_PRODUCT.search(text):
> +
> +            return ["{}:{}: remove default value of _CPE_ID_PRODUCT variable "
> +                    "({}#generic-package-reference)"
> +                    .format(self.filename, lineno, self.url_to_manual),
> +                    text]

This is actually a little bit more complex than that. Indeed, if there
is no CPE variable set, we do not consider FOO_CPE_ID to be valid, but
if the user does provide one CPE variable, then we connsider FOO_CPE_ID
to be valid.

Of course, in that case, we want to allow for the CPE variable to be the
default, if that's the actual value it needs to have. But this is only
valid *if* there is only one CPE variable set.

So, I am almost done on my side, but if you want to continue on your
side, I'm totally fine with letting you do the job! Just tell me.

Regards,
Yann E. MORIN.

> +
>  class SpaceBeforeBackslash(_CheckFunction):
>      TAB_OR_MULTIPLE_SPACES_BEFORE_BACKSLASH = re.compile(r"^.*(  |\t ?)\\$")
>  
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 3/3] utils/checkpackagelib: add RemoveDefaultPackageCpeIdProductVariable

[Fabrice Fontaine]

Hello Yann,

Le dim. 4 févr. 2024 à 14:58, Yann E. MORIN <yann.morin.1998@free.fr> a écrit :
>
> Fabrice, All,
>
> Thanks for working on my suggestion! Sorry, I was not quick enough that
> I was tackling it on my side... See below for some comments...
>
> On 2024-02-04 14:35 +0100, Fabrice Fontaine spake thusly:
> > As advised by Yann E. Morin [1], add
> > RemoveDefaultPackageCpeIdProductVariable
> >
> > [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240204103204.1415592-1-fontaine.fabrice@gmail.com
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > ---
> >  utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++++++
> >  1 file changed, 18 insertions(+)
> >
> > diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
> > index 551c87168f..b5cfdd7f41 100644
> > --- a/utils/checkpackagelib/lib_mk.py
> > +++ b/utils/checkpackagelib/lib_mk.py
> > @@ -227,6 +227,24 @@ class RemoveDefaultPackageSourceVariable(_CheckFunction):
> >                      text]
> >
> >
> > +class RemoveDefaultPackageCpeIdProductVariable(_CheckFunction):
> > +    def before(self):
> > +        package, _ = os.path.splitext(os.path.basename(self.filename))
> > +        package_upper = package.replace("-", "_").upper()
> > +        self.package = package
> > +        self.FIND_CPE_ID_PRODUCT = re.compile(
> > +            r"^{}_CPE_ID_PRODUCT\s*=\s*{}$"
> > +            .format(package_upper, package, package_upper))
> > +
> > +    def check_line(self, lineno, text):
> > +        if self.FIND_CPE_ID_PRODUCT.search(text):
> > +
> > +            return ["{}:{}: remove default value of _CPE_ID_PRODUCT variable "
> > +                    "({}#generic-package-reference)"
> > +                    .format(self.filename, lineno, self.url_to_manual),
> > +                    text]
>
> This is actually a little bit more complex than that. Indeed, if there
> is no CPE variable set, we do not consider FOO_CPE_ID to be valid, but
> if the user does provide one CPE variable, then we connsider FOO_CPE_ID
> to be valid.
>
> Of course, in that case, we want to allow for the CPE variable to be the
> default, if that's the actual value it needs to have. But this is only
> valid *if* there is only one CPE variable set.
>
> So, I am almost done on my side, but if you want to continue on your
> side, I'm totally fine with letting you do the job! Just tell me.

Indeed, I didn't manage all the corner cases. I'll let you handle the rest.

>
> Regards,
> Yann E. MORIN.
>
> > +
> >  class SpaceBeforeBackslash(_CheckFunction):
> >      TAB_OR_MULTIPLE_SPACES_BEFORE_BACKSLASH = re.compile(r"^.*(  |\t ?)\\$")
> >
> > --
> > 2.43.0
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'

Best Regards,

Fabrice
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/3] package/containerd: drop CONTAINERD_CPE_ID_VENDOR

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Commit 35af2bb8011ea57642777acf5613afa244d325d7 set
 > CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as
 > CONTAINERD_CPE_ID_PRODUCT will be set to the package name
 > (i.e. containerd) by default

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2023.02.x and 2023.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot