pool/btrfsprogs
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 200992 from home:jeff_mahoney:testpkgs

Browse Source 
- Remove udev rules file - udev packages one itself (bnc#839960).

OBS-URL: https://build.opensuse.org/request/show/200992
OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=141
This commit is contained in:
Jeff Mahoney 2013-09-26 21:22:32 +00:00 committed by Git OBS Bridge
parent 3707425039
commit 08211c769b
3 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
80-btrfs.rules
View File

@ -1,20 +0,0 @@
SUBSYSTEM!="block", GOTO="btrfs_end"
ACTION!="add|change", GOTO="btrfs_end"
ENV{ID_FS_TYPE}=="LVM2_member|LVM1_member", GOTO="btrfs_end"
ENV{ID_FS_TYPE}=="linux_raid_member", GOTO="btrfs_end"
ENV{ID_FS_TYPE}=="btrfs", GOTO="btrfs_do_scan"
ENV{DM_UUID}=="LVM-?*", GOTO="btrfs_do_scan"
ENV{DM_UUID}=="LUKS-CRYPT1-?*", GOTO="btrfs_do_scan"
ENV{DM_UUID}=="LUKS-PLAIN-?*", GOTO="btrfs_do_scan"
ENV{DM_UUID}=="LUKS-VERITY-?*", GOTO="btrfs_do_scan"
ENV{DM_UUID}=="LUKS-LOOPAES-?*", GOTO="btrfs_do_scan"
ENV{MD_UUID}=="?*", GOTO="btrfs_do_scan"
GOTO="btrfs_end"
LABEL="btrfs_do_scan"
RUN+="/sbin/modprobe btrfs"
RUN+="/usr/sbin/btrfs device scan $env{DEVNAME}"
LABEL="btrfs_end"

5
btrfsprogs.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 26 21:21:15 UTC 2013 - jeffm@suse.com
- Remove udev rules file - udev packages one itself (bnc#839960).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 16 15:49:00 UTC 2013 - jeffm@suse.com Mon Sep 16 15:49:00 UTC 2013 - jeffm@suse.com

6
btrfsprogs.spec
View File

@ -31,7 +31,6 @@ Source: btrfs-progs-%{tar_version}.tar.bz2
Source1: boot-btrfs.sh Source1: boot-btrfs.sh
Source4: setup-btrfs.sh Source4: setup-btrfs.sh
Source2: btrfs-dev-clear-sb Source2: btrfs-dev-clear-sb
Source3: 80-btrfs.rules
Patch10: 0010-Btrfs-progs-make-btrfsck-a-hardlink-at-install-time.patch Patch10: 0010-Btrfs-progs-make-btrfsck-a-hardlink-at-install-time.patch
Patch12: 0012-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch Patch12: 0012-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch
Patch40: 0040-btrfs-progs-fix-loop-device-mount-checks.patch Patch40: 0040-btrfs-progs-fix-loop-device-mount-checks.patch
@ -126,8 +125,6 @@ install -d -m0755 ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/
install -m 0755 %{S:1} ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/ install -m 0755 %{S:1} ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/
install -m 0755 %{S:4} ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/ install -m 0755 %{S:4} ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/
install -m 0755 %{S:2} ${RPM_BUILD_ROOT}/usr/sbin/ install -m 0755 %{S:2} ${RPM_BUILD_ROOT}/usr/sbin/
install -d -m 0755 $RPM_BUILD_ROOT/usr/lib/udev/rules.d
install -m 0644 %{S:3} $RPM_BUILD_ROOT/usr/lib/udev/rules.d
rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.la rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.la
# don't install .a for now # don't install .a for now
rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.a rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.a
@ -176,9 +173,6 @@ rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.a
%_mandir/man8/mkfs.btrfs.8.gz %_mandir/man8/mkfs.btrfs.8.gz
%_mandir/man8/btrfs.8.gz %_mandir/man8/btrfs.8.gz
%_mandir/man8/btrfs-convert.8.gz %_mandir/man8/btrfs-convert.8.gz
%dir /usr/lib/udev/
%dir /usr/lib/udev/rules.d/
/usr/lib/udev/rules.d/80-btrfs.rules
%files -n libbtrfs0 %files -n libbtrfs0
%defattr(-, root, root) %defattr(-, root, root)