rpm/ignition
SHA256
1
0
Fork 0
forked from pool/ignition
Code Pull Requests Activity

Fix i386 build

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=51
This commit is contained in:
Ignaz Forster 2020-08-10 13:44:51 +00:00 committed by Git OBS Bridge
parent b32bce4f74
commit 73cbccb97a
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
0003-fix-i386-build.patch Normal file
View File

@ -0,0 +1,19 @@
commit f9196c3e0c7b03bedfedeb981987e976f3c59aea
Author: Ignaz Forster <iforster@suse.com>
Date: Mon Aug 10 15:33:18 2020 +0200
Add support for building on 32 bit x86 archticture
diff --git a/Makefile b/Makefile
index 35b0deda..d80e0870 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,8 @@ ifeq ($(GOARCH),x86_64)
GOARCH=amd64
else ifeq ($(GOARCH),aarch64)
GOARCH=arm64
+else ifeq ($(patsubst i%86,386,$(GOARCH)),386)
+ GOARCH=386
endif
.PHONY: all

2
ignition.spec
View File

@ -38,6 +38,7 @@ Source20: ignition-userconfig-timeout.conf
Source21: ignition-userconfig-timeout-arm.conf Source21: ignition-userconfig-timeout-arm.conf
Patch1: 0001-fix-install-permissions.patch Patch1: 0001-fix-install-permissions.patch
Patch2: 0002-allow-multiple-mounts-of-same-device.patch Patch2: 0002-allow-multiple-mounts-of-same-device.patch
Patch3: 0003-fix-i386-build.patch
Requires: %{name}-dracut-grub2 Requires: %{name}-dracut-grub2
Requires: dracut Requires: dracut
Requires: virt-what Requires: virt-what
@ -86,6 +87,7 @@ which creates firstboot_happened after the first boot.
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
mkdir dracut/30ignition-microos grub systemd_suse mkdir dracut/30ignition-microos grub systemd_suse
chmod +x %{SOURCE3} %{SOURCE4} %{SOURCE8} chmod +x %{SOURCE3} %{SOURCE4} %{SOURCE8}