summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-10-30 22:41:45 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-11-01 14:40:06 (GMT)
commit344fc7aa0d9879a051753b972a587aed59a180c2 (patch)
treef77dcf782d2e66c217ecfab9c8aa7027072df0d3
parent77de13ba5525f4efbfed6e3f30ab5e4b18ca3980 (diff)
downloadbuildroot-344fc7aa0d9879a051753b972a587aed59a180c2.tar.gz
buildroot-344fc7aa0d9879a051753b972a587aed59a180c2.tar.bz2
xenomai: use install-user to remove patch
As noted by "George" in bug #6416, the xenomai-do-not-install-devices patch is not needed, since Xenomai provides a "install-user" target to only install the libraries/headers and not the device files. This patch changes xenomai.mk to use 'install-user' and removes the useless patch. Fixes bug #6416. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/xenomai/xenomai-do-not-install-devices.patch11
-rw-r--r--package/xenomai/xenomai.mk2
2 files changed, 2 insertions, 11 deletions
diff --git a/package/xenomai/xenomai-do-not-install-devices.patch b/package/xenomai/xenomai-do-not-install-devices.patch
deleted file mode 100644
index 348abee..0000000
--- a/package/xenomai/xenomai-do-not-install-devices.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in 2011-06-24 16:11:23.591449817 +0200
-+++ b/Makefile.in 2011-06-24 16:20:29.638129633 +0200
-@@ -719,7 +719,7 @@
- $$sudo mknod -m 666 $(DESTDIR)/dev/rtheap c 10 254 ; \
- fi
-
--install-exec-local: devices
-+install-exec-local:
-
- install-user:
- $(MAKE) SUDO=false install
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index f10dec0..786bdfd 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -16,6 +16,8 @@ XENOMAI_LICENSE = headers: GPLv2+ with exception, libraries: LGPLv2.1+, kernel:
XENOMAI_LICENSE_FILES = debian/copyright include/COPYING src/skins/native/COPYING ksrc/nucleus/COPYING
XENOMAI_INSTALL_STAGING = YES
+XENOMAI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-user
+XENOMAI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-user
XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/