From 6add9f27a4cbd0c9e78ef883bfd976663abcc593 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 17 Jun 2012 09:50:11 +0200
Subject: [PATCH] kernel: build ipv6/autofs4 as kernel builtins (for systemd),
 enable x32 abi for x86_64.

---
 srcpkgs/kernel/files/i386-dotconfig   | 4 ++--
 srcpkgs/kernel/files/x86_64-dotconfig | 6 +++---
 srcpkgs/kernel/template               | 2 +-
 srcpkgs/xbps-devel/template           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kernel/files/i386-dotconfig b/srcpkgs/kernel/files/i386-dotconfig
index fb5dd03334c..26477cc73b0 100644
--- a/srcpkgs/kernel/files/i386-dotconfig
+++ b/srcpkgs/kernel/files/i386-dotconfig
@@ -748,7 +748,7 @@ CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_DEFAULT_RENO=y
 CONFIG_DEFAULT_TCP_CONG="reno"
 CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
+CONFIG_IPV6=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
@@ -5124,7 +5124,7 @@ CONFIG_QUOTA_TREE=m
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
 CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_GENERIC_ACL=y
diff --git a/srcpkgs/kernel/files/x86_64-dotconfig b/srcpkgs/kernel/files/x86_64-dotconfig
index 2fc08b60559..8bb4431c805 100644
--- a/srcpkgs/kernel/files/x86_64-dotconfig
+++ b/srcpkgs/kernel/files/x86_64-dotconfig
@@ -639,7 +639,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_MISC=m
 CONFIG_IA32_EMULATION=y
 CONFIG_IA32_AOUT=m
-# CONFIG_X86_X32 is not set
+CONFIG_X86_X32=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_SYSVIPC_COMPAT=y
@@ -709,7 +709,7 @@ CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_DEFAULT_RENO=y
 CONFIG_DEFAULT_TCP_CONG="reno"
 CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
+CONFIG_IPV6=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
@@ -5066,7 +5066,7 @@ CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
 CONFIG_QUOTACTL=y
 CONFIG_QUOTACTL_COMPAT=y
-CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_GENERIC_ACL=y
diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index bb8c76e05fd..25dc3a2992c 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -3,7 +3,7 @@
 pkgname=kernel
 _kmajorver=3.4
 version=${_kmajorver}.2
-revision=1
+revision=2
 nostrip=yes
 noverifyrdeps=yes
 preserve=yes
diff --git a/srcpkgs/xbps-devel/template b/srcpkgs/xbps-devel/template
index fe811e4535c..80cdac151d6 100644
--- a/srcpkgs/xbps-devel/template
+++ b/srcpkgs/xbps-devel/template
@@ -11,7 +11,7 @@ conf_files="/etc/xbps/xbps.conf"
 subpackages="$pkgname-static"
 provides="xbps-9999"
 replaces="xbps>=0"
-revision=1
+revision=3
 short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"