From 98c0e424b7f45f2e85a2e5e1fe356b439f740b6b Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Mon, 17 Nov 2008 22:54:38 +0000 Subject: Fix patch with absolute paths. Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64 --- sys-fs/btrfs/ChangeLog | 6 +++++- sys-fs/btrfs/files/btrfs-0.16-new-kernels.patch | 18 +++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'sys-fs/btrfs') 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ò + files/btrfs-0.16-new-kernels.patch: + Fix patch with absolute paths. 10 Nov 2008; Joe Peterson 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 #include "extent_io.h" -- cgit v1.2.3-65-gdbad