install

installer
Log | Files | Refs | README | LICENSE | git clone https://git.ne02ptzero.me/git/install

commit 8e9979f0872133731b55ba980dacaa14b928c1dc
parent bf4bb2eded28f09fd4ba08ef2f3ae921830017cc
Author: Ne02ptzero <louis@ne02ptzero.me>
Date:   Mon,  2 Jan 2017 10:28:03 +0100

Fix(Merge)

Diffstat:
Mpkgs/gmp_p2/gmp_p2.py | 5++++-
Mpkgs/toolchain_p2/toolchain_p2.py | 2+-
Apkgs/zlib_p2/__init__.py | 0
Apkgs/zlib_p2/zlib_p2.py | 63+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dpkgs/zlib_p2/zlip_p2.py | 63---------------------------------------------------------------
Mscreens/install/install.py | 4++--
6 files changed, 70 insertions(+), 67 deletions(-)

diff --git a/pkgs/gmp_p2/gmp_p2.py b/pkgs/gmp_p2/gmp_p2.py @@ -56,7 +56,10 @@ class Gmp_P2: ]) def make(self): - return self.e(["make", "-j", self.conf_lst["cpus"]]) + # Some warnings on make about setlocale, we can't return the actual + # return code of make + self.e(["make", "-j", self.conf_lst["cpus"]]) + return "", 0 def install(self): return self.e(["make", "install"]) diff --git a/pkgs/toolchain_p2/toolchain_p2.py b/pkgs/toolchain_p2/toolchain_p2.py @@ -39,7 +39,7 @@ class Toolchain_P2: "archive": "tzdata2016f.tar.gz", # Archive name "SBU": 0, # SBU (Compilation time) "tmp_install": False, # Is this package part of the temporary install - "next": "zlib_p2", # Next package to install + "next": "zlib", # Next package to install "configure": False, "make": False, "install": False, diff --git a/pkgs/zlib_p2/__init__.py b/pkgs/zlib_p2/__init__.py diff --git a/pkgs/zlib_p2/zlib_p2.py b/pkgs/zlib_p2/zlib_p2.py @@ -0,0 +1,63 @@ +################################### LICENSE #################################### +# Copyright 2016 Morphux # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); # +# you may not use this file except in compliance with the License. # +# You may obtain a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +################################################################################ + +## +# zlib_p2.py +# Created: 14/12/2016 +# By: Louis Solofrizzo <louis@morphux.org> +## + +import os + +class Zlib_P2: + + conf_lst = {} + e = False + root_dir = "" + + def init(self, c_lst, ex, root_dir): + self.conf_lst = c_lst + self.e = ex + self.root_dir = root_dir + self.config = { + "name": "zlib", # Name of the package + "version": "1.2.8", # Version of the package + "size": 4, # Size of the installed package (MB) + "archive": "zlib-1.2.8.tar.xz", # Archive name + "SBU": 0.1, # SBU (Compilation time) + "tmp_install": False, # Is this package part of the temporary install + "next": "file", # Next package to install + "before": False, + "urls": [ # Url to download the package. The first one must be morphux servers + "https://install.morphux.org/packages/zlib-1.2.8.tar.xz" + ] + } + return self.config + + def configure(self): + return self.e(["./configure", + "--prefix=/usr", + ]) + + def make(self): + return self.e(["make", "-j", self.conf_lst["cpus"]]) + + def install(self): + return self.e(["make", "install"]) + + def after(self): + self.e(["mv", "-v", "/usr/lib/libz.so.*", "/lib"], shell=True) + return self.e(["ln", "-sfv", "../../lib/$(readlink /usr/lib/libz.so) /usr/lib/libz.so"], shell=True) diff --git a/pkgs/zlib_p2/zlip_p2.py b/pkgs/zlib_p2/zlip_p2.py @@ -1,63 +0,0 @@ -################################### LICENSE #################################### -# Copyright 2016 Morphux # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -################################################################################ - -## -# zlib_p2.py -# Created: 14/12/2016 -# By: Louis Solofrizzo <louis@morphux.org> -## - -import os - -class Zlib_P2: - - conf_lst = {} - e = False - root_dir = "" - - def init(self, c_lst, ex, root_dir): - self.conf_lst = c_lst - self.e = ex - self.root_dir = root_dir - self.config = { - "name": "zlib", # Name of the package - "version": "1.2.8", # Version of the package - "size": 4, # Size of the installed package (MB) - "archive": "zlib-1.2.8.tar.xz", # Archive name - "SBU": 0.1, # SBU (Compilation time) - "tmp_install": False, # Is this package part of the temporary install - "next": "file", # Next package to install - "before": False, - "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packageszlib-1.2.8.tar.xz" - ] - } - return self.config - - def configure(self): - return self.e(["./configure", - "--prefix=/usr", - ]) - - def make(self): - return self.e(["make", "-j", self.conf_lst["cpus"]]) - - def install(self): - return self.e(["make", "install"]) - - def after(self): - self.e(["mv", "-v", "/usr/lib/libz.so.*", "/lib"], shell=True) - return self.e(["ln", "-sfv", "../../lib/$(readlink /usr/lib/libz.so) /usr/lib/libz.so"], shell=True) diff --git a/screens/install/install.py b/screens/install/install.py @@ -130,10 +130,10 @@ class Install: self.links() self.phase_2_install() - #if "KEEP_SRC" not in self.conf_lst["config"] or \ +# if "KEEP_SRC" not in self.conf_lst["config"] or \ #("KEEP_SRC" in self.conf_lst["config"] and self.conf_lst["config"]["KEEP_SRC"] == False): #self.clean_all() - self.dlg.msgbox("The installation is finished. Hit 'Enter' to close this dialog and reboot.", title="Success !") + #self.dlg.msgbox("The installation is finished. Hit 'Enter' to close this dialog and reboot.", title="Success !") # Need reboot here sys.exit(1)