From ed95b4eba19c82e2d18438f05e95ce1456f1cfff Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Mon, 22 Jul 2019 14:30:32 -0500 Subject: [PATCH] update version of open-iscsi that is installed on musl Newer versions of open-iscsi seem to compile on Gentoo / musl. Use them if we can. This also removes the cap on open-iscsi. Change-Id: I596cb61494e459a419bce6a63deff89f9e78fe23 --- .../elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays b/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays index 347bfe47..c990e789 100755 --- a/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays +++ b/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays @@ -21,8 +21,7 @@ if [[ ${GENTOO_OVERLAYS} != '' ]]; then # upstream has problems with supporting other libcs still if [[ "${GENTOO_PROFILE}" == *"musl"* ]]; then - echo '>=sys-block/open-iscsi-2.0.875' >> /etc/portage/package.mask/open-iscsi - echo '=sys-block/open-iscsi-2.0.874-r2' >> /etc/portage/package.keywords/open-iscsi + echo '=sys-block/open-iscsi-2.0.877' >> /etc/portage/package.keywords/open-iscsi fi emerge ${GENTOO_EMERGE_DEFAULT_OPTS} --oneshot openssl openssh # install layman