Skip to contentSkip to conversation

mstpd: Add FILES variable

PATCH In review Ryan Eatmon 2 participants 3 messages Aug 12, 2023 – Aug 14, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mstpd: Add FILES variable

Bring this recipe into compliance with the latest standards. Add missing FILES and update hardcoded /sbin path to $base_sbindir.

---
 meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb +9 -1
index a410f584..be75b1c5 100644
@@ -17,7 +17,15 @@ RDEPENDS:${PN} = "python3-core"
 
 inherit autotools
 
-EXTRA_OECONF = "--sbindir=/sbin"
+EXTRA_OECONF = "--sbindir=${base_sbindir}"
+
+FILES:${PN} += " \
+    ${base_sbindir}/mstp* \
+    ${base_sbindir}/bridge-stp \
+    ${libexecdir}/mstpctl-utils/* \
+    ${sysconfdir}/bridge-stp.conf \
+    ${sysconfdir}/bash_completion.d/mstpctl \
+"
 
 do_configure:prepend() {
 	 sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/utils/ifquery
Signature · 1 line
2.17.1
#1 lore raw
Quoted 2 lines · Ryan Eatmon via lists.yoctoproject.org

Bring this recipe into compliance with the latest standards. Add missing FILES and update hardcoded /sbin path to $base_sbindir.

Well, you don't have to touch FILES, as the defaults here seem to cover everything just fine. Plus, you are adding to the defaults, not replacing them, so that's a no-op.

Changing hardcoded /sbin to ${base_sbindir} is all you need here.

Quoted 13 lines
---
 meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb +0 -0
index a410f584..be75b1c5 100644
@@ -17,7 +17,15 @@ RDEPENDS:${PN} = "python3-core"
 
 inherit autotools
 

meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb RDEPENDS:${PN} = "python3-core" · line 28

Quoted 10 lines
meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb +9 -1
-EXTRA_OECONF = "--sbindir=/sbin"
+EXTRA_OECONF = "--sbindir=${base_sbindir}"
+
+FILES:${PN} += " \
+    ${base_sbindir}/mstp* \
+    ${base_sbindir}/bridge-stp \
+    ${libexecdir}/mstpctl-utils/* \
+    ${sysconfdir}/bridge-stp.conf \
+    ${sysconfdir}/bash_completion.d/mstpctl \
+"

So, the defaults already have ${base_sbindir}/* ${libexecdir}/* and ${sysconfdir} and will scoop up everything the recipe installs in those directories.

https://git.openembedded.org/openembedded-core/tree/meta/conf/bitbake.conf#n331

Quoted 4 lines
meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb +0 -0
 do_configure:prepend() {
 	 sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/utils/ifquery
Signature · 1 line
2.17.1
#2 lore raw
Quoted 9 lines · Denys Dmytriyenko
Quoted 2 lines · Ryan Eatmon via lists.yoctoproject.org

Bring this recipe into compliance with the latest standards. Add missing FILES and update hardcoded /sbin path to $base_sbindir.

Well, you don't have to touch FILES, as the defaults here seem to cover everything just fine. Plus, you are adding to the defaults, not replacing them, so that's a no-op.

Changing hardcoded /sbin to ${base_sbindir} is all you need here.

That would explain why when I added /sbin/* to the FILES a bunch of other errors popped up! I changed the default. That was confusing me a bit. I'll get this fixed for a v2. Thanks!

Quoted 36 lines
Quoted 14 lines
---
  meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb +0 -0
index a410f584..be75b1c5 100644
@@ -17,7 +17,15 @@ RDEPENDS:${PN} = "python3-core"
 
  inherit autotools
 

meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb RDEPENDS:${PN} = "python3-core" · line 28

Quoted 10 lines
meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb +9 -1
-EXTRA_OECONF = "--sbindir=/sbin"
+EXTRA_OECONF = "--sbindir=${base_sbindir}"
+
+FILES:${PN} += " \
+    ${base_sbindir}/mstp* \
+    ${base_sbindir}/bridge-stp \
+    ${libexecdir}/mstpctl-utils/* \
+    ${sysconfdir}/bridge-stp.conf \
+    ${sysconfdir}/bash_completion.d/mstpctl \
+"

So, the defaults already have ${base_sbindir}/* ${libexecdir}/* and ${sysconfdir} and will scoop up everything the recipe installs in those directories.

https://git.openembedded.org/openembedded-core/tree/meta/conf/bitbake.conf#n331

Quoted 4 lines
meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb +0 -0
  do_configure:prepend() {
  	 sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/utils/ifquery
Signature · 1 line
2.17.1
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS