[Astlinux-commits] SF.net SVN: astlinux:[7610] tags/1.2.6/package/rp-pppoe/rp-pppoe.mk

[<abe...@us...>]

Revision: 7610
          http://sourceforge.net/p/astlinux/code/7610
Author:   abelbeck
Date:     2016-03-23 20:30:39 +0000 (Wed, 23 Mar 2016)
Log Message:
-----------
For 1.2.6.1 release, rp-pppoe, set scripts command paths for the target instead of using the host paths. CentOS 7 locations are different than AstLinux so the problem was seen for builds on CentOS 7.

Modified Paths:
--------------
    tags/1.2.6/package/rp-pppoe/rp-pppoe.mk

Modified: tags/1.2.6/package/rp-pppoe/rp-pppoe.mk
===================================================================
--- tags/1.2.6/package/rp-pppoe/rp-pppoe.mk	2016-03-23 17:26:17 UTC (rev 7609)
+++ tags/1.2.6/package/rp-pppoe/rp-pppoe.mk	2016-03-23 20:30:39 UTC (rev 7610)
@@ -20,6 +20,15 @@
 RP_PPPOE_CONF_OPT = \
 	--disable-debugging
 
+define RP_PPPOE_SET_TARGET_COMMAND_PATHS
+	find $(@D)/scripts/ -name "*.in" | xargs sed -i \
+		-e 's:@ID@:/usr/bin/id:g' \
+		-e 's:@SETSID@:/usr/bin/setsid:g' \
+		-e 's:@ECHO@:/bin/echo:g' \
+		-e 's:@PPPD@:/usr/sbin/pppd:g'
+endef
+RP_PPPOE_POST_PATCH_HOOKS += RP_PPPOE_SET_TARGET_COMMAND_PATHS
+
 define RP_PPPOE_INSTALL_TARGET_CMDS
 	for ff in $(RP_PPPOE_TARGET_FILES); do \
 		$(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff; \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.