Message ID | 1458128721-14883-1-git-send-email-niranjan.reddy@rockwellcollins.com |
---|---|
State | Superseded |
Headers | show |
Niranjan, On Wed, Mar 16, 2016 at 6:45 AM, Niranjan Reddy <niranjan.reddy@rockwellcollins.com> wrote: > The patch is for updating selinux reference policy latest > contribution changes. > > --- > Changes v10 -> v11: > - Seperated refpolicy-contrib package from refpolicy patch and created > this patch (suggested by Thomas). > > Changed v1 -> v10: > - Did not exist > --- > package/Config.in | 1 + > package/refpolicy-contrib/Config.in | 19 +++++++++++++++++++ > package/refpolicy-contrib/refpolicy-contrib.mk | 15 +++++++++++++++ > 3 files changed, 35 insertions(+) > create mode 100644 package/refpolicy-contrib/Config.in > create mode 100644 package/refpolicy-contrib/refpolicy-contrib.mk > > diff --git a/package/Config.in b/package/Config.in > index ec53cfe..d49f83e 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1513,6 +1513,7 @@ endmenu > menu "Security" > source "package/policycoreutils/Config.in" > source "package/refpolicy/Config.in" > + source "package/refpolicy-contrib/Config.in" > source "package/setools/Config.in" > endmenu > > diff --git a/package/refpolicy-contrib/Config.in b/package/refpolicy-contrib/Config.in > new file mode 100644 > index 0000000..b518248 > --- /dev/null > +++ b/package/refpolicy-contrib/Config.in > @@ -0,0 +1,19 @@ > +if BR2_PACKAGE_REFPOLICY_CUSTOM_GIT > + > +comment "A refpolicy contrib repository is required if using a refpolicy repo. (Contrib is a Git submodule of refpolicy)" > + > +config BR2_PACKAGE_REFPOLICY_CONTRIB > + bool "refpolicy-contrib" > + help > + A Git submodule of the refpolicy package. > + > +config BR2_PACKAGE_REFPOLICY_CONTRIB_CUSTOM_REPO_URL > + string "URL of custom contrib submodule repository" > + > +config BR2_PACKAGE_REFPOLICY_CONTRIB_CUSTOM_REPO_VERSION > + string "Custom contrib submodule repository version" > + help > + Revision to use in the typical format used by Git > + e.g. a SHA id, a tag, branch, .. > + > +endif > diff --git a/package/refpolicy-contrib/refpolicy-contrib.mk b/package/refpolicy-contrib/refpolicy-contrib.mk > new file mode 100644 > index 0000000..7bfcfa1 > --- /dev/null > +++ b/package/refpolicy-contrib/refpolicy-contrib.mk > @@ -0,0 +1,15 @@ > +################################################################################ > +# > +# refpolicy-contrib > +# > +################################################################################ > + > +REFPOLICY_CONTRIB_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CONTRIB_CUSTOM_REPO_URL)) > +REFPOLICY_CONTRIB_VERSION = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CONTRIB_CUSTOM_REPO_VERSION)) > +REFPOLICY_CONTRIB_SITE_METHOD = git > + > +# Inherits license from refpolicy as normally this is a submodule > +REFPOLICY_CONTRIB_LICENSE = GPLv2 > + > +# If refpolicy is from release archive, this contrib content is part of it. > +$(eval $(generic-package)) > -- > 2.5.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot This patch can probably be removed once the git submodule support is enabled in refpolicy pkg.
diff --git a/package/Config.in b/package/Config.in index ec53cfe..d49f83e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1513,6 +1513,7 @@ endmenu menu "Security" source "package/policycoreutils/Config.in" source "package/refpolicy/Config.in" + source "package/refpolicy-contrib/Config.in" source "package/setools/Config.in" endmenu diff --git a/package/refpolicy-contrib/Config.in b/package/refpolicy-contrib/Config.in new file mode 100644 index 0000000..b518248 --- /dev/null +++ b/package/refpolicy-contrib/Config.in @@ -0,0 +1,19 @@ +if BR2_PACKAGE_REFPOLICY_CUSTOM_GIT + +comment "A refpolicy contrib repository is required if using a refpolicy repo. (Contrib is a Git submodule of refpolicy)" + +config BR2_PACKAGE_REFPOLICY_CONTRIB + bool "refpolicy-contrib" + help + A Git submodule of the refpolicy package. + +config BR2_PACKAGE_REFPOLICY_CONTRIB_CUSTOM_REPO_URL + string "URL of custom contrib submodule repository" + +config BR2_PACKAGE_REFPOLICY_CONTRIB_CUSTOM_REPO_VERSION + string "Custom contrib submodule repository version" + help + Revision to use in the typical format used by Git + e.g. a SHA id, a tag, branch, .. + +endif diff --git a/package/refpolicy-contrib/refpolicy-contrib.mk b/package/refpolicy-contrib/refpolicy-contrib.mk new file mode 100644 index 0000000..7bfcfa1 --- /dev/null +++ b/package/refpolicy-contrib/refpolicy-contrib.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# refpolicy-contrib +# +################################################################################ + +REFPOLICY_CONTRIB_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CONTRIB_CUSTOM_REPO_URL)) +REFPOLICY_CONTRIB_VERSION = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CONTRIB_CUSTOM_REPO_VERSION)) +REFPOLICY_CONTRIB_SITE_METHOD = git + +# Inherits license from refpolicy as normally this is a submodule +REFPOLICY_CONTRIB_LICENSE = GPLv2 + +# If refpolicy is from release archive, this contrib content is part of it. +$(eval $(generic-package))