Skip to contentSkip to conversation

package/apparmor: fixing installation os detection

PATCH New Angelo Compagnucci 2 participants 2 messages Apr 24, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/apparmor: fixing installation os detection

Actually the install target of some tools like the parser tries to do an os detection to understand what install and where. Incidentally, when the install is invoked on SuSE, this will trig a bug in parallel install which manifests as "target/lib/apparmor: File exists" error. For this problem, a patch is already sent upstream.

For buildroot instead, the os detection is useless so we disable it and use a generic install method.

Fixes:
http://autobuild.buildroot.net/results/b18c6a9ce67065dcb7968c6f473b3b403d2925d2

---
 package/apparmor/apparmor.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/apparmor/apparmor.mk +1 -1
index 311a797..9180fcd 100644
@@ -15,7 +15,7 @@ APPARMOR_LICENSE_FILES = LICENSE parser/COPYING.GPL
 APPARMOR_DEPENDENCIES = libapparmor
 
 APPARMOR_TOOLS = parser
-APPARMOR_MAKE_OPTS = USE_SYSTEM=1
+APPARMOR_MAKE_OPTS = USE_SYSTEM=1 DISTRO=unknown
 
 ifeq ($(BR2_PACKAGE_APPARMOR_BINUTILS),y)
 APPARMOR_TOOLS += binutils
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 package/apparmor: fixing installation os detection

Angelo, All,

On 2020-04-24 12:47 +0200, Angelo Compagnucci spake thusly:

Quoted 6 lines

Actually the install target of some tools like the parser tries to do an os detection to understand what install and where. Incidentally, when the install is invoked on SuSE, this will trig a bug in parallel install which manifests as "target/lib/apparmor: File exists" error. For this problem, a patch is already sent upstream.

Quoted 7 lines

For buildroot instead, the os detection is useless so we disable it and use a generic install method.

Fixes:
http://autobuild.buildroot.net/results/b18c6a9ce67065dcb7968c6f473b3b403d2925d2

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 24 lines
---
 package/apparmor/apparmor.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/apparmor/apparmor.mk +1 -1
index 311a797..9180fcd 100644
@@ -15,7 +15,7 @@ APPARMOR_LICENSE_FILES = LICENSE parser/COPYING.GPL
 APPARMOR_DEPENDENCIES = libapparmor
 
 APPARMOR_TOOLS = parser
-APPARMOR_MAKE_OPTS = USE_SYSTEM=1
+APPARMOR_MAKE_OPTS = USE_SYSTEM=1 DISTRO=unknown
 
 ifeq ($(BR2_PACKAGE_APPARMOR_BINUTILS),y)
 APPARMOR_TOOLS += binutils
Signature · 6 lines
2.7.4

_______________________________________________
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.  |
'------------------------------^-------^------------------^--------------------'