mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-17 18:06:59 +02:00
fix(coreos-base/gmerge): Don't create /etc/make.profile
This conflicts with /etc/portage/make.profile in the chroot, generating lots of warnings. This was always a weird hack anyway. Instead lets start configuring portage properly in dev images, this will be handled in the build scripts.
This commit is contained in:
parent
3e5d90e65c
commit
df686e732b
@ -24,15 +24,7 @@ RDEPEND="app-shells/bash
|
|||||||
sys-apps/portage"
|
sys-apps/portage"
|
||||||
DEPEND="${RDEPEND}"
|
DEPEND="${RDEPEND}"
|
||||||
|
|
||||||
CHROMEOS_PROFILE="/usr/local/portage/coreos/profiles/coreos/targets/generic"
|
|
||||||
|
|
||||||
src_install() {
|
src_install() {
|
||||||
into /usr
|
into /usr
|
||||||
dobin gmerge stateful_update crdev
|
dobin gmerge stateful_update crdev
|
||||||
|
|
||||||
# Setup package.provided so that gmerge will know what packages to ignore.
|
|
||||||
# - $CHROMEOS_PROFILE/package.provided contains packages that we don't
|
|
||||||
# want to install to the device.
|
|
||||||
insinto /etc/make.profile/package.provided
|
|
||||||
newins "${CHROMEOS_PROFILE}"/package.provided coreos
|
|
||||||
}
|
}
|
||||||
|
@ -23,16 +23,8 @@ RDEPEND="app-shells/bash
|
|||||||
sys-apps/portage"
|
sys-apps/portage"
|
||||||
DEPEND="${RDEPEND}"
|
DEPEND="${RDEPEND}"
|
||||||
|
|
||||||
CHROMEOS_PROFILE="/usr/local/portage/coreos/profiles/coreos/targets/generic"
|
|
||||||
|
|
||||||
src_install() {
|
src_install() {
|
||||||
# Install tools from platform/dev into /usr/local/bin
|
# Install tools from platform/dev into /usr/local/bin
|
||||||
into /usr
|
into /usr
|
||||||
dobin gmerge stateful_update crdev
|
dobin gmerge stateful_update crdev
|
||||||
|
|
||||||
# Setup package.provided so that gmerge will know what packages to ignore.
|
|
||||||
# - $CHROMEOS_PROFILE/package.provided contains packages that we don't
|
|
||||||
# want to install to the device.
|
|
||||||
insinto /etc/make.profile/package.provided
|
|
||||||
newins "${CHROMEOS_PROFILE}"/package.provided coreos
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user