From 25ac30cae910775dc83843cb239e3dc3be91c4cb Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 29 Jun 2018 18:17:16 -0400 Subject: [PATCH] bump ignition-dracut to 17a201b --- .gitignore | 2 +- ignition.spec | 16 ++++++++++++---- sources | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 54adaf3..53428ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /ignition-7610725.tar.gz -/ignition-dracut-bf3b454.tar.gz +/ignition-dracut-17a201b.tar.gz diff --git a/ignition.spec b/ignition.spec index a4004e6..3e3835c 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,13 +73,13 @@ # https://github.com/dustymabe/ignition-dracut %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit bf3b454db89bcff82d01b472786821bd458d3593 +%global dracutcommit 17a201bb1e6fb412712df4808db553c4f93476d0 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 0.26.0 -Release: 0.2.git%{shortcommit}%{?dist} +Release: 0.3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -316,6 +316,8 @@ initramfs on boot. %license LICENSE %{dracutlibdir}/modules.d/30ignition %{dracutlibdir}/modules.d/99journald-conf +%{_sysconfdir}/grub.d/* +%{_prefix}/lib/systemd/system/*.service ############## end dracut subpackage ############## %prep @@ -355,8 +357,11 @@ install -p -m 0755 ./ignition %{buildroot}%{_bindir} install -p -m 0755 ./ignition-validate %{buildroot}%{_bindir} # dracut subpackage install -d -p %{buildroot}/%{dracutlibdir}/modules.d -rm %{dracutrepo}-%{dracutcommit}/dracut/README.txt -cp -r %{dracutrepo}-%{dracutcommit}/dracut/* %{buildroot}/%{dracutlibdir}/modules.d/ +cd %{dracutrepo}-%{dracutcommit} +rm dracut/README.txt +cp -r dracut/* %{buildroot}/%{dracutlibdir}/modules.d/ +install -D -m 0644 -t %{buildroot}/%{_prefix}/lib/systemd/system/ systemd/* +install -D -m 0755 -t %{buildroot}/%{_sysconfdir}/grub.d/ grub/* # source codes for building projects %if 0%{?with_devel} @@ -458,6 +463,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Jun 29 2018 Dusty Mabe - 0.26.0-0.3.git7610725 +- Bump to ignition-dracut 17a201b + * Tue Jun 26 2018 Dusty Mabe - 0.26.0-0.2.git7610725 - Rename dustymabe/bootengine upstrem to dustymabe/ignition-dracut diff --git a/sources b/sources index f9e18d6..68d294d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-7610725.tar.gz) = bd47f26cfc65641b63cb0846bbfd939e835fb477816effbbaff1df83a4146d4eef7d7d2f18a85e8caa386703cabcc4e54ebfd4768c590bbfc795dee6a3949519 -SHA512 (ignition-dracut-bf3b454.tar.gz) = 9b2f932d353f78013627c8c053e705b9d29a00c6d4e4783f8ca0ab171aab431788bd6d726a4de2155ab016727d015001463437d0574774410319a2958e00ee97 +SHA512 (ignition-dracut-17a201b.tar.gz) = 1113379be1762bb99808a3edc5a1213267f874051314ddb94f4d648f79ddd102b26049da59283d03e99875c1eb3651f322e3ddcbd22bf8a25408b0f0c27c222f