getch 0.0.8 → 0.1.3

data/lib/getch/gentoo.rb

@@ -1,10 +1,10 @@
-require 'open-uri'
-require 'open3'
 require_relative 'gentoo/stage'
 require_relative 'gentoo/config'
 require_relative 'gentoo/chroot'
 require_relative 'gentoo/sources'
 require_relative 'gentoo/boot'
+require_relative 'gentoo/use'
+require_relative 'gentoo/use_flag'
 
 module Getch
   module Gentoo
@@ -36,10 +36,15 @@ module Getch
         @state.config
       end
 
-      def chroot
+      def chroot(options)
         chroot = Getch::Gentoo::Chroot.new()
         chroot.update
+        chroot.cpuflags
         chroot.systemd
+
+        flags = Getch::Gentoo::UseFlag.new(options)
+        flags.apply
+
         chroot.world
         return if STATES[:gentoo_kernel]
         chroot.kernel
@@ -51,7 +56,6 @@ module Getch
         return if STATES[:gentoo_kernel]
         source = Getch::Gentoo::Sources.new()
         new
-        source.init_config
         source.build_kspp
         source.build_others
         source.make

data/lib/getch/gentoo/boot.rb

@@ -4,16 +4,17 @@ module Getch
   module Gentoo
     class Boot
       def initialize(opts)
-        @disk = opts.disk
+        @disk = opts.boot_disk ? opts.boot_disk : opts.disk
         @user = opts.username
-        @config = OPTIONS_FS[DEFAULT_OPTIONS[:fs]]::Config.new()
+        @config = Getch.class_fs::Config.new()
       end
 
       def start
         @config.fstab
         bootloader
         password
-        umount
+        permission
+        the_end
       end
 
       def bootloader
@@ -29,8 +30,8 @@ module Getch
         bootctl_dep
         puts "Configuring systemd-boot."
         # ref: https://forums.gentoo.org/viewtopic-p-8118822.html
-        esp = '/boot/efi'
-        exec_chroot("bootctl --path #{esp} install")
+        esp = '/efi'
+        Getch::Chroot.new("bootctl --path #{esp} install").run!
         datas_loader = [
           'default gentoo',
           'timeout 3',
@@ -44,43 +45,57 @@ module Getch
         initramfs = Dir.glob("#{MOUNTPOINT}/boot/initramfs-*.img")
         FileUtils.cp("#{initramfs[0]}", "#{MOUNTPOINT}/#{esp}/initramfs", preserve: true) if initramfs != []
 
-        exec_chroot("bootctl --path #{esp} update")
+        Getch::Chroot.new("bootctl --path #{esp} update").run!
       end
 
       def bootctl_dep
         puts 'Installing systemd-boot...'
-        exec_chroot("euse -p sys-apps/systemd -E gnuefi")
-        Getch::Emerge.new("sys-apps/systemd efivar").pkg!
+        Getch::Emerge.new("efivar").pkg!
       end
 
       def grub
         puts 'Installing GRUB...'
         Getch::Emerge.new("sys-boot/grub:2").pkg!
         @config.grub
-        exec_chroot("grub-install /dev/#{@disk}")
-        exec_chroot('grub-mkconfig -o /boot/grub/grub.cfg')
+        Getch::Chroot.new("grub-install /dev/#{@disk}").run!
+        Getch::Chroot.new("grub-mkconfig -o /boot/grub/grub.cfg").run!
       end
 
       def password
         puts 'Password for root'
         cmd = "chroot #{MOUNTPOINT} /bin/bash -c \"source /etc/profile && passwd\""
         system(cmd)
-        if @user != nil
+        if @user
           puts "Creating user #{@user}"
-          exec_chroot("useradd -m -G users,wheel,audio,video #{@user}")
+          Getch::Chroot.new("useradd -m -G users,wheel,audio,video #{@user}").run!
           puts "Password for your user #{@user}"
           cmd = "chroot #{MOUNTPOINT} /bin/bash -c \"source /etc/profile && passwd #{@user}\""
           system(cmd)
         end
       end
 
-      def umount
-        Helpers::exec_or_die("umount -l /mnt/gentoo/dev{/shm,/pts,}")
-        Helpers::exec_or_die("umount -R #{MOUNTPOINT}")
-        puts "Reboot when you have done"
+      private
+
+      def permission
+        FileUtils.chmod_R 0755, "#{MOUNTPOINT}/etc/portage"
+        if @user
+          Getch::Chroot.new("chown -R #{@user}:#{@user} /home/#{@user}").run!
+        end
       end
 
-      private
+      def the_end
+        #Helpers::exec_or_die("umount -l /mnt/gentoo/dev{/shm,/pts,}")
+        #Helpers::exec_or_die("umount -R #{MOUNTPOINT}")
+        puts
+        puts "getch has finish, before reboot, you can:"
+        puts "  +  Chroot on your system with: chroot #{MOUNTPOINT} /bin/bash"
+        puts "  +  Install more packages like networkmanager or emacs"
+        puts
+        puts "  +  Add more modules for your kernel (graphic, wifi card) and recompile it with:"
+        puts "  genkernel --kernel-config=/usr/src/linux/.config all  "
+        puts
+        puts "Reboot the system when you have done !"
+      end
 
       def exec_chroot(cmd)
         script = "chroot #{MOUNTPOINT} /bin/bash -c \"

data/lib/getch/gentoo/chroot.rb

@@ -7,18 +7,24 @@ 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..."
         Helpers::create_dir("#{MOUNTPOINT}/var/db/repos/gentoo")
-        cmd = "emerge-webrsync"
+        cmd = "emaint sync --auto"
         exec_chroot(cmd)
       end
 
       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
 
@@ -37,14 +43,14 @@ module Getch
       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!
@@ -52,22 +58,6 @@ module Getch
 
       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'
-      end
-
-      def garden_dep
-        Getch::Emerge.new("gentoolkit").pkg!
-        exec_chroot("euse -p sys-apps/kmod -E lzma")
-        @pkgs << "sys-apps/kmod"
-      end
-
       def mount
         puts "Populate /proc, /sys and /dev."
         Helpers::exec_or_die("mount --types proc /proc \"#{MOUNTPOINT}/proc\"")
@@ -80,11 +70,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,41 +7,66 @@ 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
         ]
         File.write(@make, data.join("\n"), mode: "a")
       end
 
+      # Write a repos.conf/gentoo.conf with the gpg verification
       def repo
         src = "#{MOUNTPOINT}/usr/share/portage/config/repos.conf"
         dest = "#{MOUNTPOINT}/etc/portage/repos.conf"
         FileUtils.mkdir dest, mode: 0644 if ! Dir.exist?(dest)
+        tmp = Tempfile.new('gentoo.conf')
         line_count = 0
-        tmp_file = Tempfile.new('gentoo.conf')
+
         File.open(src).each { |l|
-          File.write(tmp_file, "sync-allow-hardlinks = yes\n", mode: 'a') if line_count == 2
-          File.write(tmp_file, l, mode: 'a')
+          File.write(tmp, "sync-allow-hardlinks = yes\n", mode: 'a') if line_count == 2
+          if l.match(/^sync-type = rsync/)
+            File.write(tmp, "sync-type = webrsync\n", mode: 'a')
+          else
+            File.write(tmp, l, mode: 'a')
+          end
           line_count += 1
         }
-        FileUtils.copy_file(tmp_file, "#{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)
@@ -50,7 +75,7 @@ module Getch
         File.write("#{MOUNTPOINT}/etc/locale.conf", "LANG=#{@lang}\n")
         File.write("#{MOUNTPOINT}/etc/locale.conf", 'LC_COLLATE=C', mode: 'a')
         File.write("#{MOUNTPOINT}/etc/timezone", "#{options.zoneinfo}")
-        File.write("#{MOUNTPOINT}/etc/vconsole.conf", "KEYMAP=#{options.keyboard}")
+        File.write("#{MOUNTPOINT}/etc/vconsole.conf", "KEYMAP=#{options.keymap}")
       end
 
       def hostname
@@ -74,7 +99,7 @@ module Getch
       def control_options(options)
         search_zone(options.zoneinfo)
         search_utf8(options.language)
-        search_key(options.keyboard)
+        search_key(options.keymap)
       end
 
       def search_key(keys)
@@ -86,7 +111,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

@@ -3,11 +3,11 @@ module Getch
     class Sources
       def initialize
         @lsmod = `lsmod`.chomp
-        @filesystem = OPTIONS_FS[DEFAULT_OPTIONS[:fs]]::Deps.new()
+        @filesystem = Getch.class_fs::Deps.new()
       end
 
       def build_others
-        install_zfs if ismatch?('zfs')
+        cryptsetup
         virtualbox_guest
         qemu_guest
         install_wifi
@@ -16,28 +16,20 @@ module Getch
 
       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'
+        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!
-      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,45 +37,50 @@ 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")
-      end
-
-      def install_zfs
-        garden("-a zfs")
-        only_make # a first 'make' is necessary before emerge zfs
-        Getch::Emerge.new("sys-fs/zfs").pkg!
+        bask("-a sound")
       end
 
       def wifi_drivers
-        garden("-a ath9k-driver") if ismatch?('ath9k')
+        bask("-a ath9k-driver") if ismatch?('ath9k')
       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