From 609b547e542ea5b603189988fc273f0c4411a5dd Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Tue, 26 Mar 2024 13:51:05 -0400 Subject: [PATCH] fix(btrfs) closes #5707 --- .../github.com/kdave/btrfs-progs/package.yml | 8 +++---- .../github.com/kdave/btrfs-progs/patch.diff | 24 ------------------- 2 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 projects/github.com/kdave/btrfs-progs/patch.diff diff --git a/projects/github.com/kdave/btrfs-progs/package.yml b/projects/github.com/kdave/btrfs-progs/package.yml index 52610eac..0e3eda84 100644 --- a/projects/github.com/kdave/btrfs-progs/package.yml +++ b/projects/github.com/kdave/btrfs-progs/package.yml @@ -1,5 +1,5 @@ distributable: - url: https://github.com/kdave/btrfs-progs/archive/v{{version}}.tar.gz + url: https://github.com/kdave/btrfs-progs/archive/{{version.tag}}.tar.gz strip-components: 1 versions: @@ -28,7 +28,7 @@ build: gnu.org/automake: '*' gnu.org/libtool: '*' script: - - patch -p1 < props/patch.diff # remove sphinx-rtd-theme extension for html docs + - sed -i '/sphinx_rtd_theme/s/^/#/' Documentation/conf.py - ./autogen.sh - ./configure $ARGS - make --jobs {{hw.concurrency}} install V=1 udevdir={{prefix}}/lib/udev @@ -53,8 +53,8 @@ provides: - bin/mkfs.btrfs test: - - btrfs --version | grep {{version}} + - btrfs --version | grep {{version.tag}} - truncate -s 128M test.img - mkfs.btrfs test.img | grep '128.00MiB' - btrfs filesystem show test.img | grep 'Total devices 1 FS' - - python -c 'import btrfsutil' \ No newline at end of file + - python -c 'import btrfsutil' diff --git a/projects/github.com/kdave/btrfs-progs/patch.diff b/projects/github.com/kdave/btrfs-progs/patch.diff deleted file mode 100644 index 1f57580e..00000000 --- a/projects/github.com/kdave/btrfs-progs/patch.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/Documentation/conf.py b/Documentation/conf.py -index 014352a..c7a629c 100644 ---- a/Documentation/conf.py -+++ b/Documentation/conf.py -@@ -33,10 +33,6 @@ templates_path = ['_templates'] - # This pattern also affects html_static_path and html_extra_path. - exclude_patterns = ['_build'] - --# The theme to use for HTML and HTML Help pages. See the documentation for --# a list of builtin themes. --html_theme = 'sphinx_rtd_theme' -- - # Add any paths that contain custom static files (such as style sheets) here, - # relative to this directory. They are copied after the builtin static files, - # so a file named "default.css" will overwrite the builtin "default.css". -@@ -76,8 +72,6 @@ man_pages = [ - ('btrfs-man5', 'btrfs', 'topics about the BTRFS filesystem (mount options, supported file attributes and other)', '', 5), - ] - --extensions = [ 'sphinx_rtd_theme' ] -- - # Cross reference with document and label - # Syntax: :docref`Title ` - # Backends: html, man, others \ No newline at end of file