install

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

commit 46c097e3e93d0c434e73623e63b6a4df859f9618
parent ebef47342ed80f5419a3ae8290e0579174702294
Author: Ne02ptzero <louis@ne02ptzero.me>
Date:   Thu,  8 Dec 2016 23:19:14 +0100

Fix(Multiple things): Everything now working as expected.

Diffstat:
Mpkgs/bash_p1/bash_p1.py | 4++--
Mpkgs/bzip2_p1/bzip2_p1.py | 4++--
Mpkgs/check_p1/check_p1.py | 4++--
Mpkgs/coreutils_p1/coreutils_p1.py | 5+++--
Mpkgs/dejagnu_p1/dejagnu_p1.py | 4++--
Mpkgs/diffutils_p1/diffutils_p1.py | 4++--
Mpkgs/expect_p1/expect_p1.py | 6++++--
Mpkgs/file_p1/file_p1.py | 4++--
Mpkgs/findutils_p1/findutils_p1.py | 4++--
Mpkgs/gawk_p1/gawk_p1.py | 4++--
Mpkgs/ncurses_p1/ncurses_p1.py | 4++--
Mpkgs/tclcore_p1/tclcore_p1.py | 3++-
Mscreens/install/install.py | 2+-
13 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/pkgs/bash_p1/bash_p1.py b/pkgs/bash_p1/bash_p1.py @@ -36,13 +36,13 @@ class Bash_P1: "name": "bash", # Name of the package "version": "4.3.30", # Version of the package "size": 54, # Size of the installed package (MB) - "archive": "", # Archive name + "archive": "bash-4.3.30.tar.gz", # Archive name "SBU": 0.4, # SBU (Compilation time) "tmp_install": True, # Is this package part of the temporary install "next": "bzip2", # Next package to install "before": False, "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packages/" + "https://install.morphux.org/packages/bash-4.3.30.tar.gz" ] } return self.config diff --git a/pkgs/bzip2_p1/bzip2_p1.py b/pkgs/bzip2_p1/bzip2_p1.py @@ -36,7 +36,7 @@ class Bzip2_P1: "name": "bzip2", # Name of the package "version": "1.0.6", # Version of the package "size": 5.2, # Size of the installed package (MB) - "archive": "", # Archive name + "archive": "bzip2-1.0.6.tar.gz", # Archive name "SBU": 0.1, # SBU (Compilation time) "tmp_install": True, # Is this package part of the temporary install "next": "coreutils", # Next package to install @@ -44,7 +44,7 @@ class Bzip2_P1: "after": False, "configure": False, "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packages/" + "https://install.morphux.org/packages/bzip2-1.0.6.tar.gz" ] } return self.config diff --git a/pkgs/check_p1/check_p1.py b/pkgs/check_p1/check_p1.py @@ -36,14 +36,14 @@ class Check_P1: "name": "check", # Name of the package "version": "0.10.0", # Version of the package "size": 9.5, # Size of the installed package (MB) - "archive": "", # Archive name + "archive": "check-0.10.0.tar.gz", # Archive name "SBU": 0.1, # SBU (Compilation time) "tmp_install": True, # Is this package part of the temporary install "next": "ncurses", # Next package to install "before": False, "after": False, "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packages/" + "https://install.morphux.org/packages/check-0.10.0.tar.gz" ] } return self.config diff --git a/pkgs/coreutils_p1/coreutils_p1.py b/pkgs/coreutils_p1/coreutils_p1.py @@ -36,19 +36,20 @@ class Coreutils_P1: "name": "coreutils", # Name of the package "version": "8.25", # Version of the package "size": 132, # Size of the installed package (MB) - "archive": "", # Archive name + "archive": "coreutils-8.25.tar.xz", # Archive name "SBU": 0.6, # SBU (Compilation time) "tmp_install": True, # Is this package part of the temporary install "next": "diffutils", # Next package to install "before": False, "after": False, "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packages/" + "https://install.morphux.org/packages/coreutils-8.25.tar.xz" ] } return self.config def configure(self): + os.environ["FORCE_UNSAFE_CONFIGURE"] = "1" return self.e(["./configure", "--prefix=/tools", "--enable-install-program=hostname" diff --git a/pkgs/dejagnu_p1/dejagnu_p1.py b/pkgs/dejagnu_p1/dejagnu_p1.py @@ -34,7 +34,7 @@ class Dejagnu_P1: self.root_dir = root_dir self.config = { "name": "dejagnu", # Name of the package - "version": "5.45", # Version of the package + "version": "1.6", # Version of the package "size": 3.2, # Size of the installed package (MB) "archive": "dejagnu-1.6.tar.gz", # Archive name "SBU": 0.1, # SBU (Compilation time) @@ -55,4 +55,4 @@ class Dejagnu_P1: ]) def install(self): - self.e(["make", "install"]) + return self.e(["make", "install"]) diff --git a/pkgs/diffutils_p1/diffutils_p1.py b/pkgs/diffutils_p1/diffutils_p1.py @@ -36,14 +36,14 @@ class Diffutils_P1: "name": "diffutils", # Name of the package "version": "3.5", # Version of the package "size": 21.5, # Size of the installed package (MB) - "archive": "", # Archive name + "archive": "diffutils-3.5.tar.xz", # Archive name "SBU": 0.2, # SBU (Compilation time) "tmp_install": True, # Is this package part of the temporary install "next": "file", # Next package to install "before": False, "after": False, "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packages/" + "https://install.morphux.org/packages/diffutils-3.5.tar.xz" ] } return self.config diff --git a/pkgs/expect_p1/expect_p1.py b/pkgs/expect_p1/expect_p1.py @@ -40,6 +40,7 @@ class Expect_P1: "SBU": 0.1, # SBU (Compilation time) "tmp_install": True, # Is this package part of the temporary install "next": "dejagnu", # Next package to install + "chdir": False, "after": False, "urls": [ # Url to download the package. The first one must be morphux servers "https://install.morphux.org/packages/expect5.45.tar.gz" @@ -48,7 +49,8 @@ class Expect_P1: return self.config def before(self): - self.e(["cp", "-v", "configure{,.orig}"], shell=True) + os.chdir("expect5.45") + self.e(["cp", "-v", "configure", "configure.orig"]) return self.e(["sed", "s:/usr/local/bin:/bin:", "configure.orig", ">", "configure"], shell=True) def configure(self): @@ -62,4 +64,4 @@ class Expect_P1: return self.e(["make", "-j", self.conf_lst["cpus"]]) def install(self): - self.e(["make", "SCRIPTS=\"\"", "install"], shell=True) + return self.e(["make", "SCRIPTS=\"\"", "install"], shell=True) diff --git a/pkgs/file_p1/file_p1.py b/pkgs/file_p1/file_p1.py @@ -36,14 +36,14 @@ class File_P1: "name": "file", # Name of the package "version": "5.28", # Version of the package "size": 15, # Size of the installed package (MB) - "archive": "", # Archive name + "archive": "file-5.28.tar.gz", # Archive name "SBU": 0.1, # SBU (Compilation time) "tmp_install": True, # Is this package part of the temporary install "next": "findutils", # Next package to install "before": False, "after": False, "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packages/" + "https://install.morphux.org/packages/file-5.28.tar.gz" ] } return self.config diff --git a/pkgs/findutils_p1/findutils_p1.py b/pkgs/findutils_p1/findutils_p1.py @@ -36,14 +36,14 @@ class Findutils_P1: "name": "findutils", # Name of the package "version": "4.6.0", # Version of the package "size": 35, # Size of the installed package (MB) - "archive": "", # Archive name + "archive": "findutils-4.6.0.tar.gz", # Archive name "SBU": 0.3, # SBU (Compilation time) "tmp_install": True, # Is this package part of the temporary install "next": "gawk", # Next package to install "before": False, "after": False, "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packages/" + "https://install.morphux.org/packages/findutils-4.6.0.tar.gz" ] } return self.config diff --git a/pkgs/gawk_p1/gawk_p1.py b/pkgs/gawk_p1/gawk_p1.py @@ -36,14 +36,14 @@ class Gawk_P1: "name": "gawk", # Name of the package "version": "4.1.3", # Version of the package "size": 34, # Size of the installed package (MB) - "archive": "", # Archive name + "archive": "gawk-4.1.3.tar.xz", # Archive name "SBU": 0.2, # SBU (Compilation time) "tmp_install": True, # Is this package part of the temporary install "next": False, # Next package to install "before": False, "after": False, "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packages/" + "https://install.morphux.org/packages/gawk-4.1.3.tar.xz" ] } return self.config diff --git a/pkgs/ncurses_p1/ncurses_p1.py b/pkgs/ncurses_p1/ncurses_p1.py @@ -36,13 +36,13 @@ class Ncurses_P1: "name": "ncurses", # Name of the package "version": "6.0", # Version of the package "size": 38, # Size of the installed package (MB) - "archive": "", # Archive name + "archive": "ncurses-6.0.tar.gz", # Archive name "SBU": 0.5, # SBU (Compilation time) "tmp_install": True, # Is this package part of the temporary install "next": "bash", # Next package to install "after": False, "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packages/" + "https://install.morphux.org/packages/ncurses-6.0.tar.gz" ] } return self.config diff --git a/pkgs/tclcore_p1/tclcore_p1.py b/pkgs/tclcore_p1/tclcore_p1.py @@ -40,6 +40,7 @@ class Tclcore_P1: "SBU": 0.4, # SBU (Compilation time) "tmp_install": True, # Is this package part of the temporary install "next": "expect", # Next package to install + "chdir": False, "urls": [ # Url to download the package. The first one must be morphux servers "https://install.morphux.org/packages/tcl-core8.6.6-src.tar.gz" ] @@ -47,7 +48,7 @@ class Tclcore_P1: return self.config def before(self): - os.chdir("unix") + os.chdir("tcl8.6.6/unix") return "", 0 def configure(self): diff --git a/screens/install/install.py b/screens/install/install.py @@ -524,7 +524,7 @@ class Install: # If the package is first, we stock the total build time if self.sbu_time == 0 and first == pkg[1]["name"]: - self.sbu_time = (time.time() - start) + self.sbu_time = (time.time() - start) * 1.5 self.update_install_file(pkg[1]) self.global_progress_bar(reset=True)