diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
| commit | f6c5a79972bcd216429484eb706fc47c7bb52a75 (patch) | |
| tree | 4f5e17701c66df5d2359486687f1fd41b2fb469e /target/packages/pkg-available | |
| parent | 00fa581bc6acc3158b3008019e81802a5d70418c (diff) | |
| parent | b8e1fbce6811e906e7c8bd21f4e7fe1aa4881585 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/packages/pkg-available')
| -rw-r--r-- | target/packages/pkg-available/development | 1 | ||||
| -rw-r--r-- | target/packages/pkg-available/test | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development index 6da3a5564..b4a9bff9f 100644 --- a/target/packages/pkg-available/development +++ b/target/packages/pkg-available/development @@ -13,7 +13,6 @@ config ADK_PKG_DEVELOPMENT select ADK_PACKAGE_TAR select ADK_PACKAGE_MUSL_DEV if ADK_TARGET_LIB_MUSL select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC - select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC select ADK_PACKAGE_LIBNCURSES select ADK_PACKAGE_LIBNCURSES_DEV diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test new file mode 100644 index 000000000..8af24a816 --- /dev/null +++ b/target/packages/pkg-available/test @@ -0,0 +1,8 @@ +config ADK_PKG_TEST + bool "Compile a ADK test framework system" + default n + select ADK_PACKAGE_STRACE + select ADK_PACKAGE_SOCAT + help + Package collection used to build adk-test-framework root + filesystem. |