[Buildroot] [PATCH 1/2] Revert "utils/genrandconfig: add refpolicy custom git handling"

[Buildroot] [PATCH 1/2] Revert "utils/genrandconfig: add refpolicy custom git handling"

[Fabrice Fontaine]

This reverts commit 0f3115b2ca9fbdcf7a4e02aba45104f2d423fdb8 which is
broken because of a missing space and doesn't seem the best solution
afterall.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 utils/genrandconfig | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/utils/genrandconfig b/utils/genrandconfig
index a56f03681a..75757917c2 100755
--- a/utils/genrandconfig
+++ b/utils/genrandconfig
@@ -535,13 +535,6 @@ def fixup_config(sysinfo, configfile):
         if 'BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT=y\n' in configlines:
             return False
 
-   if 'BR2_PACKAGE_REFPOLICY=y\n' in configlines and \
-       'BR2_PACKAGE_REFPOLICY_CUSTOM_GIT=y\n' in configlines and \
-       'BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL=""\n' in configlines:
-        configlines.remove('BR2_PACKAGE_REFPOLICY_CUSTOM_GIT=y\n')
-        configlines.append('BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION=y\n')
-        configlines.remove('BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL=""\n')
-
     if 'BR2_PACKAGE_XVISOR=y\n' in configlines and \
        'BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG=y\n' in configlines and \
        'BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE=""\n' in configlines:
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/refpolicy: set default values for custom repo

[Fabrice Fontaine]

Set default values for custom repo to make sure that a random
configuration with an empty repo location or version for refpolicy
doesn't fail.

Fixes:
 - http://autobuild.buildroot.org/results/98da07a1f9b88e2e8a028a55c8cf76c6ebc28304

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/refpolicy/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in
index 0e72b895df..223f0f5a08 100644
--- a/package/refpolicy/Config.in
+++ b/package/refpolicy/Config.in
@@ -56,9 +56,11 @@ if BR2_PACKAGE_REFPOLICY_CUSTOM_GIT
 
 config BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL
 	string "URL of custom repository"
+	default "https://github.com/SELinuxProject/refpolicy"
 
 config BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION
 	string "Custom repository version"
+	default "RELEASE_2_20220106"
 	help
 	  Revision to use in the typical format used by Git.
 	  E.g. a sha id, tag, branch...
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/refpolicy: set default values for custom repo

[Thomas Petazzoni via buildroot]

Hello Fabrice,

On Tue,  9 Aug 2022 10:33:25 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Set default values for custom repo to make sure that a random
> configuration with an empty repo location or version for refpolicy
> doesn't fail.
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/98da07a1f9b88e2e8a028a55c8cf76c6ebc28304
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

I don't think that's the right way of solving this, because it would be
inconsistent with what we do for Linux, U-Boot, Barebox, TF-A and all
those projects that have a configurable version/repository option.

So I have instead applied your patch fixing the indentation in
genrandconfig.

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot