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

sys-fs/btrfs-progs: Sync with gentoo

Browse Source 
It's from gentoo commit 1d3fac51b9ee5811ec62e49dfbbd1579b50c7df8.
This commit is contained in:
Krzesimir Nowak 2021-11-25 11:35:34 +01:00
parent 96f881902f
commit baefb0d674
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/Manifest vendored
View File

@ -1 +1 @@
DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549

9
sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/README.md vendored
View File

@ -1,9 +0,0 @@
We forked this package to override the udev rules directory. The
configure script does not provide a way to override it, so we need to
hack it, otherwise the configure script will figure out the wrong path
in our builds. We do it by overriding it in Makefile.inc.in. Also, we
change the python versions, because we still have only python 3.6.
Ideal solution here would be to patch btrfs-progs to allow overriding
the udev path and then override it in the ebuild properly, without the
sed hacks.

11
sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild → sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild vendored
View File

@ -3,18 +3,16 @@
EAPI=7 EAPI=7
# Flatcar: We still have python 3.6 only. PYTHON_COMPAT=( python3_{8..9} )
PYTHON_COMPAT=( python3_{6..9} )
# Flatcar: Inherit udev eclass, so we can get the udev directory. inherit bash-completion-r1 python-single-r1
inherit bash-completion-r1 python-single-r1 udev
libbtrfs_soname=0 libbtrfs_soname=0
if [[ ${PV} != 9999 ]]; then if [[ ${PV} != 9999 ]]; then
MY_PV="v${PV/_/-}" MY_PV="v${PV/_/-}"
[[ "${PV}" = *_rc* ]] || \ [[ "${PV}" = *_rc* ]] || \
KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
S="${WORKDIR}/${PN}-${MY_PV}" S="${WORKDIR}/${PN}-${MY_PV}"
else else
@ -47,6 +45,7 @@ RDEPEND="
zstd? ( app-arch/zstd:0= ) zstd? ( app-arch/zstd:0= )
" "
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
>=sys-kernel/linux-headers-5.10
convert? ( sys-apps/acl ) convert? ( sys-apps/acl )
python? ( python? (
$(python_gen_cond_dep ' $(python_gen_cond_dep '
@ -95,8 +94,6 @@ src_prepare() {
ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
fi fi
# Flatcar: Replace udevdir variable with proper udev directory.
sed -i -e 's#^\(udevdir\s\+=\).*#\1 $(get_udevdir)#' Makefile.inc.in
} }
src_configure() { src_configure() {