Merge lp:~cosmos-door/ubuntu/oneiric/policycoreutils/fix-ftbfs-832802 into lp:ubuntu/oneiric/policycoreutils

Proposed by Mitsuya Shibata
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~cosmos-door/ubuntu/oneiric/policycoreutils/fix-ftbfs-832802
Merge into: lp:ubuntu/oneiric/policycoreutils
Diff against target: 29 lines (+9/-2)
2 files modified
Makefile (+2/-2)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~cosmos-door/ubuntu/oneiric/policycoreutils/fix-ftbfs-832802
Reviewer Review Type Date Requested Status
Matthias Klose Needs Fixing
Ubuntu branches Pending
Review via email: mp+76879@code.launchpad.net

Description of the change

Fix FTBFS with multi arch, see LP: #832802.

To post a comment you must log in.
Revision history for this message
Matthias Klose (doko) wrote :

this is wrong. the headers can be installed for more than one architecture. use $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) for a quick hack/fix.

review: Needs Fixing
31. By Mitsuya Shibata

use dpkg-architecture to detect path.

Revision history for this message
Mitsuya Shibata (cosmos-door) wrote :

> use $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) for a quick hack/fix.

Thank you for your review.
I pushed new code to use dpkg-architecture.

Revision history for this message
Michael Vogt (mvo) wrote :

This has hit the archive now:
https://launchpad.net/ubuntu/+source/policycoreutils/2.0.82-5ubuntu2:
policycoreutils | 2.0.82-5ubuntu2 | oneiric/universe | source, amd64, i386

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2008-09-02 13:33:10 +0000
+++ Makefile 2011-09-25 09:31:18 +0000
@@ -1,8 +1,8 @@
1SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po1SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
22
3INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)3INOTIFYH = $(shell ls /usr/include/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/sys/inotify.h 2>/dev/null)
44
5ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)5ifneq (${INOTIFYH},)
6 SUBDIRS += restorecond6 SUBDIRS += restorecond
7endif7endif
88
99
=== modified file 'debian/changelog'
--- debian/changelog 2011-02-16 19:47:17 +0000
+++ debian/changelog 2011-09-25 09:31:18 +0000
@@ -1,3 +1,10 @@
1policycoreutils (2.0.82-5ubuntu2) oneiric; urgency=low
2
3 * Fix FTBFS(LP #832802)
4 - Multiarch support in Makefile.
5
6 -- Mitsuya Shibata <mty.shibata@gmail.com> Sun, 25 Sep 2011 12:11:28 +0900
7
1policycoreutils (2.0.82-5ubuntu1) natty; urgency=low8policycoreutils (2.0.82-5ubuntu1) natty; urgency=low
29
3 * Merge from debian unstable. Remaining change:10 * Merge from debian unstable. Remaining change:

Subscribers

People subscribed via source and target branches