Hello community,
here is the log from the commit of package ignition for openSUSE:Factory
checked in at 2020-08-19 18:56:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ignition (Old)
and /work/SRC/openSUSE:Factory/.ignition.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ignition"
Wed Aug 19 18:56:51 2020 rev:17 rq:827733 version:2.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ignition/ignition.changes 2020-08-12
13:42:17.453954097 +0200
+++ /work/SRC/openSUSE:Factory/.ignition.new.3399/ignition.changes
2020-08-19 18:58:06.599888192 +0200
@@ -1,0 +2,6 @@
+Tue Aug 18 11:56:54 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Add patch to fix install on %arm:
+ * ignition-fix-arm32-installation.patch
+
+-------------------------------------------------------------------
New:
----
ignition-fix-arm32-installation.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ignition.spec ++++++
--- /var/tmp/diff_new_pack.UGJbnY/_old 2020-08-19 18:58:08.899889414 +0200
+++ /var/tmp/diff_new_pack.UGJbnY/_new 2020-08-19 18:58:08.903889417 +0200
@@ -39,27 +39,28 @@
Patch1: 0001-fix-install-permissions.patch
Patch2: 0002-allow-multiple-mounts-of-same-device.patch
Patch3: 0003-fix-i386-build.patch
+Patch4: ignition-fix-arm32-installation.patch
+BuildRequires: dracut
+BuildRequires: golang(API) >= 1.12
+BuildRequires: libblkid-devel
+BuildRequires: systemd-rpm-macros
+BuildRequires: update-bootloader-rpm-macros
Requires: %{name}-dracut-grub2
Requires: dracut
Requires: virt-what
-Provides: ignition-dracut = 0.0+git20200722.98ed51d
-Obsoletes: ignition-dracut < 0.0+git20200722.98ed51d
+Recommends: %{_sbindir}/groupadd
+Recommends: %{_sbindir}/sgdisk
+Recommends: %{_sbindir}/useradd
+Recommends: %{_sbindir}/usermod
Recommends: /sbin/mkfs.btrfs
Recommends: /sbin/mkfs.ext4
Recommends: /sbin/mkfs.vfat
Recommends: /sbin/mkfs.xfs
Recommends: /sbin/mkswap
Recommends: /sbin/udevadm
-Recommends: /usr/sbin/groupadd
-Recommends: /usr/sbin/sgdisk
-Recommends: /usr/sbin/useradd
-Recommends: /usr/sbin/usermod
Suggests: /sbin/mdadm
-BuildRequires: dracut
-BuildRequires: libblkid-devel
-BuildRequires: systemd-rpm-macros
-BuildRequires: update-bootloader-rpm-macros
-BuildRequires: golang(API) >= 1.12
+Provides: ignition-dracut = 0.0+git20200722.98ed51d
+Obsoletes: ignition-dracut < 0.0+git20200722.98ed51d
%{update_bootloader_requires}
%description
@@ -88,6 +89,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
mkdir dracut/30ignition-microos grub systemd_suse
chmod +x %{SOURCE3} %{SOURCE4} %{SOURCE8}
@@ -106,7 +108,7 @@
env VERSION=%{version} GLDFLAGS='-X
github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=false -X
github.com/coreos/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false
' bash -x ./build
%install
-make -o all install DESTDIR="${RPM_BUILD_ROOT}"
+make -o all install DESTDIR=%{buildroot}
install -d %{buildroot}%{_sysconfdir}/grub.d
install -d
%{buildroot}%{_prefix}/lib/systemd/system/ignition-firstboot-complete.service.d
++++++ ignition-fix-arm32-installation.patch ++++++
--- ignition-2.6.0/Makefile.orig 2020-08-18 10:36:22.791294210 +0000
+++ ignition-2.6.0/Makefile 2020-08-18 10:39:07.126682387 +0000
@@ -8,6 +8,8 @@ else ifeq ($(GOARCH),aarch64)
GOARCH=arm64
else ifeq ($(patsubst i%86,386,$(GOARCH)),386)
GOARCH=386
+else ifeq ($(patsubst armv%,arm,$(GOARCH)),arm)
+ GOARCH=arm
endif
.PHONY: all
