aufs-util: refresh patches

Refresh patches to fix do_patch warning.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
This commit is contained in:
Yi Zhao 2018-04-12 15:54:20 +08:00 committed by Armin Kuster
parent 50b0ed791d
commit eb65f2a8f7
3 changed files with 20 additions and 21 deletions

View File

@ -1,4 +1,4 @@
From bb8801fb21ac8d73e3b1a11a8555aaf822182a51 Mon Sep 17 00:00:00 2001
From daf04dc9ca1f2e4c65ec338ab439e0a792e1a8ac Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 5 Sep 2017 10:36:52 -0700
Subject: [PATCH] libau: Define STRIP weakly
@ -6,10 +6,11 @@ Subject: [PATCH] libau: Define STRIP weakly
STRIP can be set on environment to use cross version of strip utility
hardcoding to strip is not working in cross environment
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Submitted
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
libau/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
@ -34,6 +35,3 @@ index 81520ac..c25eef2 100644
# readelf --syms --use-dynamic libau.so
install_ulib: File = ${LibSo}.${LibSoMajor}.${LibSoMinor}
--
2.14.1

View File

@ -1,3 +1,6 @@
From 13a60c631d7cf6c7e1926473d8069795c0def9b6 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Thu, 19 Jun 2014 15:09:56 +0100
Subject: [PATCH] aufs-util: add tool concept to Makefile for cross compiling
purpose
@ -7,23 +10,21 @@ Add a tools target to Makefile to allow for this.
Upstream-Status: Pending
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
Makefile | 2 +-
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 2f905ad..49c3cd5 100644
index dbbe43d..aff969e 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ aufs.5: aufs.in.5 c2tmac
@@ -152,7 +152,7 @@ aufs.5: aufs.in.5 c2tmac
chmod a-w $@
c2sh c2tmac ver: CC = ${HOSTCC}
-.INTERMEDIATE: c2sh c2tmac ver
+tools: c2sh c2tmac ver
Install = install -o root -g root -p
install_sbin: File = auibusy auplink mount.aufs umount.aufs
--
1.7.9.5
install_sbin: File = auibusy aumvdown auplink mount.aufs umount.aufs
ifeq (${Glibc},no)

View File

@ -1,4 +1,4 @@
From 244863eca77fcaa1187884836c3e28d6b6d1504a Mon Sep 17 00:00:00 2001
From 9d5e7eff4ae906f1ea6e6527080fded0b595fbd4 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Tue, 9 Apr 2013 18:50:34 -0700
Subject: [PATCH] aufs-util: don't strip executables
@ -14,16 +14,19 @@ as follows:
To prevent this, we remove -s from LDFLAGS.
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
Makefile | 2 +-
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 2f905ad..e0c6dcd 100644
index 54f8d97..dbbe43d 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ all: ver_test ${Man} ${Bin} ${Etc}
@@ -118,7 +118,7 @@ clean:
ver_test: ver
./ver
@ -32,6 +35,3 @@ index 2f905ad..e0c6dcd 100644
${Bin}: LDLIBS = -L. -lautil
${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil}
--
1.7.10.4