[prev in list] [next in list] [prev in thread] [next in thread]
List: klik-devel
Subject: [klik-devel] [klikclient commit] r1442 - trunk/client/trunk
From: codesite-noreply () google ! com
Date: 2008-03-24 23:33:19
Message-ID: 0016368e1e0704493742cd7ba3e60cda () google ! com
[Download RAW message or body]
Author: KillerKiwi2005
Date: Mon Mar 24 16:30:45 2008
New Revision: 1442
Modified:
trunk/client/trunk/install.py
Log:
complete new glibc loader... needs testing
Modified: trunk/client/trunk/install.py
==============================================================================
--- trunk/client/trunk/install.py (original)
+++ trunk/client/trunk/install.py Mon Mar 24 16:30:45 2008
@@ -92,7 +92,6 @@
os.system(" ".join(["chmod", "755", os.path.join(klik_install_path, "bin/fusioniso")]))
os.system(" ".join(["chmod", "755", os.path.join(klik_install_path, "bin/cmginfo")]))
-
# BINARY LIBS
print ""
print "Installing binary libraries ..."
@@ -100,15 +99,20 @@
# Alternative glibc loader
print ""
-print "Installing alternative glibc loader"
+print "Installing alternative glibc loader..."
glibc_version_text = Popen(["ldd", "--version"], stdout=PIPE, stderr=open(os.devnull, \
"w")).communicate()[0].strip() glibc_version = "ld-" + re.search("\d+(\.\d+)+",
glibc_version_text).group() + ".so"
ld = os.path.join(klik_install_path, "lib/klik", glibc_version )
-call(["cp", os.path.join(klik_files_path,
os.path.pardir, "binaryparts/lib/glibc", glibc_version), ld])
-call(["ln", "-s", ld, "/lib/ld-klik2.so.2"])
-call(["ln", "-s", ld, "/lib/ld-lsk.so.1"])
-call(["ln", "-s", ld, "/lib/ld-lsk.so.2"])
-call(["ln", "-s", ld, "/lib/ld-lsk.so.3"])
+selected_so = os.path.join(klik_files_path,
os.path.pardir, "binaryparts/lib/glibc", glibc_version)
+if os.path.exists(selected_so):
+ call(["cp", os.path.join(klik_files_path,
os.path.pardir, "binaryparts/lib/glibc", glibc_version), ld])
+ call(["ln", "-s", ld, "/lib/ld-klik2.so.2"])
+ call(["ln", "-s", ld, "/lib/ld-lsk.so.1"])
+ call(["ln", "-s", ld, "/lib/ld-lsk.so.2"])
+ call(["ln", "-s", ld, "/lib/ld-lsk.so.3"])
+else:
+ print "ERROR: no binary for your ldd version "
+ print glibc_version_text
# LANGUAGE FILES
print ""
_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic