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

fix(package.mask): remove mask on syslinux

Browse Source 
lets use the upstream syslinux as it should work.
This commit is contained in:
Brandon Philips 2013-02-15 13:27:39 -08:00
parent 2f35cda962
commit e60e4edbcf
5 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
inherit useradd pam
inherit useradd
DESCRIPTION="ChromeOS specific system setup"
HOMEPAGE="http://src.chromium.org/"
@ -10,13 +10,13 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 arm x86"
IUSE="cros_host pam"
IUSE="cros_host"
# We need to make sure timezone-data is merged before us.
# See pkg_setup below as well as http://crosbug.com/27413
# and friends.
# TODO: !app-misc/editor-wrapper
DEPEND="=sys-apps/baselayout-2.0.1-r228
DEPEND="sys-apps/baselayout
!<sys-libs/timezone-data-2011d
!<=app-admin/sudo-1.8.2
!<sys-apps/mawk-1.3.4
@ -129,17 +129,6 @@ src_install() {
insinto /etc/profile.d
doins "${FILESDIR}"/cursor.sh
fi
# Add our little bit of sudo glue.
newpamd "${FILESDIR}"/include-coreos-auth sudo
# This one line comes from the sudo ebuild.
pamd_mimic system-auth sudo auth account session
if [[ -n ${SHARED_USER_NAME} ]] ; then
insinto /etc/sudoers.d
echo "${SHARED_USER_NAME} ALL=(ALL) ALL" > 95_cros_base
insopts -m 440
doins 95_cros_base || die
fi
}
pkg_postinst() {

6
sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-0.0.1-r418.ebuild vendored
View File

@ -44,14 +44,14 @@ src_unpack() {
pkgs=(
# Generate a list of packages that go into the base image. These
# packages will be assumed to be installed by emerge in the target.
chromeos
coreos
# Get the list of the packages needed to bootstrap emerge.
portage
# Get the list of dev and test packages.
coreos-dev
#coreos-test
coreos-test
)
einfo "Ignore warnings below related to LD_PRELOAD/libsandbox.so"
for pkg in ${pkgs[@]} ; do
@ -63,7 +63,7 @@ src_unpack() {
done
wait
# No virtual packages in package.provided.
grep -v "virtual/" chromeos.packages > package.provided
grep -v "virtual/" coreos.packages > package.provided
python "${FILESDIR}"/filter.py || die

12
sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-9999.ebuild vendored
View File

@ -42,14 +42,14 @@ src_unpack() {
pkgs=(
# Generate a list of packages that go into the base image. These
# packages will be assumed to be installed by emerge in the target.
chromeos
coreos
# Get the list of the packages needed to bootstrap emerge.
portage
# Get the list of dev and test packages.
chromeos-dev
chromeos-test
coreos-dev
coreos-test
)
einfo "Ignore warnings below related to LD_PRELOAD/libsandbox.so"
for pkg in ${pkgs[@]} ; do
@ -61,7 +61,7 @@ src_unpack() {
done
wait
# No virtual packages in package.provided.
grep -v "virtual/" chromeos.packages > package.provided
grep -v "virtual/" coreos.packages > package.provided
python "${FILESDIR}"/filter.py || die
@ -71,8 +71,8 @@ src_unpack() {
# Add dhcp to the list of packages installed since its installation will not
# complete (can not add dhcp group since /etc is not writeable). Bootstrap it
# instead.
grep "net-misc/dhcp-" chromeos-dev.packages >> package.provided
grep "net-misc/dhcp-" chromeos-dev.packages >> bootstrap.packages
grep "net-misc/dhcp-" coreos-dev.packages >> package.provided
grep "net-misc/dhcp-" coreos-dev.packages >> bootstrap.packages
}
src_install() {

11
sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/files/filter.py vendored
View File

@ -3,8 +3,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# Filter out all the packages that are already in chromeos.
cros_pkgs = set(open('chromeos.packages', 'r').readlines())
# Filter out all the packages that are already in coreos.
cros_pkgs = set(open('coreos.packages', 'r').readlines())
port_pkgs = set(open('portage.packages', 'r').readlines())
boot_pkgs = port_pkgs - cros_pkgs
@ -20,9 +20,10 @@ f.write(''.join(prov_pkgs))
f.close()
# Make a list of the packages that can be installed. Those packages
# are in chromeos-dev or chromeos-test and not chromeos.
dev_pkgs = set(open('chromeos-dev.packages', 'r').readlines())
test_pkgs = set(open('chromeos-test.packages', 'r').readlines())
# are in coreos-dev or coreos-test and not coreos.
dev_pkgs = set(open('coreos-dev.packages', 'r').readlines())
#test_pkgs = set(open('coreos-test.packages', 'r').readlines())
test_pkgs = set()
inst_pkgs = (dev_pkgs | test_pkgs) - cros_pkgs
f = open('package.installable', 'w')
f.write(''.join(inst_pkgs))

3
sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask vendored
View File

@ -7,8 +7,5 @@
# version of these packages even if a newer stable version becomes
# available in portage:
# Custom patches
>=sys-boot/syslinux-3.84
# libpng security vulnerability fix
<media-libs/libpng-1.2.44