[Buildroot] [PATCH 1/1] package/apparmor: drop APPARMOR_FIXUP_APXS

[Buildroot] [PATCH 1/1] package/apparmor: drop APPARMOR_FIXUP_APXS

[Fabrice Fontaine]

Drop APPARMOR_FIXUP_APXS which was added by commit
3c836e54203b16015c9c52cbe007adc92d293a0d but is not needed since the
addition of PPD_FIXUP_PATHS in commit
b06294e9897e90862656416e8b67fdace15488d7

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/apparmor/apparmor.mk | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk
index 6f0e59224d..43bfa05308 100644
--- a/package/apparmor/apparmor.mk
+++ b/package/apparmor/apparmor.mk
@@ -54,16 +54,6 @@ ifeq ($(BR2_PACKAGE_APACHE),y)
 APPARMOR_DEPENDENCIES += apache
 APPARMOR_TOOLS += changehat/mod_apparmor
 APPARMOR_MAKE_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs
-
-ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
-define APPARMOR_FIXUP_APXS
-	$(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apparmor/@g" \
-		$(STAGING_DIR)/usr/bin/apxs \
-		$(STAGING_DIR)/usr/build/config_vars.mk \
-		$(STAGING_DIR)/usr/build-1/libtool
-endef
-APPARMOR_POST_CONFIGURE_HOOKS += APPARMOR_FIXUP_APXS
-endif
 endif
 
 define APPARMOR_BUILD_CMDS
-- 
2.34.1

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

Re: [Buildroot] [PATCH 1/1] package/apparmor: drop APPARMOR_FIXUP_APXS

[Yann E. MORIN]

Fabrice, All,

On 2022-02-19 15:19 +0100, Fabrice Fontaine spake thusly:
> Drop APPARMOR_FIXUP_APXS which was added by commit
> 3c836e54203b16015c9c52cbe007adc92d293a0d but is not needed since the
> addition of PPD_FIXUP_PATHS in commit
> b06294e9897e90862656416e8b67fdace15488d7
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/apparmor/apparmor.mk | 10 ----------
>  1 file changed, 10 deletions(-)
> 
> diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk
> index 6f0e59224d..43bfa05308 100644
> --- a/package/apparmor/apparmor.mk
> +++ b/package/apparmor/apparmor.mk
> @@ -54,16 +54,6 @@ ifeq ($(BR2_PACKAGE_APACHE),y)
>  APPARMOR_DEPENDENCIES += apache
>  APPARMOR_TOOLS += changehat/mod_apparmor
>  APPARMOR_MAKE_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs
> -
> -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
> -define APPARMOR_FIXUP_APXS
> -	$(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apparmor/@g" \
> -		$(STAGING_DIR)/usr/bin/apxs \
> -		$(STAGING_DIR)/usr/build/config_vars.mk \
> -		$(STAGING_DIR)/usr/build-1/libtool
> -endef
> -APPARMOR_POST_CONFIGURE_HOOKS += APPARMOR_FIXUP_APXS
> -endif
>  endif
>  
>  define APPARMOR_BUILD_CMDS
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot