Skip to content
This repository was archived by the owner on Nov 3, 2020. It is now read-only.

Commit 654f95a

Browse files
committed
Add sphinx-workaround patch from upstream Arch
1 parent 3e58f26 commit 654f95a

File tree

2 files changed

+33
-4
lines changed

2 files changed

+33
-4
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git i/Documentation/conf.py w/Documentation/conf.py
2+
index 3c7bdf4cd31f..9a0ced58a3e9 100644
3+
--- i/Documentation/conf.py
4+
+++ w/Documentation/conf.py
5+
@@ -36,7 +36,7 @@ needs_sphinx = '1.3'
6+
# Add any Sphinx extension module names here, as strings. They can be
7+
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
8+
# ones.
9+
-extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain',
10+
+extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include',
11+
'kfigure', 'sphinx.ext.ifconfig', 'automarkup',
12+
'maintainers_include']
13+

compile_setup.sh

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,27 @@ for src in ../$cache_folder/$patches_src_folder/patches/$major_version/*.patch;
100100
patch_entry=" ${filename}"
101101
skip_entry=" 'SKIP'"
102102
ln -s "$src" "$filename"
103-
if [[ -z "$surface_patches" ]]; then
104-
surface_patches="$patch_entry"
103+
if [[ -z "$patch_names" ]]; then
104+
patch_names="$patch_entry"
105105
patch_skips="$skip_entry"
106106
else
107-
surface_patches="${surface_patches}\n${patch_entry}"
107+
patch_names="${patch_names}\n${patch_entry}"
108+
patch_skips="${patch_skips}\n${skip_entry}"
109+
fi
110+
done
111+
112+
# Add upstream patches
113+
echo "Creating symlinks to upstream patches ..."
114+
for src in ../base/patches/*.patch; do
115+
filename=$(basename $src)
116+
patch_entry=" ${filename}"
117+
skip_entry=" 'SKIP'"
118+
ln -s "$src" "$filename"
119+
if [[ -z "$patch_names" ]]; then
120+
patch_names="$patch_entry"
121+
patch_skips="$skip_entry"
122+
else
123+
patch_names="${patch_names}\n${patch_entry}"
108124
patch_skips="${patch_skips}\n${skip_entry}"
109125
fi
110126
done
@@ -116,7 +132,7 @@ pkgbuild="${pkgbuild/\{0\}/$kernel_suffix}"
116132
pkgbuild="${pkgbuild/\{1\}/$major_version}"
117133
pkgbuild="${pkgbuild/\{2\}/$version}"
118134
pkgbuild="${pkgbuild/\{3\}/$release_number}"
119-
pkgbuild="${pkgbuild/\{4\}/$surface_patches}"
135+
pkgbuild="${pkgbuild/\{4\}/$patch_names}"
120136
pkgbuild="${pkgbuild/\{5\}/$patch_skips}"
121137
echo -e "$pkgbuild" > PKGBUILD
122138

0 commit comments

Comments
 (0)