* [Buildroot] [PATCH v1 1/3] python-decorator: Update to add host package
@ 2018-03-19 15:23 Jared Bents
2018-03-19 15:23 ` [Buildroot] [PATCH v1 2/3] python-networkx: Update to add networkx package Jared Bents
2018-03-19 15:23 ` [Buildroot] [PATCH v1 3/3] setools: Update to add sedta and seinfoflow Jared Bents
0 siblings, 2 replies; 5+ messages in thread
From: Jared Bents @ 2018-03-19 15:23 UTC (permalink / raw)
To: buildroot
Update to add host package for python decorator
Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com>
---
package/python-decorator/python-decorator.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/python-decorator/python-decorator.mk b/package/python-decorator/python-decorator.mk
index c0c43f6..313ad97 100644
--- a/package/python-decorator/python-decorator.mk
+++ b/package/python-decorator/python-decorator.mk
@@ -7,7 +7,9 @@
PYTHON_DECORATOR_VERSION = 4.0.11
PYTHON_DECORATOR_SITE = https://pypi.python.org/packages/cc/ac/5a16f1fc0506ff72fcc8fd4e858e3a1c231f224ab79bb7c4c9b2094cc570
PYTHON_DECORATOR_SOURCE = decorator-$(PYTHON_DECORATOR_VERSION).tar.gz
+PYTHON_DECORATOR_DEPENDENCIES = python-setuptools
PYTHON_DECORATOR_LICENSE = BSD-2-Clause
PYTHON_DECORATOR_SETUP_TYPE = setuptools
$(eval $(python-package))
+$(eval $(host-python-package))
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v1 2/3] python-networkx: Update to add networkx package
2018-03-19 15:23 [Buildroot] [PATCH v1 1/3] python-decorator: Update to add host package Jared Bents
@ 2018-03-19 15:23 ` Jared Bents
2018-03-19 16:08 ` Matthew Weber
2018-03-19 15:23 ` [Buildroot] [PATCH v1 3/3] setools: Update to add sedta and seinfoflow Jared Bents
1 sibling, 1 reply; 5+ messages in thread
From: Jared Bents @ 2018-03-19 15:23 UTC (permalink / raw)
To: buildroot
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.
Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com>
---
package/Config.in | 1 +
package/python-networkx/Config.in | 10 ++++++++++
package/python-networkx/python-networkx.hash | 4 ++++
package/python-networkx/python-networkx.mk | 17 +++++++++++++++++
4 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
diff --git a/package/Config.in b/package/Config.in
index 9a6b199..d0655d3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -825,6 +825,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"
diff --git a/package/python-networkx/Config.in b/package/python-networkx/Config.in
new file mode 100644
index 0000000..45c83ab
--- /dev/null
+++ b/package/python-networkx/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PYTHON_NETWORKX
+ bool "python-networkx"
+ select BR2_PACKAGE_PYTHON_DECORATOR
+ select BR2_PACKAGE_PYTHON_SETUPTOOLS
+ 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
diff --git a/package/python-networkx/python-networkx.hash b/package/python-networkx/python-networkx.hash
new file mode 100644
index 0000000..92383e7
--- /dev/null
+++ b/package/python-networkx/python-networkx.hash
@@ -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
diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk
new file mode 100644
index 0000000..ec4abc9
--- /dev/null
+++ b/package/python-networkx/python-networkx.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# python-networkx
+#
+################################################################################
+
+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_DEPENDENCIES = python-decorator
+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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v1 3/3] setools: Update to add sedta and seinfoflow
2018-03-19 15:23 [Buildroot] [PATCH v1 1/3] python-decorator: Update to add host package Jared Bents
2018-03-19 15:23 ` [Buildroot] [PATCH v1 2/3] python-networkx: Update to add networkx package Jared Bents
@ 2018-03-19 15:23 ` Jared Bents
1 sibling, 0 replies; 5+ messages in thread
From: Jared Bents @ 2018-03-19 15:23 UTC (permalink / raw)
To: buildroot
Update to add sedta and seinfoflow to setools
Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com>
---
package/setools/Config.in | 2 ++
package/setools/setools.mk | 18 +++---------------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/package/setools/Config.in b/package/setools/Config.in
index ae0c45f..32a9315 100644
--- a/package/setools/Config.in
+++ b/package/setools/Config.in
@@ -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
diff --git a/package/setools/setools.mk b/package/setools/setools.mk
index 6748c95..8e6b3ac 100644
--- a/package/setools/setools.mk
+++ b/package/setools/setools.mk
@@ -6,12 +6,12 @@
SETOOLS_VERSION = 4.1.1
SETOOLS_SITE = $(call github,TresysTechnology,setools,$(SETOOLS_VERSION))
-SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-flex host-swig
+SETOOLS_DEPENDENCIES = libselinux libsepol python-networkx python-setuptools host-bison host-flex host-swig
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v1 2/3] python-networkx: Update to add networkx package
2018-03-19 15:23 ` [Buildroot] [PATCH v1 2/3] python-networkx: Update to add networkx package Jared Bents
@ 2018-03-19 16:08 ` Matthew Weber
2018-03-19 20:11 ` Jared Bents
0 siblings, 1 reply; 5+ messages in thread
From: Matthew Weber @ 2018-03-19 16:08 UTC (permalink / raw)
To: buildroot
Jared,
On Mon, Mar 19, 2018 at 10:23 AM, Jared Bents
<jared.bents@rockwellcollins.com> wrote:
> 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.
Unsure about this dependency being enforced long term.... Suggest
adding this as a comment above the PYTHON_NETWORKX_VERSION in the .mk?
>
> Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com>
> ---
> package/Config.in | 1 +
> package/python-networkx/Config.in | 10 ++++++++++
> package/python-networkx/python-networkx.hash | 4 ++++
> package/python-networkx/python-networkx.mk | 17 +++++++++++++++++
> 4 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
>
> diff --git a/package/Config.in b/package/Config.in
> index 9a6b199..d0655d3 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -825,6 +825,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"
> diff --git a/package/python-networkx/Config.in b/package/python-networkx/Config.in
> new file mode 100644
> index 0000000..45c83ab
> --- /dev/null
> +++ b/package/python-networkx/Config.in
> @@ -0,0 +1,10 @@
> +config BR2_PACKAGE_PYTHON_NETWORKX
> + bool "python-networkx"
> + select BR2_PACKAGE_PYTHON_DECORATOR
> + select BR2_PACKAGE_PYTHON_SETUPTOOLS
> + 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
> diff --git a/package/python-networkx/python-networkx.hash b/package/python-networkx/python-networkx.hash
> new file mode 100644
> index 0000000..92383e7
> --- /dev/null
> +++ b/package/python-networkx/python-networkx.hash
> @@ -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
> diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk
> new file mode 100644
> index 0000000..ec4abc9
> --- /dev/null
> +++ b/package/python-networkx/python-networkx.mk
> @@ -0,0 +1,17 @@
> +################################################################################
> +#
> +# python-networkx
> +#
> +################################################################################
> +
> +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_DEPENDENCIES = python-decorator
> +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
Did you run the utils/check-package script against these new packages?
Matt
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v1 2/3] python-networkx: Update to add networkx package
2018-03-19 16:08 ` Matthew Weber
@ 2018-03-19 20:11 ` Jared Bents
0 siblings, 0 replies; 5+ messages in thread
From: Jared Bents @ 2018-03-19 20:11 UTC (permalink / raw)
To: buildroot
Matt,
On Mon, Mar 19, 2018 at 11:08 AM, Matthew Weber
<matthew.weber@rockwellcollins.com> wrote:
> Jared,
>
> On Mon, Mar 19, 2018 at 10:23 AM, Jared Bents
> <jared.bents@rockwellcollins.com> wrote:
>> 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.
>
> Unsure about this dependency being enforced long term.... Suggest
> adding this as a comment above the PYTHON_NETWORKX_VERSION in the .mk?
>
I will add that as a comment in the mk file in v2 tomorrow to give 24
hours for comments on the three patches
>>
>> Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com>
>> ---
>> package/Config.in | 1 +
>> package/python-networkx/Config.in | 10 ++++++++++
>> package/python-networkx/python-networkx.hash | 4 ++++
>> package/python-networkx/python-networkx.mk | 17 +++++++++++++++++
>> 4 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
>>
>> diff --git a/package/Config.in b/package/Config.in
>> index 9a6b199..d0655d3 100644
>> --- a/package/Config.in
>> +++ b/package/Config.in
>> @@ -825,6 +825,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"
>> diff --git a/package/python-networkx/Config.in b/package/python-networkx/Config.in
>> new file mode 100644
>> index 0000000..45c83ab
>> --- /dev/null
>> +++ b/package/python-networkx/Config.in
>> @@ -0,0 +1,10 @@
>> +config BR2_PACKAGE_PYTHON_NETWORKX
>> + bool "python-networkx"
>> + select BR2_PACKAGE_PYTHON_DECORATOR
>> + select BR2_PACKAGE_PYTHON_SETUPTOOLS
>> + 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
>> diff --git a/package/python-networkx/python-networkx.hash b/package/python-networkx/python-networkx.hash
>> new file mode 100644
>> index 0000000..92383e7
>> --- /dev/null
>> +++ b/package/python-networkx/python-networkx.hash
>> @@ -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
>> diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk
>> new file mode 100644
>> index 0000000..ec4abc9
>> --- /dev/null
>> +++ b/package/python-networkx/python-networkx.mk
>> @@ -0,0 +1,17 @@
>> +################################################################################
>> +#
>> +# python-networkx
>> +#
>> +################################################################################
>> +
>> +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_DEPENDENCIES = python-decorator
>> +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
>
> Did you run the utils/check-package script against these new packages?
I have done the check on the new package and the updated packages. No warnings.
>
> Matt
Jared
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-19 20:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-19 15:23 [Buildroot] [PATCH v1 1/3] python-decorator: Update to add host package Jared Bents
2018-03-19 15:23 ` [Buildroot] [PATCH v1 2/3] python-networkx: Update to add networkx package Jared Bents
2018-03-19 16:08 ` Matthew Weber
2018-03-19 20:11 ` Jared Bents
2018-03-19 15:23 ` [Buildroot] [PATCH v1 3/3] setools: Update to add sedta and seinfoflow Jared Bents
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.