diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-05 21:19:09 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-05 21:19:09 +0100 |
| commit | 0d26df21995dc2f25041974fb6faf3ec31be6467 (patch) | |
| tree | 5c7d127a7440047678be887af89ad2c4029f7b92 /target | |
| parent | da41715f82af9f47cfe64a5c71fb998ba3ebc335 (diff) | |
| parent | c60450e51bf32ef6993ece3496cd8cdcb93b8e04 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/sys-available/raspberry-pi | 1 | ||||
| -rw-r--r-- | target/packages/pkg-available/development | 4 | ||||
| -rw-r--r-- | target/packages/pkg-available/mpdbox | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index 846f0fcf8..b8753c36d 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -15,7 +15,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_TARGET_WITH_INPUT select ADK_PACKAGE_BCM2835_FIRMWARE select ADK_PACKAGE_BCM2835_VC - select ADK_KERNEL_SWAP help Raspberry PI diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development index 143166acd..72e0777ce 100644 --- a/target/packages/pkg-available/development +++ b/target/packages/pkg-available/development @@ -25,10 +25,8 @@ config ADK_PKG_DEVELOPMENT select ADK_PACKAGE_MAKE select ADK_PACKAGE_MKFONTDIR select ADK_PACKAGE_PATCH - select ADK_PACKAGE_PKG_CONFIG + select ADK_PACKAGE_PKGCONF select ADK_PACKAGE_MICROPERL - select ADK_PACKAGE_TSORT - select BUSYBOX_PATCH select BUSYBOX_STAT select BUSYBOX_FEATURE_STAT_FORMAT select BUSYBOX_FEATURE_DD_IBS_OBS diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox index d3e73cb6b..810d546e5 100644 --- a/target/packages/pkg-available/mpdbox +++ b/target/packages/pkg-available/mpdbox @@ -34,6 +34,7 @@ config ADK_PKG_MPDBOX select ADK_PACKAGE_PHP select ADK_PACKAGE_PHP_MOD_SESSION select ADK_PACKAGE_PHP_MOD_JSON + select ADK_PACKAGE_PHP_MOD_CURL select ADK_PACKAGE_PHP_FASTCGI select ADK_PACKAGE_SCREEN select ADK_PACKAGE_VIM |