Compare commits
6 Commits
Author | SHA1 | Date |
---|---|---|
Fedora Release Engineering | b9113e8d4a | |
Josef Bacik | 0868c34787 | |
Josef Bacik | 5d56592a83 | |
Josef Bacik | c8c2fd4fce | |
Josef Bacik | db2d28e827 | |
Jesse Keating | dd0ea2bf04 |
21
Makefile
21
Makefile
|
@ -1,21 +0,0 @@
|
||||||
# Makefile for source rpm: btrfs-progs
|
|
||||||
# $Id: Makefile,v 1.1 2008/06/30 16:26:32 kevin Exp $
|
|
||||||
NAME := btrfs-progs
|
|
||||||
SPECFILE = $(firstword $(wildcard *.spec))
|
|
||||||
|
|
||||||
define find-makefile-common
|
|
||||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
|
||||||
|
|
||||||
ifeq ($(MAKEFILE_COMMON),)
|
|
||||||
# attept a checkout
|
|
||||||
define checkout-makefile-common
|
|
||||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
|
||||||
endif
|
|
||||||
|
|
||||||
include $(MAKEFILE_COMMON)
|
|
|
@ -1,12 +1,12 @@
|
||||||
diff -up btrfs-progs-0.19/Makefile.orig btrfs-progs-0.19/Makefile
|
--- btrfs-progs-0.19/Makefile.orig 2010-03-24 14:45:18.001490900 -0400
|
||||||
--- btrfs-progs-0.19/Makefile.orig 2009-06-19 08:05:49.151573429 -0400
|
+++ btrfs-progs-0.19/Makefile 2010-03-24 14:45:35.745491310 -0400
|
||||||
+++ btrfs-progs-0.19/Makefile 2009-06-19 08:08:35.192509803 -0400
|
@@ -17,8 +17,7 @@
|
||||||
@@ -16,7 +16,7 @@ prefix ?= /usr/local
|
|
||||||
bindir = $(prefix)/bin
|
|
||||||
LIBS=-luuid
|
LIBS=-luuid
|
||||||
|
|
||||||
-progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck
|
progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck \
|
||||||
+progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck btrfs-image btrfstune
|
- btrfs \
|
||||||
|
- btrfs-map-logical
|
||||||
|
+ btrfs btrfs-map-logical btrfstune btrfs-image
|
||||||
|
|
||||||
# make C=1 to enable sparse
|
# make C=1 to enable sparse
|
||||||
ifdef C
|
ifdef C
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,6 +1,6 @@
|
||||||
Name: btrfs-progs
|
Name: btrfs-progs
|
||||||
Version: 0.19
|
Version: 0.19
|
||||||
Release: 9%{?dist}
|
Release: 12%{?dist}
|
||||||
Summary: Userspace programs for btrfs
|
Summary: Userspace programs for btrfs
|
||||||
|
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
|
@ -12,6 +12,7 @@ Patch1: btrfs-progs-build-everything.patch
|
||||||
Patch2: btrfs-progs-valgrind.patch
|
Patch2: btrfs-progs-valgrind.patch
|
||||||
Patch3: btrfs-progs-fix-return-value.patch
|
Patch3: btrfs-progs-fix-return-value.patch
|
||||||
Patch4: btrfs-progs-build-fixes.patch
|
Patch4: btrfs-progs-build-fixes.patch
|
||||||
|
Patch5: btrfs-progs-upstream.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: e2fsprogs-devel, libuuid-devel, zlib-devel, libacl-devel
|
BuildRequires: e2fsprogs-devel, libuuid-devel, zlib-devel, libacl-devel
|
||||||
|
@ -25,14 +26,15 @@ check, modify and correct any inconsistencies in the btrfs filesystem.
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
|
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
|
||||||
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} convert
|
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} LDFLAGS="-lcom_err" convert
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
@ -53,13 +55,26 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
%{_root_sbindir}/btrfs-vol
|
%{_root_sbindir}/btrfs-vol
|
||||||
%{_root_sbindir}/btrfs-convert
|
%{_root_sbindir}/btrfs-convert
|
||||||
%{_root_sbindir}/btrfstune
|
%{_root_sbindir}/btrfstune
|
||||||
|
%{_root_sbindir}/btrfs
|
||||||
|
%{_root_sbindir}/btrfs-map-logical
|
||||||
%{_mandir}/man8/btrfs-image.8.gz
|
%{_mandir}/man8/btrfs-image.8.gz
|
||||||
%{_mandir}/man8/btrfs-show.8.gz
|
%{_mandir}/man8/btrfs-show.8.gz
|
||||||
%{_mandir}/man8/btrfsck.8.gz
|
%{_mandir}/man8/btrfsck.8.gz
|
||||||
%{_mandir}/man8/btrfsctl.8.gz
|
%{_mandir}/man8/btrfsctl.8.gz
|
||||||
%{_mandir}/man8/mkfs.btrfs.8.gz
|
%{_mandir}/man8/mkfs.btrfs.8.gz
|
||||||
|
%{_mandir}/man8/btrfs.8.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 24 2010 Josef Bacik <josef@toxicpanda.com> 0.19-12
|
||||||
|
- bring btrfs-progs uptodate with upstream so we can use the new kernel
|
||||||
|
features, such as the default subvol stuff and snapshot listing.
|
||||||
|
|
||||||
|
* Thu Mar 11 2010 Josef Bacik <josef@toxicpanda.com> 0.19-11
|
||||||
|
- fix convert build for DSO linking stuff
|
||||||
|
|
||||||
|
* Thu Mar 11 2010 Josef Bacik <josef@toxicpanda.com> 0.19-10
|
||||||
|
- add btrfs-progs-ustream.patch so we are aligned with upstream
|
||||||
|
|
||||||
* Tue Feb 2 2010 Josef Bacik <josef@toxicpanda.com> 0.19-9
|
* Tue Feb 2 2010 Josef Bacik <josef@toxicpanda.com> 0.19-9
|
||||||
- fix btrfsck so it builds on newer glibcs
|
- fix btrfsck so it builds on newer glibcs
|
||||||
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
btrfs-progs-0_15-4_fc8:HEAD:btrfs-progs-0.15-4.fc8.src.rpm:1214853686
|
|
Loading…
Reference in New Issue