mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-10-18 23:01:50 -09:00
8de4aadda7
Changes: https://github.com/SELinuxProject/selinux/releases/download/3.9/RELEASE-3.9.txt Notable changes related to policycoreutils: none. However, in terms of packaging, there's a change: the top-level Makefile of policycoreutils now uses pkg-config to find libselinux and libsemanage. So building directly the subdirs no longer works because the variables defined by the top-level Makefile are no longer set. So we simplify the whole packaging by building from the top-level Makefile. In order for this pkg-config to work for the host variant, we need to pass $(HOST_MAKE_ENV) in the environment of make, so we also did the same for consistency with $(TARGET_MAKE_ENV). In terms of dependencies: policycoreutils directly links with libselinux, libsemanage and libsepol, so all three are needed for both the target and host variants. And host-pkgconf is now needed for the host variant, as it's used to detect the dependent libraries. The patches also need to be refreshed, except 0003 that is dropped since it was a backport from upstream. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> merge policycoreutils Signed-off-by: Julien Olivain <ju.o@free.fr>
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From 85763549c53b2907dab094163f1404b2233f8029 Mon Sep 17 00:00:00 2001
|
|
From: Adam Duskett <aduskett@gmail.com>
|
|
Date: Mon, 9 Oct 2017 16:51:20 -0400
|
|
Subject: [PATCH] Add DESTDIR to setfiles
|
|
|
|
The addition of this patch makes the use of DESTDIR
|
|
mandatory as there are conditional checks which would fail if it's not
|
|
defined.
|
|
|
|
This patch was updated from the patch provided by Niranjan Reddy to
|
|
accomodate version 2.5
|
|
|
|
Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
|
|
Signed-off-by: Niranjan Reddy <niranjan.reddy@rockwellcollins.com>
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Update for 2.8]
|
|
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
|
[Update for 3.2]
|
|
---
|
|
setfiles/Makefile | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/setfiles/Makefile b/setfiles/Makefile
|
|
index a3bbbe1..df675cf 100644
|
|
--- a/setfiles/Makefile
|
|
+++ b/setfiles/Makefile
|
|
@@ -3,7 +3,7 @@ LINGUAS ?= ru
|
|
PREFIX ?= /usr
|
|
SBINDIR ?= /sbin
|
|
MANDIR = $(PREFIX)/share/man
|
|
-AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y)
|
|
+AUDITH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/libaudit.h && echo y)
|
|
|
|
CFLAGS ?= -g -Werror -Wall -W
|
|
override CFLAGS += -I../../libselinux/include
|
|
--
|
|
2.13.6
|
|
|