summaryrefslogtreecommitdiff
path: root/Config.in
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-29 09:40:49 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-29 19:56:31 (GMT)
commitf14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch)
tree7617315e619f969c13e79c1f44c2428871719357 /Config.in
parent365261c9db442081290b7d21aba6201244af294d (diff)
resolve merge conflict
Diffstat (limited to 'Config.in')
-rw-r--r--Config.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/Config.in b/Config.in
index c42dfbf..1011119 100644
--- a/Config.in
+++ b/Config.in
@@ -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"