install

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

commit b631e193bce29d36eec64a67a0a4982e06deecc4
parent b6a9cb5067cd135f49561eae3d623fb80beb57dd
Author: Ne02ptzero <louis@ne02ptzero.me>
Date:   Mon,  5 Dec 2016 14:54:41 +0100

Fix(Build and archives):

Fixed some wrong installations
Add a check-list in untar_all, in order to not decompress the same archive twice

Diffstat:
Mpkgs/binutils2_p1/binutils2_p1.py | 2+-
Mpkgs/gcc2_p1/gcc2_p1.py | 3++-
Mscreens/install/install.py | 13+++++++++++--
3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/binutils2_p1/binutils2_p1.py b/pkgs/binutils2_p1/binutils2_p1.py @@ -73,6 +73,6 @@ class Binutils2_P1: return self.e(["make", "install"]) def after(self): - return self.e(["make", "-C", "ld" "clean"]) + return self.e(["make", "-C", "ld", "clean"]) return self.e(["make", "-C", "ld", "LIBPATH=/usr/lib:/lib"], shell=True) return self.e(["cp", "-v", "ld/ld-new", "/tools/bin"]) diff --git a/pkgs/gcc2_p1/gcc2_p1.py b/pkgs/gcc2_p1/gcc2_p1.py @@ -52,7 +52,8 @@ class Gcc2_P1: self.e(["rm", "-rf", "build"]) self.e(["mkdir", "-vp", "build"]) res = self.e(["cat", "gcc/limitx.h", "gcc/glimits.h", "gcc/limity.h", - ">", "`dirname $($LFS_TGT-gcc -print-libgcc-file-name)`/include-fixed/limits.h"], shell=True) + ">", "`dirname $("+ self.conf_lst["target"] + + "-gcc -print-libgcc-file-name)`/include-fixed/limits.h"], shell=True) os.chdir("build") return res diff --git a/screens/install/install.py b/screens/install/install.py @@ -329,6 +329,7 @@ class Install: def untar_all(self, lst): to_unpack = len(lst) # Number of package to untar unpacked = 1 # Current archives decompressed + arch_done = [] # List of archives decompressed # Start the progress bar self.dlg.gauge_start("Unpacking "+ str(to_unpack) +" packages ...", width=50) @@ -340,8 +341,16 @@ class Install: self.dlg.gauge_update(int((unpacked * 100) / to_unpack), "Unpacking "+ p[1]["archive"] + "...", True) - # Un-tar the archive - self.untar(p[1]) + # Some packages use the same sources, so we store the list + # of already decompressed archives in order to not decompress + # the same archive multiple times. + if p[1]["archive"] not in arch_done: + # Un-tar the archive + self.untar(p[1]) + + # Add the archive to the list + arch_done.append(p[1]["archive"]) + unpacked += 1 # Stopping the progress bar