summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Config.in9
-rw-r--r--mk/kernel-ver.mk5
-rw-r--r--package/x11vnc/Makefile2
-rw-r--r--target/x86/sys-available/toolchain-i686 (renamed from target/x86/sys-available/toolchain-x86)0
4 files changed, 15 insertions, 1 deletions
diff --git a/Config.in b/Config.in
index 52593ebe9..d8d403109 100644
--- a/Config.in
+++ b/Config.in
@@ -89,6 +89,15 @@ source "package/Config.in.auto.global"
source "package/Config.in.auto"
endmenu
+choice
+prompt "Kernel Version"
+config ADK_KERNEL_VERSION_TOOLCHAIN
+ prompt "2.6.39.4"
+ boolean
+ depends on ADK_TOOLCHAIN_ONLY
+
+endchoice
+
menu "Kernel configuration"
depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_KERNEL && !ADK_CHOOSE_TARGET_SYSTEM && ADK_TARGET_KERNEL_CUSTOMISING
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index e2f65f330..2d7f6b34e 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -1,3 +1,8 @@
+ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
+KERNEL_VERSION:= 2.6.39.4
+KERNEL_RELEASE:= 1
+KERNEL_MD5SUM:= a17c748c2070168f1e784e9605ca043d
+endif
ifeq ($(ADK_KERNEL_VERSION_2_6_39_4),y)
KERNEL_VERSION:= 2.6.39.4
KERNEL_RELEASE:= 1
diff --git a/package/x11vnc/Makefile b/package/x11vnc/Makefile
index 74e01e1f7..ef5a2d428 100644
--- a/package/x11vnc/Makefile
+++ b/package/x11vnc/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 1498a68d02aa7b6c97bf746c073c8d00
PKG_DESCR:= VNC server for X11 displays
PKG_SECTION:= x11/apps
-PKG_BUILDDEP:= libX11 libXtst
+PKG_BUILDDEP:= libX11 libXtst jpeg
PKG_URL:= http://www.karlrunge.com/x11vnc/
PKG_SITES:= http://openadk.org/distfiles/
diff --git a/target/x86/sys-available/toolchain-x86 b/target/x86/sys-available/toolchain-i686
index e4c02a0e5..e4c02a0e5 100644
--- a/target/x86/sys-available/toolchain-x86
+++ b/target/x86/sys-available/toolchain-i686