multiarch

5 files changed, 39 insertions, 8 deletions

diff --git a/kcleanup-fedora b/kcleanup-fedora
index 83523df..e2d40f7 100755
--- a/kcleanup-fedora
+++ b/kcleanup-fedora
@@ -3,6 +3,12 @@
 # args
 version="$1"
 
+# config
+grubby="grubby"
+if test -f /boot/extlinux/extlinux.conf; then
+	grubby="$grubby --extlinux"
+fi
+
 if test "$version" = ""; then
 	echo "usage: $0 <version>"
 	echo "kernels:"
@@ -19,11 +25,11 @@ for kernel in $kernels; do
 		continue
 	fi		
 	echo "# kill $version"
-	grubby --remove-kernel="${kernel}"
+	$grubby --remove-kernel="${kernel}"
 	rm -f "${kernel}"
 	rm -f "${kernel}.old"
 	rm -f "${kernel//vmlinuz/System.map}"
 	rm -f "${kernel//vmlinuz/System.map}.old"
 	rm -f "${kernel//vmlinuz/initramfs}.img"
 	rm -rf "/lib/modules/${version}"
-done
\ No newline at end of file
+done
diff --git a/need.config b/need.config
index efcabc7..e61b3e3 100644
--- a/need.config
+++ b/need.config
@@ -16,7 +16,16 @@ CONFIG_USB_UAS=m
 # filesystems
 CONFIG_MSDOS_FS=m
 CONFIG_VFAT_FS=m
+
 CONFIG_NFS_FS=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFS_USE_KERNEL_DNS=y
 
 CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
diff --git a/qemu-arm.config b/qemu-arm.config
index 6789500..d3df0da 100644
--- a/qemu-arm.config
+++ b/qemu-arm.config
@@ -1,4 +1,17 @@
-# virtio drivers
+##############################################################
+# disable hardware not supported by qemu
+# leftovers from "make localmodconfig"
+
+CONFIG_XEN=n
+
+# build stuff statically for easy smoke tests
+CONFIG_VIRTIO_MMIO=y
 CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_NET=y
 CONFIG_SCSI_VIRTIO=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_EXT4_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_MMC=y
+CONFIG_MMC_ARMMMCI=y
diff --git a/qemu-x86_64.config b/qemu-x86_64.config
index 5e4b440..60c6293 100644
--- a/qemu-x86_64.config
+++ b/qemu-x86_64.config
@@ -1,4 +1,5 @@
-# virtio drivers
-CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_NET=m
-CONFIG_SCSI_VIRTIO=m
+##############################################################
+# disable hardware not supported by qemu
+# leftovers from "make localmodconfig"
+
+CONFIG_XEN=n
diff --git a/qemu.config b/qemu.config
index 1d9beec..6f9cb84 100644
--- a/qemu.config
+++ b/qemu.config
@@ -2,7 +2,6 @@
 # disable hardware not supported by qemu
 # leftovers from "make localmodconfig"
 
-CONFIG_XEN=n
 CONFIG_PCCARD=n
 CONFIG_IRDA=n
 CONFIG_BT=n
@@ -21,6 +20,9 @@ CONFIG_VIRTIO_PCI=y
 
 # virtio drivers
 CONFIG_VIRTIO_CONSOLE=y
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_NET=m
+CONFIG_SCSI_VIRTIO=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_VIRTIO_BALLOON=m