Merge branch 'master' of git.pengutronix.de:DistroKit

5 files changed, 11 insertions, 336 deletions

diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index cd23771..0466800 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2017.05.0
+# PTXdist 2017.06.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="v7a"
 PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2017.05.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2017.06.0"
 
 #
 # architecture                  
diff --git a/configs/platform-v7a/run b/configs/platform-v7a/run
index 5cfe8bf..4237009 100755
--- a/configs/platform-v7a/run
+++ b/configs/platform-v7a/run
@@ -41,6 +41,10 @@ TELNET_INTERNAL_PORT=23
 # port QEMU opens at the host side to give access to the ${TELNET_INTERNAL_PORT}
 TELNET_EXTERNAL_PORT=4444
 
+# dito for ssh
+SSH_INTERNAL_PORT=22
+SSH_EXTERNAL_PORT=4445
+
 # check if vde is available for networking
 if [ -z "${VDE_SOCKET}" ]; then
 	for dir in $(ls -d /var/run/vde2/*.ctl 2>/dev/null); do
@@ -58,7 +62,7 @@ fi
 
 # fall back to user network if necessary
 if [ -z "${QEMU_NET}" ]; then
-	QEMU_NET=(-netdev user,id=net1,hostfwd=tcp:127.0.0.1:${TELNET_EXTERNAL_PORT}-:${TELNET_INTERNAL_PORT} )
+	QEMU_NET=(-netdev user,id=net1,hostfwd=tcp:127.0.0.1:${TELNET_EXTERNAL_PORT}-:${TELNET_INTERNAL_PORT},hostfwd=tcp:127.0.0.1:${SSH_EXTERNAL_PORT}-:${SSH_INTERNAL_PORT} )
 fi
 
 BASE_CMDLINE="console=ttyAMA0,115200 loglevel=5 systemd.log_level=warning systemd.show_status=auto"
diff --git a/configs/ptxconfig b/configs/ptxconfig
index 04f97d6..279e028 100644
--- a/configs/ptxconfig
+++ b/configs/ptxconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2017.05.0
+# PTXdist 2017.06.0
 #
 PTXCONF_DATAPARTITION=y
 
@@ -60,7 +60,7 @@ PTXCONF_PROJECT_CHECK_LICENSES=y
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
 PTXCONF_VIRTUAL=y
-PTXCONF_CONFIGFILE_VERSION="2017.05.0"
+PTXCONF_CONFIGFILE_VERSION="2017.06.0"
 PTXCONF__ptxconfig_MAGIC__=y
 
 #
@@ -1966,6 +1966,7 @@ PTXCONF_LIBGCRYPT=y
 # PTXCONF_LIBGD is not set
 # PTXCONF_LIBGMP is not set
 PTXCONF_LIBGPG_ERROR=y
+# PTXCONF_LIBGPIOD is not set
 # PTXCONF_LIBGSF is not set
 # PTXCONF_LIBGSLOOP is not set
 PTXCONF_LIBGUDEV=y
@@ -2137,6 +2138,7 @@ PTXCONF_DBUS_SYSTEMD_UNIT=y
 # PTXCONF_MBW is not set
 # PTXCONF_PELTS_TESTS is not set
 # PTXCONF_RT_TESTS is not set
+# PTXCONF_STRESS is not set
 # PTXCONF_TIOBENCH is not set
 # PTXCONF_UNIXBENCH is not set
 
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
deleted file mode 100644
index f7ad1c8..0000000
--- a/rules/networkmanager.in
+++ /dev/null
@@ -1,97 +0,0 @@
-## SECTION=networking
-
-menuconfig NETWORKMANAGER
-	tristate
-	# intltool is unconditionally requested by configure
-	select HOST_INTLTOOL
-	select HOST_GLIB
-	select LIBC_M
-	select LIBC_DL
-	select LIBC_PTHREAD
-	select LIBC_RT
-	select DBUS
-	select DBUS_PYTHON			if NETWORKMANAGER_EXAMPLES && RUNTIME
-	select GLIB
-	select GNUTLS
-	select LIBNDP
-	select LIBNEWT				if NETWORKMANAGER_NMTUI
-	select LIBNL3
-	select LIBCURL				if NETWORKMANAGER_CONCHECK
-	select LIBUUID
-	select MODEMMANAGER			if NETWORKMANAGER_WWAN
-	select PPP				if NETWORKMANAGER_PPP
-	select PPP_PLUGINS			if NETWORKMANAGER_PPP
-	select READLINE				if NETWORKMANAGER_NMCLI
-	select SYSTEMD				if NETWORKMANAGER_SYSTEMD_UNIT
-	select UDEV
-	select UDEV_LIBUDEV
-	select WPA_SUPPLICANT			if NETWORKMANAGER_WIRELESS && RUNTIME
-	select WPA_SUPPLICANT_CTRL_IFACE_DBUS	if NETWORKMANAGER_WIRELESS && RUNTIME
-	prompt "networkmanager                "
-	help
-	  NetworkManager is a tool to automate network configuration as far as
-	  possible. The project web site is here:
-
-	  http://projects.gnome.org/NetworkManager/
-
-if NETWORKMANAGER
-
-config NETWORKMANAGER_STARTSCRIPT
-	depends on !INITMETHOD_SYSTEMD
-	bool
-	default y
-	prompt "install /etc/init.d/NetworkManager"
-
-config NETWORKMANAGER_NM_ONLINE
-	bool
-	prompt "install nm-online"
-	help
-	  Install the 'nm-online' tool to detect online state.
-
-config NETWORKMANAGER_NMTUI
-	bool
-	prompt "install nmtui"
-	help
-	  Build and install the 'nmtui' tool.
-
-config NETWORKMANAGER_SYSTEMD_UNIT
-	bool
-	default y
-	depends on INITMETHOD_SYSTEMD
-	prompt "install systemd unit files for Network Manager"
-
-config NETWORKMANAGER_WIRELESS
-	bool
-	prompt "enable wireless support"
-
-config NETWORKMANAGER_NMCLI
-	bool
-	default y
-	prompt "install nmcli"
-	help
-	  Build and install the 'nmcli' tool.
-
-config NETWORKMANAGER_WWAN
-	bool
-	prompt "enable WWAN support"
-	help
-	  Enable ModemManager interface support, wwan and bluetooth
-	  plugins depend on it.
-
-config NETWORKMANAGER_PPP
-	bool
-	prompt "enable ppp support"
-
-config NETWORKMANAGER_CONCHECK
-	bool
-	prompt "enable connectivity checking support"
-
-config NETWORKMANAGER_EXAMPLES
-	bool
-	prompt "install examples for Network Manager"
-
-endif
-
-menu "networkmanager plugins        "
-source "generated/networkmanager_plugins.in"
-endmenu
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
deleted file mode 100644
index 6fac8a8..0000000
--- a/rules/networkmanager.make
+++ /dev/null
@@ -1,234 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2009, 2017 by Robert Schwebel <r.schwebel@pengutronix.de>
-#           (C) 2012 by Jan Luebbe <j.luebbe@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
-
-#
-# Paths and names
-#
-NETWORKMANAGER_VERSION	:= 1.8.0
-NETWORKMANAGER_MD5	:= de0e70933a17ee6a682e8440015c9b1e
-NETWORKMANAGER		:= NetworkManager-$(NETWORKMANAGER_VERSION)
-NETWORKMANAGER_SUFFIX	:= tar.xz
-NETWORKMANAGER_URL	:= https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.8/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
-NETWORKMANAGER_SOURCE	:= $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
-NETWORKMANAGER_DIR	:= $(BUILDDIR)/$(NETWORKMANAGER)
-NETWORKMANAGER_LICENSE	:= GPL-2.0+
-NETWORKMANAGER_LICENSE_FILES := file://COPYING;md5=cbbffd568227ada506640fe950a4823b
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-NETWORKMANAGER_CONF_TOOL := autoconf
-NETWORKMANAGER_CONF_OPT = \
-	$(CROSS_AUTOCONF_USR) \
-	--disable-static \
-	--enable-shared \
-	--disable-nls \
-	--disable-rpath \
-	--disable-ifcfg-rh \
-	--disable-ifcfg-suse \
-	--enable-ifupdown \
-	--disable-ifnet \
-	--disable-code-coverage \
-	--$(call ptx/endis,PTXCONF_NETWORKMANAGER_WIRELESS)-wifi \
-	--disable-introspection \
-	--disable-qt \
-	--disable-teamdctl \
-	--disable-json-validation \
-	--disable-polkit \
-	--disable-modify-system \
-	--$(call ptx/endis,PTXCONF_NETWORKMANAGER_PPP)-ppp \
-	--disable-bluez5-dun \
-	--$(call ptx/endis,PTXCONF_NETWORKMANAGER_CONCHECK)-concheck \
-	--enable-more-warnings \
-	--disable-more-asserts \
-	--disable-more-logging \
-	--disable-lto \
-	--disable-address-sanitizer \
-	--disable-undefined-sanitizer \
-	--disable-vala \
-	--disable-tests \
-	--disable-gtk-doc \
-	--disable-gtk-doc-html \
-	--disable-gtk-doc-pdf \
-	--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wext \
-	--without-libnm-glib \
-	--with-systemdsystemunitdir=/usr/lib/systemd/system \
-	--with-hostname-persist=default \
-	--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-journal \
-	--with-config-logging-backend-default="" \
-	--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-logind \
-	--without-consolekit \
-	--with-session-tracking=no \
-	--with-suspend-resume=$(call ptx/ifdef,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT,systemd,upower) \
-	--without-selinux \
-	--without-libaudit \
-	--with-crypto=gnutls \
-	--with-dbus-sys-dir=/usr/share/dbus-1/system.d \
-	--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WWAN)-modem-manager-1 \
-	--without-ofono \
-	--with-dhclient=/usr/sbin/dhclient \
-	--without-dhcpcd \
-	--without-dhcpcd-supports-ipv6 \
-	--with-config-dhcp-default=internal \
-	--without-resolvconf \
-	--without-netconfig \
-	--with-config-dns-rc-manager-default=file \
-	--with-iptables=/usr/sbin/iptables \
-	--with-dnsmasq=/usr/sbin/dnsmasq \
-	--with-dnssec-trigger=/bin/true \
-	--with-system-ca-path=/etc/ssl/certs \
-	--with-kernel-firmware-dir=/lib/firmware \
-	--with-libpsl=no \
-	--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMCLI)-nmcli \
-	--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMTUI)-nmtui \
-	--without-valgrind \
-	--without-tests
-
-ifdef PTXCONF_NETWORKMANAGER_PPP
-NETWORKMANAGER_CONF_OPT += \
-	--with-pppd-plugin-dir=$(PPP_SHARED_INST_PATH)
-endif
-
-ifdef PTXCONF_NETWORKMANAGER_WWAN
-NETWORKMANAGER_LDFLAGS	:= \
-	-Wl,-rpath,/usr/lib/NetworkManager
-endif
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/networkmanager.install:
-	@$(call targetinfo)
-	@$(call world/install, NETWORKMANAGER)
-
-ifdef PTXCONF_NETWORKMANAGER_EXAMPLES
-	@cd $(NETWORKMANAGER_DIR)/examples/C/glib/ \
-		&& for FILE in `find -type f -executable -printf '%f\n'`; do \
-		install -vD -m 755 "$${FILE}" "$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}"; \
-	done
-	@cd $(NETWORKMANAGER_DIR)/examples/python/dbus \
-		&& for FILE in `find -name "*.py" -printf '%f\n'`; do \
-		install -vD -m 755 "$${FILE}" "$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}"; \
-	done
-	@cd $(NETWORKMANAGER_DIR)/examples/shell/ \
-		&& for FILE in `find -name "*.sh" -printf '%f\n'`; do \
-		install -vD -m 755 "$${FILE}" "$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}"; \
-	done
-endif
-
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/networkmanager.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, networkmanager)
-	@$(call install_fixup, networkmanager,PRIORITY,optional)
-	@$(call install_fixup, networkmanager,SECTION,base)
-	@$(call install_fixup, networkmanager,AUTHOR,"Jan Luebbe <j.luebbe@pengutronix.de>")
-	@$(call install_fixup, networkmanager,DESCRIPTION, "networkmanager")
-
-	@$(call install_alternative, networkmanager, 0, 0, 0644, /etc/NetworkManager/NetworkManager.conf)
-	@$(call install_copy, networkmanager, 0, 0, 0755, /etc/NetworkManager/dispatcher.d/)
-	@$(call install_copy, networkmanager, 0, 0, 0755, /etc/NetworkManager/system-connections/)
-
-#	# unmanage NFS root devices
-	@$(call install_alternative, networkmanager, 0, 0, 0755, /usr/lib/init/nm-unmanage.sh)
-
-	@$(call install_copy, networkmanager, 0, 0, 0755, /var/lib/NetworkManager)
-
-ifdef PTXCONF_INITMETHOD_BBINIT
-ifdef PTXCONF_NETWORKMANAGER_STARTSCRIPT
-	@$(call install_alternative, networkmanager, 0, 0, 0755, /etc/init.d/NetworkManager)
-
-ifneq ($(call remove_quotes, $(PTXCONF_NETWORKMANAGER_BBINIT_LINK)),)
-	@$(call install_link, networkmanager, \
-		../init.d/NetworkManager, \
-		/etc/rc.d/$(PTXCONF_NETWORKMANAGER_BBINIT_LINK))
-endif
-endif
-endif
-ifdef PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT
-	@$(call install_alternative, networkmanager, 0, 0, 0644, \
-		/usr/lib/systemd/system/NetworkManager.service)
-	@$(call install_link, networkmanager, ../NetworkManager.service, \
-		/usr/lib/systemd/system/multi-user.target.wants/NetworkManager.service)
-	@$(call install_link, networkmanager, NetworkManager.service, \
-		/usr/lib/systemd/system/dbus-org.freedesktop.NetworkManager.service)
-	@$(call install_alternative, networkmanager, 0, 0, 0644, \
-		/usr/lib/systemd/system/NetworkManager-unmanage.service)
-	@$(call install_link, networkmanager, ../NetworkManager-unmanage.service, \
-		/usr/lib/systemd/system/NetworkManager.service.wants/NetworkManager-unmanage.service)
-ifdef PTXCONF_NETWORKMANAGER_NM_ONLINE
-	@$(call install_alternative, networkmanager, 0, 0, 0644, \
-		/usr/lib/systemd/system/NetworkManager-wait-online.service)
-endif
-	@$(call install_alternative, networkmanager, 0, 0, 0644, \
-		/usr/lib/systemd/system/NetworkManager-dispatcher.service)
-	@$(call install_link, networkmanager, NetworkManager-dispatcher.service, \
-		/usr/lib/systemd/system/dbus-org.freedesktop.nm-dispatcher.service)
-endif
-
-	@$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/sbin/NetworkManager)
-ifdef PTXCONF_NETWORKMANAGER_NM_ONLINE
-	@$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nm-online)
-endif
-ifdef PTXCONF_NETWORKMANAGER_NMCLI
-	@$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nmcli)
-endif
-ifdef PTXCONF_NETWORKMANAGER_NMTUI
-	@$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nmtui)
-endif
-
-	@$(call install_tree, networkmanager, 0, 0, -, /usr/libexec/)
-
-	@$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-settings-plugin-ifupdown)
-ifdef PTXCONF_NETWORKMANAGER_WIRELESS
-	@$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-device-plugin-wifi)
-endif
-ifdef PTXCONF_NETWORKMANAGER_WWAN
-	@$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-device-plugin-wwan)
-	@$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-wwan)
-endif
-ifdef PTXCONF_NETWORKMANAGER_PPP
-	@$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-ppp-plugin)
-	@$(call install_copy, networkmanager, 0, 0, 0644, -, $(PPP_SHARED_INST_PATH)/nm-pppd-plugin.so)
-endif
-	@$(call install_lib, networkmanager, 0, 0, 0644, libnm)
-
-	@$(call install_tree, networkmanager, 0, 0, -, /usr/share/dbus-1/system.d/)
-	@$(call install_tree, networkmanager, 0, 0, -, /usr/share/dbus-1/system-services/)
-
-ifdef PTXCONF_NETWORKMANAGER_EXAMPLES
-	@cd $(NETWORKMANAGER_PKGDIR)/usr/bin/ \
-		&& for FILE in `find -name "nm-*-*" -printf '%f\n'`; do \
-		$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/$${FILE}); \
-	done
-endif
-
-	@$(call install_finish, networkmanager)
-
-	@$(call touch)
-
-# vim: syntax=make