summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-11-17 22:54:38 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-11-17 22:54:38 +0000
commit98c0e424b7f45f2e85a2e5e1fe356b439f740b6b (patch)
treec3a979a536e447648595a6f01ba4e80c77aeed0d /sys-fs/btrfs
parentNew version for GNOME 2.24. Added recursive_unset and notify to Client side. (diff)
downloadhistorical-98c0e424b7f45f2e85a2e5e1fe356b439f740b6b.tar.gz
historical-98c0e424b7f45f2e85a2e5e1fe356b439f740b6b.tar.bz2
historical-98c0e424b7f45f2e85a2e5e1fe356b439f740b6b.zip
Fix patch with absolute paths.
Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64
Diffstat (limited to 'sys-fs/btrfs')
-rw-r--r--sys-fs/btrfs/ChangeLog6
-rw-r--r--sys-fs/btrfs/files/btrfs-0.16-new-kernels.patch18
2 files changed, 14 insertions, 10 deletions
diff --git a/sys-fs/btrfs/ChangeLog b/sys-fs/btrfs/ChangeLog
index 315dbaf7e9bf..bb563dc7b932 100644
--- a/sys-fs/btrfs/ChangeLog
+++ b/sys-fs/btrfs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/btrfs
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/ChangeLog,v 1.14 2008/11/10 15:45:28 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/ChangeLog,v 1.15 2008/11/17 22:53:14 flameeyes Exp $
+
+ 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+ files/btrfs-0.16-new-kernels.patch:
+ Fix patch with absolute paths.
10 Nov 2008; Joe Peterson <lavajoe@gentoo.org> btrfs-9999.ebuild:
Update live ebuild to use git
diff --git a/sys-fs/btrfs/files/btrfs-0.16-new-kernels.patch b/sys-fs/btrfs/files/btrfs-0.16-new-kernels.patch
index ef992a765453..bc93756c7730 100644
--- a/sys-fs/btrfs/files/btrfs-0.16-new-kernels.patch
+++ b/sys-fs/btrfs/files/btrfs-0.16-new-kernels.patch
@@ -1,6 +1,6 @@
-diff -Nurp /var/tmp/portage/sys-fs/btrfs-0.16/work/btrfs-0.16/compat.h ./compat.h
---- /var/tmp/portage/sys-fs/btrfs-0.16/work/btrfs-0.16/compat.h 2008-08-05 12:13:37.000000000 -0600
-+++ ./compat.h 2008-08-18 10:59:06.974647262 -0600
+diff -Nurp a/compat.h ./compat.h
+--- a/compat.h 2008-08-05 12:13:37.000000000 -0600
++++ b/compat.h 2008-08-18 10:59:06.974647262 -0600
@@ -1,6 +1,9 @@
#ifndef _COMPAT_H_
#define _COMPAT_H_
@@ -11,9 +11,9 @@ diff -Nurp /var/tmp/portage/sys-fs/btrfs-0.16/work/btrfs-0.16/compat.h ./compat.
/*
* Even if AppArmor isn't enabled, it still has different prototypes.
-diff -Nurp /var/tmp/portage/sys-fs/btrfs-0.16/work/btrfs-0.16/ctree.h ./ctree.h
---- /var/tmp/portage/sys-fs/btrfs-0.16/work/btrfs-0.16/ctree.h 2008-08-05 12:13:37.000000000 -0600
-+++ ./ctree.h 2008-08-18 10:59:07.004646324 -0600
+diff -Nurp a/ctree.h ./ctree.h
+--- a/ctree.h 2008-08-05 12:13:37.000000000 -0600
++++ b/ctree.h 2008-08-18 10:59:07.004646324 -0600
@@ -1648,7 +1648,7 @@ int btrfs_csum_truncate(struct btrfs_tra
/* inode.c */
@@ -23,9 +23,9 @@ diff -Nurp /var/tmp/portage/sys-fs/btrfs-0.16/work/btrfs-0.16/ctree.h ./ctree.h
#define ClearPageChecked ClearPageFsMisc
#define SetPageChecked SetPageFsMisc
#define PageChecked PageFsMisc
-diff -Nurp /var/tmp/portage/sys-fs/btrfs-0.16/work/btrfs-0.16/extent_io.c ./extent_io.c
---- /var/tmp/portage/sys-fs/btrfs-0.16/work/btrfs-0.16/extent_io.c 2008-08-05 12:13:37.000000000 -0600
-+++ ./extent_io.c 2008-08-18 10:59:07.044650492 -0600
+diff -Nurp a/extent_io.c ./extent_io.c
+--- a/extent_io.c 2008-08-05 12:13:37.000000000 -0600
++++ b/extent_io.c 2008-08-18 10:59:07.044650492 -0600
@@ -14,6 +14,7 @@
#include <linux/pagevec.h>
#include "extent_io.h"