Arch-excludes June 2018

arch-excludes@lists.fedoraproject.org

2 participants
531 discussions

Architecture specific change in rpms/vulkan-validation-layers.git
by githook-noreply＠fedoraproject.org 26 Jun '18

26 Jun '18

The package rpms/vulkan-validation-layers.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/vulkan-validation-layers.git/commit…. Change: +%ifarch %{ix86} Thanks. Full change: ============ commit 7d9c82e465679b91b8e686053ebe5d35af42fdeb Author: leigh123linux <leigh123linux(a)googlemail.com> Date: Tue Jun 26 20:07:45 2018 +0100 Workaround i686 build issue diff --git a/vulkan-validation-layers.spec b/vulkan-validation-layers.spec index 545f6cb..5683164 100644 --- a/vulkan-validation-layers.spec +++ b/vulkan-validation-layers.spec @@ -1,18 +1,12 @@ Name: vulkan-validation-layers Version: 1.1.77.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Vulkan validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz -%if 0%{?fedora} >= 29 -# Exclude i686 due to 'virtual memory exhausted' FTBFS -# Someone who cares about 32bit can fix it or submit a patch -ExcludeArch: i686 -%endif - BuildRequires: cmake3 BuildRequires: glslang-devel BuildRequires: ninja-build @@ -35,6 +29,12 @@ Vulkan validation layers %build +# Decrease debuginfo even on ix86 because of: +%ifarch %{ix86} +# Decrease debuginfo verbosity to reduce memory consumption even more +%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') +%endif + %cmake3 -GNinja -DCMAKE_BUILD_TYPE=Release -DGLSLANG_INSTALL_DIR=%{_bindir} . # Use two threads as build uses mega amounts of RAM # It still requires at least 16Gb to compile with 2 threads @@ -56,6 +56,9 @@ ninja -v -j2 %changelog +* Tue Jun 26 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.77.0-3 +- Workaround i686 build issue + * Tue Jun 26 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.77.0-2 - Exclude i686 due to 'virtual memory exhausted' FTBFS

1 0

Architecture specific change in rpms/vulkan-validation-layers.git
by githook-noreply＠fedoraproject.org 26 Jun '18

26 Jun '18

1 0

Architecture specific change in rpms/vulkan-validation-layers.git
by githook-noreply＠fedoraproject.org 26 Jun '18

26 Jun '18

The package rpms/vulkan-validation-layers.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/vulkan-validation-layers.git/commit…. Change: +ExcludeArch: i686 Thanks. Full change: ============ commit bb4db1dcc4192b249049c6974c4b0fbe07919332 Author: leigh123linux <leigh123linux(a)googlemail.com> Date: Tue Jun 26 19:21:45 2018 +0100 Exclude i686 due to 'virtual memory exhausted' FTBFS diff --git a/vulkan-validation-layers.spec b/vulkan-validation-layers.spec index 42fe751..545f6cb 100644 --- a/vulkan-validation-layers.spec +++ b/vulkan-validation-layers.spec @@ -1,11 +1,17 @@ Name: vulkan-validation-layers Version: 1.1.77.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Vulkan validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers -Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz +Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz + +%if 0%{?fedora} >= 29 +# Exclude i686 due to 'virtual memory exhausted' FTBFS +# Someone who cares about 32bit can fix it or submit a patch +ExcludeArch: i686 +%endif BuildRequires: cmake3 BuildRequires: glslang-devel @@ -50,5 +56,8 @@ ninja -v -j2 %changelog +* Tue Jun 26 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.77.0-2 +- Exclude i686 due to 'virtual memory exhausted' FTBFS + * Sat Jun 23 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.77.0-1 - Initial package

1 0

Architecture specific change in rpms/vulkan-validation-layers.git
by githook-noreply＠fedoraproject.org 26 Jun '18

26 Jun '18

The package rpms/vulkan-validation-layers.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/vulkan-validation-layers.git/commit…. Change: +ExcludeArch: i686 Thanks. Full change: ============ commit bb4db1dcc4192b249049c6974c4b0fbe07919332 Author: leigh123linux <leigh123linux(a)googlemail.com> Date: Tue Jun 26 19:21:45 2018 +0100 Exclude i686 due to 'virtual memory exhausted' FTBFS diff --git a/vulkan-validation-layers.spec b/vulkan-validation-layers.spec index 42fe751..545f6cb 100644 --- a/vulkan-validation-layers.spec +++ b/vulkan-validation-layers.spec @@ -1,11 +1,17 @@ Name: vulkan-validation-layers Version: 1.1.77.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Vulkan validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers -Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz +Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz + +%if 0%{?fedora} >= 29 +# Exclude i686 due to 'virtual memory exhausted' FTBFS +# Someone who cares about 32bit can fix it or submit a patch +ExcludeArch: i686 +%endif BuildRequires: cmake3 BuildRequires: glslang-devel @@ -50,5 +56,8 @@ ninja -v -j2 %changelog +* Tue Jun 26 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.77.0-2 +- Exclude i686 due to 'virtual memory exhausted' FTBFS + * Sat Jun 23 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.77.0-1 - Initial package

1 0

Architecture specific change in rpms/vulkan-validation-layers.git
by githook-noreply＠fedoraproject.org 26 Jun '18

26 Jun '18

The package rpms/vulkan-validation-layers.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/vulkan-validation-layers.git/commit…. Change: +ExcludeArch: i686 Thanks. Full change: ============ commit bb4db1dcc4192b249049c6974c4b0fbe07919332 Author: leigh123linux <leigh123linux(a)googlemail.com> Date: Tue Jun 26 19:21:45 2018 +0100 Exclude i686 due to 'virtual memory exhausted' FTBFS diff --git a/vulkan-validation-layers.spec b/vulkan-validation-layers.spec index 42fe751..545f6cb 100644 --- a/vulkan-validation-layers.spec +++ b/vulkan-validation-layers.spec @@ -1,11 +1,17 @@ Name: vulkan-validation-layers Version: 1.1.77.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Vulkan validation layers License: ASL 2.0 URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers -Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz +Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz + +%if 0%{?fedora} >= 29 +# Exclude i686 due to 'virtual memory exhausted' FTBFS +# Someone who cares about 32bit can fix it or submit a patch +ExcludeArch: i686 +%endif BuildRequires: cmake3 BuildRequires: glslang-devel @@ -50,5 +56,8 @@ ninja -v -j2 %changelog +* Tue Jun 26 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.77.0-2 +- Exclude i686 due to 'virtual memory exhausted' FTBFS + * Sat Jun 23 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.77.0-1 - Initial package

1 0

Architecture specific change in rpms/ignition.git
by githook-noreply＠fedoraproject.org 26 Jun '18

26 Jun '18

The package rpms/ignition.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/ignition.git/commit/?id=333e3ff7def…. Change: +ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} Thanks. Full change: ============ commit e617c7d73c202b8d9ead576333dda8379071570c Author: Dusty Mabe <dusty(a)dustymabe.com> Date: Tue Jun 26 13:29:46 2018 -0400 Add in source tarballs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ee78891 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/bootengine-bf3b454.tar.gz +/ignition-7610725.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..7786ea4 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (bootengine-bf3b454.tar.gz) = 79e3db72a8cc538f801d59e2ba7a623c15922a9645b720adefbc1238ad283338e37d3b844a034d4c14a19cb8b0fee5f9f049c24d910f521b4fb1c1705b4a190e +SHA512 (ignition-7610725.tar.gz) = bd47f26cfc65641b63cb0846bbfd939e835fb477816effbbaff1df83a4146d4eef7d7d2f18a85e8caa386703cabcc4e54ebfd4768c590bbfc795dee6a3949519 commit 5ddad9198b64f5bf74153130ffc436096d01dca6 Author: Dusty Mabe <dusty(a)dustymabe.com> Date: Tue Jun 26 11:58:00 2018 -0400 make it so %prep won't unpack Source0 twice (cherry picked from commit c2b27f2cd02a11b00408b2c295c7f0716b6d7937) diff --git a/ignition.spec b/ignition.spec index 282b0eb..95cd042 100644 --- a/ignition.spec +++ b/ignition.spec @@ -319,8 +319,9 @@ initramfs on boot. ############## end dracut subpackage ############## %prep +# setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches -%setup -q -n %{repo}-%{commit} +%setup -T -b 0 -q -n %{repo}-%{commit} # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} commit 63ee52de6c8237641720e3575c76ec8518427512 Author: Dusty Mabe <dusty(a)dustymabe.com> Date: Mon Jun 25 16:08:42 2018 -0400 Update with comments from code review [!] ignition-dracut does not do "Requires: %{name} = %{version}-%{release}" [!] Unnecessary "%defattr(-,root,root,0755)" in dracut subpackage (cherry picked from commit a789cdea4942165f80d04e2916d363605a39caa1) diff --git a/ignition.spec b/ignition.spec index 6ae13b8..282b0eb 100644 --- a/ignition.spec +++ b/ignition.spec @@ -302,7 +302,7 @@ providing packages with %{import_path} prefix. Summary: Dracut modules for ignition License: BSD URL: https://%{dracutprovider_prefix} -Requires: ignition +Requires: %{name} = %{version}-%{release} Requires: dracut Requires: dracut-network BuildArchitectures: noarch @@ -314,7 +314,6 @@ initramfs on boot. %files dracut %doc README.md %license LICENSE -%defattr(-,root,root,0755) %{dracutlibdir}/modules.d/30ignition %{dracutlibdir}/modules.d/99journald-conf ############## end dracut subpackage ############## commit 6596f44009855d0287d284efd403ad9da16b2c17 Author: Dusty Mabe <dusty(a)dustymabe.com> Date: Mon Jun 25 15:19:53 2018 -0400 fix dracutprovider_prefix dracutimport_path macros (cherry picked from commit e60050652e3bf43c79ee0b69cfa969b824220131) diff --git a/ignition.spec b/ignition.spec index 408132e..6ae13b8 100644 --- a/ignition.spec +++ b/ignition.spec @@ -71,8 +71,8 @@ %global dracutproject dustymabe %global dracutrepo bootengine # https://github.com/dustymabe/bootengine -%global dracutprovider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global dracutimport_path %{provider_prefix} +%global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} +%global dracutimport_path %{dracutprovider_prefix} %global dracutcommit bf3b454db89bcff82d01b472786821bd458d3593 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) commit 44fe06b5abd007638a60195ead98bf8284048558 Author: Dusty Mabe <dusty(a)dustymabe.com> Date: Mon Jun 25 14:40:05 2018 -0400 make ignition-dracut a subpackage It was requested i make it a subpackage rather than a separate package. (cherry picked from commit 3d83b5d89ce2613647a4eb6b21c1a6bc66b52ca7) diff --git a/ignition-dracut.spec b/ignition-dracut.spec deleted file mode 100644 index cd17a5d..0000000 --- a/ignition-dracut.spec +++ /dev/null @@ -1,53 +0,0 @@ -%global debug_package %{nil} -%global dracutlibdir %{_prefix}/lib/dracut - -%global provider github -%global provider_tld com -%global project dustymabe -%global repo bootengine -# https://github.com/dustymabe/bootengine -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit bf3b454db89bcff82d01b472786821bd458d3593 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: ignition-dracut -Version: 0 -Release: 0.1.git%{shortcommit}%{?dist} -Summary: Dracut modules for ignition - -License: BSD -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz - -Requires: ignition -Requires: dracut -Requires: dracut-network - -BuildArchitectures: noarch - -%description -Dracut modules for ignition to enable ignition services to run in the -initramfs on boot. - -%prep -%setup -q -n %{repo}-%{commit} - -%build - -%install -# dracut modules -install -d -p %{buildroot}/%{dracutlibdir}/modules.d -rm ./dracut/README.txt -cp -r ./dracut/* %{buildroot}/%{dracutlibdir}/modules.d/ - -%files -%doc README.md -%license LICENSE -%defattr(-,root,root,0755) -%{dracutlibdir}/modules.d/30ignition -%{dracutlibdir}/modules.d/99journald-conf - -%changelog -* Thu Jun 21 2018 Dusty Mabe <dusty(a)dustymabe.com> - 0-0.1.gitbf3b454 -- First package for Fedora diff --git a/ignition.spec b/ignition.spec index 77a27ec..408132e 100644 --- a/ignition.spec +++ b/ignition.spec @@ -47,6 +47,7 @@ %define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; %endif +# macros for ignition %global provider github %global provider_tld com %global project coreos @@ -56,7 +57,6 @@ %global import_path %{provider_prefix} %global commit 76107251acd117c6d3e5b4dae2b47f82f944984b %global shortcommit %(c=%{commit}; echo ${c:0:7}) - # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these # for consistency @@ -64,6 +64,19 @@ %global buildflags %nil %global testflags %nil +# macros for ignition-dracut +%global dracutlibdir %{_prefix}/lib/dracut +%global dracutprovider github +%global dracutprovider_tld com +%global dracutproject dustymabe +%global dracutrepo bootengine +# https://github.com/dustymabe/bootengine +%global dracutprovider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%global dracutimport_path %{provider_prefix} +%global dracutcommit bf3b454db89bcff82d01b472786821bd458d3593 +%global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) + + Name: ignition Version: 0.26.0 Release: 0.1.git%{shortcommit}%{?dist} @@ -71,6 +84,7 @@ Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} @@ -156,6 +170,8 @@ and applies the configuration. %{summary} +############## devel subpackage ############## + %if 0%{?with_devel} %package devel Summary: %{summary} @@ -254,6 +270,7 @@ building other packages which use import path with %{import_path} prefix. %endif +############## unit-test-devel subpackage ############## %if 0%{?with_unit_test} && 0%{?with_devel} %package unit-test-devel Summary: Unit tests for %{name} package @@ -278,11 +295,37 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif + +############## dracut subpackage ############## +%package dracut + +Summary: Dracut modules for ignition +License: BSD +URL: https://%{dracutprovider_prefix} +Requires: ignition +Requires: dracut +Requires: dracut-network +BuildArchitectures: noarch + +%description dracut +Dracut modules for ignition to enable ignition services to run in the +initramfs on boot. + +%files dracut +%doc README.md +%license LICENSE +%defattr(-,root,root,0755) +%{dracutlibdir}/modules.d/30ignition +%{dracutlibdir}/modules.d/99journald-conf +############## end dracut subpackage ############## + %prep +# unpack source0 and apply patches %setup -q -n %{repo}-%{commit} +# unpack source1 (dracut modules) +%setup -T -D -a 1 -q -n %{repo}-%{commit} %build - # Set up PWD as a proper import path for go mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../ src/%{import_path} @@ -306,9 +349,14 @@ echo "Building ignition-validate..." %install +# main package install -d -p %{buildroot}%{_bindir} 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/ # source codes for building projects %if 0%{?with_devel} commit 62f9eb85d751964e1356e01835c49b100c3abc05 Author: Dusty Mabe <dusty(a)dustymabe.com> Date: Fri Jun 22 10:52:22 2018 -0400 add ignition-dracut spec file for dracut modules rpm (cherry picked from commit 3aca3a9c2a2ba806b4b2cfb8746b8f10a52bece3) diff --git a/ignition-dracut.spec b/ignition-dracut.spec new file mode 100644 index 0000000..cd17a5d --- /dev/null +++ b/ignition-dracut.spec @@ -0,0 +1,53 @@ +%global debug_package %{nil} +%global dracutlibdir %{_prefix}/lib/dracut + +%global provider github +%global provider_tld com +%global project dustymabe +%global repo bootengine +# https://github.com/dustymabe/bootengine +%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%global import_path %{provider_prefix} +%global commit bf3b454db89bcff82d01b472786821bd458d3593 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +Name: ignition-dracut +Version: 0 +Release: 0.1.git%{shortcommit}%{?dist} +Summary: Dracut modules for ignition + +License: BSD +URL: https://%{provider_prefix} +Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz + +Requires: ignition +Requires: dracut +Requires: dracut-network + +BuildArchitectures: noarch + +%description +Dracut modules for ignition to enable ignition services to run in the +initramfs on boot. + +%prep +%setup -q -n %{repo}-%{commit} + +%build + +%install +# dracut modules +install -d -p %{buildroot}/%{dracutlibdir}/modules.d +rm ./dracut/README.txt +cp -r ./dracut/* %{buildroot}/%{dracutlibdir}/modules.d/ + +%files +%doc README.md +%license LICENSE +%defattr(-,root,root,0755) +%{dracutlibdir}/modules.d/30ignition +%{dracutlibdir}/modules.d/99journald-conf + +%changelog +* Thu Jun 21 2018 Dusty Mabe <dusty(a)dustymabe.com> - 0-0.1.gitbf3b454 +- First package for Fedora commit 333e3ff7def8c13e81fe17deb853f4ef8ba7b799 Author: Dusty Mabe <dusty(a)dustymabe.com> Date: Thu Jun 21 19:30:24 2018 -0400 First pass add creating ignition spec with gofed - notes.txt - explains how to use gofed and build rpm - ignition.spec.orig - the spec file as generated by gofed - ignition.spec - the edited spec file - parsedeps.go - used to generate bundled provides (cherry picked from commit cd20621c8cfa1027f7afd76bac7af11899a453a2) diff --git a/ignition.spec b/ignition.spec new file mode 100644 index 0000000..77a27ec --- /dev/null +++ b/ignition.spec @@ -0,0 +1,415 @@ +# Original spec file as generated by: +# gofed repo2spec --detect github.com/coreos/ignition --commit 76107251acd117c6d3e5b4dae2b47f82f944984b --with-extra --with-build -f +# With: +# gofed@8f62d8d2dea0a87ef60cad72f72e2d7558c0cb75 +# And: +# $ git submodule status +# 33207573a1875bc828da3f863e1de439d7af8166 third_party/cmdsignature (heads/master) +# 6bff7ae54535689e2ade3d0bd3d33d903a2190b9 third_party/gofed_infra (remotes/origin/WIP-37-g6bff7ae) +# 7e414c78930a81167dc2cd4d3e9adb79eeed38a6 third_party/gofed_resources (heads/master) +# ef6ec0e387f3b125308243898435774da6128a4c third_party/gofedlib (0.1.0a1-20-gef6ec0e) + + +# If any of the following macros should be set otherwise, +# you can wrap any of them with the following conditions: +# - %%if 0%%{centos} == 7 +# - %%if 0%%{?rhel} == 7 +# - %%if 0%%{?fedora} == 23 +# Or just test for particular distribution: +# - %%if 0%%{centos} +# - %%if 0%%{?rhel} +# - %%if 0%%{?fedora} +# +# Be aware, on centos, both %%rhel and %%centos are set. If you want to test +# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition. +# (Don't forget to replace double percentage symbol with single one in order to apply a condition) + +# Not all devel deps exist in Fedora so you can't install the devel rpm +# so we need to build without devel for now +# Generate devel rpm +%global with_devel 0 +# Build project from bundled dependencies +%global with_bundled 1 +# Build with debug info rpm +%global with_debug 1 +# Run tests in check section +%global with_check 1 +# Generate unit-test rpm +%global with_unit_test 1 + +%if 0%{?with_debug} +%global _dwz_low_mem_die_limit 0 +%else +%global debug_package %{nil} +%endif + +%if ! 0%{?gobuild:1} +%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; +%endif + +%global provider github +%global provider_tld com +%global project coreos +%global repo ignition +# https://github.com/coreos/ignition +%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%global import_path %{provider_prefix} +%global commit 76107251acd117c6d3e5b4dae2b47f82f944984b +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +# define ldflags, buildflags, testflags here. The ldflags were +# taken from ./build. We will need to periodically check these +# for consistency +%global ldflags ' -X github.com/coreos/ignition/internal/version.Raw=%{version} ' +%global buildflags %nil +%global testflags %nil + +Name: ignition +Version: 0.26.0 +Release: 0.1.git%{shortcommit}%{?dist} +Summary: First boot installer and configuration tool +License: ASL 2.0 +URL: https://%{provider_prefix} +Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz + +# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required +ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} +# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} + +# add non golang BuildRequires that weren't detected +BuildRequires: libblkid-devel + +# Main rpm package BuildRequires +%if ! 0%{?with_bundled} +# validate/main.go +BuildRequires: golang(github.com/spf13/cobra) +# Remaining dependencies not included in main packages +BuildRequires: golang(github.com/coreos/go-systemd/unit) +BuildRequires: golang(github.com/coreos/go-semver/semver) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) +BuildRequires: golang(github.com/pin/tftp) +BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) +BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) +BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) +BuildRequires: golang(github.com/coreos/go-systemd/dbus) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) +BuildRequires: golang(github.com/vincent-petithory/dataurl) +BuildRequires: golang(github.com/vmware/vmw-ovflib) +BuildRequires: golang(github.com/ajeddeloh/go-json) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) +BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) +%endif + +# Main package Provides (generated with parsedeps.go) +%if 0%{?with_bundled} +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/coreos/go-semver/semver)) = %{version}-294930c1e79c64e7dbe360054274fdad492c8cf5 +Provides: bundled(golang(github.com/coreos/go-systemd/dbus)) = %{version}-39ca1b05acc7ad1220e09f133283b8859a8b71ab +Provides: bundled(golang(github.com/coreos/go-systemd/unit)) = %{version}-39ca1b05acc7ad1220e09f133283b8859a8b71ab +Provides: bundled(golang(github.com/pin/tftp/netascii)) = %{version}-9ea92f6b1029bc1bf3072bba195c84bb9b0370e3 +Provides: bundled(golang(github.com/sigma/vmw-guestinfo/rpcvmx)) = %{version}-95dd4126d6e8b4ef1970b3f3fe2e8cdd470d2903 +Provides: bundled(golang(github.com/sigma/vmw-guestinfo/vmcheck)) = %{version}-95dd4126d6e8b4ef1970b3f3fe2e8cdd470d2903 +Provides: bundled(golang(github.com/vmware/vmw-guestinfo/bdoor)) = %{version}-25eff159a728be87e103a0b8045e08273f4dbec4 +Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = %{version}-25eff159a728be87e103a0b8045e08273f4dbec4 +Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = %{version}-25eff159a728be87e103a0b8045e08273f4dbec4 +Provides: bundled(golang(go4.org/errorutil)) = %{version}-03efcb870d84809319ea509714dd6d19a1498483 +%endif + + +%description +Ignition is a utility used to manipulate systems during the initramfs. +This includes partitioning disks, formatting partitions, writing files +(regular files, systemd units, networkd units, etc.), and configuring +users. On first boot, Ignition reads its configuration from a source +of truth (remote URL, network metadata service, hypervisor bridge, etc.) +and applies the configuration. + +%{summary} + +%if 0%{?with_devel} +%package devel +Summary: %{summary} +BuildArch: noarch + +# devel subpackage BuildRequires +%if 0%{?with_check} && ! 0%{?with_bundled} +# These buildrequires are only for our tests (check) +BuildRequires: golang(github.com/ajeddeloh/go-json) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) +BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) +BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) +BuildRequires: golang(github.com/coreos/go-semver/semver) +BuildRequires: golang(github.com/coreos/go-systemd/dbus) +BuildRequires: golang(github.com/coreos/go-systemd/unit) +BuildRequires: golang(github.com/pin/tftp) +BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) +BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) +BuildRequires: golang(github.com/vincent-petithory/dataurl) +BuildRequires: golang(github.com/vmware/vmw-ovflib) +%endif + +# devel subpackage Requires. This is basically the source code from +# all of the libraries that ignition imports during build. +Requires: golang(github.com/ajeddeloh/go-json) +Requires: golang(github.com/aws/aws-sdk-go/aws) +Requires: golang(github.com/aws/aws-sdk-go/aws/awserr) +Requires: golang(github.com/aws/aws-sdk-go/aws/credentials) +Requires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) +Requires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) +Requires: golang(github.com/aws/aws-sdk-go/aws/session) +Requires: golang(github.com/aws/aws-sdk-go/service/s3) +Requires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) +Requires: golang(github.com/coreos/go-semver/semver) +Requires: golang(github.com/coreos/go-systemd/dbus) +Requires: golang(github.com/coreos/go-systemd/unit) +Requires: golang(github.com/pin/tftp) +Requires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) +Requires: golang(github.com/sigma/vmw-guestinfo/vmcheck) +Requires: golang(github.com/vincent-petithory/dataurl) +Requires: golang(github.com/vmware/vmw-ovflib) + +# devel subpackage Provides +Provides: golang(%{import_path}/config/shared) = %{version}-%{release} +Provides: golang(%{import_path}/config/shared/errors) = %{version}-%{release} +Provides: golang(%{import_path}/config/shared/validations) = %{version}-%{release} +Provides: golang(%{import_path}/config/util) = %{version}-%{release} +Provides: golang(%{import_path}/config/v1) = %{version}-%{release} +Provides: golang(%{import_path}/config/v1/types) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_0) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_0/types) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_1) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_1/types) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_2) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_2/types) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_3_experimental) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_3_experimental/types) = %{version}-%{release} +Provides: golang(%{import_path}/config/validate) = %{version}-%{release} +Provides: golang(%{import_path}/config/validate/astjson) = %{version}-%{release} +Provides: golang(%{import_path}/config/validate/astnode) = %{version}-%{release} +Provides: golang(%{import_path}/config/validate/report) = %{version}-%{release} +Provides: golang(%{import_path}/tests) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/files) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/filesystems) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/general) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/networkd) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/partitions) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/regression) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/security) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/timeouts) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/files) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/filesystems) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/general) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/networkd) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/oem) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/partitions) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/passwd) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/regression) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/security) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/systemd) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/timeouts) = %{version}-%{release} +Provides: golang(%{import_path}/tests/register) = %{version}-%{release} +Provides: golang(%{import_path}/tests/registry) = %{version}-%{release} +Provides: golang(%{import_path}/tests/types) = %{version}-%{release} + +%description devel +%{summary} + +This package contains library source intended for +building other packages which use import path with +%{import_path} prefix. +%endif + +%if 0%{?with_unit_test} && 0%{?with_devel} +%package unit-test-devel +Summary: Unit tests for %{name} package +%if 0%{?with_check} +#Here comes all BuildRequires: PACKAGE the unit tests +#in %%check section need for running +%endif + +# test subpackage tests code from devel subpackage +Requires: %{name}-devel = %{version}-%{release} + +%if 0%{?with_check} && ! 0%{?with_bundled} +BuildRequires: golang(github.com/stretchr/testify/assert) +%endif + +Requires: golang(github.com/stretchr/testify/assert) + +%description unit-test-devel +%{summary} + +This package contains unit tests for project +providing packages with %{import_path} prefix. +%endif + +%prep +%setup -q -n %{repo}-%{commit} + +%build + +# Set up PWD as a proper import path for go +mkdir -p src/%{provider}.%{provider_tld}/%{project} +ln -s ../../../ src/%{import_path} + +%if ! 0%{?with_bundled} +export GOPATH=$(pwd):%{gopath} +%else +# No dependency directories so far +export GOPATH=$(pwd):%{gopath} +%endif + +export LDFLAGS=%{ldflags} +# Tell ignition where to find chroot binary +export LDFLAGS+=' -X github.com/coreos/ignition/internal/distro.chrootCmd=%{_sbindir}/chroot ' + +echo "Building ignition..." +%gobuild -o ./ignition %{import_path}/internal + +echo "Building ignition-validate..." +%gobuild -o ./ignition-validate %{import_path}/validate + + +%install +install -d -p %{buildroot}%{_bindir} +install -p -m 0755 ./ignition %{buildroot}%{_bindir} +install -p -m 0755 ./ignition-validate %{buildroot}%{_bindir} + +# source codes for building projects +%if 0%{?with_devel} +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list +# find all *.go but no *_test.go files and generate devel.file-list +for file in $(find . $ -iname "*.go" -or -iname "*.s" $ \! -iname "*_test.go" | grep -v "vendor") ; do + dirprefix=$(dirname $file) + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix + cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file + echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list + + while [ "$dirprefix" != "." ]; do + echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list + dirprefix=$(dirname $dirprefix) + done +done +%endif + +# testing files for this project +%if 0%{?with_unit_test} && 0%{?with_devel} +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +# find all *_test.go files and generate unit-test-devel.file-list +for file in $(find . -iname "*_test.go" | grep -v "vendor") ; do + dirprefix=$(dirname $file) + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix + cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file + echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list + + while [ "$dirprefix" != "." ]; do + echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list + dirprefix=$(dirname $dirprefix) + done +done +%endif + +%if 0%{?with_devel} +sort -u -o devel.file-list devel.file-list +%endif + +%check +%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} +%if ! 0%{?with_bundled} +export GOPATH=%{buildroot}/%{gopath}:%{gopath} +%else +# Since we aren't packaging up the vendor directory we need to link +# back to it somehow. Hack it up so that we can add the vendor +# directory from BUILD dir as a gopath to be searched when executing +# tests from the BUILDROOT dir. +ln -s ./ ./vendor/src # ./vendor/src -> ./vendor + +export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} +%endif + +%if ! 0%{?gotest:1} +%global gotest go test +%endif + +%gotest %{import_path}/config/v1 +%gotest %{import_path}/config/v1/types +%gotest %{import_path}/config/v2_0 +%gotest %{import_path}/config/v2_0/types +%gotest %{import_path}/config/v2_1 +%gotest %{import_path}/config/v2_1/types +%gotest %{import_path}/config/v2_2 +%gotest %{import_path}/config/v2_2/types +%gotest %{import_path}/config/v2_3_experimental +%gotest %{import_path}/config/v2_3_experimental/types +%gotest %{import_path}/config/validate +%gotest %{import_path}/internal/config +%gotest %{import_path}/internal/exec/stages/files +%gotest %{import_path}/internal/exec/util +%gotest %{import_path}/internal/registry +%gotest %{import_path}/internal/util +%gotest %{import_path}/tests +%endif + +#define license tag if not already defined +%{!?_licensedir:%global license %doc} + +%files +%license LICENSE +%doc CONTRIBUTING.md code-of-conduct.md README.md doc/ +%{_bindir}/%{name} +%{_bindir}/%{name}-validate + + +%if 0%{?with_devel} +%files devel -f devel.file-list +%license LICENSE +%doc CONTRIBUTING.md code-of-conduct.md README.md +%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} +%endif + +%if 0%{?with_unit_test} && 0%{?with_devel} +%files unit-test-devel -f unit-test-devel.file-list +%license LICENSE +%doc CONTRIBUTING.md code-of-conduct.md README.md +%endif + +%changelog +* Thu Jun 21 2018 Dusty Mabe <dusty(a)dustymabe.com> - 0.26.0-0.1.git7610725 +- First package for Fedora + diff --git a/ignition.spec.orig b/ignition.spec.orig new file mode 100644 index 0000000..5b8cf97 --- /dev/null +++ b/ignition.spec.orig @@ -0,0 +1,352 @@ +# Original spec file as generated by: +# gofed repo2spec --detect github.com/coreos/ignition --commit 76107251acd117c6d3e5b4dae2b47f82f944984b --with-extra --with-build -f +# With: +# gofed@8f62d8d2dea0a87ef60cad72f72e2d7558c0cb75 +# And: +# $ git submodule status +# 33207573a1875bc828da3f863e1de439d7af8166 third_party/cmdsignature (heads/master) +# 6bff7ae54535689e2ade3d0bd3d33d903a2190b9 third_party/gofed_infra (remotes/origin/WIP-37-g6bff7ae) +# 7e414c78930a81167dc2cd4d3e9adb79eeed38a6 third_party/gofed_resources (heads/master) +# ef6ec0e387f3b125308243898435774da6128a4c third_party/gofedlib (0.1.0a1-20-gef6ec0e) + + +# If any of the following macros should be set otherwise, +# you can wrap any of them with the following conditions: +# - %%if 0%%{centos} == 7 +# - %%if 0%%{?rhel} == 7 +# - %%if 0%%{?fedora} == 23 +# Or just test for particular distribution: +# - %%if 0%%{centos} +# - %%if 0%%{?rhel} +# - %%if 0%%{?fedora} +# +# Be aware, on centos, both %%rhel and %%centos are set. If you want to test +# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition. +# (Don't forget to replace double percentage symbol with single one in order to apply a condition) + +# Generate devel rpm +%global with_devel 1 +# Build project from bundled dependencies +%global with_bundled 0 +# Build with debug info rpm +%global with_debug 1 +# Run tests in check section +%global with_check 1 +# Generate unit-test rpm +%global with_unit_test 1 + +%if 0%{?with_debug} +%global _dwz_low_mem_die_limit 0 +%else +%global debug_package %{nil} +%endif + +%if ! 0%{?gobuild:1} +%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; +%endif + +%global provider github +%global provider_tld com +%global project coreos +%global repo ignition +# https://github.com/coreos/ignition +%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%global import_path %{provider_prefix} +%global commit 76107251acd117c6d3e5b4dae2b47f82f944984b +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +Name: golang-%{provider}-%{project}-%{repo} +Version: 0 +Release: 0.1.git%{shortcommit}%{?dist} +Summary: !!!!FILL!!!! +# Detected licences +# - Unknown at 'LICENSE' +License: !!!!FILL!!!! +URL: https://%{provider_prefix} +Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz + +# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required +ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} +# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} + +%if ! 0%{?with_bundled} +# validate/main.go +BuildRequires: golang(github.com/spf13/cobra) + +# Remaining dependencies not included in main packages +BuildRequires: golang(github.com/coreos/go-systemd/unit) +BuildRequires: golang(github.com/coreos/go-semver/semver) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) +BuildRequires: golang(github.com/pin/tftp) +BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) +BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) +BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) +BuildRequires: golang(github.com/coreos/go-systemd/dbus) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) +BuildRequires: golang(github.com/vincent-petithory/dataurl) +BuildRequires: golang(github.com/vmware/vmw-ovflib) +BuildRequires: golang(github.com/ajeddeloh/go-json) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) +BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) +%endif + +%description +%{summary} + +%if 0%{?with_devel} +%package devel +Summary: %{summary} +BuildArch: noarch + +%if 0%{?with_check} && ! 0%{?with_bundled} +BuildRequires: golang(github.com/ajeddeloh/go-json) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) +BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) +BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) +BuildRequires: golang(github.com/coreos/go-semver/semver) +BuildRequires: golang(github.com/coreos/go-systemd/dbus) +BuildRequires: golang(github.com/coreos/go-systemd/unit) +BuildRequires: golang(github.com/pin/tftp) +BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) +BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) +BuildRequires: golang(github.com/vincent-petithory/dataurl) +BuildRequires: golang(github.com/vmware/vmw-ovflib) +%endif + +Requires: golang(github.com/ajeddeloh/go-json) +Requires: golang(github.com/aws/aws-sdk-go/aws) +Requires: golang(github.com/aws/aws-sdk-go/aws/awserr) +Requires: golang(github.com/aws/aws-sdk-go/aws/credentials) +Requires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) +Requires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) +Requires: golang(github.com/aws/aws-sdk-go/aws/session) +Requires: golang(github.com/aws/aws-sdk-go/service/s3) +Requires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) +Requires: golang(github.com/coreos/go-semver/semver) +Requires: golang(github.com/coreos/go-systemd/dbus) +Requires: golang(github.com/coreos/go-systemd/unit) +Requires: golang(github.com/pin/tftp) +Requires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) +Requires: golang(github.com/sigma/vmw-guestinfo/vmcheck) +Requires: golang(github.com/vincent-petithory/dataurl) +Requires: golang(github.com/vmware/vmw-ovflib) + +Provides: golang(%{import_path}/config/shared) = %{version}-%{release} +Provides: golang(%{import_path}/config/shared/errors) = %{version}-%{release} +Provides: golang(%{import_path}/config/shared/validations) = %{version}-%{release} +Provides: golang(%{import_path}/config/util) = %{version}-%{release} +Provides: golang(%{import_path}/config/v1) = %{version}-%{release} +Provides: golang(%{import_path}/config/v1/types) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_0) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_0/types) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_1) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_1/types) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_2) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_2/types) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_3_experimental) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_3_experimental/types) = %{version}-%{release} +Provides: golang(%{import_path}/config/validate) = %{version}-%{release} +Provides: golang(%{import_path}/config/validate/astjson) = %{version}-%{release} +Provides: golang(%{import_path}/config/validate/astnode) = %{version}-%{release} +Provides: golang(%{import_path}/config/validate/report) = %{version}-%{release} +Provides: golang(%{import_path}/tests) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/files) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/filesystems) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/general) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/networkd) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/partitions) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/regression) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/security) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/timeouts) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/files) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/filesystems) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/general) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/networkd) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/oem) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/partitions) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/passwd) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/regression) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/security) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/systemd) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/timeouts) = %{version}-%{release} +Provides: golang(%{import_path}/tests/register) = %{version}-%{release} +Provides: golang(%{import_path}/tests/registry) = %{version}-%{release} +Provides: golang(%{import_path}/tests/types) = %{version}-%{release} + +%description devel +%{summary} + +This package contains library source intended for +building other packages which use import path with +%{import_path} prefix. +%endif + +%if 0%{?with_unit_test} && 0%{?with_devel} +%package unit-test-devel +Summary: Unit tests for %{name} package +%if 0%{?with_check} +#Here comes all BuildRequires: PACKAGE the unit tests +#in %%check section need for running +%endif + +# test subpackage tests code from devel subpackage +Requires: %{name}-devel = %{version}-%{release} + +%if 0%{?with_check} && ! 0%{?with_bundled} +BuildRequires: golang(github.com/stretchr/testify/assert) +%endif + +Requires: golang(github.com/stretchr/testify/assert) + +%description unit-test-devel +%{summary} + +This package contains unit tests for project +providing packages with %{import_path} prefix. +%endif + +%prep +%setup -q -n %{repo}-%{commit} + +%build +mkdir -p src/%{provider}.%{provider_tld}/%{project} +ln -s ../../../ src/%{import_path} + +%if ! 0%{?with_bundled} +export GOPATH=$(pwd):%{gopath} +%else +# No dependency directories so far +export GOPATH=$(pwd):%{gopath} +%endif + +#%gobuild -o bin/internal %{import_path}/internal +#%gobuild -o bin/internal/util/tools/docs %{import_path}/internal/util/tools/docs +#%gobuild -o bin/tests/stubs/id-stub %{import_path}/tests/stubs/id-stub +#%gobuild -o bin/tests/stubs/useradd-stub %{import_path}/tests/stubs/useradd-stub +#%gobuild -o bin/tests/stubs/usermod-stub %{import_path}/tests/stubs/usermod-stub +#%gobuild -o bin/validate %{import_path}/validate + +%install +install -d -p %{buildroot}%{_bindir} +#install -p -m 0755 bin/internal %{buildroot}%{_bindir} +#install -p -m 0755 bin/internal/util/tools/docs %{buildroot}%{_bindir} +#install -p -m 0755 bin/tests/stubs/id-stub %{buildroot}%{_bindir} +#install -p -m 0755 bin/tests/stubs/useradd-stub %{buildroot}%{_bindir} +#install -p -m 0755 bin/tests/stubs/usermod-stub %{buildroot}%{_bindir} +#install -p -m 0755 bin/validate %{buildroot}%{_bindir} + +# source codes for building projects +%if 0%{?with_devel} +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list +# find all *.go but no *_test.go files and generate devel.file-list +for file in $(find . $ -iname "*.go" -or -iname "*.s" $ \! -iname "*_test.go" | grep -v "vendor") ; do + dirprefix=$(dirname $file) + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix + cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file + echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list + + while [ "$dirprefix" != "." ]; do + echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list + dirprefix=$(dirname $dirprefix) + done +done +%endif + +# testing files for this project +%if 0%{?with_unit_test} && 0%{?with_devel} +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +# find all *_test.go files and generate unit-test-devel.file-list +for file in $(find . -iname "*_test.go" | grep -v "vendor") ; do + dirprefix=$(dirname $file) + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix + cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file + echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list + + while [ "$dirprefix" != "." ]; do + echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list + dirprefix=$(dirname $dirprefix) + done +done +%endif + +%if 0%{?with_devel} +sort -u -o devel.file-list devel.file-list +%endif + +%check +%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} +%if ! 0%{?with_bundled} +export GOPATH=%{buildroot}/%{gopath}:%{gopath} +%else +# Since we aren't packaging up the vendor directory we need to link +# back to it somehow. Hack it up so that we can add the vendor +# directory from BUILD dir as a gopath to be searched when executing +# tests from the BUILDROOT dir. +ln -s ./ ./vendor/src # ./vendor/src -> ./vendor + +export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} +%endif + +%if ! 0%{?gotest:1} +%global gotest go test +%endif + +%gotest %{import_path}/config/v1 +%gotest %{import_path}/config/v1/types +%gotest %{import_path}/config/v2_0 +%gotest %{import_path}/config/v2_0/types +%gotest %{import_path}/config/v2_1 +%gotest %{import_path}/config/v2_1/types +%gotest %{import_path}/config/v2_2 +%gotest %{import_path}/config/v2_2/types +%gotest %{import_path}/config/v2_3_experimental +%gotest %{import_path}/config/v2_3_experimental/types +%gotest %{import_path}/config/validate +%gotest %{import_path}/internal/config +%gotest %{import_path}/internal/exec/stages/files +%gotest %{import_path}/internal/exec/util +%gotest %{import_path}/internal/registry +%gotest %{import_path}/internal/util +%gotest %{import_path}/tests +%endif + +#define license tag if not already defined +%{!?_licensedir:%global license %doc} + +%files +%license LICENSE +%doc CONTRIBUTING.md code-of-conduct.md README.md +#%{_bindir}/internal +#%{_bindir}/internal/util/tools/docs +#%{_bindir}/tests/stubs/id-stub +#%{_bindir}/tests/stubs/useradd-stub +#%{_bindir}/tests/stubs/usermod-stub +#%{_bindir}/validate + +%if 0%{?with_devel} +%files devel -f devel.file-list +%license LICENSE +%doc CONTRIBUTING.md code-of-conduct.md README.md +%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} +%endif + +%if 0%{?with_unit_test} && 0%{?with_devel} +%files unit-test-devel -f unit-test-devel.file-list +%license LICENSE +%doc CONTRIBUTING.md code-of-conduct.md README.md +%endif + +%changelog +* Thu Jun 21 2018 vagrant - 0-0.1.git7610725 +- First package for Fedora + diff --git a/notes.txt b/notes.txt new file mode 100644 index 0000000..e49b6f8 --- /dev/null +++ b/notes.txt @@ -0,0 +1,61 @@ +#grab gofed from https://github.com/gofed/gofed +#follow instructions for install + +#choose which version of the repo you want to build. For ignition it was 0.2.6 and the commit was 76107251acd117c6d3e5b4dae2b47f82f944984b + +[vagrant@vanilla-f28 ~]$ gofed repo2spec --detect github.com/coreos/ignition --commit 76107251acd117c6d3e5b4dae2b47f82f944984b --with-extra --with-build -f +Repo URL: github.com/coreos/ignition +Commit: 76107251acd117c6d3e5b4dae2b47f82f944984b +Name: golang-github-coreos-ignition + +(1/4) Checking if the package already exists in PkgDB +(2/4) Collecting data +(3/4) Generating spec file +(4/4) Discovering golang dependencies +Discovering package dependencies + Class: github.com/ajeddeloh/go-json (golang-github-ajeddeloh-go-json) PkgDB=False + Class: github.com/aws/aws-sdk-go (golang-github-aws-aws-sdk-go) PkgDB=True + Class: github.com/coreos/go-semver (golang-github-coreos-go-semver) PkgDB=True + Class: github.com/coreos/go-systemd (golang-github-coreos-go-systemd) PkgDB=True + Class: github.com/pin/tftp (golang-github-pin-tftp) PkgDB=False + Class: github.com/sigma/vmw-guestinfo (golang-github-sigma-vmw-guestinfo) PkgDB=False + Class: github.com/vincent-petithory/dataurl (golang-github-vincent-petithory-dataurl) PkgDB=False + Class: github.com/vmware/vmw-ovflib (golang-github-vmware-vmw-ovflib) PkgDB=False + +Discovering test dependencies + Class: github.com/stretchr/testify (golang-github-stretchr-testify) PkgDB=True + +Spec file golang-github-coreos-ignition.spec at /home/vagrant/golang-github-coreos-ignition + +# spec file now at /home/vagrant/golang-github-coreos-ignition/golang-github-coreos-ignition.spec + +# go through and fix things up - see diff + +# generate bundled provides by copying/using parsedeps.go to the ignition +# source folder and then running `go run parsedeps.go`. copy into spec file +# should be done by gofed at some point - https://github.com/gofed/gofed/issues/42 + +# grab source tarball +# rpmspec -P ignition.spec | grep Source0 +# pushd $HOME/rpmbuild/SOURCES/ +# curl -L -O $URL +# popd + + +# build RPM +$ rpmbuild -ba kompose.spec + +# find a srpm in `$HOME/rpmbuild/SRPMS` +# find a RPM in `$HOME/rpmbuild/RPM/arch/` +# see if the dependencies are proper + +$ rpm -qpR $HOME/rpmbuild/RPMS/x86_64/ignition-0.26.0-0.1.git7610725.fc28.x86_64.rpm + + +# setup to run koji, ref: https://fedoraproject.org/wiki/Using_the_Koji_build_system +$ fedora-packager-setup +$ kinit <username>@FEDORAPROJECT.ORG + + +# to build it on koji run: +$ koji build --scratch rawhide /path/to/srpm/ignition-0.26.0-0.1.git7610725.fc28.src.rpm diff --git a/parsedeps.go b/parsedeps.go new file mode 100644 index 0000000..ead0537 --- /dev/null +++ b/parsedeps.go @@ -0,0 +1,47 @@ +// Helper for parsing glide.lock file and spitting out +// bundled provides statements for an rpm spec file. +package main + +import ( + "fmt" + "io/ioutil" + "log" + "path" + + yaml "gopkg.in/yaml.v2" +) + +type Import struct { + Name string + Version string + Subpackages []string +} + +type Glide struct { + Hash string + Updated string + Imports []Import + TestImports []Import +} + +func main() { + yamlFile, err := ioutil.ReadFile("glide.lock") + if err != nil { + log.Fatal(err) + } + + var glide Glide + err = yaml.Unmarshal(yamlFile, &glide) + if err != nil { + log.Fatal(err) + } + + for _, imp := range glide.Imports { + // we need format like this: + // Provides: bundled(golang(github.com/coreos/go-oidc/oauth2)) = %{version}-5cf2aa52da8c574d3aa4458f471ad6ae2240fe6b + for _, subp := range imp.Subpackages { + name := path.Join(imp.Name, subp) + fmt.Printf("Provides: bundled(golang(%s)) = %s-%s\n", name, "%{version}", imp.Version) + } + } +}

1 0

Architecture specific change in rpms/vulkan-loader.git
by githook-noreply＠fedoraproject.org 26 Jun '18

26 Jun '18

The package rpms/vulkan-loader.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/vulkan-loader.git/commit/?id=3a17f6…. Change: +%ifarch x86_64 i686 Thanks. Full change: ============ commit 3a17f6459a0e821aebdb6ded83ed1b36a0434e46 Author: leigh123linux <leigh123linux(a)googlemail.com> Date: Tue Jun 26 17:36:41 2018 +0100 Add conditional for mesa-vulkan-drivers requires diff --git a/vulkan-loader.spec b/vulkan-loader.spec index 89ead86..7d740a2 100644 --- a/vulkan-loader.spec +++ b/vulkan-loader.spec @@ -1,6 +1,6 @@ Name: vulkan-loader Version: 1.1.77.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Vulkan ICD desktop loader License: ASL 2.0 @@ -23,7 +23,13 @@ Obsoletes: vulkan < %{version}-%{release} Provides: vulkan-filesystem = %{version}-%{release} Obsoletes: vulkan-filesystem < %{version}-%{release} +%if 0%{?fedora} <= 27 +%ifarch x86_64 i686 Requires: mesa-vulkan-drivers%{?_isa} +%endif +%else +Requires: mesa-vulkan-drivers%{?_isa} +%endif %description This project provides the Khronos official Vulkan ICD desktop @@ -82,6 +88,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \ %changelog +* Tue Jun 26 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.77.0-3 +- Add conditional for mesa-vulkan-drivers requires + * Tue Jun 26 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.77.0-2 - Improve description and summary - Set release

1 0

Architecture specific change in rpms/vulkan-loader.git
by githook-noreply＠fedoraproject.org 26 Jun '18

26 Jun '18

1 0

Architecture specific change in rpms/vulkan-loader.git
by githook-noreply＠fedoraproject.org 26 Jun '18

26 Jun '18

1 0

Architecture specific change in rpms/tiny-dnn.git
by githook-noreply＠fedoraproject.org 26 Jun '18

26 Jun '18

The package rpms/tiny-dnn.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/tiny-dnn.git/commit/?id=f31cc1a3a22…. Change: +ExcludeArch: %{ix86} Thanks. Full change: ============ commit f31cc1a3a22af344c8dc414149ad508e4bd1bcb4 Author: Till Hofmann <thofmann(a)fedoraproject.org> Date: Tue Jun 26 16:51:44 2018 +0200 Do not build on ix86, as tests fail diff --git a/tiny-dnn.spec b/tiny-dnn.spec index a526c7d..0a1b49b 100644 --- a/tiny-dnn.spec +++ b/tiny-dnn.spec @@ -10,6 +10,9 @@ Source0: https://github.com/tiny-dnn/tiny-dnn/archive/v%{version}%{prerel Patch0: %{name}.distro-gmock.patch Patch1: %{name}.compile-flags.patch +# Test fails on ix86. +ExcludeArch: %{ix86} + BuildRequires: /usr/bin/ctest BuildRequires: gcc-c++ BuildRequires: gtest-devel commit 953121a2d88e39554d5b9c932039682852069b12 Author: Till Hofmann <thofmann(a)fedoraproject.org> Date: Tue Jun 26 16:50:06 2018 +0200 Increase test timeout to avoid timeout failures on slower builders diff --git a/tiny-dnn.spec b/tiny-dnn.spec index e8b1bb8..a526c7d 100644 --- a/tiny-dnn.spec +++ b/tiny-dnn.spec @@ -47,7 +47,7 @@ developing applications that use %{name}. %check -ctest -V %{?_smp_mflags} +ctest --timeout 15000 -V %{?_smp_mflags} %files devel %license LICENSE

1 0

← Newer
1
2
3
4
5
6
7
8
...
54
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes June 2018