Merge branch 'master' of openslx.org:openslx-ng/buildrootHEADmaster

3 files changed, 14 insertions, 19 deletions

diff --git a/openslx/config.buildroot b/openslx/config.buildroot
index 855942c5c..093575280 100644
--- a/openslx/config.buildroot
+++ b/openslx/config.buildroot
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2012.08-git-00185-g0ad87e1 Configuration
+# Buildroot 2012.08-git-00187-ga0c582a-dirty Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -168,6 +168,7 @@ BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y
 BR2_USE_WCHAR=y
+BR2_ENABLE_LOCALE=y
 BR2_INSTALL_LIBSTDCPP=y
 BR2_TOOLCHAIN_HAS_THREADS=y
 BR2_TOOLCHAIN_HAS_THREADS_DEBUG_IF_NEEDED=y
@@ -175,6 +176,7 @@ BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS=y
 # BR2_ENABLE_LOCALE_PURGE is not set
 BR2_GENERATE_LOCALE=""
 BR2_NEEDS_GETTEXT=y
+BR2_NEEDS_GETTEXT_IF_LOCALE=y
 BR2_USE_MMU=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_TARGET_LDFLAGS="-L/openslx/lib -Wl,-rpath,/openslx/lib -Wl,--dynamic-linker,/openslx/lib/ld-uClibc.so.0"
@@ -186,7 +188,7 @@ BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
 BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
 BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-# BR2_TOOLCHAIN_BUILDROOT_LOCALE is not set
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 # BR2_PTHREADS_NONE is not set
@@ -200,9 +202,9 @@ BR2_PTHREADS_OLD=y
 BR2_TARGET_GENERIC_HOSTNAME="openslx"
 BR2_TARGET_GENERIC_ISSUE="Welcome to OpenSLX"
 # BR2_ROOTFS_DEVICE_CREATION_STATIC is not set
-# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS is not set
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
 # BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV is not set
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
+# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV is not set
 BR2_ROOTFS_DEVICE_TABLE="target/generic/device_table.txt"
 BR2_ROOTFS_SKELETON_DEFAULT=y
 # BR2_ROOTFS_SKELETON_CUSTOM is not set
@@ -318,7 +320,7 @@ BR2_PACKAGE_FLEX_LIBFL=y
 BR2_PACKAGE_GETTEXT=y
 BR2_PACKAGE_LIBINTL=y
 BR2_PACKAGE_GMP=y
-# BR2_PACKAGE_GPERF is not set
+BR2_PACKAGE_GPERF=y
 # BR2_PACKAGE_MAKE is not set
 # BR2_PACKAGE_MPC is not set
 # BR2_PACKAGE_MPFR is not set
@@ -348,10 +350,7 @@ BR2_PACKAGE_GMP=y
 # BR2_PACKAGE_DIRECTFB is not set
 # BR2_PACKAGE_FBDUMP is not set
 # BR2_PACKAGE_FBGRAB is not set
-
-#
-# fbterm requires a toolchain with C++, WCHAR and locale support
-#
+# BR2_PACKAGE_FBTERM is not set
 BR2_PACKAGE_FBV=y
 BR2_PACKAGE_FBV_PNG=y
 BR2_PACKAGE_FBV_JPEG=y
@@ -531,12 +530,12 @@ BR2_PACKAGE_SSHFS=y
 BR2_PACKAGE_SYSSTAT=y
 # BR2_PACKAGE_TI_UTILS is not set
 # BR2_PACKAGE_UBOOT_TOOLS is not set
-BR2_PACKAGE_UDEV=y
-BR2_PACKAGE_UDEV_RULES_GEN=y
-BR2_PACKAGE_UDEV_ALL_EXTRAS=y
+
+#
+# udev requires /dev mgmnt set to udev under System configuration
+#
 BR2_PACKAGE_UNIONFS=y
 BR2_PACKAGE_USB_MODESWITCH=y
-BR2_PACKAGE_USBMOUNT=y
 BR2_PACKAGE_USBUTILS=y
 BR2_PACKAGE_USBUTILS_ZLIB=y
 # BR2_PACKAGE_WIPE is not set
@@ -781,7 +780,6 @@ BR2_PACKAGE_LIBGLIB2=y
 #
 # BR2_PACKAGE_ENCHANT is not set
 # BR2_PACKAGE_ICU is not set
-BR2_PACKAGE_LIBICONV=y
 BR2_PACKAGE_NCURSES=y
 # BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
 # BR2_PACKAGE_NCURSES_TARGET_FORM is not set
@@ -883,7 +881,6 @@ BR2_PACKAGE_NDISC6_TCPSPRAY=y
 # BR2_PACKAGE_NETPLUG is not set
 # BR2_PACKAGE_NETSNMP is not set
 # BR2_PACKAGE_NETSTAT_NAT is not set
-# BR2_PACKAGE_NETWORK_MANAGER is not set
 # BR2_PACKAGE_NOIP is not set
 BR2_PACKAGE_NFS_UTILS=y
 
@@ -922,7 +919,6 @@ BR2_PACKAGE_PORTMAP=y
 BR2_PACKAGE_RSYNC=y
 # BR2_PACKAGE_RTORRENT is not set
 BR2_PACKAGE_SAMBA=y
-# BR2_PACKAGE_SAMBA_LIBICONV is not set
 
 #
 # Samba tools selection
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index a37b57822..84400d380 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_SYSTEMD
 	bool "systemd"
-	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
 	depends on BR2_INET_IPV6
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBCAP
@@ -18,4 +17,4 @@ config BR2_PACKAGE_SYSTEMD
 	  http://freedesktop.org/wiki/Software/systemd
 
 comment "systemd not available (depends on /dev management with udev and ipv6 support)"
-	depends on !(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV && BR2_INET_IPV6)
+	depends on !(BR2_INET_IPV6)
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 01ad64233..d606589ff 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -11,7 +11,7 @@ SYSTEMD_DEPENDENCIES = \
 	host-intltool \
         usbutils \
 	libcap \
-	udev \
+	host-gperf \
 	dbus
 
 # Make sure that systemd will always be built after busybox so that we have