From 4ec9c8420c8eb22d13184b27c8d3fe567afc907d Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 28 Nov 2022 14:47:52 -0800 Subject: [PATCH 1/8] - Use unicode.pf2 from /usr/share/grub/ (bcl@redhat.com) - On ppc64le Use core.elf from grub2 package (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4408cb5..098ab5a 100644 --- a/.gitignore +++ b/.gitignore @@ -222,3 +222,4 @@ /lorax-37.6.tar.gz /lorax-37.7.tar.gz /lorax-37.8.tar.gz +/lorax-37.9.tar.gz diff --git a/lorax.spec b/lorax.spec index fb056d1..bb5d333 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.8 +Version: 37.9 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -172,6 +172,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Nov 28 2022 Brian C. Lane 37.9-1 +- Use unicode.pf2 from /usr/share/grub/ (bcl@redhat.com) +- On ppc64le Use core.elf from grub2 package (bcl@redhat.com) + * Mon Jul 25 2022 Brian C. Lane 37.8-1 - mkksiso: Optionally support 3 arguments or --ks (bcl@redhat.com) - mkksiso: Add -U to xorriso on ppc64le (bcl@redhat.com) diff --git a/sources b/sources index 7dfc877..30a2a5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.8.tar.gz) = 8669ea6b873f4376cf5cace5d2eaab969bfe49f5f594f3bb0968319049c99d052379bfb7c6e5233bae7aa6a525c61c5220a3a0b3e58c7bbbecf1d72498ded25f +SHA512 (lorax-37.9.tar.gz) = 4f7cf91ab31224610c2fa588fb6777444ce7df1d5c8d7464a6c98470e037be2a8f60f8b1e8418255fe74735d6bb4b4d61d8ed9bcde1028c43732e5f887b16c92 From c96db89bcf0cc9e7e73df828346721c4429ab9fb Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 12 Dec 2022 14:53:21 -0800 Subject: [PATCH 2/8] - tests: Add tzdata package to minimizer test setup (bcl@redhat.com) - test: Use Fedora 37 container (bcl@redhat.com) - mkksiso: Disable running mkefiboot in container tests (bcl@redhat.com) - mkksiso: Rebuild efiboot.img for UEFI enabled isos (bcl@redhat.com) - gitleaks: Add config file to ignore known fake secrets (bcl@redhat.com) - workflows: Switch to actions/checkout@v3 (bcl@redhat.com) --- .gitignore | 1 + lorax.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 098ab5a..0c7d795 100644 --- a/.gitignore +++ b/.gitignore @@ -223,3 +223,4 @@ /lorax-37.7.tar.gz /lorax-37.8.tar.gz /lorax-37.9.tar.gz +/lorax-37.10.tar.gz diff --git a/lorax.spec b/lorax.spec index bb5d333..2ed43e2 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.9 +Version: 37.10 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -172,6 +172,14 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Dec 12 2022 Brian C. Lane 37.10-1 +- tests: Add tzdata package to minimizer test setup (bcl@redhat.com) +- test: Use Fedora 37 container (bcl@redhat.com) +- mkksiso: Disable running mkefiboot in container tests (bcl@redhat.com) +- mkksiso: Rebuild efiboot.img for UEFI enabled isos (bcl@redhat.com) +- gitleaks: Add config file to ignore known fake secrets (bcl@redhat.com) +- workflows: Switch to actions/checkout@v3 (bcl@redhat.com) + * Mon Nov 28 2022 Brian C. Lane 37.9-1 - Use unicode.pf2 from /usr/share/grub/ (bcl@redhat.com) - On ppc64le Use core.elf from grub2 package (bcl@redhat.com) diff --git a/sources b/sources index 30a2a5b..d1b6b8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.9.tar.gz) = 4f7cf91ab31224610c2fa588fb6777444ce7df1d5c8d7464a6c98470e037be2a8f60f8b1e8418255fe74735d6bb4b4d61d8ed9bcde1028c43732e5f887b16c92 +SHA512 (lorax-37.10.tar.gz) = 15e9c0887f4eecc1b9d3d2337d7b5614445c716a8d2a3428faad0e9245926f2a2c577423f1a5e3b41a5bdc90168ec322840b87bddb724d458aa7ef34689cdf56 From efc143dbf11e74224630e2acfeca6fc3aaef6949 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 13 Dec 2022 10:26:01 -0800 Subject: [PATCH 3/8] - Run user test with --skip-mkefiboot --- lorax.spec | 5 ++++- tests/scripts/run_tests.sh | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lorax.spec b/lorax.spec index 2ed43e2..7cb09cd 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 37.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -172,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Dec 13 2022 Brian C. Lane - 37.10-2 +- Run user test with --skip-mkefiboot + * Mon Dec 12 2022 Brian C. Lane 37.10-1 - tests: Add tzdata package to minimizer test setup (bcl@redhat.com) - test: Use Fedora 37 container (bcl@redhat.com) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index d544946..3559b7d 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -199,12 +199,12 @@ function run_all { umount_dirs } -# All of the changes as a user (lorax-ted) +# All of the changes as a user (lorax-ted) with --skip-mkefiboot function run_as_user { running "Use all the options as a user" [ ! -e "/home/lorax-ted" ] && useradd -m lorax-ted - su - lorax-ted -c "mkksiso -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 + su - lorax-ted -c "mkksiso --skip-mkefiboot -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1 mount $OUTISO $ISODIR || exit 1 test_ks @@ -213,7 +213,7 @@ function run_as_user { test_files test_quiet - status "Use all the options as a user" + status "Use all the options as a user with --skip-mkefiboot" umount_dirs } From 957b54d5aaf0897746887b95b9df101699406490 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 31 May 2023 09:27:53 -0700 Subject: [PATCH 4/8] - Fix tmt test to use Fedora 37 repos instead of rawhide --- tests/scripts/run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 3559b7d..3b67dc7 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -230,7 +230,7 @@ fi # Run lorax using the host's repository configuration file if [ ! -e "$BOOTISO" ]; then running "Build boot.iso with lorax" - lorax --product="Fedora" --version=rawhide --release=rawhide --volid="Fedora-rawhide-test" \ + lorax --product="Fedora" --version=37 --release=37 --volid="Fedora-37-test" \ $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1 fi From 6bd35a6c7c4a090d37fe7fe220c54ca5939b253c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 31 May 2023 09:28:53 -0700 Subject: [PATCH 5/8] Add updated lorax.spec --- lorax.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lorax.spec b/lorax.spec index 7cb09cd..ec2a80b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 37.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -172,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed May 31 2023 Brian C. Lane - 37.10-3 +- Fix tmt test to use Fedora 37 repos instead of rawhide + * Tue Dec 13 2022 Brian C. Lane - 37.10-2 - Run user test with --skip-mkefiboot From a4397e55c35b9efb6988424427670365cceaaa94 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 4 Jul 2023 13:49:15 -0700 Subject: [PATCH 6/8] Backport PR #1332 to handle renamed iwl firmware packages --- ...exclude-renamed-iwl-firmware-package.patch | 56 +++++++++++++++++++ lorax.spec | 10 +++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 0001-runtime-install-exclude-renamed-iwl-firmware-package.patch diff --git a/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch b/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch new file mode 100644 index 0000000..d3c11cc --- /dev/null +++ b/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch @@ -0,0 +1,56 @@ +From 30084cabdecece4065651d7aac37646ba4be1dde Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Tue, 4 Jul 2023 08:45:03 -0700 +Subject: [PATCH] runtime-install: exclude renamed iwl firmware packages + +@pbrobinson renamed the Intel wireless firmware packages in +the 20230625 build of linux-firmware. This causes installer +image builds to fail because they want to pull in the old packages +from the release repo because they fall in the "*-firmware" glob, +but those packages are now obsoleted by the newer ones from +updates/updates-testing, and dnf doesn't like that. This should +resolve the problem by specifically excluding all the renamed +packages from the glob. Of course, this change must go along +with the newer linux-firmware package, or else you'll get an +image that's missing a lot of wireless firmware. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-install.tmpl | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl +index 9fd5ddd4..ba13b1cd 100644 +--- a/share/templates.d/99-generic/runtime-install.tmpl ++++ b/share/templates.d/99-generic/runtime-install.tmpl +@@ -26,13 +26,26 @@ installpkg grubby + ## for enterprise switch devices, netinst deployment does not work on + ## these so there is no point shipping them - see + ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615 ++ ## various iwl package names were changed in linux-firmware-20230625-151 ++ ## so need to be excluded or else dnf gets sad - see ++ ## https://pagure.io/releng/issue/11511 . These exclusions can ++ ## be dropped after F38 goes EOL + installpkg --optional *-firmware --except alsa* --except midisport-firmware \ + --except crystalhd-firmware --except ivtv-firmware \ + --except cx18-firmware --except iscan-firmware \ + --except uhd-firmware --except lulzbot-marlin-firmware \ + --except gnome-firmware --except sigrok-firmware \ + --except liquidio-firmware --except netronome-firmware \ +- --except mrvlprestera-firmware --except mlxsw_spectrum-firmware ++ --except mrvlprestera-firmware --except mlxsw_spectrum-firmware \ ++ --except iwl3945-firmware --except iwl4965-firmware \ ++ --except iwl100-firmware --except iwl105-firmware \ ++ --except iwl135-firmware --except iwl1000-firmware \ ++ --except iwl2000-firmware --except iwl2030-firmware \ ++ --except iwl5000-firmware --except iwl5150-firmware \ ++ --except iwl6000-firmware --except iwl6000g2a-firmware \ ++ --except iwl6000g2b-firmware --except iwl6050-firmware \ ++ --except iwl3160-firmware --except iwl7260-firmware \ ++ --except iwlax2xx-firmware + installpkg b43-openfwwf + %endif + +-- +2.41.0 + diff --git a/lorax.spec b/lorax.spec index ec2a80b..e1a3e33 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 37.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,6 +14,10 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# https://github.com/weldr/lorax/pull/1332 +# https://pagure.io/releng/issue/11511 +# adapt to renamed iwl firmware packages +Patch0: 0001-runtime-install-exclude-renamed-iwl-firmware-package.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -131,6 +135,7 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} +%patch 0 -p1 %build @@ -172,6 +177,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Tue Jul 04 2023 Adam Williamson - 37.10-4 +- Backport PR #1332 to handle renamed iwl firmware packages + * Wed May 31 2023 Brian C. Lane - 37.10-3 - Fix tmt test to use Fedora 37 repos instead of rawhide From bf51cf435ffa1b9edc2867333c4f8c09a78d9010 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 7 Aug 2023 15:07:41 -0700 Subject: [PATCH 7/8] - runtime-install: excluded renamed olpc firmware package (awilliam@redhat.com) - runtime-install: exclude renamed iwl firmware packages (awilliam@redhat.com) - remove included renamed iwl firmware patch --- .gitignore | 1 + ...exclude-renamed-iwl-firmware-package.patch | 56 ------------------- lorax.spec | 21 ++----- sources | 2 +- 4 files changed, 8 insertions(+), 72 deletions(-) delete mode 100644 0001-runtime-install-exclude-renamed-iwl-firmware-package.patch diff --git a/.gitignore b/.gitignore index 0c7d795..28baded 100644 --- a/.gitignore +++ b/.gitignore @@ -224,3 +224,4 @@ /lorax-37.8.tar.gz /lorax-37.9.tar.gz /lorax-37.10.tar.gz +/lorax-37.11.tar.gz diff --git a/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch b/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch deleted file mode 100644 index d3c11cc..0000000 --- a/0001-runtime-install-exclude-renamed-iwl-firmware-package.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 30084cabdecece4065651d7aac37646ba4be1dde Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Tue, 4 Jul 2023 08:45:03 -0700 -Subject: [PATCH] runtime-install: exclude renamed iwl firmware packages - -@pbrobinson renamed the Intel wireless firmware packages in -the 20230625 build of linux-firmware. This causes installer -image builds to fail because they want to pull in the old packages -from the release repo because they fall in the "*-firmware" glob, -but those packages are now obsoleted by the newer ones from -updates/updates-testing, and dnf doesn't like that. This should -resolve the problem by specifically excluding all the renamed -packages from the glob. Of course, this change must go along -with the newer linux-firmware package, or else you'll get an -image that's missing a lot of wireless firmware. - -Signed-off-by: Adam Williamson ---- - share/templates.d/99-generic/runtime-install.tmpl | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index 9fd5ddd4..ba13b1cd 100644 ---- a/share/templates.d/99-generic/runtime-install.tmpl -+++ b/share/templates.d/99-generic/runtime-install.tmpl -@@ -26,13 +26,26 @@ installpkg grubby - ## for enterprise switch devices, netinst deployment does not work on - ## these so there is no point shipping them - see - ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615 -+ ## various iwl package names were changed in linux-firmware-20230625-151 -+ ## so need to be excluded or else dnf gets sad - see -+ ## https://pagure.io/releng/issue/11511 . These exclusions can -+ ## be dropped after F38 goes EOL - installpkg --optional *-firmware --except alsa* --except midisport-firmware \ - --except crystalhd-firmware --except ivtv-firmware \ - --except cx18-firmware --except iscan-firmware \ - --except uhd-firmware --except lulzbot-marlin-firmware \ - --except gnome-firmware --except sigrok-firmware \ - --except liquidio-firmware --except netronome-firmware \ -- --except mrvlprestera-firmware --except mlxsw_spectrum-firmware -+ --except mrvlprestera-firmware --except mlxsw_spectrum-firmware \ -+ --except iwl3945-firmware --except iwl4965-firmware \ -+ --except iwl100-firmware --except iwl105-firmware \ -+ --except iwl135-firmware --except iwl1000-firmware \ -+ --except iwl2000-firmware --except iwl2030-firmware \ -+ --except iwl5000-firmware --except iwl5150-firmware \ -+ --except iwl6000-firmware --except iwl6000g2a-firmware \ -+ --except iwl6000g2b-firmware --except iwl6050-firmware \ -+ --except iwl3160-firmware --except iwl7260-firmware \ -+ --except iwlax2xx-firmware - installpkg b43-openfwwf - %endif - --- -2.41.0 - diff --git a/lorax.spec b/lorax.spec index e1a3e33..ff9bfce 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,8 +3,8 @@ %define debug_package %{nil} Name: lorax -Version: 37.10 -Release: 4%{?dist} +Version: 37.11 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -14,10 +14,6 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# https://github.com/weldr/lorax/pull/1332 -# https://pagure.io/releng/issue/11511 -# adapt to renamed iwl firmware packages -Patch0: 0001-runtime-install-exclude-renamed-iwl-firmware-package.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -135,7 +131,6 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} -%patch 0 -p1 %build @@ -177,14 +172,10 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog -* Tue Jul 04 2023 Adam Williamson - 37.10-4 -- Backport PR #1332 to handle renamed iwl firmware packages - -* Wed May 31 2023 Brian C. Lane - 37.10-3 -- Fix tmt test to use Fedora 37 repos instead of rawhide - -* Tue Dec 13 2022 Brian C. Lane - 37.10-2 -- Run user test with --skip-mkefiboot +* Mon Aug 07 2023 Brian C. Lane 37.11-1 +- runtime-install: excluded renamed olpc firmware package (awilliam@redhat.com) +- runtime-install: exclude renamed iwl firmware packages (awilliam@redhat.com) +- remove included renamed iwl firmware patch * Mon Dec 12 2022 Brian C. Lane 37.10-1 - tests: Add tzdata package to minimizer test setup (bcl@redhat.com) diff --git a/sources b/sources index d1b6b8e..b459fe8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.10.tar.gz) = 15e9c0887f4eecc1b9d3d2337d7b5614445c716a8d2a3428faad0e9245926f2a2c577423f1a5e3b41a5bdc90168ec322840b87bddb724d458aa7ef34689cdf56 +SHA512 (lorax-37.11.tar.gz) = 32436e72845c7528773b0aa89e337d91e6a2496fdc1c3c67ad222c3ce3aa2a450e1e2fb5f725c465a933ad7382b14b619c94504dab4373b2fb76aeeeae0b46aa From 82e500f8c97e97321de6407fa35dc6961c982680 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 9 Aug 2023 10:58:17 -0700 Subject: [PATCH 8/8] - Exclude more obsoleted libertas firmware packages (awilliam@redhat.com) --- .gitignore | 1 + lorax.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 28baded..c2b1cf8 100644 --- a/.gitignore +++ b/.gitignore @@ -225,3 +225,4 @@ /lorax-37.9.tar.gz /lorax-37.10.tar.gz /lorax-37.11.tar.gz +/lorax-37.12.tar.gz diff --git a/lorax.spec b/lorax.spec index ff9bfce..098a513 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: lorax -Version: 37.11 +Version: 37.12 Release: 1%{?dist} Summary: Tool for creating the anaconda install images @@ -172,10 +172,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Aug 09 2023 Brian C. Lane 37.12-1 +- Exclude more obsoleted libertas firmware packages (awilliam@redhat.com) + * Mon Aug 07 2023 Brian C. Lane 37.11-1 - runtime-install: excluded renamed olpc firmware package (awilliam@redhat.com) - runtime-install: exclude renamed iwl firmware packages (awilliam@redhat.com) -- remove included renamed iwl firmware patch * Mon Dec 12 2022 Brian C. Lane 37.10-1 - tests: Add tzdata package to minimizer test setup (bcl@redhat.com) diff --git a/sources b/sources index b459fe8..63d364d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-37.11.tar.gz) = 32436e72845c7528773b0aa89e337d91e6a2496fdc1c3c67ad222c3ce3aa2a450e1e2fb5f725c465a933ad7382b14b619c94504dab4373b2fb76aeeeae0b46aa +SHA512 (lorax-37.12.tar.gz) = 56fbbdc5240e828e03b626f7931893d9b8fd3b16188d0793f71ba556f52988428ccbae17c1671a3fe83bfc7ab4473d6d0ef1ba04f250229ba93edf41870fcff8