install

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

commit a581de7ade75c5d10d65cbeab6234aedec7812ff
parent 65f90bc5986c53c94f1d76aaf953f1e9f3f39be2
Author: Ne02ptzero <louis@ne02ptzero.me>
Date:   Thu, 12 Jan 2017 13:31:21 +0100

Fix(Dhcpcd Package): Dhcpd -> Dhcpcd

Diffstat:
Rpkgs/dhcpd_opt/__init__.py -> pkgs/dhcpcd_opt/__init__.py | 0
Apkgs/dhcpcd_opt/dhcpcd_opt.py | 62++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dpkgs/dhcpd_opt/dhcpd_opt.py | 62--------------------------------------------------------------
Mscreens/install/install.py | 3++-
4 files changed, 64 insertions(+), 63 deletions(-)

diff --git a/pkgs/dhcpd_opt/__init__.py b/pkgs/dhcpcd_opt/__init__.py diff --git a/pkgs/dhcpcd_opt/dhcpcd_opt.py b/pkgs/dhcpcd_opt/dhcpcd_opt.py @@ -0,0 +1,62 @@ +################################### 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. # +################################################################################ + +## +# dhcpcd_opt.py +# Created: 11/01/2017 +# By: Louis Solofrizzo <louis@morphux.org> +## + +import os + +class Dhcpcd_Opt: + + 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": "dhcpcd", # Name of the package + "version": "6.11.3", # Version of the package + "size": 2.7, # Size of the installed package (MB) + "archive": "dhcpcd-6.11.3.tar.xz", # Archive name + "SBU": 0.1, # SBU (Compilation time) + "optionnal": True, # Is this package part of the temporary install + "before": False, + "urls": [ # Url to download the package. The first one must be morphux servers + "https://install.morphux.org/packages/dhcpcd-6.11.3.tar.xz" + ] + } + return self.config + + def configure(self): + return self.e(["./configure", + "--libexecdir=/lib/dhcpcd", + "--dbdir=/var/lib/dhcpcd" + ]) + + def make(self): + return self.e(["make", "-j", self.conf_lst["cpus"]]) + + def install(self): + return self.e(["make", "install"]) + + def after(self): + return self.e(["install", "-m", "755", "sysv/services/dhcpcd", "/lib/services"]) diff --git a/pkgs/dhcpd_opt/dhcpd_opt.py b/pkgs/dhcpd_opt/dhcpd_opt.py @@ -1,62 +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. # -################################################################################ - -## -# dhcpd_opt.py -# Created: 11/01/2017 -# By: Louis Solofrizzo <louis@morphux.org> -## - -import os - -class Dhcpd_Opt: - - 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": "dhcpd", # Name of the package - "version": "6.11.3", # Version of the package - "size": 2.7, # Size of the installed package (MB) - "archive": "dhcpcd-6.11.3.tar.xz", # Archive name - "SBU": 0.1, # SBU (Compilation time) - "optionnal": True, # Is this package part of the temporary install - "before": False, - "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packages/dhcpcd-6.11.3.tar.xz" - ] - } - return self.config - - def configure(self): - return self.e(["./configure", - "--libexecdir=/lib/dhcpd", - "--dbdir=/var/lib/dhcpd" - ]) - - def make(self): - return self.e(["make", "-j", self.conf_lst["cpus"]]) - - def install(self): - return self.e(["make", "install"]) - - def after(self): - return self.e(["install", "-m", "755", "sysv/services/dhcpd", "/lib/services"]) diff --git a/screens/install/install.py b/screens/install/install.py @@ -378,8 +378,9 @@ class Install: self.install(pkg_phase_2, "linux-headers") # Install optionnals packages + self.inst_title = "Optionnal Packages" if (type(self.conf_lst["network"]) == type("") and self.conf_lst["network"] == "DHCP"): - self.install({"dhcpd_opt": self.pkgs["dhcpd_opt"]}, "dhcpd_opt") + self.install({"dhcpcd": self.pkgs["dhcpcd_opt"]}, "dhcpcd") self.in_install = 0 # This function take an object of packages, check if the sources are there.