Home Explore Help
Register Sign In
oss
/
openadk
4
1
Fork 3
Files Issues 0 Pull Requests 0 Wiki
Browse Source

resolve merge conflict

Waldemar Brodkorb 12 years ago
parent
c18413bb4e
commit
22e24d7376
3 changed files with 3 additions and 3 deletions
Unified View Show Diff Stats
  1. 2 2
      package/oprofile/Makefile
  2. 0 1
      target/arm/sys-available/raspberry-pi
  3. 1 0
      target/packages/pkg-available/mpdbox

+ 2 - 2
package/oprofile/Makefile
View File 

@@ -4,9 +4,9 @@
 
 include $(TOPDIR)/rules.mk
 
 include $(TOPDIR)/rules.mk
 
 
 
 PKG_NAME:=		oprofile
 
 PKG_NAME:=		oprofile
 
-PKG_VERSION:=		0.9.8
 
+PKG_VERSION:=		0.9.9
 
 PKG_RELEASE:=		1
 
 PKG_RELEASE:=		1
 
-PKG_MD5SUM:=		6d127023af1dd1cf24e15411229f3cc8
 
+PKG_MD5SUM:=		00aec1287da2dfffda17a9b1c0a01868
 
 PKG_DESCR:=		system-wide profiles
 
 PKG_DESCR:=		system-wide profiles
 
 PKG_SECTION:=		debug
 
 PKG_SECTION:=		debug
 
 PKG_DEPENDS:=		libpopt kmod-oprofile libbfd libstdcxx
 
 PKG_DEPENDS:=		libpopt kmod-oprofile libbfd libstdcxx

+ 0 - 1
target/arm/sys-available/raspberry-pi
View File 

@@ -15,7 +15,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 
 	select ADK_TARGET_WITH_INPUT
 
 	select ADK_TARGET_WITH_INPUT
 
 	select ADK_PACKAGE_BCM2835_FIRMWARE
 
 	select ADK_PACKAGE_BCM2835_FIRMWARE
 
 	select ADK_PACKAGE_BCM2835_VC
 
 	select ADK_PACKAGE_BCM2835_VC
 
-	select ADK_KERNEL_SWAP
 
 	help
 
 	help
 
 	  Raspberry PI
 
 	  Raspberry PI

+ 1 - 0
target/packages/pkg-available/mpdbox
View File 

@@ -34,6 +34,7 @@ config ADK_PKG_MPDBOX
 
 	select ADK_PACKAGE_PHP
 
 	select ADK_PACKAGE_PHP
 
 	select ADK_PACKAGE_PHP_MOD_SESSION
 
 	select ADK_PACKAGE_PHP_MOD_SESSION
 
 	select ADK_PACKAGE_PHP_MOD_JSON
 
 	select ADK_PACKAGE_PHP_MOD_JSON
 
+	select ADK_PACKAGE_PHP_MOD_CURL
 
 	select ADK_PACKAGE_PHP_FASTCGI
 
 	select ADK_PACKAGE_PHP_FASTCGI
 
 	select ADK_PACKAGE_SCREEN
 
 	select ADK_PACKAGE_SCREEN
 
 	select ADK_PACKAGE_VIM
 
 	select ADK_PACKAGE_VIM