diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-31 09:24:31 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-31 09:24:31 +0100 |
| commit | 1e9a681a0fc22e40abe393aa9f015a12f7b6dc63 (patch) | |
| tree | 250019d7025db0f012d830cc7b257b091347f97f /target | |
| parent | bf73dab7201f06f26290c4ceb5cdcca603f027d7 (diff) | |
| parent | 1b6a9fa3f18fdeaa3f3869a22cd91490ffec608c (diff) | |
resolve merge conflict
Diffstat (limited to 'target')
| -rw-r--r-- | target/packages/pkg-available/mpdbox | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox index 519250f0b..ff3b685ca 100644 --- a/target/packages/pkg-available/mpdbox +++ b/target/packages/pkg-available/mpdbox @@ -19,9 +19,9 @@ config ADK_PKG_MPDBOX select ADK_PACKAGE_MPD_WITH_CURL select ADK_PACKAGE_MPD_WITH_SAMPLERATE select ADK_PACKAGE_MPD_WITH_HTTPD - select ADK_PACKAGE_NFS_UTILS - select ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS - select ADK_PACKAGE_NFS_UTILS_CLIENT + select ADK_PACKAGE_NFS_UTILS if !ADK_TARGET_LIB_MUSL + select ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS if !ADK_TARGET_LIB_MUSL + select ADK_PACKAGE_NFS_UTILS_CLIENT if !ADK_TARGET_LIB_MUSL select ADK_PACKAGE_CPUFREQUTILS select ADK_PACKAGE_FILE select ADK_PACKAGE_HTOP |