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

Merge pull request #304 from polvi/fix-gmerge2

Browse Source 
usr(gmerge): use regular /etc/ instead of /usr/local
This commit is contained in:
polvi 2014-01-15 20:48:08 -08:00
commit 4e71b1d83f
3 changed files with 3 additions and 3 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/gmerge/gmerge-0.0.1-r570.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r571.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1.ebuild vendored
View File

@ -33,6 +33,6 @@ src_install() {
# Setup package.provided so that gmerge will know what packages to ignore. # Setup package.provided so that gmerge will know what packages to ignore.
# - $CHROMEOS_PROFILE/package.provided contains packages that we don't # - $CHROMEOS_PROFILE/package.provided contains packages that we don't
# want to install to the device. # want to install to the device.
insinto /usr/local/etc/make.profile/package.provided insinto /etc/make.profile/package.provided
newins "${CHROMEOS_PROFILE}"/package.provided coreos newins "${CHROMEOS_PROFILE}"/package.provided coreos
} }

4
sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild vendored
View File

@ -27,12 +27,12 @@ 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/local into /usr
dobin gmerge stateful_update crdev dobin gmerge stateful_update crdev
# Setup package.provided so that gmerge will know what packages to ignore. # Setup package.provided so that gmerge will know what packages to ignore.
# - $CHROMEOS_PROFILE/package.provided contains packages that we don't # - $CHROMEOS_PROFILE/package.provided contains packages that we don't
# want to install to the device. # want to install to the device.
insinto /usr/local/etc/make.profile/package.provided insinto /etc/make.profile/package.provided
newins "${CHROMEOS_PROFILE}"/package.provided coreos newins "${CHROMEOS_PROFILE}"/package.provided coreos
} }