Compare commits
No commits in common. "78e00fa56de7f2db2b9aa4c9b7336b94ee5086ef" and "12883ca752fe7623ed321ff977d35b2f37e02022" have entirely different histories.
78e00fa56d
...
12883ca752
@ -1,31 +0,0 @@
|
|||||||
From 6fb10bd18488ed84776675bc1b2982800a51d839 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Sat, 6 Aug 2022 20:14:38 -0700
|
|
||||||
Subject: [mtd-utils][PATCH] tests: Remove unused linux/fs.h header from includes
|
|
||||||
|
|
||||||
This header is not needed, moreover it includes linux/mount.h which is
|
|
||||||
now in conflict[1] with glibc provided sys/mount.h from glibc 2.36 onwards
|
|
||||||
|
|
||||||
[1] https://sourceware.org/glibc/wiki/Release/2.36
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://lists.infradead.org/pipermail/linux-mtd/2022-August/094667.html]
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
tests/fs-tests/lib/tests.c | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/tests/fs-tests/lib/tests.c b/tests/fs-tests/lib/tests.c
|
|
||||||
index d1a2e0c..3db0426 100644
|
|
||||||
--- a/tests/fs-tests/lib/tests.c
|
|
||||||
+++ b/tests/fs-tests/lib/tests.c
|
|
||||||
@@ -35,7 +35,6 @@
|
|
||||||
#include <sys/vfs.h>
|
|
||||||
#include <sys/mount.h>
|
|
||||||
#include <sys/statvfs.h>
|
|
||||||
-#include <linux/fs.h>
|
|
||||||
#include <linux/jffs2.h>
|
|
||||||
|
|
||||||
#include "tests.h"
|
|
||||||
--
|
|
||||||
2.37.1
|
|
||||||
|
|
||||||
BIN
mtd-utils-2.1.1.tar.bz2
Normal file
BIN
mtd-utils-2.1.1.tar.bz2
Normal file
Binary file not shown.
Binary file not shown.
@ -1,11 +1,10 @@
|
|||||||
Name: mtd-utils
|
Name: mtd-utils
|
||||||
Version: 2.1.4
|
Version: 2.1.1
|
||||||
Release: 2
|
Release: 2%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Summary: Utilities for dealing with MTD (flash) devices
|
Summary: Utilities for dealing with MTD (flash) devices
|
||||||
URL: http://www.linux-mtd.infradead.org/
|
URL: http://www.linux-mtd.infradead.org/
|
||||||
Source0: ftp://ftp.infradead.org/pub/mtd-utils/%{name}-%{version}.tar.bz2
|
Source0: ftp://ftp.infradead.org/pub/mtd-utils/%{name}-%{version}.tar.bz2
|
||||||
Patch0001: 0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch
|
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
@ -40,12 +39,6 @@ Summary: Utilities for dealing with misc
|
|||||||
The mtd-utils-misc package contains utilities for manipulating misc on
|
The mtd-utils-misc package contains utilities for manipulating misc on
|
||||||
MTD (flash) devices.
|
MTD (flash) devices.
|
||||||
|
|
||||||
%package test
|
|
||||||
Summary: Test utilities for mtd-utils
|
|
||||||
|
|
||||||
%description test
|
|
||||||
Various test programs related to mtd-utils
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
|
||||||
@ -66,14 +59,12 @@ Various test programs related to mtd-utils
|
|||||||
%{_sbindir}/mtd_debug
|
%{_sbindir}/mtd_debug
|
||||||
%{_sbindir}/mtdinfo
|
%{_sbindir}/mtdinfo
|
||||||
%{_sbindir}/mtdpart
|
%{_sbindir}/mtdpart
|
||||||
%{_sbindir}/fectest
|
|
||||||
%{_mandir}/*/*
|
%{_mandir}/*/*
|
||||||
|
|
||||||
|
|
||||||
%files ubifs
|
%files ubifs
|
||||||
%{_sbindir}/ubi*
|
%{_sbindir}/ubi*
|
||||||
%{_sbindir}/mkfs.ubifs
|
%{_sbindir}/mkfs.ubifs
|
||||||
%{_sbindir}/mount.ubifs
|
|
||||||
|
|
||||||
%files jffs2
|
%files jffs2
|
||||||
%{_sbindir}/jffs2*
|
%{_sbindir}/jffs2*
|
||||||
@ -93,21 +84,6 @@ Various test programs related to mtd-utils
|
|||||||
%{_sbindir}/serve_image
|
%{_sbindir}/serve_image
|
||||||
%{_sbindir}/recv_image
|
%{_sbindir}/recv_image
|
||||||
|
|
||||||
%files test
|
|
||||||
%{_libexecdir}/mtd-utils/*
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Aug 10 2022 wangqing <wangqing151@huawei.com> - 2.1.4-2
|
|
||||||
- Modified the strategy of building rpms in .spec, and added a patch from openembedded.
|
|
||||||
|
|
||||||
* Thu Aug 4 2022 wangqing <wangqing151@huawei.com> - 2.1.4-1
|
|
||||||
- Update tar from 2.1.2 to 2.1.4.
|
|
||||||
|
|
||||||
* Mon Aug 1 2022 wangqing <wangqing151@huawei.com> - 2.1.2-1
|
|
||||||
- Update tar from 2.1.1 to 2.1.2.
|
|
||||||
|
|
||||||
* Mon Dec 13 2021 heyitao <heyitao@uniontech.com> - 0.6.0-3
|
|
||||||
- Remove the dist tag in the version.
|
|
||||||
|
|
||||||
* Fri Dec 28 2020 kechengsong <kechengsong@huawei.com> - 2.1.1-1
|
* Fri Dec 28 2020 kechengsong <kechengsong@huawei.com> - 2.1.1-1
|
||||||
- package init
|
- package init
|
||||||
|
|||||||
@ -1,4 +0,0 @@
|
|||||||
version_control: git
|
|
||||||
src_repo: git://git.infradead.org/mtd-utils.git
|
|
||||||
tag_prefix: "^v"
|
|
||||||
separator: "."
|
|
||||||
Loading…
x
Reference in New Issue
Block a user