diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-24 20:15:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-24 20:15:39 +0200 |
| commit | 57f1ccba214ee4d658fe2bcd61ef51651ade3225 (patch) | |
| tree | b18a2c5f6d6fc42a9228daa4cf671f517e5a4a43 /Config.default | |
| parent | f3e84309257b915cb8820917a8dd5578f02fe974 (diff) | |
| parent | 6f63961c83bdb1791779975a36ebd28a0de247d6 (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
fic conflicts
Conflicts:
package/gnutls/Makefile
package/mrd6/Makefile
Diffstat (limited to 'Config.default')
| -rw-r--r-- | Config.default | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Config.default b/Config.default index 24bac36fa..b0751213f 100644 --- a/Config.default +++ b/Config.default @@ -38,6 +38,7 @@ ADK_TARGET_ROOTFS_EXT2_CF=y # ADK_TARGET_ROOTFS_EXT2 is not set # ADK_SSP is not set # ADK_CXX is not set +# ADK_DEBUG is not set # ADK_IPV6 is not set # ADK_XORG is not set @@ -46,10 +47,6 @@ ADK_TARGET_ROOTFS_EXT2_CF=y # # -# Package categories -# - -# # Applications # @@ -896,10 +893,7 @@ ADK_PACKAGE_CFGFS=y # ADK_COMPILE_KRB5 is not set # ADK_PACKAGE_OPENCT is not set # ADK_PACKAGE_OPENSC is not set -ADK_COMPILE_OPENSSL=y -ADK_PACKAGE_LIBOPENSSL=y -# ADK_PACKAGE_OPENSSL_UTIL is not set -# ADK_PACKAGE_CA_CERTS is not set +# ADK_PACKAGE_LIBOPENSSL is not set # ADK_PACKAGE_OPENSSL_PKCS11 is not set # @@ -1236,7 +1230,7 @@ ADK_PACKAGE_DROPBEAR=y # ADK_PACKAGE_LIBWRAP is not set # ADK_PACKAGE_LIBXML2 is not set # ADK_PACKAGE_LIBXSLT is not set -ADK_PACKAGE_ZLIB=y +# ADK_PACKAGE_ZLIB is not set # # Kernel configuration |