From 26cc3b87f277d4ee85a5f9d400e0744d9bec4a59 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 13 Jan 2017 12:38:19 +0100
Subject: Final merge with tm-scripts

Commit ID in tm-scripts: 6d72610c13171ab4749aa8de2f541f2b570fdb8e
---
 core/modules/cups/module.build          | 4 ++++
 core/modules/kernel-vanilla/module.conf | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/modules/cups/module.build b/core/modules/cups/module.build
index 0128c3e6..2b29bb7d 100644
--- a/core/modules/cups/module.build
+++ b/core/modules/cups/module.build
@@ -12,6 +12,10 @@ build() {
 	list_packet_files >> "$COPYLIST"
 	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
 
+	# Move any disabled backends to the backend directory
+	mv -n -- "${MODULE_BUILD_DIR}/usr/lib/cups/backend-available/"* "${MODULE_BUILD_DIR}/usr/lib/cups/backend/"
+	rm -f -- "${MODULE_BUILD_DIR}/usr/lib/cups/backend-available/"*
+
 	# cups insists on overriding PATH, so we need to fix any scripts
 	for file in "${MODULE_BUILD_DIR}"/usr/lib/cups/{filter,backend}/*; do
 		head -n 1 "$file" | grep -q '^#!/' && sed -i '/^#!\//a . \/etc\/environment' "$file"
diff --git a/core/modules/kernel-vanilla/module.conf b/core/modules/kernel-vanilla/module.conf
index 5f72c5f2..cdfee2a0 100644
--- a/core/modules/kernel-vanilla/module.conf
+++ b/core/modules/kernel-vanilla/module.conf
@@ -1,5 +1,5 @@
 REQUIRED_BINARIES=""
 REQUIRED_LIBRARIES=""
 REQUIRED_DIRECTORIES=""
-REQUIRED_KERNEL="4.9"
+REQUIRED_KERNEL="4.9.3"
 REQUIRED_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
-- 
cgit v1.2.3-55-g7522