Add list of 64 bit deps

nicinabox · Jan 24, 2014 · 669af14 · 669af14
1 parent 789d82c
commit 669af14
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 21 deletions.
diff --git a/install/doinst.sh b/install/doinst.sh
@@ -11,22 +11,41 @@ fi
 # Bootstrap package dependencies
 fetchpkg -p /slackware/d/python-2.6.6-i486-1.txz -s 13.37 -i
 
-plz.py install kernel-headers 2.6.37.6_smp
-plz.py install binutils 2.21.51.0.6
-plz.py install glibc 2.15
-plz.py install gcc 4.5.2
-plz.py install gcc-g 4.5.2  # gcc-g++
-plz.py install libmpc 0.8.2
-plz.py install libelf 0.8.13
-plz.py install openssl 1.0.1c
-plz.py install automake 1.11.5
-plz.py install make 3.82
-plz.py install curl 7.20.1
-plz.py install libyaml 0.1.4
-plz.py install mpfr 3.0.1
-plz.py install zlib 1.2.8
-plz.py install git 1.8.4
-plz.py install ruby 1.9.3_p484
+if [[ `uname -m` == "x86_64" ]]; then
+  plz.py install kernel-headers 3.10.17
+  plz.py install binutils 2.23.52.0.1
+  plz.py install glibc 2.17
+  plz.py install gcc 4.8.2
+  plz.py install gcc-g 4.8.2  # gcc-g++
+  plz.py install libmpc 0.8.2
+  plz.py install libelf 0.8.13
+  plz.py install openssl 1.0.1f
+  plz.py install automake 1.11.5
+  plz.py install make 3.82
+  plz.py install libyaml 0.1.4
+  plz.py install mpfr 3.1.2
+  plz.py install zlib 1.2.8
+  plz.py install git 1.8.4
+  plz.py install ruby 1.9.3_p484
+else
+  plz.py install kernel-headers 2.6.37.6_smp
+  plz.py install binutils 2.21.51.0.6
+  plz.py install glibc 2.15
+  plz.py install gcc 4.5.2
+  plz.py install gcc-g 4.5.2  # gcc-g++
+  plz.py install libmpc 0.8.2
+  plz.py install libelf 0.8.13
+  plz.py install openssl 1.0.1c
+  plz.py install automake 1.11.5
+  plz.py install make 3.82
+  plz.py install curl 7.20.1
+  plz.py install libyaml 0.1.4
+  plz.py install mpfr 3.0.1
+  plz.py install zlib 1.2.8
+  plz.py install git 1.8.4
+  plz.py install ruby 1.9.3_p484
+fi
+
 
 if [[ `gem -v` < "2.2" ]]; then
   gem update --system

diff --git a/lib/setup/plz.py b/lib/setup/plz.py
@@ -18,6 +18,7 @@ def __init__(self, arg):
     self.name     = arg[2]
     self.version  = arg[3]
     self.pkg      = ''
+    self.x64      = sys.maxsize > 2 ** 32
 
   def install(self):
     self._download()
@@ -28,8 +29,8 @@ def install(self):
 
   def _installpkg(self):
     if not self._installed():
-      print "Installing {0}".format(self.pkg['tarball_name'])
-      file = self._path([self.target_dir, self.pkg['file_name']])
+      print "Installing {0}".format(self.pkg['file_name'])
+      file = self._path([self.target_dir, self.pkg['package_name']])
 
       FNULL = open(os.devnull, 'w')
       subprocess.call(['installpkg', file], stdout=FNULL, stderr=subprocess.STDOUT)
@@ -38,16 +39,21 @@ def _download(self):
     api = self._path([self.api, self.name])
     pkg = self._get(api)
 
-    versions = [v for v in pkg['versions'] if v['version'] == self.version]
+    versions = [v for v in pkg['versions'] if v['x64'] == self.x64]
+    versions = [v for v in versions if v['version'] == self.version]
+
+    if not versions:
+      sys.exit("! No match for {0} ({1}) for your architecture.".format(self.name, self.version))
+
     self.pkg = versions[-1]
 
-    local_pkg  = self._path([self.target_dir, self.pkg['file_name']])
+    local_pkg  = self._path([self.target_dir, self.pkg['package_name']])
 
     if not os.path.isfile(local_pkg):
       self._wget(self._path([self.host, self.pkg['path']]))
 
   def _installed(self):
-    return self.pkg['tarball_name'] in self._raw_installed_packages()
+    return self.pkg['file_name'] in self._raw_installed_packages()
 
   def _raw_installed_packages(self):
     return os.listdir('/var/log/packages/')