Accepting request 610098 from hardware

OBS-URL: https://build.opensuse.org/request/show/610098 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreboot-utils?expand=0&rev=25
2018-05-29 08:29:43 +00:00 · 2018-05-29 08:29:43 +00:00 · c71a50e6e5
commit c71a50e6e5
parent 24f3375caf c60deb6c18
7 changed files with 41 additions and 33 deletions
--- a/coreboot-4.7.tar.xz
+++ b/coreboot-4.7.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d68a83f8f687e8ea212b8c5bb501e24444b57c3f73896042d09628188c851368
-size 30139964
--- a/coreboot-4.7.tar.xz.sig
+++ b/coreboot-4.7.tar.xz.sig
@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAABCQAGBQJaW/ytAAoJEBl5bCs+T333bKIQAIwIyRp1svihsYvKXc/tSVKQ
-OVuDei/fQeWwlH3gINViKtzi4nVH/M7A6DoWRAmaYVQ/PMs0zqCFSeClByl2QL+Y
-msaKb2u5i0WjAvPauEbBvooZtqBow1xKP78d7Dpw3ys5cU/nkQxvGkPZtSy3Idv5
-NInivfswAv+GlQYrXj8XiUbdwImS2YspbGlNUGqMwQkpVQ07dGMmBzE6XFhIa3oX
-UU36AmzZ2Ea9oGZZ2zBcQcM0sADzLKjomRa0MpWZmjdx97htLqCZkVfGAD3D+JuH
-y19lWVBse0uAHOE2ZWqQVODeOIsdVVZFfFtYeIqLPE2430s4ct6h51jUyL0Ik9/K
-ARNxu5cJu/J3tLorGT8MeaSKFH3jZrV0qlp0btIG4gFctmBrc5j32LVl7oXImQmN
-8kPlKj3sdCuO27LWjg0K4JFu4Ho53DH1W9mCf7f6vxj4sd5DoY/XS3biXZNK0JYS
-3pb09fPV8I0mf3f+rpubUaABB/LgojXc1VROBbXP0VJ61AYUZZtZLiVRQEKVCEsx
-IsfJKujBkCOlHuGbnP5bmr8FgESGCKa6Hqk7GMYKuaLzm0bJHoguhpLKZPMru1X3
-skdrpyKK8RKA3sXP+Yn/JGoSSWxlRNjOFaw3MUTAKdnq9gZLmehwSoDcHhOMC0OL
-Tu96FMXju5ygnmhHftKU
-=I45w
-----END PGP SIGNATURE-----
--- a/coreboot-4.8.1.tar.xz
+++ b/coreboot-4.8.1.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f0ddf4db0628c1fe1e8348c40084d9cbeb5771400c963fd419cda3995b69ad23
+size 31763064
--- a/coreboot-4.8.1.tar.xz.sig
+++ b/coreboot-4.8.1.tar.xz.sig
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCQAdFiEEV0zm9oVc/et9No6dGXlsKz5PffcFAlr8gc8ACgkQGXlsKz5P
+fferGBAAgDvzD+9gMIQOpw6HM0oB6AE0VSvwf1JgdY7iklS2v2+JVT7BQpQo0MMW
+G8A4+XE6YRSLCg95ne2wmv924Oc6lHxJY5uOLOguuoOtd6Zoor+zq1xsa/+BGW8X
+x3fAhQ50ozk56oUxY/b+J1tr54XNcJyWSTYgDB+STg49hF/AVZb39yEpBbolYCts
+GMh6YyKpo1WNhEPtUyQJ/Db52sxpiT3MNRNZ/I++bX5fS9+MK6uhq2RIdgpwfaj+
+54I82Bw5TakjP7BYf29PEMc/UNPdS5O23U2LcyGf6f/1dv3w/CX+8lNgDHdt7XJO
+GLGuJMm99XQ5UDcCxmKaqp0K7FKXD5jFQfhYiMI+pMVrFkbx7fMIvT7LmyqQJfjc
+Ceh2yzrJoZ8C/KQshdeLXc4shI+n2ZJmev0cfuwMCH3aGNVSZZuoov1sFnxyY80O
+qphXSQpMsrH0IlSBTYiHXLJ6ESuFSprqMQb70CXMfdsX7F4YeC23GdCREyDb2kVJ
+IJ8P5deD6KX3mbFf9JK9ZJsIoqxud/XWj1qdYjGopRCb794go8T0lXWcNpriZwJO
+H2j3DD/g0Joch3Dbb1IX6q6DglhR6OuuBnniaNR8CazIozZcoNXuztd3pIy+13Sn
+v2UjnR3SsyJalcGFhbjWm33tJEVY3fo7nTaTlfi394O1lw0dCH8=
+=D+1n
+-----END PGP SIGNATURE-----
--- a/coreboot-utils.changes
+++ b/coreboot-utils.changes
@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu May 17 11:42:27 UTC 2018 - mardnh@gmx.de
+
+- Update to 4.8.1
+  * Full changelog:
+    https://www.coreboot.org/releases/coreboot-4.8.1-relnotes.txt
+- Rebase patches:
+  * no-pie.patch
+
 -------------------------------------------------------------------
 Mon Jan 15 18:45:33 UTC 2018 - mardnh@gmx.de

--- a/coreboot-utils.spec
+++ b/coreboot-utils.spec
@ -17,12 +17,12 @@


 Name:           coreboot-utils
-Url:            http://coreboot.org/
-Summary:        A universal flash programming utility
-License:        GPL-2.0
-Group:          Development/Tools/Other
-Version:        4.7
+Version:        4.8.1
 Release:        0
+Summary:        A universal flash programming utility
+License:        GPL-2.0-only
+Group:          Development/Tools/Other
+URL:            http://coreboot.org/
 Source0:        https://www.coreboot.org/releases/coreboot-%{version}.tar.xz
 Source1:        https://www.coreboot.org/releases/coreboot-%{version}.tar.xz.sig
 #http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x19796C2B3E4F7DF7#/%%{name}.keyring
@ -30,7 +30,6 @@ Source3:        %{name}.keyring
 Patch1:         no-pie.patch
 Patch2:         k8resdump.diff
 Patch3:         do-explicit-fallthrough.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
 BuildRequires:  pciutils-devel
 BuildRequires:  xz
@ -54,7 +53,7 @@ used to develop and configure systems with coreboot.

 %build
 make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/ectool
-make %{?_smp_mflags} CC="%{__cc} %{optflags}" -C util/superiotool
+make %{?_smp_mflags} CC="gcc %{optflags}" -C util/superiotool
 make %{?_smp_mflags} CFLAGS="%{optflags} -DCMOS_HAL=1 -I." -C util/nvramtool
 make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/romcc romcc
 make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/cbmem
@ -115,8 +114,10 @@ install -pm644 util/msrtool/COPYING COPYING.msrtool

 %files
 %defattr(-,root,root)
-%doc README.superiotool COPYING.superiotool
-%doc README.nvramtool COPYING.nvramtool DISCLAIMER.nvramtool
+%license COPYING.superiotool
+%doc README.superiotool
+%license COPYING.nvramtool
+%doc README.nvramtool DISCLAIMER.nvramtool
 %doc README.amdtools example_input.amdtools
 %{_bindir}/cbfstool
 %{_bindir}/cbmem
--- a/no-pie.patch
+++ b/no-pie.patch
@ -1,8 +1,8 @@
 diff --git a/util/msrtool/Makefile.in b/util/msrtool/Makefile.in
-index 3d50f4c..adda869 100644
+index a79cb4f..998bfe4 100644
 --- a/util/msrtool/Makefile.in
 +++ b/util/msrtool/Makefile.in
-@@ -19,8 +19,9 @@ PROGRAM = msrtool
+@@ -19,8 +19,8 @@ PROGRAM = msrtool
 CC      = @CC@
 INSTALL = @INSTALL@
 PREFIX  = @PREFIX@
@ -10,7 +10,6 @@ index 3d50f4c..adda869 100644
 -LDFLAGS = @LDFLAGS@
 +CFLAGS  = @CFLAGS@ -fPIC -fno-PIE
 +LDFLAGS = @LDFLAGS@ -fPIC -no-pie
-+
 
- TARGETS = geodegx2.o geodelx.o cs5536.o k8.o intel_pentium3_early.o intel_pentium3.o intel_pentium4_early.o intel_pentium4_later.o intel_core1.o intel_core2_early.o intel_core2_later.o intel_nehalem.o intel_atom.o
+ TARGETS = geodegx2.o geodelx.o cs5536.o k8.o via_c7.o intel_pentium3_early.o intel_pentium3.o intel_pentium4_early.o intel_pentium4_later.o intel_core1.o intel_core2_early.o intel_core2_later.o intel_nehalem.o intel_atom.o
 SYSTEMS = linux.o darwin.o freebsd.o