sys-libs/libsemanage: Clean slate to reapply our changes

This commit is contained in:
Krzesimir Nowak 2021-12-15 20:56:01 +01:00
parent f20b390fca
commit c73223ae75
5 changed files with 12 additions and 30 deletions

View File

@ -92,7 +92,7 @@ sys-apps/debianutils *
=sys-fs/quota-4.04-r1 ~arm64
=sys-libs/efivar-31 ~arm64
=sys-libs/libselinux-3.1-r2 ~arm64
=sys-libs/libsemanage-3.1-r2 ~arm64
=sys-libs/libsemanage-3.1-r1 ~arm64
=sys-libs/libsepol-3.1 ~arm64
=sys-power/iasl-20161222 ~arm64
=sys-process/tini-0.18.0 ~arm64

View File

@ -1,3 +1 @@
#Type Path Mode UID GID Age Argument
d /etc/selinux/ - - - - -
L /etc/selinux/semanage.conf - - - - ../../usr/lib/selinux/semanage.conf

View File

@ -2,10 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6..10} )
PYTHON_COMPAT=( python3_6 )
# flatcar changes
inherit python-r1 toolchain-funcs multilib-minimal systemd
inherit python-r1 toolchain-funcs multilib-minimal
MY_P="${P//_/-}"
MY_RELEASEDATE="20200710"
@ -28,21 +27,17 @@ fi
LICENSE="GPL-2"
SLOT="0"
IUSE="python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
python? ( ${PYTHON_DEPS} )"
${PYTHON_DEPS}"
DEPEND="${RDEPEND}"
BDEPEND="
python? (
>=dev-lang/swig-2.0.4-r1
virtual/pkgconfig
)
BDEPEND=">=dev-lang/swig-2.0.4-r1
sys-devel/bison
sys-devel/flex"
sys-devel/flex
virtual/pkgconfig"
# tests are not meant to be run outside of the
# full SELinux userland repo
@ -85,8 +80,7 @@ multilib_src_compile() {
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
all
# flatcar changes
if multilib_is_native_abi && use python; then
if multilib_is_native_abi; then
building_py() {
emake \
AR="$(tc-getAR)" \
@ -100,29 +94,19 @@ multilib_src_compile() {
}
multilib_src_install() {
# flatcar changes
emake \
DEFAULT_SEMANAGE_CONF_LOCATION="/usr/lib/selinux/semanage.conf" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
SHLIBDIR="/usr/$(get_libdir)" \
DESTDIR="${ED}" install
# flatcar changes
if multilib_is_native_abi && use python; then
if multilib_is_native_abi; then
installation_py() {
# flatcar changes
emake DESTDIR="${ED}" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \
LIBSEPOLA="${EPREFIX%/}/usr/$(get_libdir)/libsepol.a" \
install-pywrap
python_optimize # bug 531638
}
python_foreach_impl installation_py
fi
# flatcar changes
systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/libsemanage.conf"
}
multiib_src_install_all() {

View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6..10} )
PYTHON_COMPAT=( python3_6 )
inherit python-r1 toolchain-funcs multilib-minimal

View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6..10} )
PYTHON_COMPAT=( python3_6 )
inherit python-r1 toolchain-funcs multilib-minimal