[meta-oe][PATCH v3] net-tools: split into binary packages

[meta-oe][PATCH v3] net-tools: split into binary packages

[Sinan Kaya]

Support per binary package to not bloat the system with unneeded
tools.

Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
 .../net-tools/net-tools_1.60-20181103.bb      | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb b/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb
index e97731073e8..63a3ccbe516 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb
@@ -93,7 +93,7 @@ base_bindir_progs  = "ifconfig netstat route \
     ${@bb.utils.contains('PACKAGECONFIG', 'hostname', 'dnsdomainname domainname hostname nisdomainname ypdomainname', '', d)} \
 "
 
-ALTERNATIVE_${PN} = "${base_sbindir_progs} ${base_bindir_progs}"
+ALTERNATIVE_${PN} = ""
 ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'hostname', 'hostname.1 dnsdomainname.1', '', d)}"
 ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
 ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1"
@@ -107,4 +107,31 @@ python __anonymous() {
 }
 ALTERNATIVE_PRIORITY = "100"
 
+python __anonymous () {
+    packages = []
+    for prog in d.getVar('base_sbindir_progs').split():
+        pkg = "net-tools-%s" % prog.replace("_", "-")
+        packages.append(pkg)
+        d.setVar("ALTERNATIVE_%s" % pkg, prog.replace("_", "-"))
+        if not d.getVar("FILES_%s" % pkg):
+                d.setVar("FILES_%s" % pkg, "${base_sbindir}/%s*" % prog)
+    for prog in d.getVar('base_bindir_progs').split():
+        pkg = "net-tools-%s" % prog.replace("_", "-")
+        packages.append(pkg)
+        d.setVar("ALTERNATIVE_%s" % pkg, prog.replace("_", "-"))
+        if not d.getVar("FILES_%s" % pkg):
+                d.setVar("FILES_%s" % pkg, "${base_bindir}/%s*" % prog)
+    pkg = "net-tools-man"
+    packages.append(pkg)
+    if not d.getVar("FILES_%s" % pkg):
+            d.setVar("FILES_%s" % pkg, "${mandir}/*")
+    d.setVar("NETTOOLS_PACKAGES", " ".join(packages))
+}
+# "net-tools" is a metapackage which pulls in all net-tools binaries
+PACKAGES += "${NETTOOLS_PACKAGES}"
+PROVIDES += "${NETTOOLS_PACKAGES}"
+FILES_${PN} = ""
+ALLOW_EMPTY_${PN} = "1"
+RRECOMMENDS_${PN} += "${NETTOOLS_PACKAGES}"
+
 BBCLASSEXTEND = "native nativesdk"
-- 
2.17.1

Re: [OE-core] [meta-oe][PATCH v3] net-tools: split into binary packages

[Anibal Limon]

[-- Attachment #1: Type: text/plain, Size: 2736 bytes --]

This patch causes problems in multilib configurations,

http://errors.yoctoproject.org/Errors/Details/539019/

Regards,
Anibal

On Mon, 30 Nov 2020 at 21:35, Sinan Kaya <okaya@kernel.org> wrote:

> Support per binary package to not bloat the system with unneeded
> tools.
>
> Signed-off-by: Sinan Kaya <okaya@kernel.org>
> ---
>  .../net-tools/net-tools_1.60-20181103.bb      | 29 ++++++++++++++++++-
>  1 file changed, 28 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb
> b/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb
> index e97731073e8..63a3ccbe516 100644
> --- a/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb
> +++ b/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb
> @@ -93,7 +93,7 @@ base_bindir_progs  = "ifconfig netstat route \
>      ${@bb.utils.contains('PACKAGECONFIG', 'hostname', 'dnsdomainname
> domainname hostname nisdomainname ypdomainname', '', d)} \
>  "
>
> -ALTERNATIVE_${PN} = "${base_sbindir_progs} ${base_bindir_progs}"
> +ALTERNATIVE_${PN} = ""
>  ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG',
> 'hostname', 'hostname.1 dnsdomainname.1', '', d)}"
>  ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
>  ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1"
> @@ -107,4 +107,31 @@ python __anonymous() {
>  }
>  ALTERNATIVE_PRIORITY = "100"
>
> +python __anonymous () {
> +    packages = []
> +    for prog in d.getVar('base_sbindir_progs').split():
> +        pkg = "net-tools-%s" % prog.replace("_", "-")
> +        packages.append(pkg)
> +        d.setVar("ALTERNATIVE_%s" % pkg, prog.replace("_", "-"))
> +        if not d.getVar("FILES_%s" % pkg):
> +                d.setVar("FILES_%s" % pkg, "${base_sbindir}/%s*" % prog)
> +    for prog in d.getVar('base_bindir_progs').split():
> +        pkg = "net-tools-%s" % prog.replace("_", "-")
> +        packages.append(pkg)
> +        d.setVar("ALTERNATIVE_%s" % pkg, prog.replace("_", "-"))
> +        if not d.getVar("FILES_%s" % pkg):
> +                d.setVar("FILES_%s" % pkg, "${base_bindir}/%s*" % prog)
> +    pkg = "net-tools-man"
> +    packages.append(pkg)
> +    if not d.getVar("FILES_%s" % pkg):
> +            d.setVar("FILES_%s" % pkg, "${mandir}/*")
> +    d.setVar("NETTOOLS_PACKAGES", " ".join(packages))
> +}
> +# "net-tools" is a metapackage which pulls in all net-tools binaries
> +PACKAGES += "${NETTOOLS_PACKAGES}"
> +PROVIDES += "${NETTOOLS_PACKAGES}"
> +FILES_${PN} = ""
> +ALLOW_EMPTY_${PN} = "1"
> +RRECOMMENDS_${PN} += "${NETTOOLS_PACKAGES}"
> +
>  BBCLASSEXTEND = "native nativesdk"
> --
> 2.17.1
>
>
> 
>
>

[-- Attachment #2: Type: text/html, Size: 4252 bytes --]

Re: [OE-core] [meta-oe][PATCH v3] net-tools: split into binary packages

[Sinan Kaya]

On 12/3/2020 10:40 AM, Anibal Limon wrote:
> This patch causes problems in multilib configurations,
> 
> http://errors.yoctoproject.org/Errors/Details/539019/
> <http://errors.yoctoproject.org/Errors/Details/539019/>
> 

Thanks for the report, I'll take a look.