Commit 371c4bf
committed
fix: exclude systemd files from merge output
1. Modified mergeOutput function to accept an 'excludes' parameter for
filtering unwanted directories during file merging
2. Added logic to skip systemd-related files (lib/systemd, share/
systemd) during build stage
3. This prevents unnecessary systemd service files from being included
in the final package output
4. Updated test to verify the exclusion mechanism works correctly
Log: Systemd service files are no longer included in application
packages by default
Influence:
1. Test package building to ensure systemd files are excluded from
output
2. Verify that other critical directories (bin/, lib/, sbin/) are still
properly merged
3. Test with various source directory structures to ensure exclusion
logic handles edge cases
4. Verify that existing packages still build correctly after this change
5. Check that .wh.* files continue to be excluded as expected
fix: 从合并输出中排除 systemd 文件
1. 修改 mergeOutput 函数,添加 'excludes' 参数用于在文件合并时过滤不需要
的目录
2. 在构建阶段添加逻辑跳过 systemd 相关文件(lib/systemd, share/systemd)
3. 这防止不必要的 systemd 服务文件被包含在最终软件包输出中
4. 更新测试以验证排除机制正常工作
Log: Systemd 服务文件默认不再包含在应用程序包中
Influence:
1. 测试软件包构建,确保 systemd 文件被正确排除
2. 验证其他关键目录(bin/, lib/, sbin/)仍然正确合并
3. 使用不同的源目录结构测试,确保排除逻辑能处理边界情况
4. 验证现有软件包在此更改后仍然能正确构建
5. 检查 .wh.* 文件是否按预期继续被排除1 parent 02e61e4 commit 371c4bf
3 files changed
Lines changed: 21 additions & 5 deletions
File tree
- libs/linglong
- src/linglong/builder
- tests/ll-tests/src/linglong/builder
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
155 | 155 | | |
156 | 156 | | |
157 | 157 | | |
158 | | - | |
| 158 | + | |
| 159 | + | |
159 | 160 | | |
160 | 161 | | |
161 | 162 | | |
162 | | - | |
| 163 | + | |
163 | 164 | | |
164 | 165 | | |
165 | 166 | | |
| |||
172 | 173 | | |
173 | 174 | | |
174 | 175 | | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
175 | 181 | | |
176 | 182 | | |
177 | 183 | | |
| |||
959 | 965 | | |
960 | 966 | | |
961 | 967 | | |
962 | | - | |
| 968 | + | |
| 969 | + | |
| 970 | + | |
| 971 | + | |
963 | 972 | | |
964 | 973 | | |
965 | 974 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
| 59 | + | |
| 60 | + | |
60 | 61 | | |
61 | 62 | | |
62 | 63 | | |
| |||
Lines changed: 7 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
| 114 | + | |
114 | 115 | | |
115 | 116 | | |
116 | 117 | | |
117 | 118 | | |
| 119 | + | |
118 | 120 | | |
119 | 121 | | |
120 | 122 | | |
| |||
130 | 132 | | |
131 | 133 | | |
132 | 134 | | |
133 | | - | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
134 | 139 | | |
135 | 140 | | |
136 | 141 | | |
| |||
143 | 148 | | |
144 | 149 | | |
145 | 150 | | |
| 151 | + | |
146 | 152 | | |
147 | 153 | | |
148 | 154 | | |
| |||
0 commit comments