mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-02 11:01:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords vendored
View File

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

2
sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/files/tmpfiles.d/libsemanage.conf vendored
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 L /etc/selinux/semanage.conf - - - - ../../usr/lib/selinux/semanage.conf

34
sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r2.ebuild → sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild vendored
View File

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

2
sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.2-r1.ebuild → sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.2.ebuild vendored
View File

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

2
sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-9999.ebuild vendored
View File

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