Hello community,
here is the log from the commit of package acpica for openSUSE:Factory checked
in at 2014-03-17 09:12:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-01-30
14:53:37.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.acpica.new/acpica.changes 2014-03-17
09:12:53.000000000 +0100
@@ -1,0 +2,20 @@
+Wed Mar 12 13:27:13 UTC 2014 - tr...@suse.de
+
+- Add acpi-tools tarball from kernel sources: tools/power/acpi
+ Use latest acpidump from there instead of acpica included one.
+ This fixes acpidump on latest kernels.
+- Add script for easier retrieving of acpi-tools tarball from kernel sources.
+
+-------------------------------------------------------------------
+Tue Mar 11 13:42:30 UTC 2014 - tr...@suse.de
+
+- Update to version 20140214
+- Replace $RPM_OPT_FLAGS with %{optflags} as suggested by tc...@suse.cz
+
+-------------------------------------------------------------------
+Fri Mar 7 15:31:16 CET 2014 - r...@suse.de
+
+- set HOST for make to not blindly set the hostname
+ as compiler definition
+
+-------------------------------------------------------------------
Old:
----
acpica-unix2-20140114.tar.bz2
New:
----
acpi-tools-3.14.tar.bz2
acpica-unix2-20140214.tar.bz2
generate_acpi-tools_tarball.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ acpica.spec ++++++
--- /var/tmp/diff_new_pack.y0XiYX/_old 2014-03-17 09:12:54.000000000 +0100
+++ /var/tmp/diff_new_pack.y0XiYX/_new 2014-03-17 09:12:54.000000000 +0100
@@ -15,18 +15,24 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: acpica
Url: http://acpica.org
-Version: 20140114
-Release: 6
-License: GPL-2.0
+# 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: 20140214
+Release: 0
+%define acpi_tools_dir acpi-tools-3.14
%define src_dir acpica-unix2-%{version}
%define dmp_ver 20110323
-Group: Development/Tools/Debuggers
Summary: This is a set of tools to display and debug your BIOS ACPI
tables
+License: GPL-2.0
+Group: Development/Tools/Debuggers
Source: %{src_dir}.tar.bz2
Patch1: acpica-no-compiletime.patch
Patch2: wmidump_add_she_bang.patch
@@ -34,9 +40,12 @@
Source2: acpi_genl.tar.bz2
Source3: acpi_validate
Source4: wmidump.tar.bz2
+Source5: %{acpi_tools_dir}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 x86_64
-BuildRequires: bison flex glibc-devel
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: glibc-devel
Provides: iasl
%description
@@ -61,15 +70,16 @@
and other Intel people
%prep
-%setup -n %{src_dir} -a 2 -a 4
+%setup -n %{src_dir} -a 2 -a 4 -a 5
%patch1 -p1
%patch2 -p1
%build
-cc %{SOURCE1} $RPM_OPT_FLAGS -o ec_access
-make -C acpi_genl CFLAGS="$RPM_OPT_FLAGS"
-make -C wmidump CFLAGS="$RPM_OPT_FLAGS"
-make OPT_CFLAGS="$RPM_OPT_FLAGS"
+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}"
%install
install -Dm 755 %{SOURCE3} %{buildroot}/usr/bin/acpi_validate
@@ -84,6 +94,9 @@
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
%files
%defattr(-,root,root)
@@ -93,7 +106,7 @@
/usr/bin/acpisrc
/usr/bin/wmidump
/usr/bin/wmixtract
-/usr/bin/acpidump
+/usr/sbin/acpidump
/usr/sbin/acpi_genl
/usr/sbin/ec_access
/usr/bin/acpibin
@@ -101,6 +114,7 @@
/usr/bin/acpinames
/usr/bin/acpi_validate
/usr/bin/acpiexamples
+%{_mandir}/man8/acpidump.8*
%doc %{_docdir}/%{name}
++++++ acpica-unix2-20140114.tar.bz2 -> acpica-unix2-20140214.tar.bz2 ++++++
++++ 4181 lines of diff (skipped)
++++++ generate_acpi-tools_tarball.sh ++++++
#!/bin/bash
# Author: Thomas Renninger <tr...@suse.de>
# Execute in kernel git repositories root dir
# (or pass directory as shown below)
# for example fetch it via:
# git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
#
# Examples:
# Create acpi tools based on git v3.13 tag
# generate_acpi-tools_tarball.sh 3.13
# Create acpi tools based on git HEAD (latest code), name it acpi-tools-3.15
# Kernel git repo is in /tmp/linux-2.6
# generate_acpi-tools_tarball.sh 3.15 HEAD /tmp/linux-2.6
export GIT_DIR=".git"
if [ $# -gt 3 ] || [ $# -lt 1 ];then
echo "generate_acpi-tools_tarball.sh VERSION [ GIT_VERSION ] [
PATH_TO_GIT_REPO ]"
echo "If you want to pass PATH_TO_GIT_REPO, GIT_VERSION also must be passed"
exit 1
elif [ $# -eq 1 ];then
VERSION=$1
GIT_VERSION=v$1
elif [ $# -eq 2 ];then
VERSION=$1
GIT_VERSION=$2
elif [ $# -eq 3 ];then
VERSION=$1
GIT_VERSION=$2
GIT_DIR="$3"/.git
else
# unreachable
echo "generate_acpi-tools_tarball.sh VERSION [ GIT_VERSION ]"
exit 1
fi
set -x
TMP=`mktemp -d`
ROOT="$TMP"/acpi-tools-$VERSION
git archive --format=tar --prefix=acpi-tools-${VERSION}/
${GIT_VERSION}:tools/power/acpi |tar -x -C "$TMP"
mkdir -p "$ROOT"/include
git archive --format=tar --prefix=acpi/ ${GIT_VERSION}:include/acpi |tar -x -C
"$ROOT"/include
tar -C "$TMP" -cvjf acpi-tools-$VERSION.tar.bz2 acpi-tools-$VERSION
rm -rf "$TMP"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
