Skip to contentSkip to conversation

package/libselinux: install Python modules to target

PATCH New Thomas Petazzoni 2 participants 2 messages Oct 22, 2019 – Oct 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libselinux: install Python modules to target

While LIBSELINUX_INSTALL_STAGING_CMDS uses $(LIBSELINUX_MAKE_INSTALL_TARGETS), LIBSELINUX_INSTALL_TARGET_CMDS does not use it. Due to this, the Python module is only installed to $(STAGING_DIR) and not to $(TARGET_DIR).

Fix this by using $(LIBSELINUX_MAKE_INSTALL_TARGETS) in LIBSELINUX_INSTALL_TARGET_CMDS.

Cc James Hilliard <[email protected]>
Cc Matt Weber <[email protected]>
Cc Adam Duskett <[email protected]>
---
 package/libselinux/libselinux.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/libselinux/libselinux.mk +2 -1
index c707c8a25e..c68721e3a7 100644
@@ -72,7 +72,8 @@ endef
 
 define LIBSELINUX_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-		$(LIBSELINUX_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
+		$(LIBSELINUX_MAKE_OPTS) DESTDIR=$(TARGET_DIR) \
+		$(LIBSELINUX_MAKE_INSTALL_TARGETS)
 	# Create the selinuxfs mount point
 	if [ ! -d "$(TARGET_DIR)/selinux" ]; then mkdir $(TARGET_DIR)/selinux; fi
 	if ! grep -q "selinuxfs" $(TARGET_DIR)/etc/fstab; then \
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/1 package/libselinux: install Python modules to target

Quoted 5 lines · Thomas Petazzoni

While LIBSELINUX_INSTALL_STAGING_CMDS uses $(LIBSELINUX_MAKE_INSTALL_TARGETS), LIBSELINUX_INSTALL_TARGET_CMDS does not use it. Due to this, the Python module is only installed to $(STAGING_DIR) and not to $(TARGET_DIR).

Quoted 7 lines

Fix this by using $(LIBSELINUX_MAKE_INSTALL_TARGETS) in LIBSELINUX_INSTALL_TARGET_CMDS.

Cc James Hilliard <[email protected]>
Cc Matt Weber <[email protected]>
Cc Adam Duskett <[email protected]>

Applied to master, thanks.

Yet another reason to build target based on staging :-)

Regards,
Arnout

Quoted 19 lines
---
 package/libselinux/libselinux.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/libselinux/libselinux.mk +2 -1
index c707c8a25e..c68721e3a7 100644
@@ -72,7 +72,8 @@ endef
 
 define LIBSELINUX_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-		$(LIBSELINUX_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
+		$(LIBSELINUX_MAKE_OPTS) DESTDIR=$(TARGET_DIR) \
+		$(LIBSELINUX_MAKE_INSTALL_TARGETS)
 	# Create the selinuxfs mount point
 	if [ ! -d "$(TARGET_DIR)/selinux" ]; then mkdir $(TARGET_DIR)/selinux; fi
 	if ! grep -q "selinuxfs" $(TARGET_DIR)/etc/fstab; then \