diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /Config.in | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'Config.in')
| -rw-r--r-- | Config.in | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -61,6 +61,10 @@ endmenu menu "Package selection" depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM +source "package/Config.in.auto.global" +source "package/Config.in" + +menu "Package options" config ADK_LEAVE_ETC_ALONE boolean "do not install anything into /etc" default n @@ -101,8 +105,7 @@ config ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS Note that without further customisation, turning this option off will almost certainly render the resulting system unusable. -source "package/Config.in.auto.global" -source "package/Config.in.auto" +endmenu endmenu menu "Runtime configuration" |