more work done... still 100% untested, and i need to finish the package lists, but i have a testing platform built for all the distros.

2015-07-15 03:26:34 -04:00
parent 0153d38a33
commit 7fb6e77c32
34 changed files with 127 additions and 19 deletions
--- a/lib/prereqs/Antergos/meta
+++ b/lib/prereqs/Antergos/meta
@@ -1,7 +1,7 @@
 NAME='Antergos'
 SUPPORTED='yes'
-CHECK_METHOD='egrep "^NAME=\"Antergos Linux\"" /etc/os-release'
-PKG_MGR='pacman --noconfirm -S ${pkgname}'
+CHECK_METHOD='egrep "^NAME=\"Antergos Linux\"$" /etc/os-release'
+PKG_MGR='pacman -S --needed --noconfirm ${pkgname}'
 PRE_RUN='pacman -Syyy'
 PKG_CHK='pacman -Q ${pkgname}'
 URL='http://antergos.com/'
--- a/lib/prereqs/Antergos/pkgs
+++ b/lib/prereqs/Antergos/pkgs
--- a/lib/prereqs/Antergos/pkgs
+++ b/lib/prereqs/Antergos/pkgs
@@ -0,0 +1 @@
+../Arch/pkgs
--- a/lib/prereqs/Arch/meta
+++ b/lib/prereqs/Arch/meta
@@ -1,7 +1,7 @@
 NAME='Arch'
 SUPPORTED='yes'
-CHECK_METHOD='egrep "^NAME=\"Arch Linux\"" /etc/os-release'
-PKG_MGR='pacman --noconfirm -S ${pkgname}'
+CHECK_METHOD='egrep "^NAME=\"Arch Linux\"$" /etc/os-release'
+PKG_MGR='pacman -S --needed --noconfirm ${pkgname}'
 PRE_RUN='pacman -Syyy'
 PKG_CHK='pacman -Q ${pkgname}'
 URL='https://www.archlinux.org/'
--- a/lib/prereqs/Arch/pkgs
+++ b/lib/prereqs/Arch/pkgs
@@ -0,0 +1,17 @@
+binutils
+curl
+gcc-libs-multilib
+gcc-multilib
+git
+libisoburn
+lynx
+make
+patch
+perl
+rsync
+sed
+squashfs-tools
+syslinux
+xorriso
+xz
+zlib
--- a/lib/prereqs/CentOS/pkgs
+++ b/lib/prereqs/CentOS/pkgs
--- a/lib/prereqs/CentOS/pkgs
+++ b/lib/prereqs/CentOS/pkgs
@@ -0,0 +1 @@
+../RHEL/pkgs
--- a/lib/prereqs/Debian/meta
+++ b/lib/prereqs/Debian/meta
@@ -1,8 +1,7 @@
 NAME='Debian'
 SUPPORTED='yes'
-CHECK_METHOD='egrep "^[0-9.]*$" /etc/debian_version'
-CHECK_METHOD='egrep "^NAME=\"Debian\ GNU/Linux\"" /etc/os-release'
+CHECK_METHOD='egrep "^NAME=\"Debian\ GNU/Linux\"$" /etc/os-release'
 PKG_MGR='apt-get -y install ${pkgname}'
 PRE_RUN='apt-get update'
-PKG_CHK='dpkg-query -l ${pkgname}'
+PKG_CHK='dpkg-query -l ${pkgname} | egrep "^ii[[:space:]]*${pkgname}"'
 URL='http://www.debian.org/'
--- a/lib/prereqs/Debian/pkgs
+++ b/lib/prereqs/Debian/pkgs
@@ -0,0 +1,10 @@
+git
+curl
+dosfstools
+libisoburn1
+lynx
+rsync
+sed
+squashfs-tools
+xorriso
+xz-utils
--- a/lib/prereqs/Devuan/meta
+++ b/lib/prereqs/Devuan/meta
@@ -0,0 +1,7 @@
+NAME='Devuan'
+SUPPORTED='yes'
+CHECK_METHOD='egrep "^NAME=\"Devuan\ GNU/Linux\"$" /etc/os-release'
+PKG_MGR='apt-get -y install ${pkgname}'
+PRE_RUN='apt-get update'
+PKG_CHK='dpkg-query -l ${pkgname} | egrep "^ii[[:space:]]*${pkgname}"'
+URL='http://www.debian.org/'
--- a/lib/prereqs/Devuan/pkgs
+++ b/lib/prereqs/Devuan/pkgs
@@ -0,0 +1 @@
+../Debian/pkgs
--- a/lib/prereqs/Fedora/pkgs
+++ b/lib/prereqs/Fedora/pkgs
@@ -0,0 +1,9 @@
+git
+curl
+libisofs
+lynx
+rsync
+sed
+squashfs-tools
+xorriso
+xz
--- a/lib/prereqs/HUMAN
+++ b/lib/prereqs/HUMAN
@@ -1,4 +1,4 @@
-This directory is used to enable cross-distro support. A list of packages is needed for the *host* to build the ISO. Adding distro support is easy; there simply needs to be the following added:
+This directory is used to enable cross-distro support and set baseline ISO packages needed for it to boot. A list of packages is needed for the *host* to build the ISO as well, which you'll find detailed below. Adding distro support is easy; there simply needs to be the following added:

 <basedir>/lib/prereqs/<Distro>/{meta,pkgs}

--- a/lib/prereqs/Manjaro/meta
+++ b/lib/prereqs/Manjaro/meta
@@ -1,7 +1,7 @@
 NAME='Manjaro'
 SUPPORTED='yes'
-CHECK_METHOD='egrep "^NAME=\"Manjaro Linux\"" /etc/os-release'
-PKG_MGR='pacman --noconfirm -S ${pkgname}'
+CHECK_METHOD='egrep "^NAME=\"Manjaro Linux\"$" /etc/os-release'
+PKG_MGR='pacman -S --needed --noconfirm ${pkgname}'
 PRE_RUN='pacman -Syyyu'
 PKG_CHK='pacman -Q ${pkgname}'
 URL='https://manjaro.org/'
--- a/lib/prereqs/Manjaro/pkgs
+++ b/lib/prereqs/Manjaro/pkgs
--- a/lib/prereqs/Manjaro/pkgs
+++ b/lib/prereqs/Manjaro/pkgs
@@ -0,0 +1 @@
+../Arch/pkgs
--- a/lib/prereqs/Mint/pkgs
+++ b/lib/prereqs/Mint/pkgs
--- a/lib/prereqs/Mint/pkgs
+++ b/lib/prereqs/Mint/pkgs
@@ -0,0 +1 @@
+../Ubuntu/pkgs
--- a/lib/prereqs/RHEL/pkgs
+++ b/lib/prereqs/RHEL/pkgs
@@ -0,0 +1,9 @@
+git
+curl
+libisofs
+lynx
+rsync
+sed
+squashfs-tools
+xorriso
+xz
--- a/lib/prereqs/SUSE/meta
+++ b/lib/prereqs/SUSE/meta
@@ -1,8 +1,8 @@
 NAME='SUSE'
-SUPPORTED=
+SUPPORTED='yes'
 # Both SLED and SLES. We can probably safely combine them.
-CHECK_METHOD='egrep "^NAME=\"SLE(D|S)\"" /etc/os-release'
-PKG_MGR='zypper install -l ${pkgname}'
-PRE_RUN='none'
+CHECK_METHOD='egrep "^NAME=\"SLE(D|S)\"$" /etc/os-release'
+PKG_MGR='zypper install --no-confirm -l ${pkgname}'
+PRE_RUN='zypper refresh'
 PKG_CHK='rpm -q ${pkgname} | egrep "^${pkgname}-[0-9]"'
 URL='https://www.suse.com/'
--- a/lib/prereqs/SUSE/pkgs
+++ b/lib/prereqs/SUSE/pkgs
--- a/lib/prereqs/SUSE/pkgs
+++ b/lib/prereqs/SUSE/pkgs
@@ -0,0 +1 @@
+../openSUSE/pkgs
--- a/lib/prereqs/Ubuntu/pkgs
+++ b/lib/prereqs/Ubuntu/pkgs
@@ -0,0 +1,10 @@
+git
+curl
+dosfstools
+libisoburn1
+lynx
+rsync
+sed
+squashfs-tools
+xorriso
+xz-utils
--- a/lib/prereqs/iso.pkgs.lst
+++ b/lib/prereqs/iso.pkgs.lst
@@ -0,0 +1 @@
+syslinux
--- a/lib/prereqs/openSUSE/meta
+++ b/lib/prereqs/openSUSE/meta
@@ -1,7 +1,8 @@
 NAME='openSUSE'
 SUPPORTED='yes'
-CHECK_METHOD=''
-PKG_MGR=''
-PRE_RUN=''
-PKG_CHK=''
+# Default doesn't have the quotes around the value, but I have a feeling that's a bug that will get "fixed" soon.
+CHECK_METHOD='egrep "^NAME=\"?openSUSE\"?$" /etc/os-release'
+PKG_MGR='zypper install --no-confirm -l ${pkgname}'
+PRE_RUN='zypper refresh'
+PKG_CHK='rpm -q ${pkgname} | egrep "^${pkgname}-[0-9]"'
 URL='https://www.opensuse.org/'