diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-04 13:51:33 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-04 13:51:33 +0100 |
| commit | 22e24d73762b2cfc79797f94d9e2d9e3f070c418 (patch) | |
| tree | 37872f19f7a613eb8c3b9bdfb9012110eda61b30 | |
| parent | c18413bb4e1c94ad60be0019a70604c488d69113 (diff) | |
resolve merge conflict
| -rw-r--r-- | package/oprofile/Makefile | 4 | ||||
| -rw-r--r-- | target/arm/sys-available/raspberry-pi | 1 | ||||
| -rw-r--r-- | target/packages/pkg-available/mpdbox | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index e7ed35b74..e2f5edca9 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= oprofile -PKG_VERSION:= 0.9.8 +PKG_VERSION:= 0.9.9 PKG_RELEASE:= 1 -PKG_MD5SUM:= 6d127023af1dd1cf24e15411229f3cc8 +PKG_MD5SUM:= 00aec1287da2dfffda17a9b1c0a01868 PKG_DESCR:= system-wide profiles PKG_SECTION:= debug PKG_DEPENDS:= libpopt kmod-oprofile libbfd libstdcxx 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/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 |