FINALLY. testing cross-distro after many tweaks. also switched to github mirrors for the UEFI shells because sourceforge sucks.

bin/build.sh

@@ -103,7 +103,7 @@ fi
 set -e
 USERNAME_REAL="$(grep ${BUILD_USERNAME} /etc/passwd | cut -f5 -d':')"
 
-cat > VERSION_INFO.txt << EOF
+cat > ${BASEDIR}/VERSION_INFO.txt << EOF
 Version:	${VERSION}
 Build:		${BUILD}
 Time:		${BUILDTIME}
@@ -120,9 +120,7 @@ source ${BASEDIR}/lib/03-release_me.func.sh
 source ${BASEDIR}/lib/04-facehugger.func.sh
 source ${BASEDIR}/lib/05-chroot_wrapper.func.sh
 source ${BASEDIR}/lib/06-jenny_craig.func.sh
-if [[ "${HOST_DIST}" == "CentOS" || "${HOST_DIST}" == "RHEL" ]];
-  source ${BASEDIR}/lib/07-centos_is_stupid.func.sh
-fi
+source ${BASEDIR}/lib/07-centos_is_stupid.func.sh
 source ${BASEDIR}/lib/08-will_it_blend.func.sh
 source ${BASEDIR}/lib/09-stuffy.func.sh
 source ${BASEDIR}/lib/10-yo_dj.func.sh
@@ -139,24 +137,10 @@ release_me 64 > /dev/null 2>&1
 release_me 32 > /dev/null 2>&1
 
 # do we need to perform any updates?
-if [[ -f "${CHROOTDIR}root.x86_64/root/chroot" || -f "${CHROOTDIR}root.i686/root/chroot" ]];
-then
-  chroot_wrapper 64
-  chroot_wrapper 32
-  if [[ "${HOST_DIST}" == "CentOS" || "${HOST_DIST}" == "RHEL" ]];
-    centos_is_stupid
-  fi
-  will_it_blend 64
-  will_it_blend 32
-  yo_dj
-fi
-
 if [[ ${1} == "update" ]];
 then
   mentos
-  if [[ "${HOST_DIST}" == "CentOS" || "${HOST_DIST}" == "RHEL" ]];
-    centos_is_stupid
-  fi
+  centos_is_stupid
   will_it_blend 32
   will_it_blend 64
   yo_dj

extra/packages.both

@@ -7,8 +7,6 @@ afflib
 aircrack-ng
 apr
 apr-util
-arch-install-scripts
-archiso
 arj
 asciidoc
 atop
@@ -23,7 +21,6 @@ bonnie++
 bozocrack-git
 bridge-utils
 btrfs-progs
-bzip2
 cabextract
 cdrtools
 cdw
@@ -35,13 +32,11 @@ ckermit
 clamav
 cmospwd
 colordiff
-coreutils
 cowpatty
 cpio
 cpuburn
 cpupower
 crackpkcs12
-cronie
 #cryptcat
 cryptsetup
 customizepkg-scripting
@@ -52,9 +47,6 @@ dd_rescue
 dd_rhelp
 debianutils
 debootstrap
-dhclient
-dhcp
-dhcpcd
 dialog
 diffutils
 djohn
@@ -63,7 +55,6 @@ dnssec-anchors
 dnstracer
 #dnsutils #replaced by bind-tools, https://www.archlinux.org/packages/extra/x86_64/bind-tools/
 dos2unix
-dosfstools
 dropbear
 dstat
 dump
@@ -73,8 +64,6 @@ dvd+rw-tools
 e2fsprogs
 ecryptfs-utils
 ed
-efibootmgr
-efivar
 elfutils
 #elilo-efi
 elinks
@@ -110,7 +99,6 @@ gpm
 gptfdisk
 gst-libav
 gst-plugins-ugly
-gummiboot
 hashcat
 hddtemp
 hdparm
@@ -132,10 +120,8 @@ iozone
 ipcalc
 iperf
 iperf3
-iproute2
 ipsec-tools
 iptraf-ng
-iputils
 irssi
 iso-codes
 isomaster
@@ -145,10 +131,8 @@ jfsutils
 john
 keyutils
 kismet-allplugins
-libisoburn
 lftp
 links
-localepurge
 #logkeys
 logkeys-keymaps
 lm_sensors
@@ -159,10 +143,7 @@ lsof
 lsscsi
 lxde
 lynx
-lz4
 #lzip
-lzo
-lzop
 macchanger
 magicrescue
 mbr
@@ -175,10 +156,7 @@ megaraid-cli
 memtester
 mfoc
 minicom
-mkinitcpio-nfs-utils
-ms-sys
 mtd-utils
-mtools
 mtr
 mtree
 #mtx
@@ -189,11 +167,8 @@ ncftp
 ncompress
 ncrack
 net-snmp
-net-tools
-netctl
 netselect
 nettle
-networkmanager
 networkmanager-pptp
 nginx-devel
 ngrep
@@ -204,8 +179,6 @@ ntfsfixboot
 nwipe
 open-iscsi
 openipmi
-openssh
-openvpn
 ophcrack
 os-prober
 p7zip
@@ -233,7 +206,6 @@ procinfo-ng
 procps-ng
 progsreiserfs
 psmisc
-pv
 pwgen
 pxz
 pyrit-svn
@@ -251,7 +223,6 @@ rpcbind
 rpmextract
 rp-pppoe
 rsnapshot
-rsync
 rygel
 safecopy
 samba
@@ -261,27 +232,20 @@ scrounge-ntfs
 scrub
 scsiadd
 sdparm
-sed
 setserial
 sg3_utils
 sharutils
-shorewall
 sipcalc
 sipcrack
 smartmontools
 smbclient
 s-nail
 socat
-squashfs3-tools
-squashfs-tools
 #star
 strace
 stress
 sucrack
-sudo
 symlinks
-sysfsutils
-syslinux
 sysstat
 tcpdump
 tcpslice
@@ -292,7 +256,6 @@ thin-provisioning-tools
 thttpd
 tmon
 tmux
-traceroute
 tre
 truecrack-svn
 truecrypt

extra/pre-build.d/etc/apacman.conf

@@ -25,8 +25,8 @@ noedit=1
 skipinteg=1
 #skiptest=1
 #warn=1
-tmpdir=/var/tmp/apacman
-TMPDIR=/var/tmp/apacman
+#tmpdir=/var/tmp/apacman
+#TMPDIR=/var/tmp/apacman
 
 #
 # CONFIGURATION

lib/00-depcheck.func.sh

@@ -13,6 +13,7 @@ function so_check_me_out {
    fi  
  fi
 
+ set +e
  if [[ -z "${HOST_DIST}" ]]; 
  then
    for dist_profile in $(find "${BASEDIR}"/lib/prereqs -type f -name 'meta');
@@ -20,7 +21,7 @@ function so_check_me_out {
      source ${dist_profile}
      if [[ "${SUPPORTED}" != "yes" ]];
      then
-       continue 
+       continue
      fi
      eval "${CHECK_METHOD}" > /dev/null 2>&1
      if [[ "${?}" == "0" ]]; 
@@ -30,6 +31,7 @@ function so_check_me_out {
        break 2
      fi
    done
+   set -e
  fi
 
  # Sanity is important.
@@ -39,17 +41,6 @@ function so_check_me_out {
    exit 1
  fi
 
- ## TWEAKS GO HERE. ##
- # stupid gentoo. good riddance.
- if [[ "${HOST_DIST}" == "Gentoo" ]];
- then
-   grep -q 'app-arch/lzma' /etc/portage/package.accept_keywords
-   if [[ "${?}" != "0" ]];
-   then
-     echo 'app-arch/lzma' >> /etc/portage/package.accept_keywords
-   fi
- fi
-
  # So we've validated the distro. Here, check for packages and install if necessary. maybe use an array, but it'd be better to soft-fail if one of the packages is missing.
 
  DISTRO_DIR="${BASEDIR}/lib/prereqs/${HOST_DIST}"
@@ -59,6 +50,9 @@ function so_check_me_out {
  # And once more, just to be safe.
  source ${META}
 
+ ## TWEAKS GET RUN HERE.
+ distro_specific_tweaks
+
  if [[ "${PRE_RUN}" != 'none' ]];
  then
    echo "Now updating your local package cache..."
@@ -85,11 +79,13 @@ function so_check_me_out {
        echo "This usually means you aren't connected to the Internet or your package repositories"
        echo "are not configured correctly. Review the list of packages in ${PKGLIST} and ensure"
        echo "they are all available to be installed."
+       exit 1
      fi
    fi
  done < ${PKGLIST}
 
  set -e
+ rm -f "${LOCKFILE}"
 }
 
 so_check_me_out

lib/01-mk.chroot.func.sh

@@ -109,10 +109,10 @@ function mkchroot {
     echo "Local: ${LOCSUM32}"
     echo "Remote: ${CKSUM32}"
     echo "Fetching fresh copy."
-    curl -o latest.32.tar.gz "${RLSDIR}/${CURRLS32}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    curl -o latest.32.tar.gz "${RLSDIR}/${CURRLS32}"
   fi
  else
-   curl -o latest.32.tar.gz "${RLSDIR}/${CURRLS32}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   curl -o latest.32.tar.gz "${RLSDIR}/${CURRLS32}"
  fi
  
  if [ ! -f "${CHROOTDIR32}/etc/pacman.d/gnupg/trustdb.gpg" ] || [ ! -f "${CHROOTDIR64}/etc/pacman.d/gnupg/trustdb.gpg" ];
@@ -147,6 +147,7 @@ HOME_URL="https://www.archlinux.org/"
 SUPPORT_URL="https://bbs.archlinux.org/"
 BUG_REPORT_URL="https://bugs.archlinux.org/"
 EOF
+     cp ${BASEDIR}/VERSION_INFO.txt ${BASEDIR}/root.${i}/.
    done   
 
    # And make it usable.
@@ -212,10 +213,42 @@ EOF
   sed -i -e "/^[[:space:]]*#*MAKEFLAGS=.*$/aMAKEFLAGS=\"-j${CPUCNT}\"" ${CHROOTDIR32}/etc/makepkg.conf
  fi
  
+ # Baseline packages
+ echo "Installing baseline packages..."
+ PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/lib/prereqs/iso.pkgs.lst | tr '\n' ' ')
+ for i in ${CHROOTDIR32} ${CHROOTDIR64};
+ do
+  set +e
+  for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
+  set -e
+  ${CHROOTCMD} ${i}/ bash -c "yes '' | apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+  set +e
+  for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
+  set -e
+ done
+ # 32-bit
+ PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/lib/prereqs/iso.pkgs.lst.32 | tr '\n' ' ')
+ if [ -n "${PKGLIST}" ];
+ then
+   ${CHROOTCMD} ${CHROOTDIR32}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+ fi
+ set +e
+ for x in $(find ${CHROOTDIR32}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
+ set -e
+ # 64-bit
+ PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/lib/prereqs/iso.pkgs.lst.64 | tr '\n' ' ')
+ if [ -n "${PKGLIST}" ];
+ then
+   ${CHROOTCMD} ${CHROOTDIR64}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+ fi
+ set +e
+ for x in $(find ${CHROOTDIR64}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
+ set -e
+
  # preprocessing
  sed -i -e '/base-devel/d ; /multilib-devel/d' ${BASEDIR}/extra/packages.*
  # both
- echo "Installing common packages..."
+ echo "Installing extra common packages..."
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.both | tr '\n' ' ')
  for i in ${CHROOTDIR32} ${CHROOTDIR64};
  do
@@ -278,7 +311,7 @@ EOF
  done
  
  # 32-bit
- echo "Installing packages for 32-bit..."
+ echo "Installing extra packages for 32-bit..."
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.32 | tr '\n' ' ')
  if [ -n "${PKGLIST}" ];
  then
@@ -290,7 +323,7 @@ EOF
  echo "Done."
  
  # 64-bit
- echo "Installing packages for 64-bit..."
+ echo "Installing estra packages for 64-bit..."
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.64 | tr '\n' ' ')
  if [ -n "${PKGLIST}" ];
  then
@@ -332,4 +365,7 @@ EOF
 
 }
 
-mkchroot
+if [[ ! -f "${BASEDIR}/root.x86_64/VERSION_INFO.txt" && ! -f "${BASEDIR}/root.x86_64/VERSION_INFO.txt" ]];
+then
+  mkchroot
+fi

lib/07-centos_is_stupid.func.sh

@@ -22,6 +22,7 @@ function centos_is_stupid {
       echo
     fi
     # We used to fetch and compile mksquashfs from source here, but no longer- because a new enough version is *finally* in CentOS repos as of CentOS 7.
+    # This also lets us cut out the crufty version check and replace it with the one above.
   fi
 
   # UGH. And you know what? Fuck SUSE too.
@@ -38,7 +39,60 @@ function centos_is_stupid {
       curl -sLo /tmp/${XORRISO_RPM} "http://download.opensuse.org/repositories/home:/Knolleblau/openSUSE_${SUSE_VER}/x86_64/${XORRISO_RPM}"
       zypper install --no-confirm -l /tmp/${XORRISO_RPM} >> "${LOGFILE}.${FUNCNAME}" 2>&1
       echo "Done."
+ 
       echo
     fi
   fi
+ 
+  # And a double fuck-you to SLED/SLES.
+  if [[ "${HOST_DIST}" == "SUSE" ]];
+  then
+    source /etc/os-release
+    source ${BASEDIR}/lib/prereqs/SUSE/meta
+    SUSE_VER="${VERSION_ID}"
+    SUSE_REL="${ID}"
+    SDK_PKGS=(binutils-devel git xz-devel xz-devel-32bit zlib-devel zlib-devel-32bit)
+    
+    if [[ "${PRE_RUN}" != 'none' ]];
+    then
+      echo "Now updating your local package cache..."
+      set +e
+      eval "${PRE_RUN}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+      if [[ "${?}" != "0" ]];
+      then
+        echo "ERROR: Syncing your local package cache via ${PRE_RUN} command failed."
+        echo "Please ensure you are connected to the Internet/have repositories configured correctly."
+        exit 1
+      fi
+    fi
+
+    zypper search binutils-devel | egrep -q '^[[:space:]]*|[[:space:]]*binutils-devel[[:space:]]*'
+    if [[ "${?}" != "0" ]];
+    then
+      echo
+      echo "In order to install some of the necessary packages on the host, you will need to add the SLE SDK repository."
+      echo "It can be downloaded by visiting http://download.suse.com/ and search for 'SUSE Linux Enterprise Software Development Kit'"
+      echo "(or add it to your subscriptions)."
+      echo "See https://www.suse.com/documentation/${SUSE_REL}-${SUSE_VER}/book_sle_deployment/data/sec_add-ons_sdk.html for more information."
+      exit 1
+    else
+      for pkgname in "${SDK_PKGS[@]}";
+      do
+        eval "${PKG_CHK}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+        if [[ "${?}" != "0" ]];
+        then
+          echo "Installing ${pkgname}..."
+          eval "${PKG_MGR}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+          if [[ "${?}" != "0" ]];
+          then
+            echo "ERROR: ${pkgname} was not found to be installed and we can't install it."
+            echo "This usually means you aren't connected to the Internet or your package repositories"
+            echo "are not configured correctly. Review the list of packages in ${PKGLIST} and ensure"
+            echo "they are all available to be installed."
+          fi
+        fi
+      done
+   fi
+ fi
+
 }

lib/08-will_it_blend.func.sh

@@ -2,6 +2,9 @@ function will_it_blend () {
 
   FUNCNAME="will_it_blend"
 
+  SQUASH_CMD="mksquashfs"
+  SQUASH_OPTS="-noappend -comp xz"
+
   local ARCHSUFFIX="${1}"
   if [[ "${1}" == "64" ]]; 
   then

lib/09-stuffy.func.sh

@@ -23,12 +23,12 @@ function stuffy {
   if [ ! -f "${TEMPDIR}/EFI/shellx64_v2.efi" ];
   then
     # EFI Shell 2.0 for UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=UEFI_Shell )
-    curl -o ${TEMPDIR}/EFI/shellx64_v2.efi https://svn.code.sf.net/p/edk2/code/trunk/edk2/ShellBinPkg/UefiShell/X64/Shell.efi >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    curl -o ${TEMPDIR}/EFI/shellx64_v2.efi "https://github.com/tianocore/edk2/blob/master/ShellBinPkg/UefiShell/X64/Shell.efi?raw=true" >> "${LOGFILE}.${FUNCNAME}" 2>&1
   fi
   if [ ! -f "${TEMPDIR}/EFI/shellx64_v1.efi" ];
   then
     # EFI Shell 1.0 for non UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=Efi-shell )
-    curl -o ${TEMPDIR}/EFI/shellx64_v1.efi https://svn.code.sf.net/p/edk2/code/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    curl -o ${TEMPDIR}/EFI/shellx64_v1.efi "https://github.com/tianocore/edk2/blob/master/EdkShellBinPkg/FullShell/X64/Shell_Full.efi?raw=true" >> "${LOGFILE}.${FUNCNAME}" 2>&1
   fi
 
   # now for setting up loader config/entries. maybe add memtest or something in the future? i dunno.

lib/prereqs/Antergos/meta

@@ -5,3 +5,23 @@ PKG_MGR='pacman -S --needed --noconfirm ${pkgname}'
 PRE_RUN='pacman -Syyy'
 PKG_CHK='pacman -Q ${pkgname}'
 URL='http://antergos.com/'
+
+function distro_specific_tweaks {
+ # For some reason, I can't get "yes y | " to parse correctly with eval. And Arch isn't smart enough
+ # to figure out that if I enable the multilib repos, *I want multilib gcc*. Fuck it. We'll just remove it first.
+
+ pacman -S --needed haveged >> "${LOGFILE}.${FUNCNAME}" 2>&1
+ haveged
+
+ set +e
+ for pkg_override in gcc gcc-libs;
+ do
+   pacman -Q ${pkg_override} >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   if [[ "${?}" == "0" ]];
+   then
+     pacman -Rdd --noconfirm ${pkg_override} >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   fi
+ done
+set -e
+
+}

lib/prereqs/Arch/meta

@@ -5,3 +5,23 @@ PKG_MGR='pacman -S --needed --noconfirm ${pkgname}'
 PRE_RUN='pacman -Syyy'
 PKG_CHK='pacman -Q ${pkgname}'
 URL='https://www.archlinux.org/'
+
+function distro_specific_tweaks {
+ # For some reason, I can't get "yes y | " to parse correctly with eval. And Arch isn't smart enough
+ # to figure out that if I enable the multilib repos, *I want multilib gcc*. Fuck it. We'll just remove it first.
+
+ pacman -S --needed haveged >> "${LOGFILE}.${FUNCNAME}" 2>&1
+ haveged
+
+ set +e
+ for pkg_override in gcc gcc-libs;
+ do
+   pacman -Q ${pkg_override} >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   if [[ "${?}" == "0" ]];
+   then
+     pacman -Rdd --noconfirm ${pkg_override} >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   fi
+ done
+set -e
+
+} 

lib/prereqs/Arch/pkgs

@@ -1,5 +1,6 @@
 binutils
 curl
+findutils
 gcc-libs-multilib
 gcc-multilib
 git
@@ -13,6 +14,5 @@ rsync
 sed
 squashfs-tools
 syslinux
-xorriso
 xz
 zlib

lib/prereqs/CentOS/meta

@@ -5,5 +5,11 @@ PKG_MGR='yum -y install ${pkgname}'
 PRE_RUN='none'
 PKG_CHK='rpm -q ${pkgname} | egrep "^${pkgname}-[0-9]"'
 URL='http://centos.org/'
-# NOTE: we handle installing of squashfs-tools (maybe) and xorriso in centos_is_stupid function.
-# because they *suck*. Seriously. I need to install tk just to install xorriso. I mean, what?
+
+function distro_specific_tweaks {
+ # NOTE: we handle installing of squashfs-tools (maybe) and xorriso in centos_is_stupid function.
+ # because they *suck*. Seriously. I need to install tk just to install xorriso. I mean, what?
+
+ echo "No tweaks found."
+
+}

lib/prereqs/Debian/meta

@@ -5,3 +5,9 @@ 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/'
+
+function distro_specific_tweaks {
+
+ echo "No tweaks found."
+
+}

lib/prereqs/Devuan/meta

@@ -5,3 +5,10 @@ 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/'
+
+function distro_specific_tweaks {
+
+ echo "No tweaks found."
+
+}
+

lib/prereqs/Fedora/meta

@@ -5,3 +5,10 @@ PKG_MGR='dnf -y install ${pkgname}'
 PRE_RUN='none'
 PKG_CHK='rpm -q ${pkgname} | egrep "^${pkgname}-[0-9]"'
 URL='https://getfedora.org/'
+
+function distro_specific_tweaks {
+
+ echo "No tweaks found."
+
+}
+

lib/prereqs/Fedora/pkgs

@@ -14,6 +14,7 @@ sed
 squashfs-tools
 syslinux
 syslinux-devel
+tar
 xorriso
 xz
 xz-devel

lib/prereqs/Gentoo/meta

@@ -5,3 +5,16 @@ PKG_MGR='emerge -q1Dn ${pkgname}'
 PRE_RUN='emerge -q --sync'
 PKG_CHK='emerge -qp @installed 2>/dev/null | egrep -E "/${pkgname}-[0-9.]+"'
 URL='https://www.gentoo.org/'
+
+function distro_specific_tweaks {
+ # WHY IS THIS EVEN MASKED?!
+
+ set +e
+ grep -q 'app-arch/lzma' /etc/portage/package.accept_keywords
+ if [[ "${?}" != "0" ]];
+ then
+   echo 'app-arch/lzma' >> /etc/portage/package.accept_keywords
+ fi
+ set -e
+
+}

lib/prereqs/Mageia/meta

@@ -1,7 +1,14 @@
 NAME='Mageia'
 SUPPORTED='yes'
 CHECK_METHOD='egrep "^Mageia\ release\ " /etc/mageia-release'
-PKG_MGR='urpmi --force ${pkgname}'
+PKG_MGR='urpmi --force --auto ${pkgname}'
 PRE_RUN='urpmi.update -a'
 PKG_CHK='rpm -q ${pkgname} | egrep "^${pkgname}-[0-9]"'
 URL='https://www.mageia.org/'
+
+function distro_specific_tweaks {
+
+ echo "No tweaks found."
+
+}
+

lib/prereqs/Manjaro/meta

@@ -5,3 +5,23 @@ PKG_MGR='pacman -S --needed --noconfirm ${pkgname}'
 PRE_RUN='pacman -Syyyu'
 PKG_CHK='pacman -Q ${pkgname}'
 URL='https://manjaro.org/'
+
+function distro_specific_tweaks {
+ # For some reason, I can't get "yes y | " to parse correctly with eval. And Arch isn't smart enough
+ # to figure out that if I enable the multilib repos, *I want multilib gcc*. Fuck it. We'll just remove it first.
+
+ pacman -S --needed haveged >> "${LOGFILE}.${FUNCNAME}" 2>&1
+ haveged
+
+ set +e
+ for pkg_override in gcc gcc-libs;
+ do
+   pacman -Q ${pkg_override} >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   if [[ "${?}" == "0" ]];
+   then
+     pacman -Rdd --noconfirm ${pkg_override} >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   fi
+ done
+set -e
+
+}

lib/prereqs/Mint/meta

@@ -5,3 +5,9 @@ PKG_MGR='apt-get -y install ${pkgname}'
 PRE_RUN='apt-get -y update'
 PKG_CHK='dpkg-query -l ${pkgname}'
 URL='http://www.linuxmint.com/'
+
+function distro_specific_tweaks {
+
+ echo "No tweaks found."
+
+}

lib/prereqs/RHEL/meta

@@ -6,3 +6,10 @@ PKG_MGR='yum -y install'
 PRE_RUN='none'
 PKG_CHK='rpm -q ${pkgname} | egrep "^${pkgname}-[0-9]"'
 URL='http://www.redhat.com/en/technologies/linux-platforms/enterprise-linux'
+
+function distro_specific_tweaks {
+
+ echo "No tweaks found."
+
+}
+

lib/prereqs/SUSE/meta

@@ -6,3 +6,11 @@ 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/'
+
+function distro_specific_tweaks {
+ # See the centos_is_stupid function. we do some tweaks there since -devel pkgs require the SDK on SLES/SLED.
+
+ echo "No tweaks found."
+
+}
+

lib/prereqs/Ubuntu/meta

@@ -5,3 +5,10 @@ PKG_MGR='apt-get -y install ${pkgname}'
 PRE_RUN='apt-get -y update'
 PKG_CHK='dpkg-query -l ${pkgname} | egrep "^ii[[:space:]]*${pkgname}"'
 URL='http://www.ubuntu.com/'
+
+function distro_specific_tweaks {
+
+ echo "No tweaks found."
+
+}
+

lib/prereqs/elementaryOS/meta

@@ -5,3 +5,10 @@ PKG_MGR='apt-get -y install ${pkgname}'
 PRE_RUN='apt-get -y update'
 PKG_CHK='dpkg-query -l ${pkgname} | egrep "^ii[[:space:]]*${pkgname}"'
 URL='https://elementary.io/'
+
+function distro_specific_tweaks {
+
+ echo "No tweaks found."
+
+}
+

lib/prereqs/iso.pkgs.lst

@@ -1 +1,40 @@
+arch-install-scripts
+archiso
+bzip2
+coreutils
+cronie
+dhclient
+dhcp
+dhcpcd
+dosfstools
+efibootmgr
+efivar
+ethtool
+file
+findutils
+gummiboot
+iproute2
+iputils
+libisoburn
+localepurge
+lz4
+lzo
+lzop
+mkinitcpio-nfs-utils
+ms-sys
+mtools
+net-tools
+netctl
+networkmanager
+openssh
+openvpn
+pv
+rsync
+sed
+shorewall
+squashfs3-tools
+squashfs-tools
+sudo
+sysfsutils
 syslinux
+traceroute

lib/prereqs/iso.pkgs.lst.32

@@ -0,0 +1 @@
+# This can be used for 32-bit only packages

lib/prereqs/iso.pkgs.lst.64

@@ -0,0 +1 @@
+# This can be used for 64-bit only packages

lib/prereqs/openSUSE/meta

@@ -6,3 +6,10 @@ 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/'
+
+function distro_specific_tweaks {
+
+ echo "No tweaks found."
+
+}
+

lib/prereqs/openSUSE/pkgs

@@ -1,5 +1,4 @@
 binutils
-binutils-devel
 curl
 gcc
 gcc-32bit
@@ -16,7 +15,3 @@ sed
 squashfs
 syslinux
 xz
-xz-devel
-xz-devel-32bit
-zlib-devel
-zlib-devel-32bit