config: merge config.i686 and update package list

2 files changed, 13 insertions, 48 deletions

diff --git a/config.def b/config.def
index aaf6ff7..da11627 100644
--- a/config.def
+++ b/config.def
@@ -10,14 +10,23 @@ MNTDIR="$PWD/rootfs"
 # Most of those are already dependencies 
 # of each other but it is not a bad idea
 # to put them to the list anyway.
-PKGS="baselayout kiss musl gcc make gzip xz zlib bzip2 binutils bison curl linux-headers m4 flex busybox pkgconf rsync libressl"
+PKGS="baselayout kiss musl gcc make gzip xz zlib bzip2 binutils byacc curl \
+     linux-headers m4 flex busybox pkgconf rsync bearssl"
 
 # Build flags
 # It is a good idea to not use flags like "native"
 # If you plan on using the tarball on another computer
-# due to architechtural differences.
-CFLAGS="-march=x86-64 -mtune=generic -pipe -Os"
-CXXFLAGS="-march=x86-64 -mtune=generic -pipe -Os"
+# due to architechtural differences. You can manually
+# override this march configuration here by removing the
+# case.
+#
+march=$(uname -m)
+case "$march" in
+    x86_64) march=x86-64 ;;
+    i*86)   march=i686   ;;
+esac
+CFLAGS="-march=$march -mtune=generic -pipe -Os"
+CXXFLAGS="-march=$march -mtune=generic -pipe -Os"
 MAKEFLAGS="-j$(nproc)"
 
 # Repository
diff --git a/config.i686 b/config.i686
deleted file mode 100644
index d8ca4d4..0000000
--- a/config.i686
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Configuration file for Carbs bootstrapper
-#
-
-# Root directory
-# This is where the rootfs will be installed.
-MNTDIR="$PWD/rootfs"
-
-# List of packages to be installed
-# Most of those are already dependencies 
-# of each other but it is not a bad idea
-# to put them to the list anyway.
-PKGS="baselayout kiss musl gcc make gzip xz zlib bzip2 binutils bison curl rsync linux-headers m4 flex busybox pkgconf rsync libressl"
-
-# Build flags
-# It is a good idea to not use flags like "native"
-# If you plan on using the tarball on another computer
-# due to architechtural differences.
-CFLAGS="-march=i686   -mtune=generic -pipe -Os"
-CXXFLAGS="-march=i686 -mtune=generic -pipe -Os"
-MAKEFLAGS="-j$(nproc)"
-
-# Repository
-# This repository will be cloned to /tmp/repo on the
-# host, and /var/db/kiss/repo on the target system.
-REPO="rsync://carbslinux.org/repo"
-HOST_REPO_PATH="/tmp/repo/i686:/tmp/repo/core"
-
-export MNTDIR PKGS CFLAGS CXXFLAGS REPO HOST_REPO_PATH MAKEFLAGS
-
-postinstall() {
-	# You can preferably add some custom
-	# commands if you want a postinstall
-	# procedure. This runs right after kiss
-	# install is complete
-
-	# Currently default function is 'true'
-	# because there is nothing else to be done,
-	# but you can safely remove it if you will
-	# be adding some post-installation commands
-	true
-}
-
-# vim:filetype=sh