mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 22:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add selinux build fixes

Browse Source 
There were a couple of build failures due to selinux packages accidentally
relying on host packages.
This commit is contained in:
Matthew Garrett 2015-06-30 11:15:15 -07:00
parent 90bb5a2d94
commit 01ae86a31e
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/coreos-overlay/app-admin/setools/setools-3.3.8-r7.ebuild vendored
View File

@ -87,6 +87,7 @@ src_configure() {
--with-java-prefix=${JAVA_HOME} \ --with-java-prefix=${JAVA_HOME} \
--disable-selinux-check \ --disable-selinux-check \
--disable-bwidget-check \ --disable-bwidget-check \
--with-sepol-devel=${ROOT}/usr \
$(use_enable python swig-python) \ $(use_enable python swig-python) \
$(use_enable java swig-java) \ $(use_enable java swig-java) \
$(use_enable X swig-tcl) \ $(use_enable X swig-tcl) \

2
sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-admin/setools vendored
View File

@ -1,2 +1,2 @@
export ac_cv_file__usr_lib64_libsepol_a=yes export ac_cv_file__build_amd64_usr__usr_lib64_libsepol_a=yes

2
sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20141203-r5.ebuild vendored
View File

@ -3,7 +3,7 @@
# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20141203-r5.ebuild,v 1.3 2015/06/05 16:10:26 perfinion Exp $ # $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20141203-r5.ebuild,v 1.3 2015/06/05 16:10:26 perfinion Exp $
EAPI="5" EAPI="5"
inherit eutils inherit eutils systemd
if [[ ${PV} == 9999* ]]; then if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}" EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"

3
sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-2.4.ebuild vendored
View File

@ -6,7 +6,7 @@ EAPI="5"
PYTHON_COMPAT=( python2_7 ) PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="xml" PYTHON_REQ_USE="xml"
inherit multilib python-r1 toolchain-funcs eutils inherit multilib python-r1 toolchain-funcs eutils systemd
MY_P="${P//_/-}" MY_P="${P//_/-}"
@ -100,6 +100,7 @@ src_compile() {
INOTIFYH="$(usex dbus)" \ INOTIFYH="$(usex dbus)" \
SESANDBOX="n" \ SESANDBOX="n" \
CC="$(tc-getCC)" \ CC="$(tc-getCC)" \
PREFIX="${ROOT}" \
PYLIBVER="${EPYTHON}" \ PYLIBVER="${EPYTHON}" \
LIBDIR="\$(PREFIX)/$(get_libdir)" LIBDIR="\$(PREFIX)/$(get_libdir)"
} }