fix build-everything patch to actually build everything

This commit is contained in:
Josef Bacik 2011-08-05 15:24:09 -04:00
parent f0cec3f952
commit 4f795142bc
2 changed files with 9 additions and 6 deletions

View File

@ -1,12 +1,13 @@
--- btrfs-progs-0.19/Makefile.orig 2010-03-24 14:45:18.001490900 -0400
+++ btrfs-progs-0.19/Makefile 2010-03-24 14:45:35.745491310 -0400
@@ -17,8 +17,7 @@
diff -up btrfs-progs-0.19/Makefile.build btrfs-progs-0.19/Makefile
--- btrfs-progs-0.19/Makefile.build 2011-08-05 14:06:29.871749619 -0400
+++ btrfs-progs-0.19/Makefile 2011-08-05 14:06:45.419727708 -0400
@@ -17,8 +17,7 @@ bindir = $(prefix)/bin
LIBS=-luuid
progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck \
- btrfs \
- btrfs-map-logical
+ btrfs btrfs-map-logical btrfstune btrfs-image
+ btrfs btrfs-map-logical btrfstune btrfs-image btrfs-zero-log
# make C=1 to enable sparse
ifdef C

View File

@ -1,6 +1,6 @@
Name: btrfs-progs
Version: 0.19
Release: 15%{?dist}
Release: 16%{?dist}
Summary: Userspace programs for btrfs
Group: System Environment/Base
@ -33,7 +33,6 @@ check, modify and correct any inconsistencies in the btrfs filesystem.
%build
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} LDFLAGS="-lcom_err" convert
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} btrfs-zero-log
%install
rm -rf $RPM_BUILD_ROOT
@ -65,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/btrfs.8.gz
%changelog
* Fri Aug 05 2011 Josef Bacik <josef@toxicpanda.com> 0.19-16
- fix build-everything patch to actually build everything
* Fri Aug 05 2011 Josef Bacik <josef@toxicpanda.com> 0.19-15
- actually build btrfs-zero-log