Skip to contentSkip to conversation

setools: change sepol library directory

PATCH New Adam Duskett 3 participants 3 messages Oct 19, 2017 – Oct 21, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 setools: change sepol library directory

setools currently points the libsepol library directory to $(STAGING_DIR)/lib/ when it should be $(STAGING_DIR)/usr/lib

---
 package/setools/setools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/setools/setools.mk +1 -1
index 80d58235d3..8b93ccf45e 100644
@@ -24,7 +24,7 @@ endif
 define SETOOLS_FIX_SETUP
 	# By default, setup.py will look for libsepol.a in the host machines
 	# /usr/lib directory. This needs to be changed to the staging directory.
-	$(SED) "s at base_lib_dirs =.*@base_lib_dirs = ['$(STAGING_DIR)/lib']@g" \
+	$(SED) "s at base_lib_dirs =.*@base_lib_dirs = ['$(STAGING_DIR)/usr/lib']@g" \
 		$(@D)/setup.py
 endef
 SETOOLS_POST_PATCH_HOOKS += SETOOLS_FIX_SETUP
Signature · 1 line
2.13.6
#1 lore raw

PATCH 1/1 setools: change sepol library directory

Adam,

Quoted 4 lines · Adam Duskett

setools currently points the libsepol library directory to $(STAGING_DIR)/lib/ when it should be $(STAGING_DIR)/usr/lib

Beat me to this one :-) had a test build running with the same fix. Thanks for sending it out.

As part of the debugging I did on this one, I rechecked all the of the destdir and prefix stuff in the libsepol install just to be sure that lined up.

Quoted 24 lines
---
 package/setools/setools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/setools/setools.mk +1 -2
index 80d58235d3..8b93ccf45e 100644
@@ -24,7 +24,7 @@ endif
 define SETOOLS_FIX_SETUP
        # By default, setup.py will look for libsepol.a in the host machines
        # /usr/lib directory. This needs to be changed to the staging directory.
-       $(SED) "s at base_lib_dirs =.*@base_lib_dirs = ['$(STAGING_DIR)/lib']@g" \
+       $(SED) "s at base_lib_dirs =.*@base_lib_dirs = ['$(STAGING_DIR)/usr/lib']@g" \
                $(@D)/setup.py
 endef
 SETOOLS_POST_PATCH_HOOKS += SETOOLS_FIX_SETUP
--

2.13.6

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 8 lines
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com

Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.
#2 lore raw

PATCH 1/1 setools: change sepol library directory

In reply to Adam Duskett

Hello,

Quoted 7 lines · Adam Duskett

setools currently points the libsepol library directory to $(STAGING_DIR)/lib/ when it should be $(STAGING_DIR)/usr/lib

---
 package/setools/setools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

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