[FE training-materials-updates] Make patches work with -p1 instead of -p2
Michael Opdenacker
michael.opdenacker at free-electrons.com
Thu Dec 20 20:21:17 CET 2012
Repository : git://git.free-electrons.com/training-materials.git
On branch : master
Link : http://git.free-electrons.com/training-materials/commit/?id=164e16fba5bfe6800aa08ee297c5371c120c3032
>---------------------------------------------------------------
commit 164e16fba5bfe6800aa08ee297c5371c120c3032
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date: Mon Dec 17 15:08:09 2012 +0100
Make patches work with -p1 instead of -p2
>---------------------------------------------------------------
164e16fba5bfe6800aa08ee297c5371c120c3032
.../aosp/patches/01-add-fpermissive-flag.patch | 4 ++--
.../aosp/patches/02-undefine-FORTIFY-SOURCE.patch | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lab-data/android/aosp/patches/01-add-fpermissive-flag.patch b/lab-data/android/aosp/patches/01-add-fpermissive-flag.patch
index 9b76ab2..e556c5a 100644
--- a/lab-data/android/aosp/patches/01-add-fpermissive-flag.patch
+++ b/lab-data/android/aosp/patches/01-add-fpermissive-flag.patch
@@ -1,5 +1,5 @@
---- ./android.orig/frameworks/base/libs/utils/Android.mk 2012-12-14 12:46:22.918266602 +0100
-+++ ./android/frameworks/base/libs/utils/Android.mk 2012-12-14 12:51:39.714252478 +0100
+--- android.orig/frameworks/base/libs/utils/Android.mk 2012-12-14 12:46:22.918266602 +0100
++++ android/frameworks/base/libs/utils/Android.mk 2012-12-14 12:51:39.714252478 +0100
@@ -57,7 +57,7 @@
LOCAL_MODULE:= libutils
diff --git a/lab-data/android/aosp/patches/02-undefine-FORTIFY-SOURCE.patch b/lab-data/android/aosp/patches/02-undefine-FORTIFY-SOURCE.patch
index 079244d..0f6c045 100644
--- a/lab-data/android/aosp/patches/02-undefine-FORTIFY-SOURCE.patch
+++ b/lab-data/android/aosp/patches/02-undefine-FORTIFY-SOURCE.patch
@@ -1,5 +1,5 @@
---- ./android.orig/build/core/combo/HOST_linux-x86.mk 2012-12-14 13:00:39.338228419 +0100
-+++ ./android/build/core/combo/HOST_linux-x86.mk 2012-12-14 13:01:48.686225327 +0100
+--- android.orig/build/core/combo/HOST_linux-x86.mk 2012-12-14 13:00:39.338228419 +0100
++++ android/build/core/combo/HOST_linux-x86.mk 2012-12-14 13:01:48.686225327 +0100
@@ -58,6 +58,6 @@
-include $(call select-android-config-h,linux-x86)
More information about the training-materials-updates
mailing list