Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-3056: Liquidsoap binaries not working on Ubuntu Maverick

Browse source 
-compiled all liquidsoap binaries
This commit is contained in:
martin 2011-11-18 18:45:37 -05:00
parent d0de9b65dd
commit 4c388f0a1a
14 changed files with 40 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

30
python_apps/pypo/install/pypo-initialize.py
View file

@ -79,7 +79,7 @@ PATH_INI_FILE = '/etc/airtime/pypo.cfg'
PATH_LIQUIDSOAP_BIN = '/usr/lib/airtime/pypo/bin/liquidsoap_bin'
#any debian/ubuntu codename in this et will automatically use the natty liquidsoap binary
codenames_for_natty_binary = set(["natty", "oneiric", "precise", "squeeze"])
arch_map = dict({"32bit":"i386", "64bit":"amd64"})
# load config file
try:
@ -91,29 +91,19 @@ except Exception, e:
try:
#select appropriate liquidsoap file for given system os/architecture
architecture = platform.architecture()[0]
#natty = is_natty()
arch = arch_map[architecture]
print "* Detecting OS: ...",
(codename, fullname) = get_os_codename()
print " Found %s" % fullname
natty = codename in codenames_for_natty_binary
if architecture == '64bit' and natty:
print " * Installing 64-bit liquidsoap binary (Natty)"
shutil.copy("%s/liquidsoap-natty-amd64"%PATH_LIQUIDSOAP_BIN, "%s/liquidsoap"%PATH_LIQUIDSOAP_BIN)
elif architecture == '32bit' and natty:
print " * Installing 32-bit liquidsoap binary (Natty)"
shutil.copy("%s/liquidsoap-natty-i386"%PATH_LIQUIDSOAP_BIN, "%s/liquidsoap"%PATH_LIQUIDSOAP_BIN)
elif architecture == '64bit' and not natty:
print " * Installing 64-bit liquidsoap binary"
shutil.copy("%s/liquidsoap-amd64"%PATH_LIQUIDSOAP_BIN, "%s/liquidsoap"%PATH_LIQUIDSOAP_BIN)
elif architecture == '32bit' and not natty:
print " * Installing 32-bit liquidsoap binary"
shutil.copy("%s/liquidsoap-i386"%PATH_LIQUIDSOAP_BIN, "%s/liquidsoap"%PATH_LIQUIDSOAP_BIN)
else:
print "Unknown system architecture."
sys.exit(1)
print " Found %s (%s) on %s architecture" % (fullname, codename, arch)
print " * Installing Liquidsoap binary"
if (os.path.exists("%s/liquidsoap_%s_%s"%(PATH_LIQUIDSOAP_BIN, codename, arch))):
shutil.copy("%s/liquidsoap_%s_%s"%(PATH_LIQUIDSOAP_BIN, codename, arch), "%s/liquidsoap"%PATH_LIQUIDSOAP_BIN)
else:
print "Unsupported system architecture."
sys.exit(1)
#initialize init.d scripts
p = Popen("update-rc.d airtime-playout defaults >/dev/null 2>&1", shell=True)
sts = os.waitpid(p.pid, 0)[1]