Skip to contentSkip to conversation

package/nfs-utils: nfsiostat used python3, not python2

PATCH In review Peter Korsgaard 2 participants 5 messages Feb 6, 2022 – Feb 17, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/nfs-utils: nfsiostat used python3, not python2

nfsiostat is a python3 script, so keep it if python3 is enabled and not python2:

head -n 1 target/usr/sbin/nfsiostat
#!/usr/bin/python3

---
 package/nfs-utils/nfs-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/nfs-utils/nfs-utils.mk +1 -1
index 6a3a801359..44653e2707 100644
@@ -114,7 +114,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT
 endef
 
 # nfsiostat is interpreted python, so remove it unless it's in the target
-NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT)
+NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT)
 
 define HOST_NFS_UTILS_BUILD_CMDS
 	$(MAKE) -C $(@D)/tools/rpcgen
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

s/used/uses/ in the subject naturally.

Quoted 26 lines

nfsiostat is a python3 script, so keep it if python3 is enabled and not python2:

head -n 1 target/usr/sbin/nfsiostat
#!/usr/bin/python3

---
 package/nfs-utils/nfs-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/nfs-utils/nfs-utils.mk +1 -1
index 6a3a801359..44653e2707 100644
@@ -114,7 +114,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT
 endef
 
 # nfsiostat is interpreted python, so remove it unless it's in the target
-NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT)
+NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT)
 
 define HOST_NFS_UTILS_BUILD_CMDS
 	$(MAKE) -C $(@D)/tools/rpcgen
Signature · 1 line
2.20.1
Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Reviewed-by
#2 lore raw

Hi Peter,

Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

s/used/uses/ in the subject naturally.

+1

Quoted 2 lines
Quoted 2 lines

nfsiostat is a python3 script, so keep it if python3 is enabled and not python2:

Good catch, thanks!

Kind regards,
Petr

Quoted 15 lines
Quoted 14 lines

head -n 1 target/usr/sbin/nfsiostat
#!/usr/bin/python3

---
 package/nfs-utils/nfs-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/nfs-utils/nfs-utils.mk +0 -0
index 6a3a801359..44653e2707 100644
@@ -114,7 +114,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT
 endef
Quoted 8 lines
Quoted 8 lines
package/nfs-utils/nfs-utils.mk +1 -1
 # nfsiostat is interpreted python, so remove it unless it's in the target
-NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT)
+NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT)
 
 define HOST_NFS_UTILS_BUILD_CMDS
 	$(MAKE) -C $(@D)/tools/rpcgen
Signature · 1 line
2.20.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Petr" == Petr Vorel <[email protected]> writes:

Hi Peter,

Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

s/used/uses/ in the subject naturally.

Quoted 7 lines

+1

Quoted 2 lines
Quoted 2 lines

nfsiostat is a python3 script, so keep it if python3 is enabled and not python2:

Good catch, thanks!

Committed, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw
In reply to Peter Korsgaard
Quoted 12 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

"Peter" == Peter Korsgaard <[email protected]> writes:

"Peter" == Peter Korsgaard <[email protected]> writes:

s/used/uses/ in the subject naturally.

Quoted 7 lines

nfsiostat is a python3 script, so keep it if python3 is enabled and not python2:

head -n 1 target/usr/sbin/nfsiostat
#!/usr/bin/python3

Committed to 2021.02.x and 2021.11.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot