Re: Bug#955210: kernel-wedge: regression causes kfreebsd-10 FTBFS

Steven Chamberlain <[email protected]> Sat, 28 Mar 2020 18:29:09 +0000

Newsgroups	gmane.linux.debian.ports.bsd
Message-ID	<[email protected]>

tags -1 + patch
thanks

0001-preprocess-If-source-directory-is-a-symlink-follow-it.patch (text/x-diff, 1.4 KB)

From 03477bf089926f7a599bbe89f67df53080b69bfa Mon Sep 17 00:00:00 2001
From: Steven Chamberlain <[email protected]>
Date: Sat, 28 Mar 2020 18:12:35 +0000
Subject: [PATCH] preprocess: If source directory is a symlink, follow it

Closes: #955210
---
 commands/preprocess | 9 +++++----
 debian/changelog    | 7 +++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/commands/preprocess b/commands/preprocess
index b60c0d7..0c77e52 100755
--- a/commands/preprocess
+++ b/commands/preprocess
@@ -25,15 +25,16 @@ my %loaded;
 sub find_all_modules {
 	my ($moddir) = @_;
 
-	File::Find::find(
-		sub {
+	File::Find::find({
+		follow => 1, # If $moddir is a symlink, follow it.
+		wanted => sub {
 			if (/\.ko$/) {
 				push @module_files,
 				    File::Spec->abs2rel($File::Find::name,
 							$moddir);
 			}
-		},
-		$moddir);
+		}
+	}, $moddir);
 
 	if ($os eq 'linux') {
 		if (open(my $builtin, "$moddir/modules.builtin")) {
diff --git a/debian/changelog b/debian/changelog
index cf26ea1..46ffe4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kernel-wedge (2.103) UNRELEASED; urgency=medium
+
+  * preprocess: If source directory is a symlink, follow it
+    (Closes: #955210)
+
+ -- Steven Chamberlain <[email protected]>  Sat, 28 Mar 2020 18:08:28 +0000
+
 kernel-wedge (2.102) unstable; urgency=medium
 
   * debian/tests: Correct expected exit code for preprocess missingdir case
-- 
2.1.4

signature.asc (application/pgp-signature, 648 B)