diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 22:44:34 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 22:44:34 +0200 |
commit | 9bbda20e102696cb396b0db0f5e745cb637ccd1e (patch) | |
tree | 120e7257fd8a67b6a8fb892c8f182f0a8ae7986e /target | |
parent | 96d9f7612b66674d60f6fc37df647d363fd9dce2 (diff) | |
parent | ed060fd872e3193e2d20860532ee70b4d155db20 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r-- | target/config/Config.in | 4 | ||||
-rw-r--r-- | target/linux/config/Config.in.debug | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.fs | 5 | ||||
-rw-r--r-- | target/linux/config/Config.in.fsnet | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.netfilter | 2 | ||||
-rw-r--r-- | target/linux/patches/2.6.39/defaults.patch | 26 | ||||
-rw-r--r-- | target/x86_64/sys-available/qemu-x86_64 | 2 | ||||
-rw-r--r-- | target/x86_64/uclibc.config | 2 |
8 files changed, 41 insertions, 3 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index d5cdcdb70..5c38228b6 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -227,6 +227,9 @@ config ADK_CPU_I586 config ADK_CPU_I686 boolean +config ADK_CPU_X86_64 + boolean + config ADK_CPU_GEODE boolean @@ -248,6 +251,7 @@ config ADK_CPU_ARMV5 config ADK_TARGET_CPU_ARCH string + default "x86_64" if ADK_CPU_X86_64 default "i486" if ADK_CPU_I486 default "i586" if ADK_CPU_I586 default "i686" if ADK_CPU_I686 diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 1ab7bba85..891a00c6e 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -36,7 +36,7 @@ config ADK_KERNEL_MAGIC_SYSRQ config ADK_KERNEL_DEBUG_FS prompt "Debug Filesystem" boolean - default n + default y help debugfs is a virtual file system that kernel developers use to put debugging files into. Enable this option to be able to read and diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 4df34a2bc..ee2adc39f 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -1,7 +1,12 @@ menu "Filesystems support" +config ADK_KERNEL_FSNOTIFY + boolean + default y + config ADK_KERNEL_EXPORTFS boolean + default y config ADK_KERNEL_YAFFS_FS tristate diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index 301a988f2..40f9b1bbe 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -107,6 +107,7 @@ config ADK_KPACKAGE_KMOD_NFSD select ADK_KERNEL_NFSD_V4 select ADK_KERNEL_DNOTIFY select ADK_KPACKAGE_KMOD_SUNRPC + select ADK_KPACKAGE_KMOD_SUNRPC_GSS select ADK_KPACKAGE_KMOD_LOCKD select ADK_KERNEL_NETWORK_FILESYSTEMS depends on !ADK_TARGET_ROOTFS_NFSROOT diff --git a/target/linux/config/Config.in.netfilter b/target/linux/config/Config.in.netfilter index 94f82ef64..f4b9610af 100644 --- a/target/linux/config/Config.in.netfilter +++ b/target/linux/config/Config.in.netfilter @@ -2,7 +2,7 @@ menu "Netfilter (Firewall/Filtering)" config ADK_KERNEL_NETFILTER bool - default n + default y config ADK_KERNEL_NETFILTER_ADVANCED bool diff --git a/target/linux/patches/2.6.39/defaults.patch b/target/linux/patches/2.6.39/defaults.patch new file mode 100644 index 000000000..d24c1c367 --- /dev/null +++ b/target/linux/patches/2.6.39/defaults.patch @@ -0,0 +1,26 @@ +diff -Nur linux-2.6.39.orig/fs/Kconfig linux-2.6.39/fs/Kconfig +--- linux-2.6.39.orig/fs/Kconfig 2011-05-19 06:06:34.000000000 +0200 ++++ linux-2.6.39/fs/Kconfig 2011-08-08 20:33:22.618014757 +0200 +@@ -44,10 +44,10 @@ + # this symbol for ifdefs in core code. + # + config FS_POSIX_ACL +- def_bool n ++ def_bool y + + config EXPORTFS +- bool ++ def_bool y + + config FILE_LOCKING + bool "Enable POSIX file locking API" if EXPERT +diff -Nur linux-2.6.39.orig/fs/notify/Kconfig linux-2.6.39/fs/notify/Kconfig +--- linux-2.6.39.orig/fs/notify/Kconfig 2011-05-19 06:06:34.000000000 +0200 ++++ linux-2.6.39/fs/notify/Kconfig 2011-08-08 20:33:38.328017344 +0200 +@@ -1,5 +1,5 @@ + config FSNOTIFY +- def_bool n ++ def_bool y + + source "fs/notify/dnotify/Kconfig" + source "fs/notify/inotify/Kconfig" diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64 index e7dd37fa8..d0427ea29 100644 --- a/target/x86_64/sys-available/qemu-x86_64 +++ b/target/x86_64/sys-available/qemu-x86_64 @@ -2,6 +2,8 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64 bool "Qemu Emulator" select ADK_x86_64 select ADK_qemu_x86_64 + select ADK_CPU_X86_64 + select ADK_LINUX_64 select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT diff --git a/target/x86_64/uclibc.config b/target/x86_64/uclibc.config index 301220414..7492fdcfc 100644 --- a/target/x86_64/uclibc.config +++ b/target/x86_64/uclibc.config @@ -81,7 +81,7 @@ UCLIBC_CTOR_DTOR=y UCLIBC_HAS_THREADS_NATIVE=y UCLIBC_HAS_THREADS=y UCLIBC_HAS_TLS=y -# PTHREADS_DEBUG_SUPPORT is not set +PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y # MALLOC is not set |