summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/dropbear/Makefile2
-rw-r--r--package/dropbear/files/dropbear.init8
-rw-r--r--package/xbmc/Makefile2
-rw-r--r--target/arm/kernel.config57
-rw-r--r--target/arm/sys-available/raspberry-pi1
5 files changed, 62 insertions, 8 deletions
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 5a07ea5c5..503efa1e5 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= dropbear
PKG_VERSION:= 2013.62
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= ca2c7932a1399cf361f795aaa3843998
PKG_DESCR:= SSH 2 server/client designed for embedded systems
PKG_SECTION:= net/security
diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index 11b91db49..955ae33c3 100644
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -31,6 +31,14 @@ start)
echo "dropbear: key generation exited with code $?"
fi
fi
+ if test ! -f /etc/dropbear/dropbear_ecdsa_host_key; then
+ # take it easy here, since above already catched the worst cases
+ if test -x /usr/bin/dropbearkey; then
+ echo "dropbear: generating SSH private key (ECDSA)"
+ /usr/bin/dropbearkey -f /etc/dropbear/dropbear_ecdsa_host_key -t ecdsa
+ echo "dropbear: key generation exited with code $?"
+ fi
+ fi
/usr/sbin/dropbear $dropbear_flags
;;
stop)
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 5eacadcc9..aa971d872 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 3
PKG_MD5SUM:= 489f3877decae4e265ece54f9eaef0ba
PKG_DESCR:= software media player
PKG_SECTION:= multimedia
-PKG_DEPENDS:= boost libffmpeg python2 libstdcxx
+PKG_DEPENDS:= boost libffmpeg python2 libstdcxx bcm2835-vc
PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad dbus
PKG_DEPENDS+= libjpeg libogg libvorbis libmodplug libcurl
PKG_DEPENDS+= libflac libopenssl libbz2 libtiff liblzo
diff --git a/target/arm/kernel.config b/target/arm/kernel.config
index 7a4266c04..a702c270f 100644
--- a/target/arm/kernel.config
+++ b/target/arm/kernel.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.11.5 Kernel Configuration
+# Linux/arm 3.11.10 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -332,9 +332,6 @@ CONFIG_ZBOOT_ROM_TEXT=0
CONFIG_ZBOOT_ROM_BSS=0
# CONFIG_ARM_APPENDED_DTB is not set
CONFIG_CMDLINE=""
-# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
-CONFIG_CMDLINE_EXTEND=y
-# CONFIG_CMDLINE_FORCE is not set
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not set
@@ -810,7 +807,57 @@ CONFIG_TMPFS=y
# CONFIG_CONFIGFS_FS is not set
# CONFIG_MISC_FILESYSTEMS is not set
# CONFIG_NETWORK_FILESYSTEMS is not set
-# CONFIG_NLS is not set
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="utf8"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_MAC_ROMAN is not set
+# CONFIG_NLS_MAC_CELTIC is not set
+# CONFIG_NLS_MAC_CENTEURO is not set
+# CONFIG_NLS_MAC_CROATIAN is not set
+# CONFIG_NLS_MAC_CYRILLIC is not set
+# CONFIG_NLS_MAC_GAELIC is not set
+# CONFIG_NLS_MAC_GREEK is not set
+# CONFIG_NLS_MAC_ICELAND is not set
+# CONFIG_NLS_MAC_INUIT is not set
+# CONFIG_NLS_MAC_ROMANIAN is not set
+# CONFIG_NLS_MAC_TURKISH is not set
+# CONFIG_NLS_UTF8 is not set
#
# Kernel hacking
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi
index 9d743ed18..3fa60178e 100644
--- a/target/arm/sys-available/raspberry-pi
+++ b/target/arm/sys-available/raspberry-pi
@@ -14,7 +14,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
select ADK_TARGET_WITH_USB
select ADK_TARGET_WITH_INPUT
select ADK_PACKAGE_BCM2835_FIRMWARE
- select ADK_PACKAGE_BCM2835_VC
select ADK_TARGET_KERNEL_ZIMAGE
help
Raspberry PI