Skip to content

Commit f29d5ff

Browse files
eabdullin1eabdullin1
authored
Merge pull request #136 from yuravk/devel-ng-0.22.0
Solve valgrind-docs, valgrind-scripts with valgrind package conflicts during 8to9 upgrade
2 parents 1e2f9c0 + ebb4158 commit f29d5ff

6 files changed

Lines changed: 237 additions & 4 deletions

File tree

‎files/almalinux/config.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2060,6 +2060,63 @@
20602060
"minor_version": 0,
20612061
"os_name": "AlmaLinux"
20622062
}
2063+
},
2064+
{
2065+
"action": 5,
2066+
"architectures": [
2067+
"aarch64",
2068+
"ppc64le",
2069+
"s390x",
2070+
"x86_64"
2071+
],
2072+
"id": 0,
2073+
"in_packageset": {
2074+
"package": [
2075+
{
2076+
"modulestreams": [
2077+
null
2078+
],
2079+
"name": "valgrind-docs",
2080+
"repository": "appstream"
2081+
},
2082+
{
2083+
"modulestreams": [
2084+
null
2085+
],
2086+
"name": "valgrind-scripts",
2087+
"repository": "appstream"
2088+
}
2089+
],
2090+
"set_id": 0
2091+
},
2092+
"initial_release": {
2093+
"major_version": 8,
2094+
"minor_version": 0,
2095+
"os_name": "AlmaLinux"
2096+
},
2097+
"modulestream_maps": [
2098+
{
2099+
"in_modulestream": null,
2100+
"out_modulestream": null
2101+
}
2102+
],
2103+
"out_packageset": {
2104+
"package": [
2105+
{
2106+
"modulestreams": [
2107+
null
2108+
],
2109+
"name": "valgrind",
2110+
"repository": "almalinux9-appstream"
2111+
}
2112+
],
2113+
"set_id": 0
2114+
},
2115+
"release": {
2116+
"major_version": 9,
2117+
"minor_version": 0,
2118+
"os_name": "AlmaLinux"
2119+
}
20632120
}
20642121
]
20652122
}

‎files/almalinux/pes-events.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630662,6 +630662,63 @@
630662630662
"minor_version": 0,
630663630663
"os_name": "AlmaLinux"
630664630664
}
630665+
},
630666+
{
630667+
"action": 5,
630668+
"architectures": [
630669+
"aarch64",
630670+
"ppc64le",
630671+
"s390x",
630672+
"x86_64"
630673+
],
630674+
"id": 17753,
630675+
"in_packageset": {
630676+
"package": [
630677+
{
630678+
"modulestreams": [
630679+
null
630680+
],
630681+
"name": "valgrind-docs",
630682+
"repository": "appstream"
630683+
},
630684+
{
630685+
"modulestreams": [
630686+
null
630687+
],
630688+
"name": "valgrind-scripts",
630689+
"repository": "appstream"
630690+
}
630691+
],
630692+
"set_id": 24346
630693+
},
630694+
"initial_release": {
630695+
"major_version": 8,
630696+
"minor_version": 0,
630697+
"os_name": "AlmaLinux"
630698+
},
630699+
"modulestream_maps": [
630700+
{
630701+
"in_modulestream": null,
630702+
"out_modulestream": null
630703+
}
630704+
],
630705+
"out_packageset": {
630706+
"package": [
630707+
{
630708+
"modulestreams": [
630709+
null
630710+
],
630711+
"name": "valgrind",
630712+
"repository": "almalinux9-appstream"
630713+
}
630714+
],
630715+
"set_id": 24345
630716+
},
630717+
"release": {
630718+
"major_version": 9,
630719+
"minor_version": 0,
630720+
"os_name": "AlmaLinux"
630721+
}
630665630722
}
630666630723
]
630667630724
}

‎files/rocky/config.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,6 +1282,63 @@
12821282
"tag": null,
12831283
"z_stream": null
12841284
}
1285+
},
1286+
{
1287+
"action": 5,
1288+
"architectures": [
1289+
"aarch64",
1290+
"ppc64le",
1291+
"s390x",
1292+
"x86_64"
1293+
],
1294+
"id": 0,
1295+
"in_packageset": {
1296+
"package": [
1297+
{
1298+
"modulestreams": [
1299+
null
1300+
],
1301+
"name": "valgrind-docs",
1302+
"repository": "appstream"
1303+
},
1304+
{
1305+
"modulestreams": [
1306+
null
1307+
],
1308+
"name": "valgrind-scripts",
1309+
"repository": "appstream"
1310+
}
1311+
],
1312+
"set_id": 0
1313+
},
1314+
"initial_release": {
1315+
"major_version": 8,
1316+
"minor_version": 0,
1317+
"os_name": "Rocky"
1318+
},
1319+
"modulestream_maps": [
1320+
{
1321+
"in_modulestream": null,
1322+
"out_modulestream": null
1323+
}
1324+
],
1325+
"out_packageset": {
1326+
"package": [
1327+
{
1328+
"modulestreams": [
1329+
null
1330+
],
1331+
"name": "valgrind",
1332+
"repository": "rocky9-appstream"
1333+
}
1334+
],
1335+
"set_id": 0
1336+
},
1337+
"release": {
1338+
"major_version": 9,
1339+
"minor_version": 0,
1340+
"os_name": "Rocky"
1341+
}
12851342
}
12861343
]
12871344
}

‎files/rocky/pes-events.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628971,6 +628971,63 @@
628971628971
"tag": null,
628972628972
"z_stream": null
628973628973
}
628974+
},
628975+
{
628976+
"action": 5,
628977+
"architectures": [
628978+
"aarch64",
628979+
"ppc64le",
628980+
"s390x",
628981+
"x86_64"
628982+
],
628983+
"id": 17731,
628984+
"in_packageset": {
628985+
"package": [
628986+
{
628987+
"modulestreams": [
628988+
null
628989+
],
628990+
"name": "valgrind-docs",
628991+
"repository": "appstream"
628992+
},
628993+
{
628994+
"modulestreams": [
628995+
null
628996+
],
628997+
"name": "valgrind-scripts",
628998+
"repository": "appstream"
628999+
}
629000+
],
629001+
"set_id": 24320
629002+
},
629003+
"initial_release": {
629004+
"major_version": 8,
629005+
"minor_version": 0,
629006+
"os_name": "Rocky"
629007+
},
629008+
"modulestream_maps": [
629009+
{
629010+
"in_modulestream": null,
629011+
"out_modulestream": null
629012+
}
629013+
],
629014+
"out_packageset": {
629015+
"package": [
629016+
{
629017+
"modulestreams": [
629018+
null
629019+
],
629020+
"name": "valgrind",
629021+
"repository": "rocky9-appstream"
629022+
}
629023+
],
629024+
"set_id": 24319
629025+
},
629026+
"release": {
629027+
"major_version": 9,
629028+
"minor_version": 0,
629029+
"os_name": "Rocky"
629030+
}
628974629031
}
628975629032
]
628976629033
}

‎leapp-data.spec‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
Name: leapp-data-%{dist_name}
5757
Version: 0.8
58-
Release: 1%{?dist}.%{pes_events_build_date}
58+
Release: 2%{?dist}.%{pes_events_build_date}
5959
Summary: data for migrating tool
6060
Group: Applications/Databases
6161
License: ASL 2.0
@@ -180,6 +180,11 @@ python3 tests/check_debranding.py %{buildroot}%{_sysconfdir}/leapp/files/pes-eve
180180

181181

182182
%changelog
183+
* Thu Mar 27 2025 Yuriy Kohut <ykohut@almalinux.org> - 0.8-2.20250228
184+
- Update pes-events.json and config.json (except almalinux-kitten, centos):
185+
- solve valgrind-docs, valgrind-scripts with valgrind package conflicts during 8to9 upgrade
186+
- Bump the package release
187+
183188
* Thu Mar 06 2025 Yuriy Kohut <ykohut@almalinux.org> - 0.8-1.20250228
184189
- AlmaLinux Kitten 10 support
185190

‎vendors.d/epel_pes.json_template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174283,7 +174283,7 @@
174283174283
"ppc64le"
174284174284
],
174285174285
"description": "",
174286-
"id": 17753,
174286+
"id": 33934,
174287174287
"in_packageset": {
174288174288
"package": [
174289174289
{
@@ -238132,7 +238132,7 @@
238132238132
"repository": "epel"
238133238133
}
238134238134
],
238135-
"set_id": 24345
238135+
"set_id": 34178
238136238136
},
238137238137
"initial_release": {
238138238138
"major_version": 7,
@@ -238202,7 +238202,7 @@
238202238202
"repository": "epel"
238203238203
}
238204238204
],
238205-
"set_id": 24346
238205+
"set_id": 34179
238206238206
},
238207238207
"initial_release": {
238208238208
"major_version": 7,

0 commit comments

Comments
 (0)