Revision: 5942
http://ipcop.svn.sourceforge.net/ipcop/?rev=5942&view=rev
Author: gespinasse
Date: 2011-10-15 10:41:39 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
One build hack to preserve our ability to rebuild a package and run tcl script,
even after usb-modeswitch has been build.
Remove tclsh symlink creation on usb-modeswitch build and do that in cdrom.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/usb-modeswitch
ipcop/trunk/lfs/cdrom
ipcop/trunk/lfs/usb-modeswitch
Modified: ipcop/trunk/config/rootfiles/common/usb-modeswitch
===================================================================
--- ipcop/trunk/config/rootfiles/common/usb-modeswitch 2011-10-15 10:15:16 UTC
(rev 5941)
+++ ipcop/trunk/config/rootfiles/common/usb-modeswitch 2011-10-15 10:41:39 UTC
(rev 5942)
@@ -1,7 +1,6 @@
etc/usb_modeswitch.conf
lib/udev/usb_modeswitch
usr/bin/jimsh
-usr/bin/tclsh
usr/sbin/usb_modeswitch
usr/sbin/usb_modeswitch_dispatcher
#usr/share/man/man1/usb_modeswitch.1
Modified: ipcop/trunk/lfs/cdrom
===================================================================
--- ipcop/trunk/lfs/cdrom 2011-10-15 10:15:16 UTC (rev 5941)
+++ ipcop/trunk/lfs/cdrom 2011-10-15 10:41:39 UTC (rev 5942)
@@ -140,6 +140,9 @@
cd /tmp && find ./etc/Conexant -type f -exec
/$(TOOLS_DIR)/bin/strip --strip-all {} \;
endif
+ # Recreate tclsh symlink here to not break tcl testing on our build tree
+ cd /tmp/usr/bin && ln -fs jimsh tclsh
+
# Create a tmp directory
cd /tmp && mkdir -p tmp
Modified: ipcop/trunk/lfs/usb-modeswitch
===================================================================
--- ipcop/trunk/lfs/usb-modeswitch 2011-10-15 10:15:16 UTC (rev 5941)
+++ ipcop/trunk/lfs/usb-modeswitch 2011-10-15 10:41:39 UTC (rev 5942)
@@ -89,6 +89,10 @@
# apply patch that will be on 1.2.0
cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)_default-if.patch
+ # remove tclsh symlink creation as that break tclsh tree wide and
create issues rebuilding packages with tcl tests
+ # link will be remade on cdrom stage
+ cd $(DIR_APP) && sed -i '/ln -f/d' Makefile
+
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) $(DIR_DATAAPP)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
