author | Misaki Miyashita <Misaki.Miyashita@Oracle.COM> |
Mon, 14 Nov 2011 08:53:40 -0800 | |
branch | s11-sru |
changeset 2230 | f34d51fb8646 |
parent 327 | b3a36ee93012 |
permissions | -rw-r--r-- |
327
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
1 |
Someday GNU find will be available for the SFW build environment (maybe |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
2 |
LSARC/2008/531). When that happens this patch will no longer be required. |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
3 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
4 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
5 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
6 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
7 |
Index: quilt/fold.in |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
8 |
=================================================================== |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
9 |
--- quilt/fold.in.orig 2008-11-05 14:11:24.246878000 -0600 |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
10 |
+++ quilt/fold.in 2008-11-05 14:18:18.240681000 -0600 |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
11 |
@@ -103,7 +103,7 @@ if [ -z "$failed" ] |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
12 |
then |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
13 |
# Copy additional files from workdir to the backup directory |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
14 |
# For this patch |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
15 |
- for file in $(find $workdir -type f -a ! -path "$workdir/.timestamp") |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
16 |
+ for file in $(find $workdir -type f | @GREP@ -v -E "^$workdir/.timestamp$") |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
17 |
do |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
18 |
file="${file:${#workdir}+1}" |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
19 |
backup_file="$(backup_file_name $top "$file")" |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
20 |
@@ -121,7 +121,7 @@ fi |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
21 |
if [ -n "$failed" ] |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
22 |
then |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
23 |
# Restore all files to the state from before applying the patch |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
24 |
- for file in $(find $workdir -type f -a ! -path "$workdir/.timestamp") |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
25 |
+ for file in $(find $workdir -type f | @GREP@ -v -E "^$workdir/.timestamp$") |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
26 |
do |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
27 |
file="${file:${#workdir}+1}" |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
28 |
if ! mv -f "$workdir/$file" "$file" |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
29 |
Index: quilt/scripts/patchfns.in |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
30 |
=================================================================== |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
31 |
--- quilt/scripts/patchfns.in.orig 2008-11-05 14:11:24.251209000 -0600 |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
32 |
+++ quilt/scripts/patchfns.in 2008-11-05 14:18:18.242696000 -0600 |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
33 |
@@ -649,8 +649,8 @@ files_in_patch() |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
34 |
if [ -d "$path" ] |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
35 |
then |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
36 |
local files |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
37 |
- files=( $(find "$path" -type f \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
38 |
- -a ! -path "$path/.timestamp") ) \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
39 |
+ files=( $(find "$path" -type f | \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
40 |
+ @GREP@ -v -E "^$path/.timestamp$") ) \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
41 |
|| return 1 |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
42 |
printf "%s\n" "${files[@]#$path/}" |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
43 |
fi |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
44 |
Index: quilt/grep.in |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
45 |
=================================================================== |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
46 |
--- quilt/grep.in.orig 2008-11-05 14:11:24.257342000 -0600 |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
47 |
+++ quilt/grep.in 2008-11-05 14:18:18.243720000 -0600 |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
48 |
@@ -114,10 +114,9 @@ fi |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
49 |
# may pass a single filename to grep and cause it to omit the file name. |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
50 |
[ -z "$opt_h" ] && opt_H=-H |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
51 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
52 |
-find "${myargs[@]}" \( \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
53 |
- -path "./$QUILT_PATCHES/*" -o \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
54 |
- -path "./$QUILT_PC/*" \) -prune -o \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
55 |
+find "${myargs[@]}" \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
56 |
-type f -print \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
57 |
+| @GREP@ -v -E "^\./$QUILT_(PATCHES|PC)/" \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
58 |
| xargs grep $opt_H "${args[@]}" \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
59 |
| if [ ${#myargs[@]} -eq 0 ]; then |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
60 |
sed -e 's,^./,,' |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
61 |
Index: configure.ac |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
62 |
=================================================================== |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
63 |
--- configure.ac.orig 2008-11-05 14:11:24.263434000 -0600 |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
64 |
+++ configure.ac 2008-11-05 14:18:18.244870000 -0600 |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
65 |
@@ -296,18 +296,18 @@ fi |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
66 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
67 |
QUILT_COMPAT_PROG_PATH(FIND, find) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
68 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
69 |
-AC_MSG_CHECKING([whether $FIND -path works]) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
70 |
-if $FIND . -path '*' >/dev/null 2>&1; then |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
71 |
- AC_MSG_RESULT(yes) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
72 |
-else |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
73 |
- AC_MSG_RESULT(no) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
74 |
- AC_MSG_ERROR([ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
75 |
-Sorry, you have a version of find which doesn't understand -path. |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
76 |
-$PACKAGE_NAME needs it. If you have access to a version of find which |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
77 |
-does understand -path, you can supply its path with the |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
78 |
-'--with-find=' option. |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
79 |
-]) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
80 |
-fi |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
81 |
+# AC_MSG_CHECKING([whether $FIND -path works]) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
82 |
+# if $FIND . -path '*' >/dev/null 2>&1; then |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
83 |
+# AC_MSG_RESULT(yes) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
84 |
+# else |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
85 |
+# AC_MSG_RESULT(no) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
86 |
+# AC_MSG_ERROR([ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
87 |
+# Sorry, you have a version of find which doesn't understand -path. |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
88 |
+# $PACKAGE_NAME needs it. If you have access to a version of find which |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
89 |
+# does understand -path, you can supply its path with the |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
90 |
+# '--with-find=' option. |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
91 |
+# ]) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
92 |
+# fi |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
93 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
94 |
QUILT_COMPAT_PROG_PATH_OPT(DIFFSTAT, diffstat) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
95 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
96 |
Index: Makefile.in |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
97 |
=================================================================== |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
98 |
--- Makefile.in.orig 2008-11-05 14:15:59.439693000 -0600 |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
99 |
+++ Makefile.in 2008-11-05 14:18:18.246168000 -0600 |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
100 |
@@ -262,6 +262,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
101 |
-e 's:@QUILT_DIR''@:$(datadir)/$(PACKAGE):g' \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
102 |
-e 's:@PERL''@:$(PERL):g' \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
103 |
-e 's:@BASH''@:$(BASH):g' \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
104 |
+ -e 's:@GREP''@:$(GREP):g' \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
105 |
-e 's:@PATCH''@:$(PATCH):g' \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
106 |
-e 's:@VERSION''@:$(VERSION):g' \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
107 |
-e 's:@RELEASE''@:$(RELEASE):g' \ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
108 |
@@ -281,7 +282,7 @@ Makefile : Makefile.in configure |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
109 |
@echo "Please run ./configure" |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
110 |
@false |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
111 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
112 |
-compat_leftover := $(filter-out $(COMPAT),$(shell $(FIND) compat -maxdepth 1 -type f -perm +111)) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
113 |
+compat_leftover := $(filter-out $(COMPAT),$(shell $(FIND) compat -type f -perm +rwx)) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
114 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
115 |
.PHONY :: compat |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
116 |
compat :: $(COMPAT) |