Initial set of updates for 3.0

Makefile

@@ -3,11 +3,11 @@
 # Copyright (c) 2003-2005 Per Liden <per@fukt.bth.se>
 #
 
-CRUXVERSION       = 2.8
+CRUXVERSION       = 3.0
 CUSTOMVERSION     =
 COLLECTIONS       = core opt xorg
 KERNEL_MIRROR     = http://www.kernel.org
-KERNEL_VERSION    = 3.5.4
+KERNEL_VERSION    = 3.6.7
 KERNEL_PATCHES    =
 BB_VERSION        = 1.20.2
 SYSLINUX_VERSION  = 4.04
@@ -29,7 +29,7 @@ ISO_PACKAGES      = filesystem bash coreutils bzip2 e2fsprogs jfsutils \
                     util-linux vim which dialog nano mdadm pciutils libusb libusb-compat \
                     sysfsutils usbutils udev zlib openssl openssh \
                     dhcpcd wget iproute2 libpcre iputils libgmp libdevmapper lvm2 \
-                    attr acl libcap tcp_wrappers btrfs-progs parted
+                    attr acl libcap tcp_wrappers btrfs-progs parted xz
 
 PORTS_core        = $(shell /bin/ls -I README $(PORTS_DIR)/core)
 PORTS_opt         = $(shell /bin/cat packages.opt)
@@ -79,11 +79,11 @@ check-log:
 
 
 # kernel
-kernel/linux-$(KERNEL_VERSION).tar.bz2:
+kernel/linux-$(KERNEL_VERSION).tar.xz:
-	cd kernel && wget $(KERNEL_MIRROR)/pub/linux/kernel/v3.0/linux-$(KERNEL_VERSION).tar.bz2
+	cd kernel && wget $(KERNEL_MIRROR)/pub/linux/kernel/v3.0/linux-$(KERNEL_VERSION).tar.xz
 
-kernel/linux-$(KERNEL_VERSION): kernel/linux-$(KERNEL_VERSION).tar.bz2
+kernel/linux-$(KERNEL_VERSION): kernel/linux-$(KERNEL_VERSION).tar.xz
-	tar -C kernel -xjmf kernel/linux-$(KERNEL_VERSION).tar.bz2
+	tar -C kernel -xJmf kernel/linux-$(KERNEL_VERSION).tar.xz
 	for FILE in $(KERNEL_PATCHES); do \
 		(cd kernel/linux-$(KERNEL_VERSION) && patch -p1 -i ../$$FILE;) \
 	done
@@ -101,7 +101,7 @@ kernel-clean:
 	rm -rf kernel/linux-$(KERNEL_VERSION)
 
 kernel-distclean: kernel-clean
-	rm -f kernel/linux-$(KERNEL_VERSION).tar.bz2
+	rm -f kernel/linux-$(KERNEL_VERSION).tar.xz
 
 
 
@@ -196,7 +196,7 @@ all-chroot: check-root
 	done
 	@echo "Installing kernel source (linux-$(KERNEL_VERSION)) into $(FAKE_ROOT_DIR)/usr/src/linux-$(KERNEL_VERSION)..."
 	@mkdir -p $(FAKE_ROOT_DIR)/usr/src
-	@tar jxf kernel/linux-$(KERNEL_VERSION).tar.bz2 -C $(FAKE_ROOT_DIR)/usr/src/
+	@tar Jxf kernel/linux-$(KERNEL_VERSION).tar.xz -C $(FAKE_ROOT_DIR)/usr/src/
 	@for FILE in $(KERNEL_PATCHES); do \
 		cp kernel/$$FILE $(FAKE_ROOT_DIR)/usr/src/linux-$(KERNEL_VERSION)/; \
 		(cd $(FAKE_ROOT_DIR)/usr/src/linux-$(KERNEL_VERSION) && \
@@ -354,7 +354,7 @@ image-base: check-root kernel syslinux initramfs rootfs setup.dependencies
 	@cp doc/handbook/{handbook,releasenotes}.txt $(IMG_ROOT_DIR)/crux
 	@cp iso/setup.dependencies $(IMG_ROOT_DIR)/crux
 	@mkdir -p $(IMG_ROOT_DIR)/crux/kernel
-	@cp kernel/linux-$(KERNEL_VERSION).tar.bz2 $(IMG_ROOT_DIR)/crux/kernel
+	@cp kernel/linux-$(KERNEL_VERSION).tar.xz $(IMG_ROOT_DIR)/crux/kernel
 	@cp kernel/linux-$(KERNEL_VERSION).config $(IMG_ROOT_DIR)/crux/kernel
 	@for FILE in $(KERNEL_PATCHES); do \
 		cp kernel/$$FILE $(IMG_ROOT_DIR)/crux/kernel; \
@@ -396,7 +396,7 @@ iso: image-base memtest
 	@echo "Done"
 
 
-source-iso: busybox-source packages.all iso/syslinux-$(SYSLINUX_VERSION).tar.gz kernel/linux-$(KERNEL_VERSION).tar.bz2
+source-iso: busybox-source packages.all iso/syslinux-$(SYSLINUX_VERSION).tar.gz kernel/linux-$(KERNEL_VERSION).tar.xz
 	@echo "Creating ISO image with sources ($(SRCISO_FILENAME))"
 	@rm -rf $(SRCISO_ROOT_DIR)
 	@mkdir -p $(SRCISO_ROOT_DIR)/{ports,kernel,misc}
@@ -409,7 +409,7 @@ source-iso: busybox-source packages.all iso/syslinux-$(SYSLINUX_VERSION).tar.gz
 	@cp busybox/busybox-$(BB_VERSION).tar.bz2   $(SRCISO_ROOT_DIR)/misc
 	@cp iso/syslinux-$(SYSLINUX_VERSION).tar.gz $(SRCISO_ROOT_DIR)/misc
 	@echo "- Copying kernel and patches"
-	@cp kernel/linux-$(KERNEL_VERSION).tar.bz2  $(SRCISO_ROOT_DIR)/kernel
+	@cp kernel/linux-$(KERNEL_VERSION).tar.xz  $(SRCISO_ROOT_DIR)/kernel
 	@for PATCH in $(KERNEL_PATCHES); do cp kernel/$$PATCH $(SRCISO_ROOT_DIR)/kernel; done
 	@echo "- Creating README"
 	@echo "This ISO image contains sources for the packages, kernel and utilities" > $(SRCISO_ROOT_DIR)/README

initramfs/init

@@ -244,7 +244,7 @@ then
 			pata_ns87415 pata_ali pata_amd pdc_adma ata_generic \
 			pata_atiixp pata_triflex pata_sc1200 \
 			pata_netcell pata_sch pata_sis pata_hpt3x2n pata_marvell \
-			pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 \
+			pata_jmicron pata_via pata_cs5520 pata_cs5530 \
 			pata_cs5536 pata_sl82c105
 		do
 			if [ ! -z "$DEBUG" ]

initramfs/initramfs.lst

@@ -99,7 +99,6 @@ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_cmd640.ko ../kernel/l
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_cmd64x.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_cmd64x.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_cs5520.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_cs5520.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_cs5530.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_cs5530.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_cs5535.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_cs5535.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_cs5536.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_cs5536.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_cypress.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_cypress.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata/pata_efar.ko ../kernel/linux-#KERNEL_VERSION#/drivers/ata/pata_efar.ko 644 0 0
@@ -150,12 +149,9 @@ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/scsi_mod.ko ../kernel/lin
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/3w-9xxx.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/3w-9xxx.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/3w-xxxx.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/3w-xxxx.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/BusLogic.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/BusLogic.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/NCR53c406a.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/NCR53c406a.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/a100u2w.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/a100u2w.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/aacraid/aacraid.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/aacraid/aacraid.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/advansys.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/advansys.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/aha152x.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/aha152x.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/aha1542.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/aha1542.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/aic7xxx/aic79xx.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/aic7xxx/aic79xx.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/aic7xxx/aic7xxx.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/aic7xxx/aic7xxx.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/aic94xx/aic94xx.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/aic94xx/aic94xx.ko 644 0 0
@@ -164,13 +160,11 @@ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/atp870u.ko ../kernel/linu
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/dc395x.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/dc395x.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/dmx3191d.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/dmx3191d.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/dpt_i2o.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/dpt_i2o.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/dtc.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/dtc.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/eata.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/eata.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/fdomain.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/fdomain.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/gdth.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/gdth.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/hpsa.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/hpsa.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/hptiop.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/hptiop.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/in2000.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/in2000.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/initio.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/initio.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/ipr.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/ipr.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/ips.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/ips.ko 644 0 0
@@ -181,29 +175,19 @@ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/megaraid/megaraid_mbox.ko
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/megaraid/megaraid_mm.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/megaraid/megaraid_mm.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/megaraid/megaraid_sas.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/megaraid/megaraid_sas.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/mvsas/mvsas.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/mvsas/mvsas.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/nsp32.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/nsp32.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/pas16.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/pas16.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/qla1280.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/qla1280.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/qla2xxx/qla2xxx.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/qla2xxx/qla2xxx.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/qla4xxx/qla4xxx.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/qla4xxx/qla4xxx.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/qlogicfas.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/qlogicfas.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/qlogicfas408.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/qlogicfas408.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/scsi_transport_fc.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/scsi_transport_fc.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/scsi_transport_iscsi.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/scsi_transport_iscsi.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/scsi_transport_sas.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/scsi_transport_sas.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/scsi_transport_spi.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/scsi_transport_spi.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/scsi_wait_scan.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/scsi_wait_scan.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/sd_mod.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/sd_mod.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/sg.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/sg.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/sr_mod.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/sr_mod.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/stex.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/stex.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/sym53c416.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/sym53c416.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/sym53c8xx_2/sym53c8xx.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/sym53c8xx_2/sym53c8xx.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/t128.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/t128.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/tmscsim.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/tmscsim.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/u14-34f.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/u14-34f.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/ultrastor.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/ultrastor.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/wd7000.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/wd7000.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/message/fusion/mptbase.ko ../kernel/linux-#KERNEL_VERSION#/drivers/message/fusion/mptbase.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/message/fusion/mptfc.ko ../kernel/linux-#KERNEL_VERSION#/drivers/message/fusion/mptfc.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/message/fusion/mptsas.ko ../kernel/linux-#KERNEL_VERSION#/drivers/message/fusion/mptsas.ko 644 0 0

iso/bin/net-setup

@@ -1,395 +0,0 @@
-#!/bin/bash
-#
-# CRUX Setup
-#
-# Copyright (c) 2001-2005 by Per Liden <per@fukt.bth.se>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-# USA.
-#
-
-VERSION="2.7"
-DEFAULT_URL="http://crux.nu/netinst/"
-PKG_EXT="xz"
-
-do_dialog() {
-    dialog --backtitle "CRUX $VERSION Setup" --no-shadow "$@"
-}
-
-do_abort() {
-    do_dialog --aspect 50 --defaultno --yesno "Abort installation?" 0 0 && exit 1
-}
-
-do_select() {
-    while true; do
-	do_dialog "$@"
-	if [ $? != 0 ]; then
-	    do_abort
-	else
-	    break
-	fi
-    done
-}
-
-welcome() {
-    do_select --aspect 5 --yesno "Welcome!\n\nThis script will guide you through the installation of CRUX packages via HTTP/FTP.\n\nBefore starting the installation make sure you have read and understood the \"CRUX Installation Guide\" as well as configured/activated your network connection. If you have done that then please continue, else abort the installation and come back later.\n\nAre you really sure you want to continue?" 0 0
-}
-
-select_action() {
-    do_select --menu "Install or upgrade?" 9 45 2 \
-	             "1" "Install CRUX $VERSION" \
-                     "2" "Upgrade to CRUX $VERSION" 2> $tmpfile
-    ACTION=`cat $tmpfile`
-    if [ "$ACTION" = "1" ]; then
-	ACTION="INSTALL"
-    else
-	ACTION="UPGRADE"
-	do_select --aspect 5 --yesno "NOTE!\n\nBefore upgrading make sure /etc/pkgadd.conf in the old installation is tuned to fit your needs, important files might otherwise be overwritten. Further, when this script has completed the upgrade you need to go though the rejected files in /var/lib/pkg/rejected/ and upgrade them manually if needed. See the pkgadd(8) man page for more information about /etc/pkgadd.conf.\n\nAre you really sure you want to continue?" 0 0
-    fi
-}
-
-select_root() {
-    while true; do
-	do_select --aspect 40 --inputbox "Enter directory where your CRUX root partition is mounted:" 0 0 "/mnt" 2> $tmpfile
-	ROOT=`cat $tmpfile`
-	if [ -d "$ROOT" ]; then
-	    if [ "$ACTION" = "INSTALL" ] || [ -f "$ROOT/var/lib/pkg/db" ]; then
-		break
-	    fi
-	    do_dialog --aspect 50 --msgbox "Directory does not look like a CRUX root directory. Try again." 0 0
-	else
-	    do_dialog --aspect 50 --msgbox "Directory not found. Try again." 0 0
-	fi
-    done
-}
-
-select_url() {
-	while true; do
-		do_select --aspect 40 --inputbox "Enter the URL from which you wish to install CRUX packages:" 0 0 "$DEFAULT_URL" 2> $tmpfile
-		INSTURL=`cat $tmpfile`
-		[ -z "$INSTURL" ] && INSTURL="$DEFAULT_URL"
-		# proxy support
-		do_select --aspect 40 --inputbox "Enter proxy host (protocol://host[:port]) if needed, leave blank otherwise:" 0 0 "" 2> $tmpfile
-		PROXYURL=`cat $tmpfile`
-		if [ -z "$PROXYURL" ]; then
-			export http_proxy="$PROXYURL"
-			export ftp_proxy="$PROXYURL"
-		fi
-		# try to fetch the package list and md5sums
-		[ -f $ROOT/packages.lst ] && rm -f $ROOT/packages.lst
-		[ -f $ROOT/MD5SUMS ] && rm -f $ROOT/MD5SUMS
-		do_dialog --aspect 50 --infobox "Attempting to download the package list..." 0 0
-		wget -O $ROOT/packages.lst --tries=5 ${INSTURL}/crux/packages.lst > $tmpfile 2>&1
-		wget -O $ROOT/MD5SUMS --tries=5 ${INSTURL}/crux/MD5SUMS >> $tmpfile 2>&1
-		if [ ! -f $ROOT/packages.lst ] || [ ! -f $ROOT/MD5SUMS ]; then
-			do_dialog --aspect 50 --msgbox "Failed to download the package list! Please try a different URL." 0 0
-		else
-			break
-		fi
-	done
-}
-
-select_collections() {
-	if [ "$ACTION" != "INSTALL" ]; then
-		return 0
-	fi
-	TITLE="Select collections to install:\n(detailed package selection will follow)"
-	do_select --separate-output --checklist "$TITLE" 13 60 6 \
-		core "The core packages (required)" ON \
-		opt "Optional packages" OFF \
-		xorg "X.org packages" OFF 2> $collfile
-}
-
-ask_detailed() {
-	if [ "$ACTION" != "INSTALL" ]; then
-		return 0
-	fi
-	do_dialog --aspect 50 --defaultno --yesno "Do you want the chance to select packages individually?" 0 0 && DO_DETAILED="yes"
-}
-
-select_packages() {
-	if [ "$ACTION" = "INSTALL" ]; then
-		if [ "$DO_DETAILED" = "yes" ]; then
-			for collection in core opt xorg; do
-				presel=`grep $collection $collfile`
-				if [ "$presel" == "$collection" ]; then
-					checked=ON
-				else
-					checked=OFF
-				fi
-				do_dialog --aspect 50 --infobox "Collecting package information, please wait..." 0 0
-				TITLE="Select $collection packages to install:"
-				PKG_LIST=`cat $ROOT/packages.lst | grep ^$collection | cut -d" " -f3 | sed 's/.pkg.tar.*//g' | awk -v col="$collection" -v chk="$checked" '{ print $1, "(" col ")", chk }' | sort | xargs echo ' '`
-				do_select --separate-output --checklist "$TITLE" 19 60 12 $PKG_LIST 2>> $pkgfile
-			done
-		else # no detailed selection
-			for collection in core opt xorg; do
-				presel=`grep $collection $collfile`
-				if [ "$presel" == "$collection" ]; then
-					cat $ROOT/packages.lst | grep ^$collection | cut -d" " -f3 | sed 's/.pkg.tar.*//g' | sort >> $pkgfile
-				fi
-			done
-		fi
-	else
-		# Upgrade
-		do_dialog --aspect 50 --infobox "Collecting package information, please wait..." 0 0
-		TITLE="Select packages to upgrade:"
-		INSTALLED_PACKAGES=`pkginfo -r $ROOT -i | gawk '{ print $1; }'`
-		for package in $INSTALLED_PACKAGES; do
-			CORE_LIST="$CORE_LIST `grep ^core $ROOT/packages.lst | grep ${package}#.*.pkg.tar.* | cut -d" " -f3 | sed 's/.pkg.tar.*//g' | awk '{ print $1, "(core) ON\n" }' | sort | xargs echo ' '`"
-			OPT_LIST="$OPT_LIST `grep ^opt $ROOT/packages.lst | grep ${package}#.*.pkg.tar.* | cut -d" " -f3 | sed 's/.pkg.tar.*//g' | awk '{ print $1, "(opt) ON\n" }' | sort | xargs echo ' '`"
-			XORG_LIST="$XORG_LIST `grep ^xorg $ROOT/packages.lst | grep ${package}#.*.pkg.tar.* | cut -d" " -f3 | sed 's/.pkg.tar.*//g' | awk '{ print $1, "(xorg) ON\n" }' | sort | xargs echo ' '`"
-		done
-		do_select --separate-output --checklist "$TITLE" 19 60 12 $CORE_LIST $OPT_LIST $XORG_LIST 2> $pkgfile
-	fi
-}
-
-check_dependencies() {
-	if [ "$ACTION" != "INSTALL" ]; then
-		return 0
-	fi
-	do_dialog --aspect 50 --infobox "Checking dependencies, please wait..." 0 0
-	get_missing_deps
-	if [ -n "$MISSING_DEPS" ]; then
-		for package in $MISSING_DEPS; do
-		    MISSING_LIST="$MISSING_LIST `grep ${package}#.*.pkg.tar.* $ROOT/packages.lst | sed -r 's/.pkg.tar.(xz|bz2|gz)/ /g' | awk '{ print $3, "(" $1 ")", "ON" }' | sort | xargs echo ' '`"
-		done
-		TITLE="The following packages are needed by the ones you selected"
-		do_select --separate-output --checklist "$TITLE" 19 60 12 $MISSING_LIST 2>> $pkgfile
-	fi
-}
-
-get_missing_deps() {
-	needed=""
-	toinstall=`sed 's/\#.*//g' $pkgfile`
-	for f in $toinstall; do
-		pdeps=`grep "^$f\:" $depsfile|sed "s|^$f: ||g"`
-		for d in $pdeps; do
-			needed="$needed $d"
-		done
-	done
-	sed 's/\#.*//g' $pkgfile|sort -u > $markedfile
-	echo $needed|tr ' ' '\n'|sort -u > $neededfile
-	MISSING_DEPS=`comm -1 -3 $markedfile $neededfile`
-}
-
-confirm() {
-	if [ "$ACTION" = "INSTALL" ]; then
-		# Install
-		do_select --aspect 25 --yesno "Selected packages will now be installed. Are you sure you want to continue?" 0 0
-	else
-		# Upgrade
-		do_select --aspect 25 --yesno "Selected packages will now be upgraded. Are you sure you want to continue?" 0 0
-	fi
-}
-
-progressbar() {
-    echo "XXX"
-    expr $COUNT '*' 50 / $TOTAL
-    echo "\n$*"
-    echo "XXX"
-    let $((COUNT+=1))
-}
-
-install_packages() {
-    if [ ! -d $ROOT/var/lib/pkg ]; then
-	mkdir -p $ROOT/var/lib/pkg
-	touch $ROOT/var/lib/pkg/db
-    fi
-
-    if [ -d $ROOT/var/lib/pkg/rejected ]; then
-	rm -rf $ROOT/var/lib/pkg/rejected
-    fi
-
-    if [ "$ACTION" = "INSTALL" ]; then
-	PKGARGS=""
-    else
-	# We use -f here since we want to avoid pkgadd conflicts.
-	# Unwanted/Unexpected conflicts could arise if files are
-	# moved from one package to another, or if the user added
-	# the files himself. Instead of failing the whole upgrade
-	# we force the upgrade. This should be fairly safe and it
-	# will probably help to avoid some "semi-bogus" errors from
-	# pkgadd. The rules in /etc/pkgadd.conf will still be used.
-	PKGARGS="-f -u"
-    fi
-
-    (
-        # Log header
-	echo "Log  ($logfile)" > $logfile
-	echo "----------------------------------------------------------" >> $logfile
-
-        # Install packages
-	KERNEL_VERSION=`basename ./kernel/linux-*.config .config | sed 's/^linux-//'`
-	TOTAL=`cat $pkgfile | wc -l`
-	let $((TOTAL+=1))
-	let $((COUNT=0))
-	let $((ERRORS=0))
-	for FILE in `cat $pkgfile`; do
-		# download the package first
-		progressbar "Downloading $FILE..."
-		ESCFILE="`echo $FILE | sed 's/#/%23/g'`"
-		COLL="`grep $FILE.pkg.tar.$PKG_EXT $ROOT/packages.lst | cut -d" " -f1`"
-		let $((TRIES=0))
-		while true; do
-			if [ "$TRIES" = "5" ]; then
-				do_dialog --aspect 50 --msgbox "Failed to download package $FILE! Please restart setup using a different URL or install it manually after setup completes." 0 0
-				FAILED=1
-				break
-			fi
-			# if the download has failed before, remove a possibly incomplete file
-			[ -f $ROOT/$FILE.pkg.tar.* ] && rm -f $ROOT/$FILE.pkg.tar.* > /dev/null
-			# download the package
-			(cd $ROOT && wget --tries=5 $INSTURL/crux/$COLL/$ESCFILE.pkg.tar.$PKG_EXT > $tmpfile 2>&1)
-			# check its MD5 checksum
-			if [ "`grep $FILE.pkg.tar.${PKG_EXT}$ $ROOT/MD5SUMS | cut -d' ' -f1`" = "`md5sum $ROOT/$FILE.pkg.tar.$PKG_EXT | cut -d' ' -f1`" ]; then
-				break
-			else
-				do_dialog --aspect 50 --infobox "$FILE.pkg.tar.$PKG_EXT failed MD5SUM check, trying again..." 0 0
-				sleep 5
-			fi
-		done
-
-		if [ ! "$FAILED" = "1" ]; then
-			# then install it
-	    	progressbar "Installing $FILE..."
-	    	echo -n "Installing $FILE....." >> $logfile
-	    	pkgadd -r $ROOT $PKGARGS $ROOT/$FILE.pkg.tar.$PKG_EXT >> $tmpfile 2>&1
-			rm -f $ROOT/$FILE.pkg.tar.$PKG_EXT
-	    	if [ $? = 0 ]; then
-				echo "OK" >> $logfile
-	    	else
-				let $((ERRORS+=1))
-				echo "ERROR" >> $logfile
-				echo "" >> $logfile
-				cat $tmpfile >> $logfile
-				echo "" >> $logfile
-	    	fi
-		fi
-	done
-
-	# Install kernel
-	if [ ! -d $ROOT/usr/src/linux-$KERNEL_VERSION ]; then
-		progressbar "Downloading linux-$KERNEL_VERSION..."
-		(cd $ROOT/usr/src && wget --tries=5 $INSTURL/crux/kernel/linux-$KERNEL_VERSION.tar.bz2 > $tmpfile 2>&1)
-		if [ ! -f $ROOT/usr/src/linux-$KERNEL_VERSION.tar.bz2 ]; then
-			do_dialog --aspect 40 --msgbox "Failed to download linux-$KERNEL_VERSION! Please try a different URL or install it manually after setup completes." 0 0
-		fi
-	    progressbar "Installing linux-$KERNEL_VERSION..."
-	    echo -n "Installing linux-$KERNEL_VERSION....." >> $logfile
-	    (
-		set -e
-		tar -C $ROOT/usr/src -xjf $ROOT/usr/src/linux-$KERNEL_VERSION.tar.bz2
-		cp -f ./kernel/linux-$KERNEL_VERSION.config $ROOT/usr/src/linux-$KERNEL_VERSION/.config
-		chown -R root.root $ROOT/usr/src/linux-$KERNEL_VERSION
-		chmod -R go-w $ROOT/usr/src/linux-$KERNEL_VERSION
-		shopt -s nullglob
-		# modified to be filename-agnostic
-		for patch in ./kernel/*patch; do
-		    patch -s -d $ROOT/usr/src/linux-$KERNEL_VERSION -p1 < $patch
-			cp $patch $ROOT/usr/src/
-		done
-		if [ ! -d $ROOT/lib/modules/$KERNEL_VERSION ]; then
-		    mkdir -p $ROOT/lib/modules/$KERNEL_VERSION
-		    depmod -b $ROOT -a $KERNEL_VERSION
-		fi
-	    ) > $tmpfile 2>&1
-	    if [ $? = 0 ]; then
-		echo "OK" >> $logfile
-	    else
-		let $((ERRORS+=1))
-		echo "ERROR" >> $logfile
-		echo "" >> $logfile
-		cat $tmpfile >> $logfile
-		echo "" >> $logfile
-	    fi
-	else
-	    echo "Directory $ROOT/usr/src/linux-$KERNEL_VERSION already exists." >> $logfile
-	    echo "Assuming linux-$KERNEL_VERSION is already installed." >> $logfile
-	fi
-
-        # Log footer
-	echo "----------------------------------------------------------" >> $logfile
-	echo "$ERRORS error(s) found" >> $logfile
-
-	cat $logfile > $tmpfile
-
-	echo "" > $logfile
-	if [ "$ERRORS" = "0" ]; then
-	    echo "$ACTION COMPLETED SUCCESSFULLY!" >> $logfile
-	else
-	    echo "$ACTION FAILED!" >> $logfile
-	fi
-	echo "" >> $logfile
-	echo "" >> $logfile
-	cat $tmpfile >> $logfile
-
-    ) | do_dialog --title " Please wait " --gauge "" 8 60 0
-
-    # Show log
-    do_dialog --exit-label "OK" --textbox $logfile 19 68
-}
-
-main() {
-	welcome
-	select_action
-	select_root
-	select_url
-	select_collections
-	ask_detailed
-	select_packages
-	check_dependencies
-	confirm
-	if [ "$ACTION" = "UPGRADE" ] && [ -f /usr/bin/net-setup-helper ]
-	then
-		(/usr/bin/net-setup-helper $ROOT $INSTURL &> $helperlogfile) | do_dialog \
-			--title " Please wait [2.6 -> 2.7 check]" --gauge "" 8 60 0
-	fi
-    install_packages
-
-	cat $helperlogfile 2> /dev/null
-}
-
-tmpfile=/tmp/tmp.$$
-collfile=/tmp/collections.$$
-pkgfile=/tmp/packages.$$
-logfile=/tmp/log.$$
-helperlogfile=/tmp/log-helper.$$
-crux_dir=/media/crux
-neededfile=/tmp/needed.$$
-markedfile=/tmp/marked.$$
-
-# Detailed selection of packages
-DO_DETAILED="no"
-MISSINGDEPS=""
-
-trap "rm -f $tmpfile $pkgfile $collfile $neededfile $markedfile" 0 1 2 5 15
-
-if [ "$1" != "" ]; then
-	crux_dir=$1
-fi
-
-depsfile=$crux_dir/setup.dependencies
-
-if [ -d $crux_dir ]; then
-	cd $crux_dir
-else
-	do_dialog --aspect 50 --msgbox "Directory $crux_dir not found. Aborting." 0 0
-	exit 1
-fi
-
-main
-
-# End of file

iso/bin/net-setup-helper

@@ -1,139 +0,0 @@
-#!/bin/bash
-# post setup
-#
-# Johannes Winkelmann, jw at tks6 dot net
-
-ROOT=$1
-INSTURL=$2
-DB=$ROOT/var/lib/pkg/db
-
-## those values should be changed:
-TMPDB=$DB.tmp
-BACKUPDB=$DB.backup
-PKGADD="pkgadd"
-PKGRM="pkgrm"
-MV="mv"
-
-
-is_installed() {
-    printf "%s" $(pkginfo -r $ROOT -i | gawk -v r="^$1\$" '$1 ~ r {print $1}')
-}
-
-
-rename_packages() {
-    if [ -z "$1" ]; then
-	return
-    fi
-    pkg=$@
-    
-    filter="sed "
-    runfilter="no"
-    for tuple in $@; do
-	split=($(echo $tuple|sed -e 's|:| |'))
-	if [ -n "${split[1]}" ] && [ `is_installed ${split[0]}` ]; then
-	    echo "Package renamed:  ${split[0]} -> ${split[1]}"
-	    filter="$filter -e 's|^${split[0]}$|${split[1]}|'"
-	    runfilter="yes"
-	fi
-    done
-    if [ "$runfilter" = "no" ]; then
-	return
-    fi
-
-    :> $TMPDB
-    if [ -f $DB ]; then
-	nextIsName=1
-	cat $DB|while read l; do
-	    if [ $nextIsName -eq 1 ]; then
-		nextIsName=0
-		echo $l|eval $filter >> $TMPDB
-	    else
-		if [ "$l" = "" ]; then
-		    nextIsName=1
-		fi
-		echo $l >> $TMPDB
-	    fi
-	done
-    fi
-
-    $MV $DB $BACKUPDB
-    $MV $TMPDB $DB
-}
-
-
-remove_packages() {
-    for package in $@; do
-	if [ `is_installed $package` ]; then
-	    echo "Package removed:  $package"
-            $PKGRM -r $ROOT $package
-	fi
-    done
-}
-
-inject_packages() {
-    for package in $@; do
-	if [ -z `is_installed $package` ]; then
-	    echo "Package injected: $package"
-	    #pkg="`find core opt xorg \( -name \"${package}#*.pkg.tar.gz\" -o -name \"${package}#*.pkg.tar.bz2\" -o -name \"${package}#*.pkg.tar.xz\" \)&2> /dev/null`"
-		pkg="`grep \"${package}#*.pkg.tar\" $ROOT/packages.lst | cut -d" " -f3`"
-		escpkg="`echo $pkg | sed -e 's/#/%23/g'`"
-		coll="`grep \"${package}#*.pkg.tar\" $ROOT/packages.lst | cut -d" " -f1`"
-		let $((TRIES=0))
-		while true; do
-			if [ "$TRIES" = "5" ]; then
-				echo "Failed to download $pkg! Please install it manually after setup completes."
-				FAILED=1
-				break
-			fi
-			# if the last md5 check failed there might be an incomplete file
-			[ -f $ROOT/$pkg ] && rm -f $ROOT/$pkg > /dev/null
-			# download the file
-			wget -O $ROOT/$pkg ${INSTURL}/crux/$coll/$escpkg > /tmp/log.wget.$$ 2>&1
-			# check md5sum
-			if [ "`grep ${pkg}$ $ROOT/MD5SUMS | cut -d\" \" -f1`" = "`md5sum $ROOT/$pkg | cut -d\" \" -f1`" ]; then
-				break
-			else
-				echo "$pkg failed md5sum check, refetching..."
-				sleep 5
-			fi
-		done
-
-	    if [ -n "$pkg" ]; then
-			$PKGADD -r $ROOT -f $pkg
-			rm -f $ROOT/$pkg
-	    else
-			echo "  ERROR: package $package not found"
-	    fi
-	fi
-    done
-}
-
-####################
-
-if [ -z "$1" ]; then
-    echo "Usage: $0 <root> <installation URL>"
-    exit -1
-fi
-
-
-
-##### # 2.6 -> 2.7 #####
-echo "* CRUX 2.6 -> 2.7 setup-helper"
-
-rename_packages "libattr:attr"
-remove_packages portmap glitz
-inject_packages libmpc attr acl libcap
-
-
-if [ `is_installed xorg-xf86-video-intel` ]; then
-    inject_packages gperf xorg-xcb-util
-fi
-
-if [ `is_installed cairo` ]; then
-    inject_packages gperf xorg-xcb-util
-fi
-
-if [ `is_installed nfs-utils` ]; then
-    inject_packages libtirpc libnfsidmap libevent rpcbind
-fi
-

iso/bin/setup

@@ -20,7 +20,7 @@
 # USA.
 #
 
-VERSION="2.8"
+VERSION="3.0"
 
 do_dialog() {
     dialog --backtitle "CRUX $VERSION Setup" --no-shadow "$@"
@@ -212,8 +212,8 @@ install_packages() {
 	echo "----------------------------------------------------------" >> $logfile
 
         # Install packages
-	KERNEL=./kernel/linux-*.tar.bz2
+	KERNEL=./kernel/linux-*.tar.xz
-	KERNEL_VERSION=`basename $KERNEL .tar.bz2 | sed "s/linux-//"`
+	KERNEL_VERSION=`basename $KERNEL .tar.xz | sed "s/linux-//"`
 	TOTAL=`cat $pkgfile | wc -l`
 	let $((TOTAL+=1))
 	let $((COUNT=0))
@@ -236,11 +236,11 @@ install_packages() {
 
 	# Install kernel
 	if [ ! -d $ROOT/usr/src/linux-$KERNEL_VERSION ]; then
-	    progressbar "Installing `basename $KERNEL .tar.bz2`..."
+	    progressbar "Installing `basename $KERNEL .tar.xz`..."
-	    echo -n "Installing `basename $KERNEL .tar.bz2`....." >> $logfile
+	    echo -n "Installing `basename $KERNEL .tar.xz`....." >> $logfile
 	    (
 		set -e
-		tar -C $ROOT/usr/src -xjf $KERNEL
+		tar -C $ROOT/usr/src -xJf $KERNEL
 		cp -f ./kernel/linux-$KERNEL_VERSION.config $ROOT/usr/src/linux-$KERNEL_VERSION/.config
 		chown -R root.root $ROOT/usr/src/linux-$KERNEL_VERSION
 		chmod -R go-w $ROOT/usr/src/linux-$KERNEL_VERSION
@@ -304,7 +304,7 @@ main() {
 	if [ "$ACTION" = "UPGRADE" ] && [ -f /usr/bin/setup-helper ]
 	then
 		(/usr/bin/setup-helper $ROOT &> $helperlogfile) | do_dialog \
-			--title " Please wait [2.7 -> 2.8 check]" --gauge "" 8 60 0
+			--title " Please wait [2.8 -> 3.0 check]" --gauge "" 8 60 0
 	fi
     install_packages
 

iso/bin/setup-helper

@@ -94,40 +94,10 @@ if [ -z "$1" ]; then
 fi
 
 
-##### # 2.7 -> 2.8 #####
+##### # 2.8 -> 3.0 #####
-echo "* CRUX 2.7 -> 2.8 setup-helper"
+echo "* CRUX 2.8 -> 3.0 setup-helper"
 
-rename_packages "util-linux-ng:util-linux"
+inject_packages glibc-32
-remove_packages module-init-tools eject
-inject_packages kmod tzdata util-linux
-
-if [ `is_installed glib` ]; then
-    inject_packages libffi
-fi
-
-if [ `is_installed wpa_supplicant` ]; then
-    inject_packages libnl
-fi
-
-if [ `is_installed xorg-xcb-util` ]; then
-    inject_packages xorg-xcb-util-image xorg-xcb-util-keysyms xorg-xcb-util-renderutil xorg-xcb-util-wm
-fi
-
-if [ `is_installed xorg-xf86-input-evdev` ]; then
-    inject_packages mtdev
-fi
-
-if [ `is_installed xorg-xf86-input-synaptics` ]; then
-    inject_packages mtdev
-fi
-
-if [ `is_installed firefox` ]; then
-    inject_packages nspr nss sqlite3
-fi
-
-if [ `is_installed mesa3d` ]; then
-    inject_packages glu
-fi
 
 # force replacement of /etc/mtab with symlink
 ln -sf /proc/self/mounts $ROOT/etc/mtab

iso/etc/motd

@@ -1,3 +1,3 @@
 
-Welcome to the CRUX 2.8 installation media!
+Welcome to the CRUX 3.0 installation media!
 

iso/isolinux/boot.msg

@@ -1,4 +1,4 @@
-Welcome to the CRUX 2.8 installation media!
+Welcome to the CRUX 3.0 installation media!
 
 Press <Enter> to boot using the default 'CRUX' image
 or use one of the others in the following list:

iso/setup.dependencies

@@ -8,8 +8,9 @@ bin86: bin86
 bindutils: openssl bindutils 
 binutils: zlib binutils 
 bison: bison 
-btrfs-progs: e2fsprogs btrfs-progs 
+btrfs-progs: ncurses zlib util-linux e2fsprogs btrfs-progs 
 bzip2: bzip2 
+ca-certificates: ca-certificates 
 coreutils: libgmp attr acl libcap coreutils 
 cpio: cpio 
 curl: openssl zlib curl 
@@ -17,7 +18,7 @@ db: db
 dcron: dcron 
 dhcpcd: dhcpcd 
 diffutils: diffutils 
-e2fsprogs: e2fsprogs 
+e2fsprogs: ncurses zlib util-linux e2fsprogs 
 ed: ed 
 exim: db openssl libpcre tcp_wrappers exim 
 file: zlib file 
@@ -29,6 +30,7 @@ gcc: zlib libgmp libmpfr libmpc gcc
 gdbm: gdbm 
 gettext: ncurses attr acl gettext 
 glibc: glibc 
+glibc-32: glibc-32 
 grep: libpcre grep 
 groff: groff 
 gzip: gzip 
@@ -38,8 +40,8 @@ iana-etc: iana-etc
 inetutils: ncurses readline inetutils 
 iproute2: db iptables iproute2 
 iptables: iptables 
-iputils: sysfsutils iputils 
+iputils: attr openssl sysfsutils libcap iputils 
-jfsutils: jfsutils 
+jfsutils: ncurses zlib util-linux jfsutils 
 kbd: kbd 
 kmod: kmod 
 less: ncurses libpcre less 
@@ -78,7 +80,7 @@ prt-get: prt-get
 psmisc: ncurses psmisc 
 rc: rc 
 readline: ncurses readline 
-reiserfsprogs: reiserfsprogs 
+reiserfsprogs: ncurses zlib util-linux reiserfsprogs 
 rsync: attr acl rsync 
 sed: attr acl sed 
 shadow: attr acl shadow 
@@ -98,27 +100,28 @@ util-linux: ncurses zlib util-linux
 vim: ncurses attr acl vim 
 wget: openssl wget 
 which: which 
-xfsprogs: xfsprogs 
+xfsprogs: ncurses zlib util-linux xfsprogs 
 xz: xz 
 zip: bzip2 zip 
 zlib: zlib 
 alsa-lib: alsa-lib 
 atk: libpcre libffi gdbm openssl bzip2 zlib ncurses readline sqlite3 python glib atk 
-cairo: zlib expat gdbm openssl bzip2 ncurses xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-xtrans xorg-util-macros xorg-renderproto xorg-libpixman libpcre libffi freetype libpng libxml2 readline xorg-libxdmcp xorg-libxau xorg-kbproto xorg-inputproto fontconfig libxslt sqlite3 python xorg-xcb-proto glib xorg-libxcb xorg-libx11 xorg-xcb-util xorg-libxrender cairo 
+cairo: zlib expat xorg-xproto gdbm openssl bzip2 ncurses libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-xtrans xorg-util-macros xorg-renderproto xorg-libpixman libpcre libffi freetype libpng libxml2 xorg-libxdmcp xorg-libxau readline xorg-kbproto xorg-inputproto fontconfig libxslt sqlite3 python xorg-xcb-proto glib xorg-libxcb xorg-libx11 xorg-xcb-util xorg-libxext xorg-libxrender cairo 
 cdrkit: zlib openssl bzip2 xz attr expat ncurses file curl acl libcap libarchive cmake cdrkit 
 cmake: openssl zlib bzip2 xz attr expat ncurses curl acl libarchive cmake 
 dialog: ncurses dialog 
 expat: expat 
 fakeroot: fakeroot 
 fetchmail: openssl fetchmail 
-firefox: nspr ncurses libpcre libffi gdbm openssl bzip2 zlib hicolor-icon-theme xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-xtrans xorg-util-macros libjpeg expat xorg-renderproto xorg-libpixman xorg-fixesproto xorg-xineramaproto xorg-randrproto xorg-compositeproto alsa-lib yasm xorg-libpciaccess xorg-dri2proto xorg-xf86vidmodeproto xorg-damageproto readline libxml2 libpng freetype xorg-libxdmcp xorg-libxau xorg-makedepend xorg-libice xorg-kbproto xorg-inputproto xorg-glproto libtiff libdrm sqlite3 libxslt fontconfig xorg-libsm nss python glib xorg-xcb-proto talloc libxml2-python libidl atk xorg-libxcb xorg-libx11 xorg-xcb-util gdk-pixbuf xorg-libxrender xorg-libxext xorg-libxfixes xorg-libxt cairo xorg-libxft xorg-libxinerama xorg-libxrandr xorg-libxxf86vm xorg-libxcursor xorg-libxcomposite xorg-libxdamage pango mesa3d gtk firefox 
+firefox: nspr ncurses libpcre libffi gdbm openssl bzip2 zlib hicolor-icon-theme xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-xtrans xorg-util-macros libjpeg expat xorg-renderproto xorg-libpixman xorg-fixesproto xorg-xineramaproto xorg-randrproto xorg-compositeproto alsa-lib yasm xorg-libpciaccess xorg-dri2proto xorg-xf86vidmodeproto xorg-damageproto readline libxml2 libpng freetype xorg-libxdmcp xorg-libxau xorg-makedepend xorg-libice xorg-kbproto xorg-inputproto xorg-glproto libtiff libdrm sqlite3 libxslt fontconfig xorg-libsm nss python glib xorg-xcb-proto talloc libxml2-python libidl atk xorg-libxcb xorg-libx11 xorg-xcb-util gdk-pixbuf xorg-libxext xorg-libxrender xorg-libxfixes xorg-libxt xorg-libxinerama xorg-libxxf86vm cairo xorg-libxft xorg-libxrandr xorg-libxcursor xorg-libxcomposite xorg-libxdamage harfbuzz mesa3d pango gtk firefox 
 fontconfig: zlib expat freetype fontconfig 
 freetype: zlib freetype 
 gdk-pixbuf: libpcre libffi gdbm openssl bzip2 zlib ncurses xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-xtrans xorg-util-macros libjpeg libxml2 libpng readline xorg-libxdmcp xorg-libxau xorg-kbproto xorg-inputproto libtiff libxslt sqlite3 python glib xorg-xcb-proto xorg-libxcb xorg-libx11 gdk-pixbuf 
 glib: libpcre libffi gdbm openssl bzip2 zlib ncurses readline sqlite3 python glib 
 gperf: gperf 
 grub2: kmod zlib udev freetype libdevmapper grub2 
-gtk: libpcre libffi gdbm openssl bzip2 zlib ncurses hicolor-icon-theme xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-xtrans xorg-util-macros libjpeg expat xorg-renderproto xorg-libpixman xorg-fixesproto xorg-xineramaproto xorg-randrproto xorg-compositeproto libxml2 libpng freetype readline xorg-libxdmcp xorg-libxau xorg-libice xorg-kbproto xorg-inputproto libtiff libxslt fontconfig sqlite3 xorg-libsm python glib xorg-xcb-proto atk xorg-libxcb xorg-libx11 xorg-xcb-util gdk-pixbuf xorg-libxrender xorg-libxext xorg-libxfixes cairo xorg-libxft xorg-libxinerama xorg-libxrandr xorg-libxcursor xorg-libxcomposite pango gtk 
+gtk: libpcre libffi gdbm openssl bzip2 zlib ncurses hicolor-icon-theme xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-xtrans xorg-util-macros libjpeg expat xorg-renderproto xorg-libpixman xorg-fixesproto xorg-xineramaproto xorg-randrproto xorg-compositeproto libxml2 libpng freetype readline xorg-libxdmcp xorg-libxau xorg-libice xorg-kbproto xorg-inputproto libtiff libxslt fontconfig sqlite3 xorg-libsm python glib xorg-xcb-proto atk xorg-libxcb xorg-libx11 xorg-xcb-util gdk-pixbuf xorg-libxext xorg-libxrender xorg-libxfixes xorg-libxinerama cairo xorg-libxft xorg-libxrandr xorg-libxcursor xorg-libxcomposite harfbuzz pango gtk 
+harfbuzz: zlib expat xorg-xproto gdbm openssl bzip2 ncurses libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-xtrans xorg-util-macros xorg-renderproto xorg-libpixman libpcre libffi freetype libpng libxml2 xorg-libxdmcp xorg-libxau readline xorg-kbproto xorg-inputproto fontconfig libxslt sqlite3 python xorg-xcb-proto glib xorg-libxcb xorg-libx11 xorg-xcb-util xorg-libxext xorg-libxrender cairo harfbuzz 
 hicolor-icon-theme: hicolor-icon-theme 
 intltool: expat db gdbm perl p5-xml-parser intltool 
 keyutils: keyutils 
@@ -142,9 +145,9 @@ nano: ncurses nano
 nfs-utils: tcp_wrappers attr libtirpc libnfsidmap libevent keyutils libcap rpcbind nfs-utils 
 nspr: nspr 
 nss: nspr ncurses readline sqlite3 nss 
-openbox: gdbm openssl bzip2 zlib ncurses xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-xtrans xorg-util-macros xorg-xineramaproto xorg-randrproto xorg-renderproto libpcre libffi expat xorg-libpixman libxml2 freetype libpng readline xorg-libxdmcp xorg-libxau xorg-libice xorg-kbproto xorg-inputproto libxslt fontconfig sqlite3 xorg-libsm python xorg-xcb-proto glib xorg-libxcb xorg-libx11 xorg-xcb-util xorg-libxext xorg-libxrender xorg-libxinerama xorg-libxrandr cairo xorg-libxft pango openbox 
+openbox: gdbm openssl bzip2 zlib ncurses xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-xtrans xorg-util-macros xorg-xineramaproto xorg-randrproto xorg-renderproto libpcre libffi expat xorg-libpixman libxml2 freetype libpng readline xorg-libxdmcp xorg-libxau xorg-libice xorg-kbproto xorg-inputproto libxslt fontconfig sqlite3 xorg-libsm python xorg-xcb-proto glib xorg-libxcb xorg-libx11 xorg-xcb-util xorg-libxext xorg-libxrender xorg-libxinerama xorg-libxrandr cairo xorg-libxft harfbuzz pango openbox 
 p5-xml-parser: expat db gdbm perl p5-xml-parser 
-pango: zlib expat gdbm openssl bzip2 ncurses xorg-xproto libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-xtrans xorg-util-macros xorg-renderproto xorg-libpixman libpcre libffi freetype libpng libxml2 readline xorg-libxdmcp xorg-libxau xorg-libice xorg-kbproto xorg-inputproto fontconfig libxslt sqlite3 xorg-libsm python xorg-xcb-proto glib xorg-libxcb xorg-libx11 xorg-xcb-util xorg-libxrender xorg-libxext cairo xorg-libxft pango 
+pango: zlib expat xorg-xproto gdbm openssl bzip2 ncurses libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-xtrans xorg-util-macros xorg-renderproto xorg-libpixman libpcre libffi freetype libpng libxml2 xorg-libxdmcp xorg-libxau readline xorg-libice xorg-kbproto xorg-inputproto fontconfig libxslt sqlite3 xorg-libsm python xorg-xcb-proto glib xorg-libxcb xorg-libx11 xorg-xcb-util xorg-libxext xorg-libxrender cairo xorg-libxft harfbuzz pango 
 parted: kmod ncurses udev readline libdevmapper parted 
 procmail: procmail 
 python: gdbm openssl bzip2 zlib ncurses readline sqlite3 python 

kernel/linux-3.6.7.config

@@ -1,22 +1,23 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.5.4 Kernel Configuration
+# Linux/x86_64 3.6.7 Kernel Configuration
 #
-# CONFIG_64BIT is not set
+CONFIG_64BIT=y
-CONFIG_X86_32=y
+# CONFIG_X86_32 is not set
-# CONFIG_X86_64 is not set
+CONFIG_X86_64=y
 CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_MMU=y
-# CONFIG_NEED_DMA_MAP_STATE is not set
+CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
@@ -31,14 +32,13 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ZONE_DMA32 is not set
+CONFIG_ZONE_DMA32=y
-# CONFIG_AUDIT_ARCH is not set
+CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_X86_32_SMP=y
+CONFIG_X86_64_SMP=y
 CONFIG_X86_HT=y
-CONFIG_X86_32_LAZY_GS=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_HAVE_IRQ_WORK=y
@@ -83,7 +83,8 @@ CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_KTIME_SCALAR=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@ -171,7 +172,6 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
@@ -185,13 +185,15 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
 
 #
 # GCOV-based kernel profiling
 #
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
@@ -203,7 +205,6 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
-CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
@@ -229,6 +230,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
+CONFIG_BLOCK_COMPAT=y
 
 #
 # IO Schedulers
@@ -275,62 +277,36 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_ZONE_DMA=y
 CONFIG_SMP=y
 CONFIG_X86_MPPARSE=y
-CONFIG_X86_BIGSMP=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
-# CONFIG_X86_32_IRIS is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_PARAVIRT_GUEST is not set
 CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
+# CONFIG_MPSC is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MELAN is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
-CONFIG_X86_GENERIC=y
+CONFIG_GENERIC_CPU=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
-# CONFIG_X86_PPRO_FENCE is not set
 CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_TSC=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_DEBUGCTLMSR=y
 CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_HPET_TIMER=y
-# CONFIG_HPET_TIMER is not set
+CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
-# CONFIG_IOMMU_HELPER is not set
+CONFIG_GART_IOMMU=y
+# CONFIG_CALGARY_IOMMU is not set
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
 CONFIG_NR_CPUS=16
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
@@ -342,37 +318,35 @@ CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
 # CONFIG_X86_MCE is not set
-CONFIG_VM86=y
-# CONFIG_TOSHIBA is not set
 # CONFIG_I8K is not set
-# CONFIG_X86_REBOOTFIXUPS is not set
 # CONFIG_MICROCODE is not set
 # CONFIG_X86_MSR is not set
 # CONFIG_X86_CPUID is not set
-CONFIG_NOHIGHMEM=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-# CONFIG_HIGHMEM4G is not set
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-# CONFIG_HIGHMEM64G is not set
+CONFIG_DIRECT_GBPAGES=y
-CONFIG_PAGE_OFFSET=0xC0000000
+# CONFIG_NUMA is not set
-# CONFIG_X86_PAE is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
+CONFIG_SPARSEMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_SPARSEMEM=y
-CONFIG_FLATMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_STATIC=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
+# CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_COMPACTION is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
@@ -384,7 +358,6 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 # CONFIG_FRONTSWAP is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW=64
-# CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 # CONFIG_MTRR_SANITIZER is not set
 CONFIG_X86_PAT=y
@@ -400,12 +373,14 @@ CONFIG_HZ_100=y
 CONFIG_HZ=100
 # CONFIG_SCHED_HRTICK is not set
 # CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x1000000
 # CONFIG_RELOCATABLE is not set
-CONFIG_PHYSICAL_ALIGN=0x200000
+CONFIG_PHYSICAL_ALIGN=0x1000000
 # CONFIG_HOTPLUG_CPU is not set
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
 # Power management and ACPI options
@@ -444,17 +419,18 @@ CONFIG_X86_PM_TIMER=y
 # CONFIG_CPU_FREQ is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
+#
+# Memory power savings
+#
+# CONFIG_I7300_IDLE is not set
+
 #
 # Bus options (PCI etc.)
 #
 CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_DOMAINS=y
@@ -477,13 +453,6 @@ CONFIG_HT_IRQ=y
 CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y
 CONFIG_ISA_DMA_API=y
-CONFIG_ISA=y
-# CONFIG_EISA is not set
-# CONFIG_SCx200 is not set
-# CONFIG_OLPC is not set
-# CONFIG_ALIX is not set
-# CONFIG_NET5501 is not set
-# CONFIG_GEOS is not set
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
@@ -501,9 +470,6 @@ CONFIG_YENTA_ENE_TUNE=y
 CONFIG_YENTA_TOSHIBA=y
 CONFIG_PD6729=m
 CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
 CONFIG_PCCARD_NONSTATIC=y
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_RAPIDIO is not set
@@ -512,14 +478,20 @@ CONFIG_PCCARD_NONSTATIC=y
 # Executable file formats / Emulations
 #
 CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_HAVE_AOUT=y
+# CONFIG_HAVE_AOUT is not set
-# CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
-CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+# CONFIG_X86_X32 is not set
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
 
 #
 # Networking options
@@ -606,6 +578,7 @@ CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 CONFIG_BQL=y
+# CONFIG_BPF_JIT is not set
 
 #
 # Network testing
@@ -629,7 +602,6 @@ CONFIG_CFG80211=m
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
@@ -643,6 +615,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
@@ -650,6 +623,7 @@ CONFIG_MAC80211_LEDS=y
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
 # CONFIG_NFC is not set
+CONFIG_HAVE_BPF_JIT=y
 
 #
 # Device Drivers
@@ -669,7 +643,6 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 # CONFIG_DMA_SHARED_BUFFER is not set
-# CONFIG_CMA is not set
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
 # CONFIG_PARPORT is not set
@@ -679,13 +652,9 @@ CONFIG_PNP=y
 #
 # Protocols
 #
-CONFIG_ISAPNP=y
-CONFIG_PNPBIOS=y
-# CONFIG_PNPBIOS_PROC_FS is not set
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -748,7 +717,6 @@ CONFIG_VMWARE_BALLOON=m
 # CONFIG_EEPROM_MAX6875 is not set
 CONFIG_EEPROM_93CX6=m
 # CONFIG_CB710_CORE is not set
-# CONFIG_IWMC3200TOP is not set
 
 #
 # Texas Instruments shared transport line discipline
@@ -787,7 +755,6 @@ CONFIG_CHR_DEV_SG=m
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -812,10 +779,7 @@ CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_HPSA=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_7000FASST=m
 CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AHA152X=m
-CONFIG_SCSI_AHA1542=m
 CONFIG_SCSI_AACRAID=m
 CONFIG_SCSI_AIC7XXX=m
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
@@ -838,7 +802,6 @@ CONFIG_SCSI_MVSAS_DEBUG=y
 # CONFIG_SCSI_MVUMI is not set
 CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
 CONFIG_SCSI_ARCMSR=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
@@ -851,14 +814,12 @@ CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 # CONFIG_SCSI_UFSHCD is not set
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_FLASHPOINT=y
 CONFIG_VMWARE_PVSCSI=m
 # CONFIG_LIBFC is not set
 # CONFIG_LIBFCOE is not set
 # CONFIG_FCOE is not set
 # CONFIG_FCOE_FNIC is not set
 CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DTC3280=m
 CONFIG_SCSI_EATA=m
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 CONFIG_SCSI_EATA_LINKED_COMMANDS=y
@@ -866,12 +827,9 @@ CONFIG_SCSI_EATA_MAX_TAGS=16
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
 # CONFIG_SCSI_ISCI is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_NCR53C406A=m
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
@@ -881,22 +839,12 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 CONFIG_SCSI_IPR=m
 # CONFIG_SCSI_IPR_TRACE is not set
 # CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_PAS16=m
-CONFIG_SCSI_QLOGIC_FAS=m
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
 CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_SYM53C416=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DC390T=m
-CONFIG_SCSI_T128=m
-CONFIG_SCSI_U14_34F=m
-CONFIG_SCSI_U14_34F_TAGGED_QUEUE=y
-CONFIG_SCSI_U14_34F_LINKED_COMMANDS=y
-CONFIG_SCSI_U14_34F_MAX_TAGS=8
-CONFIG_SCSI_ULTRASTOR=m
-CONFIG_SCSI_NSP32=m
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_PMCRAID is not set
 # CONFIG_SCSI_PM8001 is not set
@@ -954,7 +902,6 @@ CONFIG_PATA_ATIIXP=m
 CONFIG_PATA_CMD64X=m
 CONFIG_PATA_CS5520=m
 CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
 CONFIG_PATA_CS5536=m
 CONFIG_PATA_CYPRESS=m
 CONFIG_PATA_EFAR=m
@@ -990,14 +937,11 @@ CONFIG_PATA_WINBOND=m
 # PIO-only SFF controllers
 #
 CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_MPIIX=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_OPTI=m
 CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_QDI=m
 CONFIG_PATA_RZ1000=m
-CONFIG_PATA_WINBOND_VLB=m
 
 #
 # Generic fallback / legacy drivers
@@ -1073,9 +1017,6 @@ CONFIG_SUNGEM_PHY=m
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
-CONFIG_EL3=m
-CONFIG_3C515=m
 CONFIG_PCMCIA_3C574=m
 CONFIG_PCMCIA_3C589=m
 CONFIG_VORTEX=m
@@ -1087,11 +1028,8 @@ CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
-CONFIG_LANCE=m
 CONFIG_PCNET32=m
-CONFIG_DEPCA=m
 CONFIG_PCMCIA_NMCLAN=m
-CONFIG_NI65=m
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
 CONFIG_ATL1=m
@@ -1115,14 +1053,10 @@ CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3=m
 # CONFIG_CHELSIO_T4 is not set
 # CONFIG_CHELSIO_T4VF is not set
-CONFIG_NET_VENDOR_CIRRUS=y
-CONFIG_CS89x0=m
-# CONFIG_CS89x0_PLATFORM is not set
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
 CONFIG_DNET=m
 CONFIG_NET_VENDOR_DEC=y
-CONFIG_EWRK3=m
 CONFIG_NET_TULIP=y
 CONFIG_DE2104X=m
 CONFIG_DE2104X_DSL=0
@@ -1145,9 +1079,7 @@ CONFIG_NET_VENDOR_EXAR=y
 CONFIG_S2IO=m
 # CONFIG_VXGE is not set
 CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_AT1700=m
 CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_ETH16I=m
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_INTEL=y
@@ -1161,13 +1093,6 @@ CONFIG_IXGB=m
 CONFIG_IXGBE=m
 # CONFIG_IXGBE_PTP is not set
 CONFIG_NET_VENDOR_I825XX=y
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_APRICOT=m
-CONFIG_EEXPRESS=m
-CONFIG_EEXPRESS_PRO=m
-CONFIG_LP486E=m
-CONFIG_NI52=m
 CONFIG_ZNET=m
 CONFIG_IP1000=m
 CONFIG_JME=m
@@ -1189,17 +1114,9 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_8390=y
-CONFIG_EL2=m
-CONFIG_AC3200=m
 CONFIG_PCMCIA_AXNET=m
-CONFIG_E2100=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
-CONFIG_NE2000=m
 CONFIG_NE2K_PCI=m
 CONFIG_PCMCIA_PCNET=m
-CONFIG_ULTRA=m
-CONFIG_WD80x3=m
 CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
@@ -1211,7 +1128,6 @@ CONFIG_QLA3XXX=m
 # CONFIG_QLCNIC is not set
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
-CONFIG_NET_VENDOR_RACAL=y
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
@@ -1231,7 +1147,6 @@ CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_SFC=m
 CONFIG_NET_VENDOR_SMSC=y
-CONFIG_SMC9194=m
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
 CONFIG_SMSC9420=m
@@ -1270,6 +1185,7 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
+# CONFIG_BCM87XX_PHY is not set
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_NATIONAL_PHY=m
@@ -1403,7 +1319,6 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
-# CONFIG_IWM is not set
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
@@ -1560,10 +1475,8 @@ CONFIG_SERIAL_CORE=m
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-# CONFIG_SONYPI is not set
 
 #
 # PCMCIA character devices
@@ -1573,8 +1486,6 @@ CONFIG_SERIAL_CORE=m
 # CONFIG_CARDMAN_4040 is not set
 # CONFIG_IPWIRELESS is not set
 # CONFIG_MWAVE is not set
-# CONFIG_PC8736x_GPIO is not set
-# CONFIG_NSC_GPIO is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_HPET is not set
 # CONFIG_HANGCHECK_TIMER is not set
@@ -1639,9 +1550,7 @@ CONFIG_I2C_I801=y
 #
 # Other I2C/SMBus bus drivers
 #
-# CONFIG_I2C_PCA_ISA is not set
 # CONFIG_I2C_STUB is not set
-# CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -1681,6 +1590,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_SMB347 is not set
+# CONFIG_POWER_AVS is not set
 # CONFIG_HWMON is not set
 CONFIG_THERMAL=y
 # CONFIG_WATCHDOG is not set
@@ -1714,6 +1624,8 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_MFD_LM3533 is not set
@@ -1728,11 +1640,13 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_I2C is not set
 # CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
 # CONFIG_MFD_MAX8925 is not set
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_S5M_CORE is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_WM8350_I2C is not set
@@ -1757,16 +1671,10 @@ CONFIG_BCMA_POSSIBLE=y
 # Graphics support
 #
 CONFIG_AGP=m
-CONFIG_AGP_ALI=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_AMD=m
 CONFIG_AGP_AMD64=m
 CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
 CONFIG_AGP_SIS=m
-CONFIG_AGP_SWORKS=m
 CONFIG_AGP_VIA=m
-CONFIG_AGP_EFFICEON=m
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=2
 CONFIG_VGA_SWITCHEROO=y
@@ -1811,7 +1719,6 @@ CONFIG_FB_VESA=y
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set
 # CONFIG_FB_I740 is not set
-# CONFIG_FB_I810 is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
@@ -1847,7 +1754,6 @@ CONFIG_FB_VESA=y
 CONFIG_VGA_CONSOLE=y
 CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-# CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
@@ -1863,6 +1769,7 @@ CONFIG_FONT_8x16=y
 #
 CONFIG_HID=m
 CONFIG_HIDRAW=y
+# CONFIG_UHID is not set
 CONFIG_HID_GENERIC=m
 
 #
@@ -1888,6 +1795,7 @@ CONFIG_HID_KYE=m
 # CONFIG_HID_TWINHAN is not set
 CONFIG_HID_KENSINGTON=m
 # CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LENOVO_TPKBD is not set
 CONFIG_HID_LOGITECH=m
 CONFIG_HID_LOGITECH_DJ=m
 # CONFIG_LOGITECH_FF is not set
@@ -2087,13 +1995,16 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_INTEL_SS4200 is not set
 # CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_LM3556 is not set
 # CONFIG_LEDS_OT200 is not set
+# CONFIG_LEDS_BLINKM is not set
 CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
 # CONFIG_LEDS_TRIGGER_TIMER is not set
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
@@ -2187,11 +2098,11 @@ CONFIG_RTC_DRV_CMOS=y
 #
 # Hardware Spinlock drivers
 #
-CONFIG_CLKSRC_I8253=y
 CONFIG_CLKEVT_I8253=y
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
 CONFIG_IOMMU_SUPPORT=y
+# CONFIG_AMD_IOMMU is not set
 
 #
 # Remoteproc drivers (EXPERIMENTAL)
@@ -2206,6 +2117,7 @@ CONFIG_IOMMU_SUPPORT=y
 # CONFIG_MEMORY is not set
 # CONFIG_IIO is not set
 # CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set
 
 #
 # Firmware Drivers
@@ -2344,10 +2256,11 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_UFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
-CONFIG_NFS_V2=y
+CONFIG_NFS_V2=m
-CONFIG_NFS_V3=y
+CONFIG_NFS_V3=m
 # CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
+# CONFIG_NFS_SWAP is not set
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V3_ACL is not set
@@ -2470,7 +2383,6 @@ CONFIG_HAVE_ARCH_KMEMCHECK=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
-CONFIG_DOUBLEFAULT=y
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_IO_DELAY_TYPE_0X80=0
@@ -2565,34 +2477,41 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
 CONFIG_CRYPTO_SHA1=m
+# CONFIG_CRYPTO_SHA1_SSSE3 is not set
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
 # CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
 
 #
 # Ciphers
 #
 CONFIG_CRYPTO_AES=m
-# CONFIG_CRYPTO_AES_586 is not set
+# CONFIG_CRYPTO_AES_X86_64 is not set
 # CONFIG_CRYPTO_AES_NI_INTEL is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_BLOWFISH_X86_64 is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAMELLIA_X86_64 is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
+# CONFIG_CRYPTO_SALSA20_X86_64 is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SERPENT_SSE2_586 is not set
+# CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set
+# CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set
 # CONFIG_CRYPTO_TEA is not set
 # CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
+# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
+# CONFIG_CRYPTO_TWOFISH_X86_64_3WAY is not set
+# CONFIG_CRYPTO_TWOFISH_AVX_X86_64 is not set
 
 #
 # Compression
@@ -2661,6 +2580,7 @@ CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_AVERAGE=y
 # CONFIG_CORDIC is not set
 # CONFIG_DDR is not set

packages.opt

@@ -15,6 +15,7 @@ glib
 gperf
 grub2
 gtk
+harfbuzz
 hicolor-icon-theme
 intltool
 keyutils

pkgmk.conf

@@ -2,15 +2,30 @@
 # /etc/pkgmk.conf: pkgmk(8) configuration
 #
 
-export CFLAGS="-O2 -march=i686 -pipe"
+export CFLAGS="-O2 -march=x86-64 -pipe"
 export CXXFLAGS="${CFLAGS}"
 
-export MAKEFLAGS="-j4"
+export MAKEFLAGS="-j5"
+
+case ${PKGMK_ARCH} in
+	"64")
+		;;
+	"32")
+		export CFLAGS="${CFLAGS} -m32"
+		export CXXFLAGS="${CXXFLAGS} -m32"
+		export LDFLAGS="${LDFLAGS} -m32"
+		export PKG_CONFIG_LIBDIR="/usr/lib32/pkgconfig"
+		;;
+	*)
+		echo "Unknown architecture selected! Exiting."
+		exit 1
+		;;
+esac
 
 # PKGMK_SOURCE_MIRRORS=()
-# PKGMK_SOURCE_DIR="$PWD"
+# PKGMK_SOURCE_DIR="/usr/ports/sources"
-# PKGMK_PACKAGE_DIR="$PWD"
+# PKGMK_PACKAGE_DIR="/usr/ports/packages"
-# PKGMK_WORK_DIR="$PWD/work"
+# PKGMK_WORK_DIR="/usr/ports/work/$name"
 # PKGMK_DOWNLOAD="no"
 # PKGMK_IGNORE_FOOTPRINT="no"
 # PKGMK_IGNORE_NEW="no"