mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-12 07:26:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-apps/util-linux: Sync with Gentoo

Browse Source 
It's from Gentoo commit 077a7b0c85c80d1ca837e4838cb7f7aa9dd8adf1.
This commit is contained in:
Flatcar Buildbot 2024-02-19 07:16:35 +00:00 committed by Krzesimir Nowak
parent da40629cc3
commit dd6dd15531
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild → sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild vendored
View File

@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..11} ) PYTHON_COMPAT=( python3_{10..11} )
inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
pam python-r1 multilib-minimal multiprocessing systemd pam python-r1 multilib-minimal multiprocessing systemd
MY_PV="${PV/_/-}" MY_PV="${PV/_/-}"
@ -356,11 +356,6 @@ multilib_src_install() {
# This needs to be called AFTER python_install call, bug #689190 # This needs to be called AFTER python_install call, bug #689190
emake DESTDIR="${D}" install emake DESTDIR="${D}" install
if multilib_is_native_abi ; then
# Need the libs in /
gen_usr_ldscript -a blkid fdisk mount smartcols uuid
fi
} }
multilib_src_install_all() { multilib_src_install_all() {

27
sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild vendored
View File

@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..11} ) PYTHON_COMPAT=( python3_{10..11} )
inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
pam python-r1 multilib-minimal multiprocessing systemd pam python-r1 multilib-minimal multiprocessing systemd
MY_PV="${PV/_/-}" MY_PV="${PV/_/-}"
@ -55,8 +55,10 @@ RDEPEND="
rtas? ( sys-libs/librtas ) rtas? ( sys-libs/librtas )
selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
slang? ( sys-libs/slang ) slang? ( sys-libs/slang )
!build? ( systemd? ( sys-apps/systemd ) ) !build? (
udev? ( virtual/libudev:= ) systemd? ( sys-apps/systemd )
udev? ( virtual/libudev:= )
)
" "
BDEPEND=" BDEPEND="
virtual/pkgconfig virtual/pkgconfig
@ -213,8 +215,6 @@ multilib_src_configure() {
$(multilib_native_use_enable suid makeinstall-setuid) $(multilib_native_use_enable suid makeinstall-setuid)
$(multilib_native_use_with readline) $(multilib_native_use_with readline)
$(multilib_native_use_with slang) $(multilib_native_use_with slang)
$(multilib_native_use_with systemd)
$(multilib_native_use_with udev)
$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic') $(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
@ -228,6 +228,18 @@ multilib_src_configure() {
$(use_with selinux) $(use_with selinux)
) )
if use build ; then
myeconfargs+=(
--without-systemd
--without-udev
)
else
myeconfargs+=(
$(multilib_native_use_with systemd)
$(multilib_native_use_with udev)
)
fi
if multilib_is_native_abi ; then if multilib_is_native_abi ; then
myeconfargs+=( myeconfargs+=(
--disable-chfn-chsh --disable-chfn-chsh
@ -334,11 +346,6 @@ multilib_src_install() {
# This needs to be called AFTER python_install call, bug #689190 # This needs to be called AFTER python_install call, bug #689190
emake DESTDIR="${D}" install emake DESTDIR="${D}" install
if multilib_is_native_abi ; then
# Need the libs in /
gen_usr_ldscript -a blkid fdisk mount smartcols uuid
fi
} }
multilib_src_install_all() { multilib_src_install_all() {