Skip to contentSkip to conversation

package/refpolicy: do not use the bare target in the configuration step

PATCH New Antoine Tenart 2 participants 5 messages Feb 10, 2021 – Feb 11, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/refpolicy: do not use the bare target in the configuration step

The 'bare' target is a clean target, removing generated files from previous builds. Here in Buildroot we'll only build the refpolicy from a clean state and we don't need to execute this target. Remove it.

---
 package/refpolicy/refpolicy.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/refpolicy/refpolicy.mk +1 -1
index 0194708b378d..62d96e68043c 100644
@@ -108,7 +108,7 @@ define REFPOLICY_CONFIGURE_CMDS
 	$(if $(REFPOLICY_EXTRA_MODULES_DIRS), \
 		$(REFPOLICY_COPY_EXTRA_MODULES)
 	)
-	$(REFPOLICY_MAKE) -C $(@D) bare conf
+	$(REFPOLICY_MAKE) -C $(@D) conf
 	$(REFPOLICY_CONFIGURE_MODULES)
 endef
 
Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/1 package/refpolicy: do not use the bare target in the configuration step

Antoine, All,

On 2021-02-10 19:51 +0100, Antoine Tenart spake thusly:

Quoted 3 lines

The 'bare' target is a clean target, removing generated files from previous builds. Here in Buildroot we'll only build the refpolicy from a clean state and we don't need to execute this target. Remove it.

Will that still do correct builds with 'make refpolicy-rebuild' ?

Regards,
Yann E. MORIN.

Quoted 25 lines
---
 package/refpolicy/refpolicy.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/refpolicy/refpolicy.mk +1 -1
index 0194708b378d..62d96e68043c 100644
@@ -108,7 +108,7 @@ define REFPOLICY_CONFIGURE_CMDS
 	$(if $(REFPOLICY_EXTRA_MODULES_DIRS), \
 		$(REFPOLICY_COPY_EXTRA_MODULES)
 	)
-	$(REFPOLICY_MAKE) -C $(@D) bare conf
+	$(REFPOLICY_MAKE) -C $(@D) conf
 	$(REFPOLICY_CONFIGURE_MODULES)
 endef
 
Signature · 6 lines
2.29.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/refpolicy: do not use the bare target in the configuration step

Hi Yann,

Quoting Yann E. MORIN (2021-02-10 21:47:59)

Quoted 6 lines

On 2021-02-10 19:51 +0100, Antoine Tenart spake thusly:

Quoted 3 lines

The 'bare' target is a clean target, removing generated files from previous builds. Here in Buildroot we'll only build the refpolicy from a clean state and we don't need to execute this target. Remove it.

Will that still do correct builds with 'make refpolicy-rebuild' ?

I think you meant refpolicy-reconfigure, as I don't think rebuild will call the configuration step again.

I double checked and there's an issue with an use case; the list of modules to compile is not updated if a module is deleted (if added, yes...). While we shouldn't expect much when deleting something from a package (as the installation step will not clean what was installed before), here, as we're explicitly using the monolithic build, removing a module and reconfiguring should work. So let's be safe and keep this as is.

Thanks!
Antoine

#3 lore raw

PATCH 1/1 package/refpolicy: do not use the bare target in the configuration step

Antoine, All,

On 2021-02-11 09:51 +0100, Antoine Tenart spake thusly:

Quoted 10 lines

Quoting Yann E. MORIN (2021-02-10 21:47:59)

Quoted 6 lines

On 2021-02-10 19:51 +0100, Antoine Tenart spake thusly:

Quoted 3 lines

The 'bare' target is a clean target, removing generated files from previous builds. Here in Buildroot we'll only build the refpolicy from a clean state and we don't need to execute this target. Remove it.

Will that still do correct builds with 'make refpolicy-rebuild' ?

I think you meant refpolicy-reconfigure, as I don't think rebuild will call the configuration step again.

Yes, of course. ;-)

Quoted 5 lines

I double checked and there's an issue with an use case; the list of modules to compile is not updated if a module is deleted (if added, yes...). While we shouldn't expect much when deleting something from a package (as the installation step will not clean what was installed before),

Well, it can happen if one is using on a custom policy and working on it with REFPOLICY_OVERRIDE_SRCDIR: the source files may change, appear, or disappear between two builds...

Quoted 3 lines

here, as we're explicitly using the monolithic build, removing a module and reconfiguring should work. So let's be safe and keep this as is.

So I've marked this patch as rejected in patchwork, then. Thanks for the prompt feedback!

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH 1/1 package/refpolicy: do not use the bare target in the configuration step

Quoting Yann E. MORIN (2021-02-11 18:31:18)

Quoted 11 lines

On 2021-02-11 09:51 +0100, Antoine Tenart spake thusly:

Quoted 5 lines

I double checked and there's an issue with an use case; the list of modules to compile is not updated if a module is deleted (if added, yes...). While we shouldn't expect much when deleting something from a package (as the installation step will not clean what was installed before),

Well, it can happen if one is using on a custom policy and working on it with REFPOLICY_OVERRIDE_SRCDIR: the source files may change, appear, or disappear between two builds...

Depends on what the output of the build is :)

Quoted 6 lines
Quoted 3 lines

here, as we're explicitly using the monolithic build, removing a module and reconfiguring should work. So let's be safe and keep this as is.

So I've marked this patch as rejected in patchwork, then. Thanks for the prompt feedback!

Thanks!

Antoine