mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-04 19:56:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(sys-apps/baselayout): Sync baselayout with recent Gentoo updates.

Browse Source 
baselayout no longer depends on openrc upstream so remove our
openrc/efunctions use flag and dependency. Depend on efunctions in
coreos-base instead.

Remove os-release and roll back gentoo-release since customizing them is
now handled by the set_lsb_release.
This commit is contained in:
Michael Marineau 2013-08-27 18:42:17 -07:00
parent 01c3765fa7
commit 037d2841df
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r66.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r67.ebuild vendored
View File

1
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild vendored
View File

@ -18,6 +18,7 @@ IUSE="cros_host"
# See pkg_setup below as well as http://crosbug.com/27413
# and friends.
DEPEND="sys-apps/baselayout
sys-apps/efunctions
!<sys-libs/timezone-data-2011d
!<=app-admin/sudo-1.8.2
!<sys-apps/mawk-1.3.4

15
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild vendored
View File

@ -1,8 +1,7 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.14 2013/05/20 17:56:20 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.16 2013/07/27 22:56:21 williamh Exp $
EAPI=1
inherit eutils multilib
DESCRIPTION="Filesystem baselayout and init scripts"
@ -12,11 +11,8 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="build kernel_linux +openrc"
PDEPEND="openrc? ( sys-apps/openrc )
!openrc? ( sys-apps/efunctions )"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="build kernel_linux"
pkg_setup() {
multilib_layout
@ -174,11 +170,8 @@ src_install() {
done
echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic
# override our CoreOS specific files
# rc-scripts version for testing of features that *should* be present
echo "CoreOS Base System release ${PV}" > "${D}"/etc/gentoo-release
cp "${FILESDIR}/os-release" "${D}"/etc/
#cp "${FILESDIR}/gentoo-release" "${D}"/etc/
echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
}
pkg_postinst() {

5
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/files/os-release vendored
View File

@ -1,5 +0,0 @@
NAME=CoreOS
ID=coreos
PRETTY_NAME="CoreOS Linux"
ANSI_COLOR="1;32"
HOME_URL="http://www.coreos.com/"