Skip to contentSkip to conversation

python-decorator: update to add host package

PATCH New Jared Bents 4 participants 12 messages Mar 20, 2018 – Apr 2, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/3 python-decorator: update to add host package

Update to add host package for python decorator

--
v2 -> v3: Update to remove the dependency changes
v1 -> v2: No change

---
 package/python-decorator/python-decorator.mk | 1 +
 1 file changed, 1 insertion(+)
package/python-decorator/python-decorator.mk +1 -0
index c0c43f6..3802f3d 100644
@@ -11,3 +11,4 @@ PYTHON_DECORATOR_LICENSE = BSD-2-Clause
 PYTHON_DECORATOR_SETUP_TYPE = setuptools
 
 $(eval $(python-package))
+$(eval $(host-python-package))
Signature · 1 line
1.9.1
#1 lore raw

PATCH v3 2/3 python-networkx: new package

Update to add python-networkx package to buildroot. While 2.1 is the latest version, the current version of setools does not work with versions past 1.11.

--
v2 -> v3: Update to remove target dependencies but kept the
host package dependency as it is required for host-python-decorator to be built and thus available at runtime
v1 -> v2: Update to add version dependency to networkx mk file

---
 package/Config.in                            |  1 +
 package/python-networkx/Config.in            |  9 +++++++++
 package/python-networkx/python-networkx.hash |  4 ++++
 package/python-networkx/python-networkx.mk   | 17 +++++++++++++++++
 5 files changed, 32 insertions(+)
 create mode 100644 package/python-networkx/Config.in
 create mode 100644 package/python-networkx/python-networkx.hash
 create mode 100644 package/python-networkx/python-networkx.mk
package/Config.in +1 -0
index 449ffcc..4d98365 100644
@@ -837,6 +837,7 @@ menu "External python modules"
 	source "package/python-netaddr/Config.in"
 	source "package/python-netifaces/Config.in"
 	source "package/python-networkmanager/Config.in"
+	source "package/python-networkx/Config.in"
 	source "package/python-nfc/Config.in"
 	source "package/python-numpy/Config.in"
 	source "package/python-oauthlib/Config.in"
package/python-networkx/Config.in new file +9 -0
new file mode 100644
index 0000000..0f3e86f
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYTHON_NETWORKX
+	bool "python-networkx"
+	select BR2_PACKAGE_PYTHON_DECORATOR # runtime
+	help
+	  A Python package for the creation, manipulation,
+	  and study of the structure, dynamics, and
+	  functions of complex networks.
+
+	  https://pypi.python.org/pypi/networkx
package/python-networkx/python-networkx.hash new file +4 -0
new file mode 100644
index 0000000..92383e7
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/networks/json, sha256 locally computed
+md5 6ef584a879e9163013e9a762e1cf7cd1 networkx-1.11.tar.gz
+sha256 0d0e70e10dfb47601cbb3425a00e03e2a2e97477be6f80638fef91d54dd1e4b8 networkx-1.11.tar.gz
+sha256 f4c13bf0e83bef45116ebda6c360066df6fd99610efaea9790b998c5441b0c0d LICENSE.txt
package/python-networkx/python-networkx.mk new file +17 -0
new file mode 100644
index 0000000..4dfdbd5
@@ -0,0 +1,17 @@
+################################################################################
+#
+# python-networkx
+#
+################################################################################
+
+# The current version of setools (v4.1.1) does not work with python-networkx past v1.11
+PYTHON_NETWORKX_VERSION = 1.11
+PYTHON_NETWORKX_SOURCE = networkx-$(PYTHON_NETWORKX_VERSION).tar.gz
+PYTHON_NETWORKX_SITE = https://pypi.python.org/packages/c2/93/dbb41b03cf7c878a7409c8e92226531f840a423c9309ea534873a83c9192
+PYTHON_NETWORKX_LICENSE = BSD-3-Clause
+PYTHON_NETWORKX_LICENSE_FILES = LICENSE.txt
+PYTHON_NETWORKX_SETUP_TYPE = setuptools
+HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator
+
+$(eval $(python-package))
+$(eval $(host-python-package))
Signature · 1 line
1.9.1
#2 lore raw

PATCH v3 2/3 python-networkx: new package

Quoted 5 lines · Jared Bents

Update to add python-networkx package to buildroot. While 2.1 is the latest version, the current version of setools does not work with versions past 1.11.

Quoted 84 lines

--
v2 -> v3: Update to remove target dependencies but kept the
host package dependency as it is required for host-python-decorator to be built and thus available at runtime
v1 -> v2: Update to add version dependency to networkx mk file

---
 package/Config.in                            |  1 +
 package/python-networkx/Config.in            |  9 +++++++++
 package/python-networkx/python-networkx.hash |  4 ++++
 package/python-networkx/python-networkx.mk   | 17 +++++++++++++++++
 5 files changed, 32 insertions(+)
 create mode 100644 package/python-networkx/Config.in
 create mode 100644 package/python-networkx/python-networkx.hash
 create mode 100644 package/python-networkx/python-networkx.mk
package/Config.in +1 -0
index 449ffcc..4d98365 100644
@@ -837,6 +837,7 @@ menu "External python modules"
        source "package/python-netaddr/Config.in"
        source "package/python-netifaces/Config.in"
        source "package/python-networkmanager/Config.in"
+       source "package/python-networkx/Config.in"
        source "package/python-nfc/Config.in"
        source "package/python-numpy/Config.in"
        source "package/python-oauthlib/Config.in"
package/python-networkx/Config.in new file +9 -0
new file mode 100644
index 0000000..0f3e86f
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYTHON_NETWORKX
+       bool "python-networkx"
+       select BR2_PACKAGE_PYTHON_DECORATOR # runtime
+       help
+         A Python package for the creation, manipulation,
+         and study of the structure, dynamics, and
+         functions of complex networks.
+
+         https://pypi.python.org/pypi/networkx
package/python-networkx/python-networkx.hash new file +4 -0
new file mode 100644
index 0000000..92383e7
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/networks/json, sha256 locally computed
+md5 6ef584a879e9163013e9a762e1cf7cd1 networkx-1.11.tar.gz
+sha256 0d0e70e10dfb47601cbb3425a00e03e2a2e97477be6f80638fef91d54dd1e4b8 networkx-1.11.tar.gz
+sha256 f4c13bf0e83bef45116ebda6c360066df6fd99610efaea9790b998c5441b0c0d LICENSE.txt
package/python-networkx/python-networkx.mk new file +17 -1
new file mode 100644
index 0000000..4dfdbd5
@@ -0,0 +1,17 @@
+################################################################################
+#
+# python-networkx
+#
+################################################################################
+
+# The current version of setools (v4.1.1) does not work with python-networkx past v1.11
+PYTHON_NETWORKX_VERSION = 1.11
+PYTHON_NETWORKX_SOURCE = networkx-$(PYTHON_NETWORKX_VERSION).tar.gz
+PYTHON_NETWORKX_SITE = https://pypi.python.org/packages/c2/93/dbb41b03cf7c878a7409c8e92226531f840a423c9309ea534873a83c9192
+PYTHON_NETWORKX_LICENSE = BSD-3-Clause
+PYTHON_NETWORKX_LICENSE_FILES = LICENSE.txt
+PYTHON_NETWORKX_SETUP_TYPE = setuptools
+HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator
+
+$(eval $(python-package))
+$(eval $(host-python-package))
--

1.9.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#3 lore raw

PATCH v3 2/3 python-networkx: new package

In reply to Jared Bents

Hello,

Quoted 12 lines · Jared Bents

Update to add python-networkx package to buildroot. While 2.1 is the latest version, the current version of setools does not work with versions past 1.11.

--
v2 -> v3: Update to remove target dependencies but kept the
host package dependency as it is required for host-python-decorator to be built and thus available at runtime
v1 -> v2: Update to add version dependency to networkx mk file

Quoted 9 lines
---
 package/Config.in                            |  1 +
 package/python-networkx/Config.in            |  9 +++++++++
 package/python-networkx/python-networkx.hash |  4 ++++
 package/python-networkx/python-networkx.mk   | 17 +++++++++++++++++
 5 files changed, 32 insertions(+)
 create mode 100644 package/python-networkx/Config.in
 create mode 100644 package/python-networkx/python-networkx.hash
 create mode 100644 package/python-networkx/python-networkx.mk

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH v3 3/3 setools: update to add sedta and seinfoflow

In reply to Jared Bents

Update to add sedta and seinfoflow to setools

--
v2 -> v3: Update to remove target dependencies change but kept
the host package dependency as it is required for host-python-networkx to be built and thus available at runtime
v1 -> v2: No change

---
 package/setools/Config.in  |  2 ++
 package/setools/setools.mk | 16 ++--------------
 2 files changed, 4 insertions(+), 14 deletions(-)
package/setools/Config.in +2 -0
index ae0c45f..32a9315 100644
@@ -8,6 +8,7 @@ config BR2_PACKAGE_SETOOLS
 	depends on BR2_USE_MMU
 	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_PYTHON_ENUM34 if !BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_NETWORKX
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS
 	select BR2_PACKAGE_LIBSELINUX
 	help
@@ -16,6 +17,7 @@ config BR2_PACKAGE_SETOOLS
 	   * apol - analyze a SELinux policy. (requires python-qt5)
 	   * sediff - semantic policy difference tool for SELinux.
 	   * sedta - Perform domain transition analyses
+	   * seinfoflow - information flow analysis for SELinux
 	   * sesearch - Search rules (allow, type_transition, etc.)
 
 	  https://github.com/TresysTechnology/setools
package/setools/setools.mk +2 -14
index 6748c95..1ed7e97 100644
@@ -11,7 +11,7 @@ SETOOLS_INSTALL_STAGING = YES
 SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+
 SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
 SETOOLS_SETUP_TYPE = setuptools
-HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol
+HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol host-python-networkx
 
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
 SETOOLS_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
@@ -36,14 +36,6 @@ define HOST_SETOOLS_FIX_SETUP
 endef
 HOST_SETOOLS_POST_PATCH_HOOKS += HOST_SETOOLS_FIX_SETUP
 
-# sedta and seinfoflow depend on python-networkx. This package is not
-# available in buildroot.
-define SETOOLS_REMOVE_BROKEN_SCRIPTS
-	$(RM) $(TARGET_DIR)/usr/bin/sedta
-	$(RM) $(TARGET_DIR)/usr/bin/seinfoflow
-endef
-SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_BROKEN_SCRIPTS
-
 # apol requires pyqt5. However, the setools installation
 # process will install apol even if pyqt5 is missing.
 # Remove these scripts from the target it pyqt5 is not selected.
@@ -55,12 +47,8 @@ endef
 SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_QT_SCRIPTS
 endif
 
-# sedta and seinfoflow depend on python-networkx. This package is not
-# available in buildroot. pyqt5 is not a host-package, remove apol
-# from the host directory as well.
+# pyqt5 is not a host-package, remove apol from the host directory.
 define HOST_SETOOLS_REMOVE_BROKEN_SCRIPTS
-	$(RM) $(HOST_DIR)/bin/sedta
-	$(RM) $(HOST_DIR)/bin/seinfoflow
 	$(RM) $(HOST_DIR)/bin/apol
 endef
 HOST_SETOOLS_POST_INSTALL_HOOKS += HOST_SETOOLS_REMOVE_BROKEN_SCRIPTS
Signature · 1 line
1.9.1
#5 lore raw

PATCH v3 3/3 setools: update to add sedta and seinfoflow

Quoted 3 lines · Jared Bents

Update to add sedta and seinfoflow to setools

Just curious what BR package is really uses host-setools with Python functionality. I've built refpolicy without setools' host-python-networx dependency and the build was successful.

Yegor

Quoted 81 lines

--
v2 -> v3: Update to remove target dependencies change but kept
the host package dependency as it is required for host-python-networkx to be built and thus available at runtime
v1 -> v2: No change

---
 package/setools/Config.in  |  2 ++
 package/setools/setools.mk | 16 ++--------------
 2 files changed, 4 insertions(+), 14 deletions(-)
package/setools/Config.in +2 -0
index ae0c45f..32a9315 100644
@@ -8,6 +8,7 @@ config BR2_PACKAGE_SETOOLS
        depends on BR2_USE_MMU
        select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
        select BR2_PACKAGE_PYTHON_ENUM34 if !BR2_PACKAGE_PYTHON3
+       select BR2_PACKAGE_PYTHON_NETWORKX
        select BR2_PACKAGE_PYTHON_SETUPTOOLS
        select BR2_PACKAGE_LIBSELINUX
        help
@@ -16,6 +17,7 @@ config BR2_PACKAGE_SETOOLS
           * apol - analyze a SELinux policy. (requires python-qt5)
           * sediff - semantic policy difference tool for SELinux.
           * sedta - Perform domain transition analyses
+          * seinfoflow - information flow analysis for SELinux
           * sesearch - Search rules (allow, type_transition, etc.)
 
          https://github.com/TresysTechnology/setools
package/setools/setools.mk +2 -15
index 6748c95..1ed7e97 100644
@@ -11,7 +11,7 @@ SETOOLS_INSTALL_STAGING = YES
 SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+
 SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
 SETOOLS_SETUP_TYPE = setuptools
-HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol
+HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol host-python-networkx
 
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
 SETOOLS_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
@@ -36,14 +36,6 @@ define HOST_SETOOLS_FIX_SETUP
 endef
 HOST_SETOOLS_POST_PATCH_HOOKS += HOST_SETOOLS_FIX_SETUP
 
-# sedta and seinfoflow depend on python-networkx. This package is not
-# available in buildroot.
-define SETOOLS_REMOVE_BROKEN_SCRIPTS
-       $(RM) $(TARGET_DIR)/usr/bin/sedta
-       $(RM) $(TARGET_DIR)/usr/bin/seinfoflow
-endef
-SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_BROKEN_SCRIPTS
-
 # apol requires pyqt5. However, the setools installation
 # process will install apol even if pyqt5 is missing.
 # Remove these scripts from the target it pyqt5 is not selected.
@@ -55,12 +47,8 @@ endef
 SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_QT_SCRIPTS
 endif
 
-# sedta and seinfoflow depend on python-networkx. This package is not
-# available in buildroot. pyqt5 is not a host-package, remove apol
-# from the host directory as well.
+# pyqt5 is not a host-package, remove apol from the host directory.
 define HOST_SETOOLS_REMOVE_BROKEN_SCRIPTS
-       $(RM) $(HOST_DIR)/bin/sedta
-       $(RM) $(HOST_DIR)/bin/seinfoflow
        $(RM) $(HOST_DIR)/bin/apol
 endef
 HOST_SETOOLS_POST_INSTALL_HOOKS += HOST_SETOOLS_REMOVE_BROKEN_SCRIPTS
--

1.9.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#6 lore raw

PATCH v3 3/3 setools: update to add sedta and seinfoflow

Yegor,

Quoted 6 lines · Yegor Yefremov
Quoted 3 lines · Jared Bents

Update to add sedta and seinfoflow to setools

Quoted 8 lines

Just curious what BR package is really uses host-setools with Python functionality. I've built refpolicy without setools' host-python-networx dependency and the build was successful.

Yegor

I don't think any package needs host-setools as nothing selects setools from what I can tell. I can also build and use refpolicy without host-setools but the security team on my project is using host-setools for analysis. I am assuming host-setools is listed as a host dependency for refpolicy so that if a user selects setools, the host package gets built for the user to use.

Jared

Quoted 81 lines
Quoted 81 lines

--
v2 -> v3: Update to remove target dependencies change but kept
the host package dependency as it is required for host-python-networkx to be built and thus available at runtime
v1 -> v2: No change

---
 package/setools/Config.in  |  2 ++
 package/setools/setools.mk | 16 ++--------------
 2 files changed, 4 insertions(+), 14 deletions(-)
package/setools/Config.in +2 -0
index ae0c45f..32a9315 100644
@@ -8,6 +8,7 @@ config BR2_PACKAGE_SETOOLS
        depends on BR2_USE_MMU
        select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
        select BR2_PACKAGE_PYTHON_ENUM34 if !BR2_PACKAGE_PYTHON3
+       select BR2_PACKAGE_PYTHON_NETWORKX
        select BR2_PACKAGE_PYTHON_SETUPTOOLS
        select BR2_PACKAGE_LIBSELINUX
        help
@@ -16,6 +17,7 @@ config BR2_PACKAGE_SETOOLS
           * apol - analyze a SELinux policy. (requires python-qt5)
           * sediff - semantic policy difference tool for SELinux.
           * sedta - Perform domain transition analyses
+          * seinfoflow - information flow analysis for SELinux
           * sesearch - Search rules (allow, type_transition, etc.)
 
          https://github.com/TresysTechnology/setools
package/setools/setools.mk +2 -15
index 6748c95..1ed7e97 100644
@@ -11,7 +11,7 @@ SETOOLS_INSTALL_STAGING = YES
 SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+
 SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
 SETOOLS_SETUP_TYPE = setuptools
-HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol
+HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol host-python-networkx
 
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
 SETOOLS_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
@@ -36,14 +36,6 @@ define HOST_SETOOLS_FIX_SETUP
 endef
 HOST_SETOOLS_POST_PATCH_HOOKS += HOST_SETOOLS_FIX_SETUP
 
-# sedta and seinfoflow depend on python-networkx. This package is not
-# available in buildroot.
-define SETOOLS_REMOVE_BROKEN_SCRIPTS
-       $(RM) $(TARGET_DIR)/usr/bin/sedta
-       $(RM) $(TARGET_DIR)/usr/bin/seinfoflow
-endef
-SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_BROKEN_SCRIPTS
-
 # apol requires pyqt5. However, the setools installation
 # process will install apol even if pyqt5 is missing.
 # Remove these scripts from the target it pyqt5 is not selected.
@@ -55,12 +47,8 @@ endef
 SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_QT_SCRIPTS
 endif
 
-# sedta and seinfoflow depend on python-networkx. This package is not
-# available in buildroot. pyqt5 is not a host-package, remove apol
-# from the host directory as well.
+# pyqt5 is not a host-package, remove apol from the host directory.
 define HOST_SETOOLS_REMOVE_BROKEN_SCRIPTS
-       $(RM) $(HOST_DIR)/bin/sedta
-       $(RM) $(HOST_DIR)/bin/seinfoflow
        $(RM) $(HOST_DIR)/bin/apol
 endef
 HOST_SETOOLS_POST_INSTALL_HOOKS += HOST_SETOOLS_REMOVE_BROKEN_SCRIPTS
--

1.9.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#7 lore raw

PATCH v3 3/3 setools: update to add sedta and seinfoflow

Jared,

Quoted 19 lines · Jared Bents

Yegor,

Quoted 6 lines · Yegor Yefremov
Quoted 3 lines · Jared Bents

Update to add sedta and seinfoflow to setools

Quoted 8 lines

Just curious what BR package is really uses host-setools with Python functionality. I've built refpolicy without setools' host-python-networx dependency and the build was successful.

Yegor

Quoted 6 lines

I don't think any package needs host-setools as nothing selects setools from what I can tell. I can also build and use refpolicy without host-setools but the security team on my project is using host-setools for analysis. I am assuming host-setools is listed as a host dependency for refpolicy so that if a user selects setools, the host package gets built for the user to use.

Thanks for clarification. I hope setools would release 4.2 soon so that we could bump python-netowrx to the latest version.

Yegor

Quoted 81 lines
Quoted 81 lines
Quoted 81 lines

--
v2 -> v3: Update to remove target dependencies change but kept
the host package dependency as it is required for host-python-networkx to be built and thus available at runtime
v1 -> v2: No change

---
 package/setools/Config.in  |  2 ++
 package/setools/setools.mk | 16 ++--------------
 2 files changed, 4 insertions(+), 14 deletions(-)
package/setools/Config.in +2 -0
index ae0c45f..32a9315 100644
@@ -8,6 +8,7 @@ config BR2_PACKAGE_SETOOLS
        depends on BR2_USE_MMU
        select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
        select BR2_PACKAGE_PYTHON_ENUM34 if !BR2_PACKAGE_PYTHON3
+       select BR2_PACKAGE_PYTHON_NETWORKX
        select BR2_PACKAGE_PYTHON_SETUPTOOLS
        select BR2_PACKAGE_LIBSELINUX
        help
@@ -16,6 +17,7 @@ config BR2_PACKAGE_SETOOLS
           * apol - analyze a SELinux policy. (requires python-qt5)
           * sediff - semantic policy difference tool for SELinux.
           * sedta - Perform domain transition analyses
+          * seinfoflow - information flow analysis for SELinux
           * sesearch - Search rules (allow, type_transition, etc.)
 
          https://github.com/TresysTechnology/setools
package/setools/setools.mk +2 -15
index 6748c95..1ed7e97 100644
@@ -11,7 +11,7 @@ SETOOLS_INSTALL_STAGING = YES
 SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+
 SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
 SETOOLS_SETUP_TYPE = setuptools
-HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol
+HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol host-python-networkx
 
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
 SETOOLS_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
@@ -36,14 +36,6 @@ define HOST_SETOOLS_FIX_SETUP
 endef
 HOST_SETOOLS_POST_PATCH_HOOKS += HOST_SETOOLS_FIX_SETUP
 
-# sedta and seinfoflow depend on python-networkx. This package is not
-# available in buildroot.
-define SETOOLS_REMOVE_BROKEN_SCRIPTS
-       $(RM) $(TARGET_DIR)/usr/bin/sedta
-       $(RM) $(TARGET_DIR)/usr/bin/seinfoflow
-endef
-SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_BROKEN_SCRIPTS
-
 # apol requires pyqt5. However, the setools installation
 # process will install apol even if pyqt5 is missing.
 # Remove these scripts from the target it pyqt5 is not selected.
@@ -55,12 +47,8 @@ endef
 SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_QT_SCRIPTS
 endif
 
-# sedta and seinfoflow depend on python-networkx. This package is not
-# available in buildroot. pyqt5 is not a host-package, remove apol
-# from the host directory as well.
+# pyqt5 is not a host-package, remove apol from the host directory.
 define HOST_SETOOLS_REMOVE_BROKEN_SCRIPTS
-       $(RM) $(HOST_DIR)/bin/sedta
-       $(RM) $(HOST_DIR)/bin/seinfoflow
        $(RM) $(HOST_DIR)/bin/apol
 endef
 HOST_SETOOLS_POST_INSTALL_HOOKS += HOST_SETOOLS_REMOVE_BROKEN_SCRIPTS
--

1.9.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#8 lore raw

PATCH v3 3/3 setools: update to add sedta and seinfoflow

In reply to Jared Bents

Hello,

package/setools/Config.in config BR2_PACKAGE_SETOOLS · line 11

Quoted 9 lines · Jared Bents
package/setools/Config.in +1 -0
index ae0c45f..32a9315 100644
@@ -8,6 +8,7 @@ config BR2_PACKAGE_SETOOLS
 	depends on BR2_USE_MMU
 	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_PYTHON_ENUM34 if !BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_NETWORKX

I've added a # runtime comment here to explain that this is only a runtime dependency, and applied to master.

However, I'm wondering if it wouldn't have made sense to add a sub-option for this. We generally try to avoid having too many dependencies in Buildroot packages, and this commit adds a new dependency that isn't strictly necessary, as long as you don't need those two tools. I'm not saying we /must/ add such a sub-option, I'm just asking.

I've applied nonetheless, because this can be improved later on if needed.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#9 lore raw

PATCH v3 3/3 setools: update to add sedta and seinfoflow

Thomas,

Quoted 17 lines · Thomas Petazzoni

Hello,

package/setools/Config.in config BR2_PACKAGE_SETOOLS · line 11

Quoted 9 lines · Jared Bents
package/setools/Config.in +1 -0
index ae0c45f..32a9315 100644
@@ -8,6 +8,7 @@ config BR2_PACKAGE_SETOOLS
      depends on BR2_USE_MMU
      select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
      select BR2_PACKAGE_PYTHON_ENUM34 if !BR2_PACKAGE_PYTHON3
+     select BR2_PACKAGE_PYTHON_NETWORKX

I've added a # runtime comment here to explain that this is only a runtime dependency, and applied to master.

Quoted 7 lines

However, I'm wondering if it wouldn't have made sense to add a sub-option for this. We generally try to avoid having too many dependencies in Buildroot packages, and this commit adds a new dependency that isn't strictly necessary, as long as you don't need those two tools. I'm not saying we /must/ add such a sub-option, I'm just asking.

It actually turned out it was a missed dependency and until we actually used it at runtime, we didn't notice.

Matt

#10 lore raw

PATCH v3 1/3 python-decorator: update to add host package

In reply to Jared Bents
Quoted 3 lines · Jared Bents

Update to add host package for python decorator

Quoted 24 lines

--
v2 -> v3: Update to remove the dependency changes
v1 -> v2: No change

---
 package/python-decorator/python-decorator.mk | 1 +
 1 file changed, 1 insertion(+)
package/python-decorator/python-decorator.mk +1 -1
index c0c43f6..3802f3d 100644
@@ -11,3 +11,4 @@ PYTHON_DECORATOR_LICENSE = BSD-2-Clause
 PYTHON_DECORATOR_SETUP_TYPE = setuptools
 
 $(eval $(python-package))
+$(eval $(host-python-package))
--

1.9.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#11 lore raw

PATCH v3 1/3 python-decorator: update to add host package

In reply to Jared Bents

Hello,

Quoted 10 lines · Jared Bents

Update to add host package for python decorator

--
v2 -> v3: Update to remove the dependency changes
v1 -> v2: No change

---
 package/python-decorator/python-decorator.mk | 1 +
 1 file changed, 1 insertion(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com