diff options
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | package/dropbear/Config.in | 6 | ||||
| -rw-r--r-- | package/dropbear/dropbear.mk | 9 | ||||
| -rw-r--r-- | package/linux-headers/Config.in.host | 11 | ||||
| -rw-r--r-- | package/pkg-generic.mk | 8 | ||||
| -rw-r--r-- | toolchain/toolchain-common.in | 5 | ||||
| -rw-r--r-- | toolchain/toolchain-external/toolchain-external-custom/Config.in.options | 4 |
7 files changed, 46 insertions, 4 deletions
@@ -426,6 +426,9 @@ GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) PACKAGES := PACKAGES_ALL := +TARGET_TARGETS := +IMAGE_TARGETS := + # silent mode requested? QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) @@ -693,7 +696,7 @@ endif $(TARGETS_ROOTFS): target-finalize .PHONY: target-finalize -target-finalize: $(PACKAGES) +target-finalize: $(TARGET_TARGETS) host-localedef @$(call MESSAGE,"Finalizing target directory") # Check files that are touched by more than one package ./support/scripts/check-uniq-files -t target $(BUILD_DIR)/packages-file-list.txt @@ -762,7 +765,7 @@ endif $(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) .PHONY: target-post-image -target-post-image: $(TARGETS_ROOTFS) target-finalize +target-post-image: $(TARGETS_ROOTFS) $(IMAGE_TARGETS) target-finalize @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \ $(call MESSAGE,"Executing post-image script $(s)"); \ $(EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in index 6700778161..7844641d1a 100644 --- a/package/dropbear/Config.in +++ b/package/dropbear/Config.in @@ -27,6 +27,12 @@ config BR2_PACKAGE_DROPBEAR_CLIENT and are therefore always build regardless this setting: dropbear, dropbearkey, dropbearconvert, scp +config BR2_PACKAGE_DROPBEAR_SERVER + bool "dropbear ssh server" + default y + help + Enable the dropbear ssh server, run from init + config BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS bool "disable reverse DNS lookups" help diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 01a1a07b76..412eb94b72 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -10,7 +10,7 @@ DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2-Clause-like, BSD-2-Clause DROPBEAR_LICENSE_FILES = LICENSE DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp -DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS) +DROPBEAR_PROGRAMS = $(DROPBEAR_TARGET_BINS) ifeq ($(BR2_PACKAGE_DROPBEAR_CLIENT),y) # Build dbclient, and create a convenience symlink named ssh @@ -26,6 +26,11 @@ ifeq ($(BR2_STATIC_LIBS),y) DROPBEAR_MAKE += STATIC=1 endif +ifeq ($(BR2_PACKAGE_DROPBEAR_SERVER),y) +DROPBEAR_TARGET_BINS += dropbear +DROPBEAR_PROGRAMS += dropbear +endif + define DROPBEAR_FIX_XAUTH $(SED) 's,^#define XAUTH_COMMAND.*/xauth,#define XAUTH_COMMAND "/usr/bin/xauth,g' $(@D)/options.h endef @@ -51,6 +56,7 @@ define DROPBEAR_DISABLE_STANDALONE $(SED) 's:\(#define NON_INETD_MODE\):/*\1 */:' $(@D)/options.h endef +ifeq ($(BR2_PACKAGE_DROPBEAR_SERVER),y) define DROPBEAR_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/dropbear/dropbear.service \ $(TARGET_DIR)/usr/lib/systemd/system/dropbear.service @@ -67,6 +73,7 @@ endef else DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_STANDALONE endif +endif ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),) DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3bd3e779b0..40faef2281 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_4_15 + default BR2_KERNEL_HEADERS_4_16 help Select the kernel version to get headers from. @@ -67,6 +67,10 @@ config BR2_KERNEL_HEADERS_4_15 bool "Linux 4.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 +config BR2_KERNEL_HEADERS_4_16 + bool "Linux 4.16.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 + config BR2_KERNEL_HEADERS_VERSION bool "Manually specified Linux version" @@ -89,6 +93,10 @@ choice This is used to hide/show some packages that have strict requirements on the version of kernel headers. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16 + bool "4.16.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15 bool "4.15.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 @@ -250,4 +258,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.13.16" if BR2_KERNEL_HEADERS_4_13 default "4.14.33" if BR2_KERNEL_HEADERS_4_14 default "4.15.16" if BR2_KERNEL_HEADERS_4_15 + default "4.16.1" if BR2_KERNEL_HEADERS_4_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 3706834a5e..a6988b8893 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -907,6 +907,14 @@ $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) PACKAGES += $(1) +ifneq ($$($(2)_INSTALL_STAGING)$$($(2)_INSTALL_TARGET),NONO) +TARGET_TARGETS += $(1) +endif + +ifeq ($$($(2)_INSTALL_IMAGES),YES) +IMAGE_TARGETS += $(1) +endif + ifneq ($$($(2)_PERMISSIONS),) PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) endif diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index 8941e0f3cd..d0e5ac6c89 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -262,10 +262,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "4.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 default "4.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 default "4.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 70c7d8e3c3..870b72708a 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -108,6 +108,10 @@ choice m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16 + bool "4.16.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_15 bool "4.15.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 |
