Skip to contentSkip to conversation

Revert "setools: fix race condition"

PATCH New Vicente Olivert Riera 2 participants 3 messages Sep 30, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Revert "setools: fix race condition"

This reverts commit 1ac68fe2c9b4cea91c7a30429ebf75279ede8e70.

Further investigations revealed that the problem wasn't a race condition but the lack of flex package in the host machine:

https://github.com/TresysTechnology/setools3/issues/5#issuecomment-144048612

---
Changes v1 -> v2:
- Added missing SoB. (Highlighted by Thomas Petazzoni)

 package/setools/setools.mk |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
package/setools/setools.mk +0 -4
index 71301c7..a2bfd42 100644
@@ -12,10 +12,6 @@ SETOOLS_INSTALL_STAGING = YES
 SETOOLS_LICENSE = GPLv2+ LGPLv2.1+
 SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
 
-# Race condition reported upstream:
-# https://github.com/TresysTechnology/setools3/issues/5
-SETOOLS_MAKE = $(MAKE1)
-
 # configure.ac is patched by the cross compile patch,
 # so autoreconf is necessary
 SETOOLS_AUTORECONF = YES
Signature · 1 line
1.7.1
#1 lore raw

PATCH v2 1/1 setools: depends on host-flex

setools needs host-flex in order to generate some source files during build time, otherwise it will fail with an error like this one:

error: policy_scan.c: No such file or directory

Issue reported here as a race condition problem, but it turned out that it the actual problem was the lack of host-flex:

https://github.com/TresysTechnology/setools3/issues/5#issuecomment-144048612

Fixes:

http://autobuild.buildroot.net/results/dad/dad9d79c10722b203536540141a6defc79937e4e/

---
Changes v1 -> v2:
- No changes.

 package/setools/setools.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/setools/setools.mk +1 -1
index a2bfd42..612ab89 100644
@@ -7,7 +7,7 @@
 SETOOLS_VERSION = 3.3.8
 SETOOLS_SOURCE = setools-$(SETOOLS_VERSION).tar.bz2
 SETOOLS_SITE = https://raw.githubusercontent.com/wiki/TresysTechnology/setools3/files/dists/setools-$(SETOOLS_VERSION)/
-SETOOLS_DEPENDENCIES = libselinux libsepol sqlite libxml2 bzip2 host-bison
+SETOOLS_DEPENDENCIES = libselinux libsepol sqlite libxml2 bzip2 host-bison host-flex
 SETOOLS_INSTALL_STAGING = YES
 SETOOLS_LICENSE = GPLv2+ LGPLv2.1+
 SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
Signature · 1 line
1.7.1
#2 lore raw

PATCH v2 1/1 Revert "setools: fix race condition"

In reply to Vicente Olivert Riera

Dear Vicente Olivert Riera,

Quoted 11 lines · Vicente Olivert Riera

This reverts commit 1ac68fe2c9b4cea91c7a30429ebf75279ede8e70.

Further investigations revealed that the problem wasn't a race condition but the lack of flex package in the host machine:

https://github.com/TresysTechnology/setools3/issues/5#issuecomment-144048612

---
Changes v1 -> v2:
- Added missing SoB. (Highlighted by Thomas Petazzoni)

Both patches applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com