getch 0.0.9 → 0.1.5

data/lib/getch/gentoo/chroot.rb

@@ -7,6 +7,12 @@ module Getch
         mount
       end
 
+      def cpuflags
+        Getch::Emerge.new("app-portage/cpuid2cpuflags").pkg!
+        cpuflags = `chroot #{MOUNTPOINT} /bin/bash -c "source /etc/profile; cpuid2cpuflags"`.chomp
+        File.write("#{MOUNTPOINT}/etc/portage/package.use/00cpuflags", "*/* #{cpuflags}")
+      end
+
       def update
         return if STATES[:gentoo_update]
         puts "Downloading the last ebuilds for Gentoo..."
@@ -18,7 +24,7 @@ module Getch
       def world
         return if STATES[:gentoo_update]
         puts "Update Gentoo world"
-        Getch::Emerge.new("emerge --update --deep --newuse @world").run!
+        Getch::Emerge.new("emerge --update --deep --changed-use --newuse @world").run!
         @state.update
       end
 
@@ -33,40 +39,29 @@ module Getch
         license = "#{MOUNTPOINT}/etc/portage/package.license"
         File.write(license, "sys-kernel/linux-firmware linux-fw-redistributable no-source-code\n")
         @pkgs << "sys-kernel/gentoo-sources"
-        @pkgs << "dev-util/dwarves"
       end
 
       def kernel_deps
-        puts "Installing Garden..."
-        get_garden
-        garden_dep
+        @pkgs << "sys-apps/kmod"
       end
 
       def install_pkgs
+        @pkgs << "app-portage/gentoolkit"
         @pkgs << "app-admin/sudo"
         @pkgs << "app-editors/vim"
+        @pkgs << "sys-kernel/linux-firmware"
         all_pkgs = @pkgs.join(" ")
         puts "Installing #{all_pkgs}..."
         Getch::Emerge.new(all_pkgs).pkg!
       end
 
-      private
-
-      def get_garden
-        return if Dir.exist? "#{MOUNTPOINT}/root/garden-master"
-        url = 'https://github.com/szorfein/garden/archive/master.tar.gz'
-        file = 'garden-master.tar.gz'
-
-        Dir.chdir("#{MOUNTPOINT}/root")
-        Helpers::get_file_online(url, file)
-        Getch::Command.new("tar xzf #{file}").run! if ! Dir.exist? 'garden-master'
+      # create a symbolic link for /usr/src/linux
+      def kernel_link
+        cmd = "eselect kernel set 1"
+        exec_chroot(cmd)
       end
 
-      def garden_dep
-        Getch::Emerge.new("gentoolkit").pkg!
-        exec_chroot("euse -p sys-apps/kmod -E lzma")
-        @pkgs << "sys-apps/kmod"
-      end
+      private
 
       def mount
         puts "Populate /proc, /sys and /dev."
@@ -80,11 +75,7 @@ module Getch
       end
 
       def exec_chroot(cmd)
-        script = "chroot #{MOUNTPOINT} /bin/bash -c \"
-          source /etc/profile
-          #{cmd}
-        \""
-        Getch::Command.new(script).run!
+        Getch::Chroot.new(cmd).run!
       end
     end
   end

data/lib/getch/gentoo/config.rb

@@ -7,17 +7,35 @@ module Getch
     class Config
       def initialize
         @make = "#{MOUNTPOINT}/etc/portage/make.conf"
+        @log = Getch::Log.new
       end
 
       def portage
-        nproc = `nproc`.chomp()
         grub_pc = Helpers::efi? ? '' : 'GRUB_PLATFORMS="pc"'
-        quiet = DEFAULT_OPTIONS[:verbose] ? '' : "EMERGE_DEFAULT_OPTS=\"--jobs=#{nproc} --load-average=#{nproc}\""
+        nproc = `nproc`.chomp()
+
+        # Add cpu name
+        cpu=`chroot #{MOUNTPOINT} /bin/bash -c \"source /etc/profile ; gcc -c -Q -march=native --help=target | grep march\" | awk '{print $2}' | head -1`.chomp
+        raise "Error, no cpu found" if ! cpu or cpu == ""
+        @log.debug "CPU found ==> #{cpu}"
+
+        tmp = Tempfile.new('make.conf')
+
+        File.open(@make).each { |l|
+          if l.match(/^COMMON_FLAGS/)
+            File.write(tmp, "COMMON_FLAGS=\"-march=#{cpu} -O2 -pipe -fomit-frame-pointer\"\n", mode: 'a')
+          else
+            File.write(tmp, l, mode: 'a')
+          end
+        }
+
+        FileUtils.copy_file(tmp, @make, preserve = true)
+
+        # Add the rest
         data = [
           '',
+          "MAKEOPTS=\"-j#{nproc}\"",
           'ACCEPT_KEYWORDS="amd64"',
-          "MAKEOPTS=\"-j#{nproc} -l#{nproc}\"",
-          quiet,
           'INPUT_DEVICES="libinput"',
           grub_pc
         ]
@@ -42,13 +60,13 @@ module Getch
           line_count += 1
         }
 
-        FileUtils.copy_file(tmp, "#{dest}/gentoo.conf", preserve = false)
+        FileUtils.copy_file(tmp, "#{dest}/gentoo.conf", preserve = true)
       end
 
       def network
         src = '/etc/resolv.conf'
         dest = "#{MOUNTPOINT}/etc/resolv.conf"
-        FileUtils.copy_file(src, dest, preserve = false)
+        FileUtils.copy_file(src, dest, preserve = true)
       end
 
       def systemd(options)
@@ -76,6 +94,40 @@ module Getch
         Helpers::add_file("#{portage}/package.unmask/zzz_via_autounmask")
       end
 
+      def portage_bashrc
+        conf = "#{MOUNTPOINT}/etc/portage/bashrc"
+        content = %q{
+# https://wiki.gentoo.org/wiki/Signed_kernel_module_support
+function pre_pkg_preinst() {
+    # This hook signs any out-of-tree kernel modules.
+    if [[ "$(type -t linux-mod_pkg_preinst)" != "function" ]]; then
+        # The package does not seem to install any kernel modules.
+        return
+    fi
+    # Get the signature algorithm used by the kernel.
+    local module_sig_hash="$(grep -Po '(?<=CONFIG_MODULE_SIG_HASH=").*(?=")' "${KERNEL_DIR}/.config")"
+    # Get the key file used by the kernel.
+    local module_sig_key="$(grep -Po '(?<=CONFIG_MODULE_SIG_KEY=").*(?=")' "${KERNEL_DIR}/.config")"
+    module_sig_key="${module_sig_key:-certs/signing_key.pem}"
+    # Path to the key file or PKCS11 URI
+    if [[ "${module_sig_key#pkcs11:}" == "${module_sig_key}" && "${module_sig_key#/}" == "${module_sig_key}" ]]; then
+        local key_path="${KERNEL_DIR}/${module_sig_key}"
+    else
+        local key_path="${module_sig_key}"
+    fi
+    # Certificate path
+    local cert_path="${KERNEL_DIR}/certs/signing_key.x509"
+    # Sign all installed modules before merging.
+    find "${D%/}/${INSDESTTREE#/}/" -name "*.ko" -exec "${KERNEL_DIR}/scripts/sign-file" "${module_sig_hash}" "${key_path}" "${cert_path}" '{}' \;
+}
+        }
+
+        f = File.new(conf, "w")
+        f.write("#{content}\n")
+        f.chmod(0644)
+        f.close
+      end
+
       private
 
       def control_options(options)
@@ -93,7 +145,7 @@ module Getch
       end
 
       def search_zone(zone)
-        if ! File.exist?("#{MOUNTPOINT}/usr/share/zoneinfo/#{zone}")
+        if !File.exist?("#{MOUNTPOINT}/usr/share/zoneinfo/#{zone}")
           raise ArgumentError, "Zoneinfo #{zone} doesn\'t exist."
         end
       end

data/lib/getch/gentoo/sources.rb

@@ -7,37 +7,35 @@ module Getch
       end
 
       def build_others
-        install_zfs if ismatch?('zfs')
+        cryptsetup
         virtualbox_guest
         qemu_guest
         install_wifi
         install_audio
+        flash_mod
       end
 
       def build_kspp
         puts "Adding KSPP to the kernel source"
-        garden("-b -a systemd")
+        bask("-b -a systemd")
       end
 
       def make
-        if DEFAULT_OPTIONS[:fs] == 'lvm' or DEFAULT_OPTIONS[:encrypt]
+        if DEFAULT_OPTIONS[:fs] == 'lvm' || DEFAULT_OPTIONS[:fs] == 'zfs' || DEFAULT_OPTIONS[:encrypt]
           @filesystem.make
         else
-          just_make
+          make_kernel
         end
       end
 
-      def init_config
-        Getch::Make.new("make localyesconfig").run!
+      def firewall
+        bask("-a iptables")
+        Getch::Emerge.new("net-firewall/iptables").pkg!
       end
 
       private
 
-      def only_make
-        Getch::Make.new("make -j$(nproc)").run!
-      end
-
-      def just_make
+      def make_kernel
         puts "Compiling kernel sources"
         cmd = "make -j$(nproc) && make modules_install && make install"
         Getch::Make.new(cmd).run!
@@ -45,46 +43,76 @@ module Getch
         raise "No kernel installed, compiling source fail..." if is_kernel == []
       end
 
+      def cryptsetup
+        return unless DEFAULT_OPTIONS[:encrypt]
+        make_conf = "#{MOUNTPOINT}/etc/portage/make.conf"
+
+        puts "Adding support for cryptsetup."
+        bask("-a cryptsetup")
+        Getch::Chroot.new("euse -E cryptsetup").run! unless Helpers::grep?(make_conf, /cryptsetup/)
+        Getch::Emerge.new("sys-fs/cryptsetup").pkg!
+      end
+
       def virtualbox_guest
-        return if ! ismatch?('vmwgfx')
-        garden("-a virtualbox-guest")
+        systemd=`systemd-detect-virt`.chomp
+        return if ! ismatch?('vmwgfx') || systemd.match(/none/)
+        bask("-a virtualbox-guest")
         Getch::Emerge.new("app-emulation/virtualbox-guest-additions").pkg!
       end
 
       def qemu_guest
-        garden("-a kvm-guest") if ismatch?('virtio')
-        garden("-a kvm") if ismatch?('kvm')
+        bask("-a kvm-host") if ismatch?('kvm')
+        bask("-a kvm-guest") if ismatch?('virtio')
       end
 
       def ismatch?(arg)
         @lsmod.match?(/#{arg}/)
       end
 
-      def garden(cmd)
-        Getch::Garden.new(cmd).run!
+      def bask(cmd)
+        Getch::Bask.new(cmd).run!
       end
 
       def install_wifi
         return if ! ismatch?('cfg80211')
-        garden("-a wifi")
+        bask("-a wifi")
         wifi_drivers
         Getch::Emerge.new("net-wireless/iw wpa_supplicant net-wireless/iwd").pkg!
       end
 
       def install_audio
         return if ! ismatch?('snd_pcm')
-        garden("-a sound")
+        bask("-a sound")
       end
 
-      def install_zfs
-        return if ! DEFAULT_OPTIONS[:fs] == 'zfs'
-        garden("-a zfs")
-        only_make # a first 'make' is necessary before emerge zfs
-        Getch::Emerge.new("sys-fs/zfs").pkg!
+      def wifi_drivers
+        conf = "#{MOUNTPOINT}/etc/modules-load.d/wifi.conf"
+        File.delete(conf) if File.exists? conf
+
+        if ismatch?('ath9k')
+          bask("-a ath9k-driver")
+        end
+
+        module_load("iwlmvm", conf)
+        module_load("ath9k", conf)
       end
 
-      def wifi_drivers
-        garden("-a ath9k-driver") if ismatch?('ath9k')
+      def flash_mod
+        conf = "#{MOUNTPOINT}/etc/modules-load.d/usb.conf"
+        File.delete(conf) if File.exists? conf
+
+        module_load("ehci_pci", conf)
+        module_load("rtsx_pci_sdmmc", conf)
+        module_load("sdhci_pci", conf)
+        module_load("uas", conf)
+        module_load("uhci_hcd", conf)
+        module_load("xhci_pci", conf)
+      end
+
+      def module_load(name, file)
+        return unless name
+        return unless ismatch?(name)
+        File.write(file, "#{name}\n", mode: 'a')
       end
     end
   end

data/lib/getch/gentoo/use.rb

@@ -0,0 +1,43 @@
+module Getch
+  module Gentoo
+    class Use
+      def initialize(pkg = nil)
+        @use_dir = "#{MOUNTPOINT}/etc/portage/package.use"
+        @pkg = pkg
+        @file = @pkg ? @pkg.match(/[\w]+$/) : nil
+        @make = "#{MOUNTPOINT}/etc/portage/make.conf"
+      end
+
+      def add(*flags)
+        @flags = flags.join(' ')
+        write
+      end
+
+      def add_global(*flags)
+        @flags = flags
+        write_global
+      end
+
+      private
+
+      def write
+        content = "#{@pkg} #{@flags}\n"
+        File.write("#{@use_dir}/#{@file}", content, mode: 'w')
+      end
+
+      def write_global
+        list = []
+
+        @flags.each { |f|
+          unless Helpers::grep?(@make, /#{f}/)
+            list << f
+          end
+        }
+
+        use = list.join(' ')
+        line = "USE=\"${USE} #{use}\"\n"
+        File.write(@make, line, mode: 'a')
+      end
+    end
+  end
+end

data/lib/getch/gentoo/use_flag.rb

@@ -0,0 +1,64 @@
+# lib/use_flag.rb
+
+module Getch::Gentoo
+  class UseFlag
+    def initialize(options)
+      @efi = Helpers::efi?
+      @o = options
+    end
+
+    def apply
+      systemd
+      kmod
+      grub
+      zfs
+      lvm
+      cryptsetup
+    end
+
+    private
+
+    def systemd
+      flags = []
+      use = Getch::Gentoo::Use.new('sys-apps/systemd')
+      flags << 'dns-over-tls'
+      flags << 'gnuefi' if @efi
+      use.add(flags)
+    end
+
+    def kmod
+      use = Getch::Gentoo::Use.new('sys-apps/kmod')
+      use.add('zstd', 'lzma')
+    end
+
+    def grub
+      return if @efi
+      flags = []
+      use = Getch::Gentoo::Use.new('sys-boot/grub')
+      flags << '-grub_platforms_efi-64'
+      flags << 'libzfs' if @o.fs == 'zfs'
+      flags << 'device-mapper' if @o.fs == 'lvm'
+      use.add(flags)
+    end
+
+    def zfs
+      return unless @o.fs == 'zfs'
+      use = Getch::Gentoo::Use.new('sys-fs/zfs-kmod')
+      use.add('rootfs')
+      use = Getch::Gentoo::Use.new('sys-fs/zfs')
+      use.add('rootfs')
+    end
+
+    def lvm
+      return unless @o.fs == 'lvm'
+      use = Getch::Gentoo::Use.new
+      use.add_global('lvm', 'device-mapper')
+    end
+
+    def cryptsetup
+      return unless @o.encrypt
+      use = Getch::Gentoo::Use.new
+      use.add_global('cryptsetup')
+    end
+  end
+end

data/lib/getch/guard.rb

@@ -0,0 +1,62 @@
+class InvalidDisk < StandardError
+end
+
+class InvalidFormat < StandardError
+end
+
+class InvalidZone < StandardError
+end
+
+class InvalidKeymap < StandardError
+end
+
+module Getch::Guard
+  def self.disk(name)
+    raise InvalidDisk, "No disk." unless name
+    raise InvalidDisk, "Bad device name #{name}." unless name.match(/^sd[a-z]{1}$/)
+    raise InvalidDisk, "Disk /dev/#{name} no found." unless File.exist? "/dev/#{name}"
+    name
+  rescue InvalidDisk => e
+    puts "#{e.class} => #{e}"
+    exit 1
+  end
+
+  def self.format(name)
+    raise InvalidFormat, "No format specified." unless name
+    raise InvalidFormat, "Format #{name} not yet available." if name.match(/btrfs/)
+    raise InvalidFormat, "Format #{name} not supported." unless name.match(/zfs|lvm|zfs/)
+  rescue InvalidFormat => e
+    puts "#{e.class} => #{e}"
+    exit 1
+  end
+
+  def self.zone(name)
+    raise InvalidZone, "No zoneinfo specified." unless name
+    raise InvalidZone, "Directory /usr/share/zoneinfo/ no found on this system..." unless Dir.exist? "/usr/share/zoneinfo/"
+    raise InvalidZone, "Zoneinfo #{name} is no found in /usr/share/zoneinfo/." unless File.exist? "/usr/share/zoneinfo/#{name}"
+  rescue InvalidZone => e
+    puts "#{e.class} => #{e}"
+    exit 1
+  end
+
+  def self.keymap(name)
+    raise InvalidKeymap, "No keymap specified." unless name
+    key = []
+
+    if Dir.exist? '/usr/share/keymaps'
+      key = Dir.glob("/usr/share/keymaps/**/#{name}.map.gz")
+    elsif Dir.exist? '/usr/share/kbd/keymaps'
+      key = Dir.glob("/usr/share/kbd/keymaps/**/#{name}.map.gz")
+    else
+      raise InvalidKeymap, "No directory found for keymap."
+    end
+
+    if key == []
+      raise InvalidKeymap, "Keymap #{name} no found."
+    end
+    name
+  rescue InvalidKeymap => e
+    puts "#{e.class} => #{e}"
+    exit 1
+  end
+end