[Astlinux-commits] SF.net SVN: astlinux:[7349] branches/1.0

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

Revision: 7349
          http://sourceforge.net/p/astlinux/code/7349
Author:   abelbeck
Date:     2015-11-24 18:36:52 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Asterisk FOP2, add support for x86_64 binary blob

Modified Paths:
--------------
    branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package

Modified: branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
===================================================================
--- branches/1.0/package/asterisk-fop2/asterisk-fop2.mk	2015-11-24 17:38:50 UTC (rev 7348)
+++ branches/1.0/package/asterisk-fop2/asterisk-fop2.mk	2015-11-24 18:36:52 UTC (rev 7349)
@@ -8,6 +8,13 @@
 ASTERISK_FOP2_SITE = http://download.fop2.com
 # Note: be sure to edit "project/astlinux/target_skeleton/usr/sbin/upgrade-package" on version change
 
+ASTERISK_FOP2_X86_64_SOURCE = fop2-$(ASTERISK_FOP2_VERSION)-debian-x86_64.tgz
+
+define ASTERISK_FOP2_X86_64_DOWNLOAD
+	$(call DOWNLOAD,$(ASTERISK_FOP2_SITE),$(ASTERISK_FOP2_X86_64_SOURCE))
+endef
+ASTERISK_FOP2_POST_DOWNLOAD_HOOKS += ASTERISK_FOP2_X86_64_DOWNLOAD
+
 define ASTERISK_FOP2_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 package/asterisk-fop2/fop2.init $(TARGET_DIR)/etc/init.d/fop2
 	$(INSTALL) -D -m 0644 package/asterisk-fop2/config/fop2.cfg $(TARGET_DIR)/stat/etc/fop2/fop2.cfg

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package	2015-11-24 17:38:50 UTC (rev 7348)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package	2015-11-24 18:36:52 UTC (rev 7349)
@@ -248,7 +248,7 @@
   if ! RAM_needed_MB 475; then
     finish $RED "Not enough RAM installed. Minimum: 512 MB, Recommended: 1024+ MB"
   fi
-  SRC_URL="http://files.astlinux.org/fop2-2.28-debian-i386.tgz"
+  SRC_URL="http://files.astlinux.org/fop2-2.28-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
   ;;
 
 show)

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