From e60e4edbcf8e20f59745b54110efb79261960228 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Fri, 15 Feb 2013 13:27:39 -0800 Subject: [PATCH] fix(package.mask): remove mask on syslinux lets use the upstream syslinux as it should work. --- .../coreos-base/coreos-base-0.ebuild | 17 +++-------------- .../dev-install/dev-install-0.0.1-r418.ebuild | 6 +++--- .../dev-install/dev-install-9999.ebuild | 12 ++++++------ .../coreos-base/dev-install/files/filter.py | 11 ++++++----- .../profiles/default/linux/package.mask | 3 --- 5 files changed, 18 insertions(+), 31 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild index a4e5f954a1..8fc520b3f3 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild @@ -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 ! 95_cros_base - insopts -m 440 - doins 95_cros_base || die - fi } pkg_postinst() { diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-0.0.1-r418.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-0.0.1-r418.ebuild index 66bd35d8ac..a6fd67c421 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-0.0.1-r418.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-0.0.1-r418.ebuild @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-9999.ebuild index 379b959516..738e4fed96 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-9999.ebuild @@ -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() { diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/files/filter.py b/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/files/filter.py index 46e309f200..9cff52b464 100755 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/files/filter.py +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/files/filter.py @@ -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)) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask index 172b0bf6ef..e5dd87bbd0 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask @@ -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