[opensuse-kernel] [PATCH] Update group-source-files.pl to handle symlink to directory
Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files. --- rpm/group-source-files.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rpm/group-source-files.pl b/rpm/group-source-files.pl index ce9799d..06e436a 100755 --- a/rpm/group-source-files.pl +++ b/rpm/group-source-files.pl @@ -26,7 +26,7 @@ sub scan foreach $_ (`find "$loc"`) { chomp $_; - if (!-f $_) { + if (-d $_ && !-l $_) { # Generate directory list later. next; } @@ -34,6 +34,7 @@ sub scan m{^\Q$loc\E.*/Kconfig} || m{^\Q$loc\E.*/Kbuild} || m{^\Q$loc\E.*/Makefile} || + m{^\Q$loc\E/arch/[^/]+/boot/dts/include/dt-bindings\b} || m{^\Q$loc\E/arch/[^/]+/include\b} || m{^\Q$loc\E/arch/arm/[^/]+/include/mach\b} || m{^\Q$loc\E/arch/arm/[^/]+/include/plat\b} || -- 1.8.2.3 -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. --- rpm/group-source-files.pl | 3 ++- rpm/kernel-source.spec.in | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/group-source-files.pl b/rpm/group-source-files.pl index ce9799d..06e436a 100755 --- a/rpm/group-source-files.pl +++ b/rpm/group-source-files.pl @@ -26,7 +26,7 @@ sub scan foreach $_ (`find "$loc"`) { chomp $_; - if (!-f $_) { + if (-d $_ && !-l $_) { # Generate directory list later. next; } @@ -34,6 +34,7 @@ sub scan m{^\Q$loc\E.*/Kconfig} || m{^\Q$loc\E.*/Kbuild} || m{^\Q$loc\E.*/Makefile} || + m{^\Q$loc\E/arch/[^/]+/boot/dts/include/dt-bindings\b} || m{^\Q$loc\E/arch/[^/]+/include\b} || m{^\Q$loc\E/arch/arm/[^/]+/include/mach\b} || m{^\Q$loc\E/arch/arm/[^/]+/include/plat\b} || diff --git a/rpm/kernel-source.spec.in b/rpm/kernel-source.spec.in index 713e525..b054668 100644 --- a/rpm/kernel-source.spec.in +++ b/rpm/kernel-source.spec.in @@ -233,7 +233,6 @@ find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts" %files -f nondevel.files %defattr(-, root, root) -/usr/src/linux%variant-%kernelrelease/README.SUSE %files -n kernel-devel%variant -f devel.files %defattr(-,root,root) -- 1.8.2.3 -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
participants (1)
-
Andreas Schwab