summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTilman Sauerbeck <tilman@crux.nu>2010-07-13 23:00:56 +0200
committerTilman Sauerbeck <tilman@crux.nu>2010-07-13 23:04:07 +0200
commitfb9b94a860d01f687d1e2c55e2ed2fa8fddc4a1a (patch)
tree4badf65684aa8c03fab7a3ca8442ea0118e8dc75
parent891890603535e22ef273b88ae94d759b80a39ae9 (diff)
downloadiso-fb9b94a860d01f687d1e2c55e2ed2fa8fddc4a1a.tar.gz
iso-fb9b94a860d01f687d1e2c55e2ed2fa8fddc4a1a.tar.xz
Added btrfs support.
This touches the kernel config so we get the btrfs module and it also adds the btrfs-progs package to the iso.
-rw-r--r--Makefile2
-rw-r--r--iso/setup.dependencies1
-rw-r--r--kernel/linux-2.6.34.config5
3 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 600ff10..d97f9f2 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ ISO_PACKAGES = filesystem bash coreutils bzip2 e2fsprogs jfsutils \
util-linux-ng 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
+ attr acl libcap tcp_wrappers btrfs-progs
PORTS_core = $(shell /bin/ls -I README $(PORTS_DIR)/core)
PORTS_opt = $(shell /bin/cat packages.opt)
diff --git a/iso/setup.dependencies b/iso/setup.dependencies
index 060f5c1..d4366b8 100644
--- a/iso/setup.dependencies
+++ b/iso/setup.dependencies
@@ -8,6 +8,7 @@ bin86: bin86
bindutils: openssl bindutils
binutils: zlib binutils
bison: bison
+btrfs-progs: util-linux-ng
bzip2: bzip2
coreutils: libgmp attr acl libcap coreutils
cpio: cpio
diff --git a/kernel/linux-2.6.34.config b/kernel/linux-2.6.34.config
index 503cefa..e015f1c 100644
--- a/kernel/linux-2.6.34.config
+++ b/kernel/linux-2.6.34.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.34
-# Fri Jun 25 20:43:26 2010
+# Tue Jul 13 22:59:44 2010
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1940,7 +1940,8 @@ CONFIG_XFS_POSIX_ACL=y
# CONFIG_XFS_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_NILFS2_FS is not set
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y

Generated by cgit