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

portage: apply coreos patches to 2.2.28, stabilize

Browse Source 
New in this version: ship an empty repos.conf since having the gentoo
repo defined raises warnings despite our patch to disable it. This seems
like a better path forward since upstream never accepted our patch.

Later once our configs/scripts are transitioned away from explicitly
disabling the gentoo repo we can drop the patch.
This commit is contained in:
Michael Marineau 2016-03-25 18:11:39 -07:00
parent 6ce3549a88
commit f733d52894
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.2.28.ebuild vendored
View File

@ -17,7 +17,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
LICENSE="GPL-2" LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
SLOT="0" SLOT="0"
IUSE="build doc epydoc +ipc linguas_ru selinux xattr" IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
@ -78,6 +78,12 @@ TARBALL_PV=${PV}
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
PATCHES=(
"${FILESDIR}/${PN}-2.2.18-0001-portage-repository-config.py-add-disabled-attribute-.patch"
"${FILESDIR}/${PN}-2.2.18-0002-environment-Filter-EROOT-for-all-EAPIs.patch"
"${FILESDIR}/${PN}-2.2.18-0003-depgraph-ensure-slot-rebuilds-happen-in-the-correct-.patch"
)
pkg_setup() { pkg_setup() {
use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
} }
@ -85,6 +91,9 @@ pkg_setup() {
python_prepare_all() { python_prepare_all() {
distutils-r1_python_prepare_all distutils-r1_python_prepare_all
# CoreOS does not use the gentoo repo, silence oodles of errors about it:
echo "# no defaults, configuration is in /etc" > cnf/repos.conf
if ! use ipc ; then if ! use ipc ; then
einfo "Disabling ipc..." einfo "Disabling ipc..."
sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \