Skip to content

Commit 57fbb50

Browse files
pvalenapvalena
committed
Rebase to dracut-109
1 parent b89a9e7 commit 57fbb50

4 files changed

Lines changed: 54 additions & 40 deletions

File tree

‎.distro/dracut.spec‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
%global __requires_exclude pkg-config
88

99
Name: dracut
10-
Version: 108
10+
Version: 109
1111
Release: 1%{?dist}
1212

1313
Summary: Initramfs generator using udev
@@ -218,7 +218,7 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
218218
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs
219219
mkdir -p $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d
220220

221-
install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf
221+
install -m 0644 dracut.conf.d/fedora/01-dist.conf $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf
222222
rm -f $RPM_BUILD_ROOT%{_mandir}/man?/*suse*
223223

224224
echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-image.conf
@@ -293,7 +293,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
293293
%{dracutlibdir}/modules.d/11systemd-resolved
294294
%{dracutlibdir}/modules.d/11systemd-sysext
295295
%{dracutlibdir}/modules.d/11systemd-sysctl
296-
%{dracutlibdir}/modules.d/01systemd-sysusers
296+
%{dracutlibdir}/modules.d/78systemd-sysusers
297297
%{dracutlibdir}/modules.d/11systemd-timedated
298298
%{dracutlibdir}/modules.d/11systemd-timesyncd
299299
%{dracutlibdir}/modules.d/11systemd-tmpfiles
@@ -322,6 +322,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
322322
%{dracutlibdir}/modules.d/70dm
323323
%{dracutlibdir}/modules.d/70dmraid
324324
%{dracutlibdir}/modules.d/70kernel-modules
325+
%{dracutlibdir}/modules.d/70kernel-modules-export
325326
%{dracutlibdir}/modules.d/70kernel-modules-extra
326327
%{dracutlibdir}/modules.d/70lvm
327328
%{dracutlibdir}/modules.d/70mdraid
@@ -454,6 +455,21 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
454455
%{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
455456

456457
%changelog
458+
* Thu Jan 22 2026 Pavel Valena <pvalena@redhat.com> - 109-1
459+
- Rebase to dracut-109
460+
461+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 108-5
462+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
463+
464+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 108-4
465+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
466+
467+
* Tue Oct 07 2025 Pavel Valena <pvalena@redhat.com> - 108-3
468+
- fix: partial revert for hostonly sloppy mode
469+
470+
* Wed Sep 10 2025 Pavel Valena <pvalena@redhat.com> - 108-2
471+
- Reapply "feat(systemd-sysusers): run systemd-sysusers as part
472+
457473
* Tue Aug 26 2025 Pavel Valena <pvalena@redhat.com> - 108-1
458474
- build: upgrade to dracut 108
459475

‎.distro/rebase.sh‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -182,33 +182,33 @@ p="${v}-pre-rebase${s}"
182182

183183
## Second part
184184
[[ $c -lt 2 ]] && {
185-
: 'Continue #1'
185+
: 'Continue #1'
186186

187-
: 'Get previous version'
188-
[[ -n "$pv" ]] || pv="$(( ${v} - 1 ))"
187+
: 'Get previous version'
188+
[[ -n "$pv" ]] || pv="$(( ${v} - 1 ))"
189189

190-
[[ -n "$pv" ]]
191-
[[ ${pv} -gt 0 ]]
192-
[[ ${pv} -lt $v ]]
190+
[[ -n "$pv" ]]
191+
[[ ${pv} -gt 0 ]]
192+
[[ ${pv} -lt $v ]]
193193

194194

195-
: 'List files changed downstream'
196-
F="$( (gitds ${p} ${pv} | head -n -1; gitds ${v} | head -n -1) | tr -s ' ' | cut -d' ' -f2 | sort -u | xargs echo)"
195+
: 'List files changed downstream'
196+
F="$( (gitds ${p} ${pv} | head -n -1; gitds ${v} | head -n -1) | tr -s ' ' | cut -d' ' -f2 | sort -u | xargs echo)"
197197

198198

199-
: "Diff downstream changes"
200-
gitds -p ${p} -- `echo $F`
201-
gitds -p ${p} -- `echo $F` > "dracut_rebase_${v}_changes_downstream${s}_$(date -I).diff"
199+
: "Diff downstream changes"
200+
gitds -p ${p} -- `echo $F`
201+
gitds -p ${p} -- `echo $F` > "dracut_rebase_${v}_changes_downstream${s}_$(date -I).diff"
202202

203203

204-
: "Diff from upstream changes"
205-
gitds -p ${v}
206-
gitds -p ${v} > "dracut_rebase_${v}_changes_upstream${s}_$(date -I).diff"
204+
: "Diff from upstream changes"
205+
gitds -p ${v}
206+
gitds -p ${v} > "dracut_rebase_${v}_changes_upstream${s}_$(date -I).diff"
207207

208208

209-
: "Complete diff"
210-
gitds -p ${p}
211-
gitds -p ${p} > "dracut_rebase_${v}_changes_complete${s}_$(date -I).diff"
209+
: "Complete diff"
210+
gitds -p ${p}
211+
gitds -p ${p} > "dracut_rebase_${v}_changes_complete${s}_$(date -I).diff"
212212

213213

214214
# WORK IN PROGRESS
@@ -269,26 +269,24 @@ gist -spf dracut_rebase_107_changes_upstream_2025-07-02.diff{,}
269269

270270

271271
MSG="
272-
Rebase from downstream commit a4e87db1ba678f7f3b65cd65730132ca399cdf3e onto upstream tag 107 (279da16f1b8fcca27d41937967c4e8f4c295086a).
272+
Rebase from downstream commit <> onto upstream tag <> (<>).
273273
274274
Test builds:
275-
- Koji Rawhide: TBD
276-
- Koji F42: TBD
277-
- COPR: https://copr.fedorainfracloud.org/coprs/build/9233168
275+
- Koji Rawhide: <>
276+
- COPR: <>
278277
279278
Smoke tests:
280-
- Rawhide aarch64: https://gist.github.com/pvalena/9151b9ae01288759a9b5d1bb989b99c7
281-
- Rawhide x86_64 (no reboot): https://gist.github.com/pvalena/8f7b7d2ae219eaec9d68922eaf6d4372
282-
- F42 aarch64: https://gist.github.com/pvalena/284a0cf9da6dcc2d0e40d239660d1e99
283-
- F41 x86_64: https://gist.github.com/pvalena/e0016f383a00e032b0728ddd34b0239e
279+
- Rawhide aarch64: <>
280+
- Rawhide x86_64: <>
281+
- Rawhide mock: <>
282+
- Rawhide container: <>
284283
285284
Diff:
286-
- Downstream-modified changes only: https://gist.github.com/pvalena/d1af4a74194e77417d496b6abe294ae9
287-
- Changes from upstream: https://gist.github.com/pvalena/06fc42934b1f345e8a53b18075cc7eee
288-
- Complete diff: https://gist.github.com/pvalena/12de812cc0ae7829c9d5479f2b44359e
285+
- Downstream-modified changes only: <>
286+
- Changes from upstream: <>
287+
- Complete diff: <>
289288
"
290289

291-
292290
gh pr create -f -a '@me' -R "redhat-plumbers/dracut-fedora"
293291

294292

‎.distro/source-git.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ files_to_sync:
2727
##############################
2828

2929
sources:
30-
- path: dracut-ng-108.tar.gz
31-
url: https://github.com/dracut-ng/dracut-ng/archive/refs/tags/108.tar.gz
30+
- path: dracut-ng-109.tar.gz
31+
url: https://github.com/dracut-ng/dracut-ng/archive/refs/tags/109.tar.gz
3232

3333
specfile_path: .distro/dracut.spec
3434

@@ -42,8 +42,8 @@ patch_generation_patch_id_digits: 1
4242
sync_changelog: true
4343

4444
# TODO: #
45-
#upstream_ref: "108"
46-
upstream_ref: 97c5568ec42abd5e6035f0cfa9d319ae6ae4e50a
45+
#upstream_ref: "109"
46+
upstream_ref: 13c5e5feee9ba86b960d351f87aa0eb25f242ff0
4747

4848
upstream_package_name: dracut
4949
downstream_package_name: dracut

‎.packit.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ files_to_sync:
2727
##############################
2828

2929
sources:
30-
- path: dracut-ng-108.tar.gz
31-
url: https://github.com/dracut-ng/dracut-ng/archive/refs/tags/108.tar.gz
30+
- path: dracut-ng-109.tar.gz
31+
url: https://github.com/dracut-ng/dracut-ng/archive/refs/tags/109.tar.gz
3232

3333
specfile_path: .distro/dracut.spec
3434

@@ -42,8 +42,8 @@ patch_generation_patch_id_digits: 1
4242
sync_changelog: true
4343

4444
# TODO: #
45-
#upstream_ref: "108"
46-
upstream_ref: 97c5568ec42abd5e6035f0cfa9d319ae6ae4e50a
45+
#upstream_ref: "109"
46+
upstream_ref: 13c5e5feee9ba86b960d351f87aa0eb25f242ff0
4747

4848
upstream_package_name: dracut
4949
downstream_package_name: dracut

0 commit comments

Comments
 (0)