summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/attr/acl.inc1
-rw-r--r--meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch198
2 files changed, 199 insertions, 0 deletions
diff --git a/meta/recipes-support/attr/acl.inc b/meta/recipes-support/attr/acl.inc
index 04967a6027..355dbdd9b0 100644
--- a/meta/recipes-support/attr/acl.inc
+++ b/meta/recipes-support/attr/acl.inc
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
11DEPENDS = "attr" 11DEPENDS = "attr"
12SRC_URI = "http://download.savannah.gnu.org/releases/acl/${BP}.src.tar.gz \ 12SRC_URI = "http://download.savannah.gnu.org/releases/acl/${BP}.src.tar.gz \
13 file://run-ptest \ 13 file://run-ptest \
14 file://acl-fix-the-order-of-expected-output-of-getfacl.patch \
14" 15"
15 16
16require ea-acl.inc 17require ea-acl.inc
diff --git a/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch b/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch
new file mode 100644
index 0000000000..cf765fdbb8
--- /dev/null
+++ b/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch
@@ -0,0 +1,198 @@
1acl: fix the order of expected output of getfacl
2
3The result of getfacl is sorted by user id.
4In Centos or RHEL, bin user id is 1 and daemon user id is 2.
5But in our image, bin user id is 2 and daemon user id is 1.
6The patch fixes this issue to make ptest pass.
7
8Upstream-Status: Inappropriate [embedded specific]
9
10Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
11---
12 test/misc.test | 38 +++++++++++++++++++-------------------
13 1 file changed, 19 insertions(+), 19 deletions(-)
14
15diff --git a/test/misc.test b/test/misc.test
16index 6e98053..53ae5b0 100644
17--- a/test/misc.test
18+++ b/test/misc.test
19@@ -79,8 +79,8 @@ Multiple users
20
21 $ getfacl --omit-header f
22 > user::rw-
23- > user:bin:rw-
24 > user:daemon:r--
25+ > user:bin:rw-
26 > group::r--
27 > mask::rw-
28 > other::r--
29@@ -94,8 +94,8 @@ Multiple groups
30
31 $ getfacl --omit-header f
32 > user::rw-
33- > user:bin:rw-
34 > user:daemon:r--
35+ > user:bin:rw-
36 > group::r--
37 > group:daemon:r--
38 > group:users:rw-
39@@ -111,8 +111,8 @@ Remove one group
40
41 $ getfacl --omit-header f
42 > user::rw-
43- > user:bin:rw-
44 > user:daemon:r--
45+ > user:bin:rw-
46 > group::r--
47 > group:daemon:r--
48 > mask::rw-
49@@ -146,8 +146,8 @@ Default ACL
50
51 $ getfacl --omit-header d
52 > user::rwx
53- > user:bin:rwx
54 > user:daemon:rw-
55+ > user:bin:rwx
56 > group::r-x
57 > mask::rwx
58 > other::---
59@@ -236,16 +236,16 @@ Add some users and groups
60
61 $ getfacl --omit-header d/d
62 > user::rwx
63- > user:bin:rwx #effective:r-x
64 > user:daemon:r-x
65+ > user:bin:rwx #effective:r-x
66 > group::r-x
67 > group:daemon:rwx #effective:r-x
68 > group:users:r-x
69 > mask::r-x
70 > other::---
71 > default:user::rwx
72- > default:user:bin:rwx #effective:r-x
73 > default:user:daemon:r-x
74+ > default:user:bin:rwx #effective:r-x
75 > default:group::r-x
76 > default:mask::r-x
77 > default:other::---
78@@ -262,16 +262,16 @@ Symlink in directory with default ACL?
79
80 $ getfacl --omit-header d/l
81 > user::rwx
82- > user:bin:rwx #effective:r-x
83 > user:daemon:r-x
84+ > user:bin:rwx #effective:r-x
85 > group::r-x
86 > group:daemon:rwx #effective:r-x
87 > group:users:r-x
88 > mask::r-x
89 > other::---
90 > default:user::rwx
91- > default:user:bin:rwx #effective:r-x
92 > default:user:daemon:r-x
93+ > default:user:bin:rwx #effective:r-x
94 > default:group::r-x
95 > default:mask::r-x
96 > default:other::---
97@@ -287,16 +287,16 @@ Does mask manipulation work?
98
99 $ getfacl --omit-header d/d
100 > user::rwx
101- > user:bin:r-x
102 > user:daemon:r-x
103+ > user:bin:r-x
104 > group::r-x
105 > group:daemon:r-x
106 > group:users:r-x
107 > mask::r-x
108 > other::---
109 > default:user::rwx
110- > default:user:bin:rwx #effective:r-x
111 > default:user:daemon:r-x
112+ > default:user:bin:rwx #effective:r-x
113 > default:group::r-x
114 > default:mask::r-x
115 > default:other::---
116@@ -308,16 +308,16 @@ Does mask manipulation work?
117
118 $ getfacl --omit-header d/d
119 > user::rwx
120- > user:bin:r-x
121 > user:daemon:r-x
122+ > user:bin:r-x
123 > group::r-x
124 > group:daemon:r-x
125 > group:users:r-x
126 > mask::r-x
127 > other::---
128 > default:user::rwx
129- > default:user:bin:rwx
130 > default:user:daemon:r-x
131+ > default:user:bin:rwx
132 > default:group::r-x
133 > default:mask::rwx
134 > default:other::---
135@@ -333,8 +333,8 @@ Remove the default ACL
136
137 $ getfacl --omit-header d
138 > user::rwx
139- > user:bin:rwx
140 > user:daemon:rw-
141+ > user:bin:rwx
142 > group::r-x
143 > mask::rwx
144 > other::---
145@@ -373,14 +373,14 @@ Now, chmod should change the group_obj entry
146
147 $ getfacl --omit-header d
148 > user::rwx
149- > user:bin:r-x
150 > user:daemon:rwx
151+ > user:bin:r-x
152 > group::rwx
153 > mask::rwx
154 > other::r-x
155 > default:user::rwx
156- > default:user:bin:r-x
157 > default:user:daemon:rwx
158+ > default:user:bin:r-x
159 > default:group::rwx
160 > default:mask::rwx
161 > default:other::r-x
162@@ -392,14 +392,14 @@ Now, chmod should change the group_obj entry
163
164 $ getfacl --omit-header d
165 > user::rwx
166- > user:bin:r-x
167 > user:daemon:rwx #effective:r-x
168+ > user:bin:r-x
169 > group::rwx #effective:r-x
170 > mask::r-x
171 > other::---
172 > default:user::rwx
173- > default:user:bin:r-x
174 > default:user:daemon:rwx
175+ > default:user:bin:r-x
176 > default:group::rwx
177 > default:mask::rwx
178 > default:other::r-x
179@@ -411,14 +411,14 @@ Now, chmod should change the group_obj entry
180
181 $ getfacl --omit-header d
182 > user::rwx
183- > user:bin:r-x
184 > user:daemon:rwx #effective:r-x
185+ > user:bin:r-x
186 > group::rwx #effective:r-x
187 > mask::r-x
188 > other::---
189 > default:user::rwx
190- > default:user:bin:r-x
191 > default:user:daemon:rwx
192+ > default:user:bin:r-x
193 > default:group::rwx
194 > default:mask::rwx
195 > default:other::r-x
196--
1971.7.9.5
198
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-13 18:43:35 +0000