From dc926b24f225b2b0817c722847323ce9869e00bc453bb9a51f6f9d0ba4c67ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 9 Jan 2016 19:39:41 +0000 Subject: [PATCH] Accepting request 352720 from home:posophe:branches:hardware fixed as requested OBS-URL: https://build.opensuse.org/request/show/352720 OBS-URL: https://build.opensuse.org/package/show/hardware/coreboot-utils?expand=0&rev=18 --- coreboot-4.2.tar.xz | 3 + coreboot-utils-r6158.tar.bz2 | 3 - coreboot-utils.changes | 11 ++ coreboot-utils.spec | 192 ++++++++++++++--------------------- k8resdump.diff | 4 +- nvramtool-revision.diff | 29 ------ superiotool-revision.diff | 46 --------- update-snapshots.sh | 54 ---------- 8 files changed, 95 insertions(+), 247 deletions(-) create mode 100644 coreboot-4.2.tar.xz delete mode 100644 coreboot-utils-r6158.tar.bz2 delete mode 100644 nvramtool-revision.diff delete mode 100644 superiotool-revision.diff delete mode 100644 update-snapshots.sh diff --git a/coreboot-4.2.tar.xz b/coreboot-4.2.tar.xz new file mode 100644 index 0000000..c0adfd5 --- /dev/null +++ b/coreboot-4.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9a737cdf252da547cc3500749d94428eeaed77e1ff170e618156a754deb0b9e +size 25524028 diff --git a/coreboot-utils-r6158.tar.bz2 b/coreboot-utils-r6158.tar.bz2 deleted file mode 100644 index e5068ba..0000000 --- a/coreboot-utils-r6158.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2df9b6f8afd2d15b5a7ca63e22f9019af1016029d99c45e8a99cf60a1aa53386 -size 520621 diff --git a/coreboot-utils.changes b/coreboot-utils.changes index 3078226..60b2225 100644 --- a/coreboot-utils.changes +++ b/coreboot-utils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Dec 6 16:14:56 UTC 2015 - p.drouand@gmail.com + +- Use upstream tarball instead of svn revisions + version 4.2 +- Remove obsolete patches + * nvramtool-revision.diff + * superiotool-revision.diff +- Remove update-snapshots.sh +- Use download Url as source + ------------------------------------------------------------------- Wed Mar 13 12:04:46 UTC 2013 - cfarrell@suse.com diff --git a/coreboot-utils.spec b/coreboot-utils.spec index bcac096..c0d6e72 100644 --- a/coreboot-utils.spec +++ b/coreboot-utils.spec @@ -1,7 +1,7 @@ # # spec file for package coreboot-utils # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,12 +21,9 @@ Url: http://coreboot.org/ Summary: A universal flash programming utility License: GPL-2.0 Group: Development/Tools/Other -Version: r6158 +Version: 4.2 Release: 0 -Source0: coreboot-utils-%{version}.tar.bz2 -Source23: update-snapshots.sh -Patch0: nvramtool-revision.diff -Patch1: superiotool-revision.diff +Source0: http://www.coreboot.org/releases/coreboot-%{version}.tar.xz Patch2: k8resdump.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ @@ -35,125 +32,94 @@ BuildRequires: zlib-devel ExclusiveArch: %ix86 x86_64 %description -coreboot utilities are a comprehensive set of tools to work with coreboot. -Currently it includes: -* nvramtool - a tool to set CMOS variables +coreboot is a Free Software project aimed at replacing the proprietary BIOS +(firmware) found in most computers. This package contains various utilities +used to develop and configure systems with coreboot. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%setup -q -n coreboot-%{version} %patch2 -p1 %build -cd nvramtool -make %{?_smp_mflags} \ - CFLAGS="$RPM_OPT_FLAGS -Os -Wall" \ - LDFLAGS="-lpci -lz" -strip nvramtool -gzip nvramtool.8 - -cd ../inteltool -make inteltool \ - CFLAGS="$RPM_OPT_FLAGS -Os -Wall" \ - LDFLAGS="-lpci -lz" -strip inteltool -gzip inteltool.8 - -cd ../superiotool -make %{?_smp_mflags} \ - CFLAGS="$RPM_OPT_FLAGS -Os -Wall -DPCI_SUPPORT" \ - LDFLAGS="-lpci -lz" -strip superiotool -gzip superiotool.8 - -cd ../ectool -make %{?_smp_mflags} \ - CFLAGS="$RPM_OPT_FLAGS -Os -Wall" \ - LDFLAGS="-lpci -lz" -strip ectool - -cd ../msrtool -CFLAGS="$RPM_OPT_FLAGS" ./configure -make %{?_smp_mflags} -strip msrtool - -cd ../k8resdump -make %{?_smp_mflags} -strip k8resdump - -cd ../cbfstool -make %{?_smp_mflags} \ - CFLAGS="$RPM_OPT_FLAGS -Os -Wall" \ - CXXFLAGS="$RPM_OPT_FLAGS -Os -Wall -DCOMPACT" - -cd ../ +make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/ectool +make %{?_smp_mflags} CC="%{__cc} %{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 +make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/fletcher +make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/ifdfake +make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/ifdtool +make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/cbfstool +make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/k8resdump +%ifarch %{ix86} x86_64 +make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/inteltool +make %{?_smp_mflags} CFLAGS="%{optflags} -I." -C util/viatool +(cd util/msrtool && %configure && make %{?_smp_mflags}) +%endif %install -mkdir -p %{buildroot}%{_bindir} -mkdir -p $RPM_BUILD_ROOT/%{_sbindir} -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8 +install -d %{buildroot}%{_sbindir} +install -d %{buildroot}%{_bindir} +install -d %{buildroot}%{_datadir} +install -d %{buildroot}%{_mandir}/man1 -cd nvramtool -install -m 0755 nvramtool $RPM_BUILD_ROOT/%{_sbindir} -install -m 0644 nvramtool.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8 -cp DISCLAIMER DISCLAIMER.nvramtool -cp README README.nvramtool -cp ChangeLog ChangeLog.nvramtool +make %{?_smp_mflags} PREFIX=%{buildroot}/%{_prefix} -C util/ectool install +make %{?_smp_mflags} DESTDIR=%{buildroot} PREFIX=%{_prefix} -C util/superiotool install +make %{?_smp_mflags} DESTDIR=%{buildroot} PREFIX=%{_prefix} -C util/nvramtool install +make %{?_smp_mflags} DESTDIR=%{buildroot} PREFIX=%{_prefix} -C util/ifdfake install +# ifdtool & viatool install targets try to install a nonexistent manpage... +install util/ifdtool/ifdtool %{buildroot}%{_bindir} +install util/cbfstool/cbfstool %{buildroot}%{_bindir} +install util/cbmem/cbmem %{buildroot}%{_bindir} +install util/fletcher/fletcher %{buildroot}%{_bindir} +install util/romcc/romcc %{buildroot}%{_bindir} +install -pm644 util/romcc/romcc.1 %{buildroot}%{_mandir}/man1/ +install util/k8resdump/k8resdump %{buildroot}%{_sbindir} +install util/amdtools/*.pl %{buildroot}%{_sbindir} +install util/amdtools/k8-read-mem-settings.sh %{buildroot}%{_sbindir} +%ifarch %{ix86} x86_64 +make %{?_smp_mflags} DESTDIR=%{buildroot} PREFIX=%{_prefix} -C util/inteltool install +install util/viatool/viatool %{buildroot}%{_bindir} +make -C util/msrtool DESTDIR=%{buildroot} PREFIX=%{_prefix} install +%endif -cd ../inteltool -install -m 0755 inteltool $RPM_BUILD_ROOT/%{_sbindir} -install -m 0644 inteltool.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8 - -cd ../superiotool -install -m 0755 superiotool $RPM_BUILD_ROOT/%{_sbindir} -install -m 0644 superiotool.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8 -cp README README.superiotool - -cd ../ectool -install -m 0755 ectool $RPM_BUILD_ROOT/%{_sbindir} - -cd ../msrtool -install -m 0755 msrtool $RPM_BUILD_ROOT/%{_sbindir} - -cd ../k8resdump -install -m 0755 k8resdump $RPM_BUILD_ROOT/%{_sbindir} - -cd ../amdtools -install -m 0755 k8-interpret-extended-memory-settings.pl \ - $RPM_BUILD_ROOT/%{_sbindir}/k8-interpret-extended-memory-settings.pl -install -m 0755 k8-compare-pci-space.pl \ - $RPM_BUILD_ROOT/%{_sbindir}/k8-compare-pci-space.pl -install -m 0755 k8-read-mem-settings.sh \ - $RPM_BUILD_ROOT/%{_sbindir}/k8-read-mem-settings.sh -install -m 0755 parse-bkdg.pl \ - $RPM_BUILD_ROOT/%{_sbindir}/parse-bkdg.pl -cp -a example_input example_input.amdtools -cp -a README README.amdtools - -cd ../cbfstool -install -m 0755 cbfstool $RPM_BUILD_ROOT/%{_bindir} -cp EXAMPLE EXAMPLE.cbfstool +install -pm644 util/superiotool/README README.superiotool +install -pm644 util/superiotool/COPYING COPYING.superiotool +install -pm644 util/nvramtool/README README.nvramtool +install -pm644 util/nvramtool/COPYING COPYING.nvramtool +install -pm644 util/nvramtool/DISCLAIMER DISCLAIMER.nvramtool +install -pm644 util/romcc/COPYING COPYING.romcc +install -pm644 util/optionlist/README README.optionlist +install -pm644 util/amdtools/README README.amdtools +cp -a util/amdtools/example_input example_input.amdtools +%ifarch %{ix86} x86_64 +install -pm644 util/viatool/README README.viatool +install -pm644 util/msrtool/COPYING COPYING.msrtool +%endif %files %defattr(-,root,root) -%doc nvramtool/COPYING -%doc nvramtool/DISCLAIMER.nvramtool nvramtool/ChangeLog.nvramtool nvramtool/README.nvramtool -%doc superiotool/README.superiotool cbfstool/EXAMPLE.cbfstool -%doc amdtools/README.amdtools amdtools/example_input.amdtools -%{_sbindir}/nvramtool -%{_sbindir}/inteltool -%{_sbindir}/superiotool -%{_sbindir}/ectool -%{_sbindir}/msrtool -%{_sbindir}/k8resdump -%{_sbindir}/k8-interpret-extended-memory-settings.pl -%{_sbindir}/k8-compare-pci-space.pl -%{_sbindir}/k8-read-mem-settings.sh -%{_sbindir}/parse-bkdg.pl +%doc README.superiotool COPYING.superiotool +%doc README.nvramtool COPYING.nvramtool DISCLAIMER.nvramtool +%doc README.amdtools example_input.amdtools %{_bindir}/cbfstool -%{_mandir}/man8/nvramtool.8.gz -%{_mandir}/man8/inteltool.8.gz -%{_mandir}/man8/superiotool.8.gz +%{_bindir}/cbmem +%{_bindir}/fletcher +%{_bindir}/ifdfake +%{_bindir}/ifdtool +%{_bindir}/romcc +%{_bindir}/viatool +%{_sbindir}/ectool +%{_sbindir}/inteltool +%{_sbindir}/k8-compare-pci-space.pl +%{_sbindir}/k8-interpret-extended-memory-settings.pl +%{_sbindir}/k8-read-mem-settings.sh +%{_sbindir}/k8resdump +%{_sbindir}/msrtool +%{_sbindir}/nvramtool +%{_sbindir}/parse-bkdg.pl +%{_sbindir}/superiotool +%{_mandir}/man1/* +%{_mandir}/man8/* %changelog diff --git a/k8resdump.diff b/k8resdump.diff index 294ff51..2e8fbef 100644 --- a/k8resdump.diff +++ b/k8resdump.diff @@ -1,5 +1,5 @@ ---- a/k8resdump/Makefile -+++ b/k8resdump/Makefile +--- a/util/k8resdump/Makefile ++++ b/util/k8resdump/Makefile @@ -16,7 +16,7 @@ ifeq ($(OS_ARCH), SunOS) LDFLAGS = -lpci diff --git a/nvramtool-revision.diff b/nvramtool-revision.diff deleted file mode 100644 index 1640e91..0000000 --- a/nvramtool-revision.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- a/nvramtool/common.c -+++ b/nvramtool/common.c -@@ -34,7 +34,7 @@ - const char prog_name[] = "nvramtool"; - - /* version of this program */ --const char prog_version[] = "2.1"; -+const char prog_version[] = "2.1 (r" NVRAMTOOL_REVISION ")"; - - /**************************************************************************** - * get_line_from_file ---- a/nvramtool/Makefile -+++ b/nvramtool/Makefile -@@ -20,10 +20,15 @@ - - all: dep $(PROGRAM) - -+SVNDEF := -D'NVRAMTOOL_REVISION="$(shell basename `cd ..;pwd`|cut -c17-)"' -+ - $(PROGRAM): $(OBJS) - $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS) - $(STRIP) $(STRIP_ARGS) $(PROGRAM) - -+common.o: common.c -+ $(CC) -c $(CFLAGS) $(SVNDEF) $< -o $@ -+ - clean: - rm -f $(PROGRAM) *.o - diff --git a/superiotool-revision.diff b/superiotool-revision.diff deleted file mode 100644 index e64a776..0000000 --- a/superiotool-revision.diff +++ /dev/null @@ -1,46 +0,0 @@ ---- a/superiotool/Makefile -+++ b/superiotool/Makefile -@@ -26,12 +26,10 @@ - - # Set the superiotool version string from the highest revision number - # of the checked out superiotool files. --SVNDEF := -D'SUPERIOTOOL_VERSION="$(shell svnversion -cn . \ -- | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"' -+SVNDEF := -D'SUPERIOTOOL_VERSION="$(shell basename `cd ..;pwd`|cut -c17-)"' - - CFLAGS += -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \ -- -Werror-implicit-function-declaration -ansi -pedantic $(SVNDEF) --LDFLAGS += -lz -+ -Werror-implicit-function-declaration -ansi -pedantic - - OBJS = superiotool.o ali.o fintek.o ite.o nsc.o nuvoton.o smsc.o winbond.o - -@@ -41,10 +39,9 @@ - endif - ifeq ($(OS_ARCH), FreeBSD) - CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \ -- -Werror-implicit-function-declaration -ansi $(SVNDEF) \ -+ -Werror-implicit-function-declaration -ansi \ - -I/usr/local/include - LDFLAGS += -L/usr/local/lib --LIBS = -lz - endif - ifeq ($(OS_ARCH), NetBSD) - LDFLAGS = -l$(shell uname -p) -@@ -55,6 +52,7 @@ - - ifeq ($(CONFIG_PCI), yes) - CFLAGS += -DPCI_SUPPORT -+LIBS += -lz - LIBS += -lpci - OBJS += pci.o via.o - endif -@@ -75,5 +73,8 @@ - clean: - rm -f $(PROGRAM) *.o - -+%.o: %.c -+ $(CC) $(CFLAGS) $(SVNDEF) -c $< -o $@ -+ - .PHONY: all install clean - diff --git a/update-snapshots.sh b/update-snapshots.sh deleted file mode 100644 index 3a1c855..0000000 --- a/update-snapshots.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -# get upstream revisions -printf "Checking coreboot revision... " -REV=$(svn info svn://coreboot.org/coreboot/trunk/util |grep ^Revision|cut -c11-) -printf "done. (r$REV)\n" - -printf "Continue? (YES/no) " -read answer -answer=$(echo $answer|tr "a-z" "A-Z") -if [ "$answer" == "YES" -o "$answer" == "Y" -o "$answer" == "" ]; then - printf "Updating tree... \n" -else - printf "Good bye.\n" - exit 0 -fi - -osc rm coreboot-utils-r*.tar.bz2 - -# clean up -printf "Cleaning up... " -rm -rf coreboot-utils-r???? -printf "done.\n" - -# check out nvramtool -printf "Checking out coreboot-utils r$REV... " -svn export -q svn://coreboot.org/coreboot/trunk/util/ coreboot-utils-r$REV -cd coreboot-utils-r$REV -rm -rf x86emu newconfig abuild analysis compareboard kconfig options xcompile -rm -rf kbuildall optionlist sconfig -cd .. - -printf "packing... " -tar cjf coreboot-utils-r$REV.tar.bz2 coreboot-utils-r$REV -printf "done.\n" - -sed -i s/Version:.*r[0-9].*$/Version:\ \ \ \ \ \ \ \ r$REV/ \ - coreboot-utils.spec - -osc add coreboot-utils-r$REV.tar.bz2 -mv coreboot-utils.changes coreboot-utils.changes.old -echo "-------------------------------------------------------------------" > \ - coreboot-utils.changes -echo "`date` - stepan@coresystems.de" >> \ - coreboot-utils.changes -echo >> coreboot-utils.changes -echo "- update to r$REV." >> coreboot-utils.changes -echo >> coreboot-utils.changes -cat coreboot-utils.changes.old >> coreboot-utils.changes -rm coreboot-utils.changes.old - -# finished. -ls -la *.bz2 -