From a729ef7c9aa807e3d47878d4fe406a768c14b378 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 3 Aug 2022 15:31:43 +0200 Subject: [PATCH] net-libs/libtirpc: Apply Flatcar modifications Update keywords to stable amd64 and arm64. Note, fix-dos patch is not necessary any more, because 1.3.2-r1 from upstream Gentoo already has the patch. Based on commit f3150e4b458e8d8979a37a91e44a7e1d2334d2aa. --- .../coreos-overlay/net-libs/libtirpc/README.md | 7 +++++++ .../net-libs/libtirpc/libtirpc-1.3.2-r1.ebuild | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/README.md diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/README.md b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/README.md new file mode 100644 index 00000000000..fddc7913999 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/README.md @@ -0,0 +1,7 @@ +This is a fork of gentoo package. We have it on overlay because: + +- We change the NETCONFIG macro value from `"/etc/netconfig"` to + `"/usr/share/tirpc/netconfig"`. + +- We update the installation of the netconfig accordingly to the + previous point. diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.3.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.3.2-r1.ebuild index fe750fb291d..ea678b7ba13 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.3.2-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.3.2-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 LICENSE="BSD BSD-2 BSD-4 LGPL-2.1+" SLOT="0/3" # subslot matches SONAME major -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="ipv6 kerberos static-libs" RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )" @@ -30,6 +30,10 @@ src_prepare() { ) cp -r "${WORKDIR}"/tirpc "${S}"/ || die default + + # Flatcar: Set netconfig path to /usr so NFS works in + # PXE/ISO-booted systems. + sed -i -e "s,/etc,/usr/share/tirpc," "${S}/tirpc/netconfig.h" || die } multilib_src_configure() { @@ -51,7 +55,7 @@ multilib_src_install() { multilib_src_install_all() { einstalldocs - insinto /etc + insinto /usr/share/tirpc doins doc/netconfig insinto /usr/include/tirpc