[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Bug#601946: Freeze exception for acpidump 20100513-2



On Sun, Oct 31, 2010 at 06:46:38PM +0900, Mattia Dongili wrote:
> Package: release.debian.org
> 
> Hi Release Managers,
> Actually I have to blame myself for not checking the status of acpidump
> build logs.
> Anyway, long story short, I fixed a FTBFS on ia64 that prevented
> acpidump_20100513 to migrate to squeeze since April and the version
> currently in the next release is quite out of date.
> 
> It would be nice to have a 20100513 go in the next stable release. It
> sat in unstable for months without major bugs filed and having a
> reasonably recent acpidump in squeze would at least provide support for
> the latest acpi spec.
> Feel free to bump the urgency as well if you deem it necessary.

I forgot to attach a diff from the previous package revision:

diff --git a/debian/acpidump.links b/debian/acpidump.links
deleted file mode 100644
index efb1d36..0000000
--- a/debian/acpidump.links
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/man/man1/acpidump.1.gz usr/share/man/man1/acpixtract.1.gz
-usr/share/man/man1/acpidump.1.gz usr/share/man/man1/madt.1.gz
-usr/share/man/man1/acpidump.1.gz usr/share/man/man1/turbostat.1.gz
diff --git a/debian/changelog b/debian/changelog
index a4a0c46..0ff7221 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+acpidump (20100513-2) unstable; urgency=low
+
+  * Do not build turbostat on ia64 (Closes: #599950)
+
+ -- Mattia Dongili <malattia@debian.org>  Sun, 31 Oct 2010 11:20:03 +0900
+
 acpidump (20100513-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/rules b/debian/rules
index 78c3908..4e2d8b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,15 @@ else
 	CFLAGS += -O2
 endif
 
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifeq ($(DEB_HOST_ARCH),ia64)
+	BINARIES = acpixtract acpidump madt
+	MANPAGES = acpixtract madt
+else
+	BINARIES = acpixtract acpidump turbostat madt
+	MANPAGES = acpixtract turbostat madt
+endif
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -29,10 +38,9 @@ build: build-stamp
 
 build-stamp: configure-stamp 
 	dh_testdir
-
-	# Add here commands to compile the package.
-	CFLAGS="$(CFLAGS)" $(MAKE)
-	CFLAGS="$(CFLAGS)" $(MAKE) -C madt
+	# since turbostat cannot be built on ia64 just build what we
+	# actually need rather than invoking the top level Makefile
+	for i in $(BINARIES); do CFLAGS="$(CFLAGS)" $(MAKE) -C $$i; done
 
 	touch build-stamp
 
@@ -55,7 +63,10 @@ install: build
 
 	# Add here commands to install the package into debian/acpidump.
 	install -d $(CURDIR)/debian/acpidump/usr/bin
-	install -m 755 acpidump/acpidump madt/madt turbostat/turbostat acpixtract/acpixtract \
+	install -m 755 acpidump/acpidump madt/madt acpixtract/acpixtract \
+		$(CURDIR)/debian/acpidump/usr/bin
+	[ ! -f turbostat/turbostat ] || \
+		install -m 755 turbostat/turbostat \
 		$(CURDIR)/debian/acpidump/usr/bin
 	install -d $(CURDIR)/debian/acpidump/usr/share/man/man1
 	gzip -9 < $(CURDIR)/debian/acpidump.1 \
@@ -73,7 +84,10 @@ binary-arch: build install
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installman
-	dh_link
+	for i in $(MANPAGES); do \
+		dh_link usr/share/man/man1/acpidump.1.gz \
+			usr/share/man/man1/$$i.1.gz ; \
+	done
 	dh_strip
 	dh_compress
 	dh_fixperms

-- 
mattia
:wq!


Reply to: