Hello community, here is the log from the commit of package acpica for openSUSE:Factory checked in at 2015-04-27 12:58:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/acpica (Old) and /work/SRC/openSUSE:Factory/.acpica.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "acpica" Changes: -------- --- /work/SRC/openSUSE:Factory/acpica/acpica.changes 2015-02-05 10:58:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.acpica.new/acpica.changes 2015-04-27 12:58:37.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Apr 24 08:58:34 UTC 2015 - [email protected] + +- Update to acpica version 20150410 + +- Do not generate acpitools tarball from external kernel repo, but + use kernel-source package inside the build service. +*Added acpica_remove_date_macro.patch + -> This patch got mainline in kernel version 4.0 and can be removed + again at some point of time. + +------------------------------------------------------------------- Old: ---- acpi-tools-3.14.tar.bz2 acpica-unix2-20140724.tar.bz2 generate_acpi-tools_tarball.sh New: ---- acpica-unix2-20150410.tar.bz2 acpica_remove_date_macro.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acpica.spec ++++++ --- /var/tmp/diff_new_pack.3mTCfD/_old 2015-04-27 12:58:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3mTCfD/_new 2015-04-27 12:58:38.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package acpica # -# Copyright (c) 2015 SUSE LINUX 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 @@ -18,17 +18,14 @@ Name: acpica Url: http://acpica.org -# How to fetch acpi-tools: -# git clone http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 -# cd linux-2.6/tools/power/acpi -# mkdir -p include/acpi -# cp ../../../include/acpi/* include/acpi -# tar -cvjf acpi-tools-3.15 `find *` -Version: 20140724 +Version: 20150410 Release: 0 -%define acpi_tools_dir acpi-tools-3.14 + %define src_dir acpica-unix2-%{version} -%define dmp_ver 20110323 +%define kver %(rpm -q --qf '%{VERSION}' kernel-source) +BuildRequires: kernel-source >= 2.6.31 +%define dmp_ver %{kver} + Summary: This is a set of tools to display and debug your BIOS ACPI tables License: GPL-2.0 Group: Development/Tools/Debuggers @@ -39,13 +36,13 @@ Source2: acpi_genl.tar.bz2 Source3: acpi_validate Source4: wmidump.tar.bz2 -Source5: %{acpi_tools_dir}.tar.bz2 -Source6: generate_acpi-tools_tarball.sh +Source5: acpica_remove_date_macro.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 x86_64 aarch64 BuildRequires: bison BuildRequires: flex BuildRequires: glibc-devel +BuildRequires: patch Provides: iasl %description @@ -70,16 +67,25 @@ and other Intel people %prep -%setup -n %{src_dir} -a 2 -a 4 -a 5 +%setup -n %{src_dir} -a 2 -a 4 %patch1 -p1 %patch2 -p1 +mkdir acpidump-%{dmp_ver} +cd acpidump-%{dmp_ver} +# acpitools (acpidump) from kernel sources: +# copy necessary files from kernel-source since we need to modify them +(cd /usr/src/linux ; tar -cf - COPYING CREDITS README tools include scripts Kbuild Makefile drivers/acpi lib) | tar -xf - +# Supress error, if the patch does not patch, it is expected the version is +# new enough and the patch already is in +x=`patch -p1 -i %{SOURCE5}` %build cc %{SOURCE1} %{optflags} -o ec_access make -C acpi_genl CFLAGS="%{optflags}" make -C wmidump CFLAGS="%{optflags}" make OPT_CFLAGS="%{optflags}" HOST="_LINUX" -make -C %{acpi_tools_dir} CFLAGS="-DDEFINE_ALTERNATE_TYPES -I include %{optflags}" +cd acpidump-%{dmp_ver}/tools/power/acpi +make EXTRA_CFLAGS="%{optflags}" prefix=/usr libdir=%{_libdir} all %install install -Dm 755 %{SOURCE3} %{buildroot}/usr/bin/acpi_validate @@ -92,11 +98,12 @@ install -Dm 755 acpi_genl/acpi_genl %{buildroot}/usr/sbin/acpi_genl install -Dm 644 acpi_genl/README %{buildroot}/%{_docdir}/%{name}/README_acpi_genl -install -Dm 644 changes.txt %{buildroot}/%{_docdir}/%{name}/changes.txt make install DESTDIR="%{buildroot}" # Latest acpidump is coming from kernel and not from acpica sources now. rm -rf "%{buildroot}"/usr/bin/acpidump -make -C %{acpi_tools_dir} install DESTDIR="%{buildroot}" mandir=/usr/share/man +cd acpidump-%{dmp_ver}/tools/power/acpi +export WERROR=0 +make V=1 EXTRA_CFLAGS="%{optflags}" mandir=%{_mandir} prefix=/usr libdir=%{_libdir} DESTDIR=%{buildroot} install install-man %files %defattr(-,root,root) ++++++ acpica-no-compiletime.patch ++++++ --- /var/tmp/diff_new_pack.3mTCfD/_old 2015-04-27 12:58:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3mTCfD/_new 2015-04-27 12:58:38.000000000 +0200 @@ -55,27 +55,3 @@ } /* Summary of main input and output files */ -Index: acpica-unix2-20121018/source/include/acapps.h -=================================================================== ---- acpica-unix2-20121018.orig/source/include/acapps.h -+++ acpica-unix2-20121018/source/include/acapps.h -@@ -69,15 +69,15 @@ - /* Macros for signons and file headers */ - - #define ACPI_COMMON_SIGNON(UtilityName) \ -- "\n%s\n%s version %8.8X%s [%s]\n%s\n\n", \ -+ "\n%s\n%s version %8.8X%s\n%s\n\n", \ - ACPICA_NAME, \ -- UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \ -+ UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, \ - ACPICA_COPYRIGHT - - #define ACPI_COMMON_HEADER(UtilityName, Prefix) \ -- "%s%s\n%s%s version %8.8X%s [%s]\n%s%s\n%s\n", \ -+ "%s%s\n%s%s version %8.8X%s\n%s%s\n%s\n", \ - Prefix, ACPICA_NAME, \ -- Prefix, UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \ -+ Prefix, UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, \ - Prefix, ACPICA_COPYRIGHT, \ - Prefix - ++++++ acpica-unix2-20140724.tar.bz2 -> acpica-unix2-20150410.tar.bz2 ++++++ ++++ 37819 lines of diff (skipped) ++++++ acpica_remove_date_macro.patch ++++++ commit 1797d379f20901ee51711d737b65cc77e22c13e2 Author: Rasmus Villemoes <[email protected]> Date: Mon Apr 13 11:49:18 2015 +0800 ACPICA: Applications: Remove use of __DATE__ macro. ACPICA commit 3d9fb6d1f216a78ad098d3ad23f1304376c2f4ef The macro __DATE__ and friends is not allowed in the Linux kernel. Also, including the build time in output doesn't seem to provide any value. Link: https://github.com/acpica/acpica/commit/3d9fb6d1 Signed-off-by: Rasmus Villemoes <[email protected]> Acked-by: David E. Box <[email protected]> Signed-off-by: Bob Moore <[email protected]> Signed-off-by: Lv Zheng <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]> diff --git a/drivers/acpi/acpica/acapps.h b/drivers/acpi/acpica/acapps.h index d863016..e9f0833 100644 --- a/drivers/acpi/acpica/acapps.h +++ b/drivers/acpi/acpica/acapps.h @@ -64,15 +64,15 @@ /* Macros for signons and file headers */ #define ACPI_COMMON_SIGNON(utility_name) \ - "\n%s\n%s version %8.8X%s [%s]\n%s\n\n", \ + "\n%s\n%s version %8.8X%s\n%s\n\n", \ ACPICA_NAME, \ - utility_name, ((u32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \ + utility_name, ((u32) ACPI_CA_VERSION), ACPI_WIDTH, \ ACPICA_COPYRIGHT #define ACPI_COMMON_HEADER(utility_name, prefix) \ - "%s%s\n%s%s version %8.8X%s [%s]\n%s%s\n%s\n", \ + "%s%s\n%s%s version %8.8X%s\n%s%s\n%s\n", \ prefix, ACPICA_NAME, \ - prefix, utility_name, ((u32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \ + prefix, utility_name, ((u32) ACPI_CA_VERSION), ACPI_WIDTH, \ prefix, ACPICA_COPYRIGHT, \ prefix
