d38412baaf
Resolves: RHEL-50942 Upstream: https://github.com/rhkdump/kdump-utils.git Conflict: Dropped hunks concerning OVS bridge support in patch 3 and 5 due to missing 224d310 ("Support setting up Open vSwitch (Ovs) Bridge network") Also contains upstream commit commit 2970176d9e9b7b6a1191a9ee54423d2f1c56fbaf Author: Philipp Rudo <prudo@redhat.com> Date: Tue Sep 24 10:39:32 2024 +0200 spec: fix patching of files in subdirectories With 23df04b ("dracut: create sub-directories for dracut modules") the dracut modules were moved to subdirectories. This causes problems when someone wants to include a patch to the spec file to change one of the files in those subdirectories. Reason is that '%autosetup' in the spec file calls 'patch' per default. 'patch' however, will strip all directories when it is called without option -p. Which means that it will search the file in the root directory and then fail because it cannot find it. Thus add option -p1 to '%autosetup' which will be passed on to 'patch'. Choose -p1 as that will work with the most common patch creation tools like git and packit. Signed-off-by: Philipp Rudo <prudo@redhat.com> Signed-off-by: Philipp Rudo <prudo@redhat.com>
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From 628387661812c74ddd613fcb3ac2203bbd6f1204 Mon Sep 17 00:00:00 2001
|
|
From: Philipp Rudo <prudo@redhat.com>
|
|
Date: Tue, 13 Aug 2024 13:59:41 +0200
|
|
Subject: [PATCH 01/16] editorconfig: set indent_size=8
|
|
|
|
The indent_size gives the number of spaces an indentation should have.
|
|
When combined with indent_style=tab and tab_width=X the leading X spaces
|
|
are replaced by a tab. If tab_width is omitted it is set to the value of
|
|
indent_size. For the current settings this means that every level of
|
|
indentation is indented by a single space which gets replaced by a tab.
|
|
The tab again is displayed by a single space, if you set your editor to
|
|
follow the editconfig. This is not only barely readable but also impacts
|
|
line breaks for over long lines. Thus set indent_size=8 to better match
|
|
the way over long lines are broken at the moment.
|
|
|
|
Signed-off-by: Philipp Rudo <prudo@redhat.com>
|
|
---
|
|
.editorconfig | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/.editorconfig b/.editorconfig
|
|
index b343f27..98bc39a 100644
|
|
--- a/.editorconfig
|
|
+++ b/.editorconfig
|
|
@@ -11,7 +11,7 @@ shell_variant = posix
|
|
insert_final_newline = true
|
|
trim_trailing_whitespace = true
|
|
indent_style = tab
|
|
-indent_size = 1
|
|
+indent_size = 8
|
|
switch_case_indent = false
|
|
function_next_line = true
|
|
binary_next_line = false
|
|
--
|
|
2.46.1
|
|
|