Skip to content

Commit

Permalink
R74 complete
Browse files Browse the repository at this point in the history
  • Loading branch information
arnoldthebat committed May 27, 2019
1 parent daba725 commit 53616d0
Show file tree
Hide file tree
Showing 19 changed files with 78 additions and 47 deletions.
@@ -1,2 +1,4 @@
# camera
- builtin_camera
- usb_camera
- no mipi_camera
10 changes: 6 additions & 4 deletions kconfigs/.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.14.83 Kernel Configuration
# Linux/x86 4.14.104 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
Expand Down Expand Up @@ -3784,6 +3784,7 @@ CONFIG_SND_HDA_GENERIC=m
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=15
CONFIG_SND_HDA_CORE=m
CONFIG_SND_HDA_DSP_LOADER=y
CONFIG_SND_HDA_COMPONENT=y
CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_EXT_CORE=m
CONFIG_SND_HDA_PREALLOC_SIZE=64
Expand Down Expand Up @@ -3841,6 +3842,7 @@ CONFIG_SND_SOC_INTEL_HASWELL=m
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=y
# CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI is not set
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=y
CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
CONFIG_SND_SOC_INTEL_SKYLAKE=m
CONFIG_SND_SOC_ACPI_INTEL_MATCH=y
CONFIG_SND_SOC_INTEL_MACH=y
Expand All @@ -3852,6 +3854,7 @@ CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
# CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH is not set
CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
Expand All @@ -3864,7 +3867,7 @@ CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
CONFIG_SND_SOC_INTEL_CNL_MAX98373_MACH=m
CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_CNL_RT274_MACH=m
# CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH is not set
# CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH is not set
# CONFIG_SND_SOC_SOF is not set

Expand Down Expand Up @@ -3944,7 +3947,6 @@ CONFIG_SND_SOC_PCM512x_I2C=m
CONFIG_SND_SOC_PCM512x_SPI=m
CONFIG_SND_SOC_RL6231=m
CONFIG_SND_SOC_RL6347A=m
CONFIG_SND_SOC_RT274=m
CONFIG_SND_SOC_RT286=m
CONFIG_SND_SOC_RT298=m
CONFIG_SND_SOC_RT5514=m
Expand Down Expand Up @@ -5813,7 +5815,6 @@ CONFIG_TEST_UDELAY=m
# CONFIG_TEST_KMOD is not set
# CONFIG_MEMTEST is not set
# CONFIG_BUG_ON_DATA_CORRUPTION is not set
CONFIG_TEST_MODULE=m
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
Expand Down Expand Up @@ -5897,6 +5898,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
CONFIG_SECURITY_LOADPIN=y
CONFIG_SECURITY_LOADPIN_ENABLED=y
CONFIG_SECURITY_YAMA=y
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_CHROMIUMOS=y
CONFIG_SECURITY_CHROMIUMOS_NO_SYMLINK_MOUNT=y
CONFIG_SECURITY_CHROMIUMOS_NO_UNPRIVILEGED_UNSAFE_MOUNTS=y
Expand Down
2 changes: 1 addition & 1 deletion prebuilt.conf
@@ -1,2 +1,2 @@

FULL_BINHOST="gs://chromeos-prebuilt/board/amd64-generic/full-R72-11315.0.0-rc1/packages/"
FULL_BINHOST="gs://chromeos-prebuilt/board/amd64-generic/full-R74-11893.0.0-rc1/packages/"
14 changes: 14 additions & 0 deletions profiles/base/make.defaults
Expand Up @@ -37,9 +37,23 @@ USE="${USE} arc-camera3"
# Enable vivid
USE="${USE} vivid"

# Enable usbip
USE="${USE} usbip"

# Enable Downloadable Content (DLC)
USE="${USE} dlc"

# Include the kernel in the base image.
USE="${USE} include_vmlinuz"

# Disable unibuild on this legacy board. This is only for existing (as of Jan 2019)
# boards as all new boards must be unibuild enabled moving forward. Do not copy this
# to new boards as it will be rejected. See
# https://chromium.googlesource.com/chromiumos/platform2/+/HEAD/chromeos-config/README.md
# for further details about chromeos-config, which is the required entry point for
# unified builds.
USE="${USE} -unibuild"

# Enable a few more video cards as this is a generic board.
VIDEO_CARDS="intel i915 i965 llvmpipe nouveau radeon radeonsi r100 r200 r300 r600 amdgpu vmware"

Expand Down
2 changes: 1 addition & 1 deletion profiles/coverage/parent
@@ -1,2 +1,2 @@
../base
chromiumos:coverage/amd64
chromiumos:features/sanitizers/coverage/amd64
6 changes: 0 additions & 6 deletions profiles/fuzzer/package.use

This file was deleted.

7 changes: 7 additions & 0 deletions profiles/msan-fuzzer/make.defaults
@@ -0,0 +1,7 @@
USE="fuzzer msan"
# Keep the debug symbols to get symbolized traces when fuzzing.
FEATURES="nostrip -splitdebug"
# Compiler flags to build all packages with msan.
CFLAGS=" -fsanitize=memory,fuzzer-no-link"
CXXFLAGS=" -fsanitize=memory,fuzzer-no-link"
LDFLAGS=" -Xcompiler -fsanitize=memory,fuzzer-no-link"
2 changes: 2 additions & 0 deletions profiles/msan-fuzzer/parent
@@ -0,0 +1,2 @@
../base
chromiumos:features/sanitizers/msan/amd64
2 changes: 1 addition & 1 deletion profiles/msan/parent
@@ -1,2 +1,2 @@
../base
chromiumos:msan/amd64
chromiumos:features/sanitizers/msan/amd64
2 changes: 2 additions & 0 deletions profiles/tsan/parent
@@ -0,0 +1,2 @@
../base
chromiumos:features/sanitizers/tsan/amd64
6 changes: 0 additions & 6 deletions profiles/ubsan-fuzzer/package.use

This file was deleted.

2 changes: 1 addition & 1 deletion profiles/ubsan-fuzzer/parent
@@ -1,2 +1,2 @@
../base
chromiumos:ubsan/amd64
chromiumos:features/sanitizers/ubsan/amd64
2 changes: 1 addition & 1 deletion profiles/ubsan/parent
@@ -1,2 +1,2 @@
../base
chromiumos:ubsan/amd64
chromiumos:features/sanitizers/ubsan/amd64
Expand Up @@ -3,8 +3,8 @@

EAPI=5

CROS_WORKON_COMMIT="66ab05738a89be545af257dbea63970a127565b3"
CROS_WORKON_TREE="31242d29e4b1983a640c3dd9c43149ec27c37168"
CROS_WORKON_COMMIT="ee83e89d4aa0ad9e09366f8d54d5aa458a1f9638"
CROS_WORKON_TREE="4d90a44bf4d9ff170e898f64369aab7b9fbc56f3"
CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
CROS_WORKON_LOCALNAME="kernel/v4.14"

Expand All @@ -24,4 +24,4 @@ KEYWORDS="*"
# Don't forget to update the comment in _all_ chromeos-kernel-x_x-9999.ebuild
# files (!!!)
#
# The coolest prime number is: 41
# The coolest prime number is: 43
17 changes: 5 additions & 12 deletions sys-kernel/chromeos-kernel-4_14/files/chromeos-version.sh
Expand Up @@ -8,28 +8,21 @@
# the package, and it prints a string on stdout with the numerical version
# number for said repo.

# Matching regexp for all known kernel release tags to date.
GLOB="v[2-9].*[0-9]"
PATTERN="^v[2-9](\.[0-9]+)+(-rc[0-9]+)?$"

if [ ! -d "$1" ] ; then
exit
fi

cd "$1" || exit

# If the script runs from a board overlay, add "_p1" to returned kernel version.
SCRIPT=$(realpath "$0")
OVERLAY_ROOT="$(dirname "${SCRIPT}")/../../.."
OVERLAY_NAME=$(sed -n '/^repo-name *=/s:[^=]*= *::p' "${OVERLAY_ROOT}"/metadata/layout.conf)

# Only after we've parsed $0 change directory in case $0 is relative.
cd "$1" || exit

suffix=""
if [[ "${OVERLAY_NAME}" != "chromiumos" ]]; then
suffix="_p1"
fi

version=$(git describe --match "${GLOB}" --abbrev=0 HEAD | egrep "${PATTERN}" |
sed s/v\\.*//g | sed s/-/_/g)
# Strip any .0 fix level from the version string.
version=$(make kernelversion | sed -Ee 's/([0-9]*\.[0-9]*)\.0/\1/' -e s/-/_/g)

if [[ -n "${version}" ]]; then
echo "${version}${suffix}"
Expand Down
2 changes: 1 addition & 1 deletion sys-kernel/linux-firmware/Manifest
@@ -1 +1 @@
DIST linux-firmware-20181026.tar.gz 167486645 BLAKE2B 9923b9a8ab692023022d7bceb238b2ec4eba395062307864be558d969fba657301ada317b95071cad82a7a883a2d08f63f0ed34ecc7914a36f31ce85f55ac31f SHA512 4d6eff765557888dea432e0a28973c8ec067354a57aa4c37198e887618ca17e9d5e1243a618820fb470a86a5ce4b6255290f1c2c3835baba4fb87148372cafb0
DIST linux-firmware-20190313.tar.gz 177810569 BLAKE2B 410206491591115505964ca1cefb5effe6bb43002234489285a0985c7a87f80071ed22dd5678f5457ec6611bdd702ac9610ba89b3e44174f8d222b75b5d32d2a SHA512 eec933ebdefe83d466bfcf0babe710f95f67d319317f3187e43518a15a273b47e63ae88a35106932f0a8d5ce54f8a4c5325d7ab9da8b1789eed532a4a500fafd
@@ -1,4 +1,4 @@
# Copyright 1999-2018 Gentoo Authors
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI="6"
Expand All @@ -9,15 +9,15 @@ if [[ ${PV} == 99999999* ]]; then
SRC_URI=""
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
else
GIT_COMMIT="1cb4e51018293c14642f115b5868cda92b879161"
GIT_COMMIT="efd2c1cc375cff1c17b4259d99a7fee240c3b510"
SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc x86"
fi

DESCRIPTION="Linux firmware files"
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"

LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist"
LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+"
SLOT="0"
IUSE="savedconfig"

Expand Down Expand Up @@ -84,10 +84,31 @@ src_prepare() {
if use savedconfig; then
restore_config ${PN}.conf
ebegin "Removing all files not listed in config"
find * \( \! -type d -and \! -name ${PN}.conf \) \
| sort ${PN}.conf ${PN}.conf - \
| uniq -u | xargs -r rm
eend $? || die

local file delete_file preserved_file preserved_files=()

while IFS= read -r file; do
# Ignore comments.
if [[ ${file} != "#"* ]]; then
preserved_files+=("${file}")
fi
done < ${PN}.conf || die

while IFS= read -d "" -r file; do
delete_file=true
for preserved_file in "${preserved_files[@]}"; do
if [[ "${file}" == "${preserved_file}" ]]; then
delete_file=false
fi
done

if ${delete_file}; then
rm "${file}" || die
fi
done < <(find * \( \! -type d -and \! -name ${PN}.conf \) -print0 || die)

eend || die

# remove empty directories, bug #396073
find -type d -empty -delete || die
fi
Expand Down
6 changes: 3 additions & 3 deletions www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
DIST google-chrome-beta_72.0.3626.71-1_amd64.deb 58360214 BLAKE2B 0cef3065af93efc258920d98b145ff14423e5c8a9d3bede7becef3b2058dd5f3d9fc4b273581dd8575d21973de55f6007d8b2b9fd3a93c2ed1f4c76e1bb5a253 SHA512 52ac25b235ff8614ab2672af31ddd94f9b95ad6f1772f86f2e632b72647642abf8ac8d9111de87d6bca7a17418100bdda801cb61c4cfc63b5c531b9018c512e2
DIST google-chrome-stable_71.0.3578.98-1_amd64.deb 56611204 BLAKE2B 77fc467a3041576d64ddfe5d2c66b33aef8f936a53dd78cc16a38a34f99085e00205061643ba9f70c2fd74c127dcb1f2979361daf1ad43b5b2e0164bbbed1113 SHA512 50518b38b5f7c198014b82243aa19b29e7c29d5a0df6175c72df1e082ffaa40e4b2a2f81047d1d7a069a4f9035fe22b4644946d00807db2fcbae93f189054e7f
DIST google-chrome-unstable_73.0.3679.0-1_amd64.deb 58489980 BLAKE2B ae86ce9cf87fda474fb024323d84a7a173c0f021bebb5bcb1ce758ed273d0f78646153a7253df1753a9d5f78e229c171a537c650f61ac1c74c34b860dfb05054 SHA512 9fba3e4c2d947d6c34c1b9232724a1696cda3da2efef0b4998c5756cd33c34287689bc7070914f96a251e5af61a3578be96ff056b5f5454aaf0b23fd8ff90088
DIST google-chrome-beta_74.0.3729.108-1_amd64.deb 59657250 BLAKE2B 7e18cff6fe654de663fbe657490dab196d9f2efa21f19db83e542efbe7adfad78d361da1509410094602fd817f52b23111b8a9b36c2119e6a348f051803d018e SHA512 7ce9d10c454f7a7f0bd8f49782b0fa0b850af925cfeed9a3b2c7c15c7842cdc6a53131647dce3a7a05a824cbafd65ec9f7e46bae6249471b6e713b5a7ce3ce01
DIST google-chrome-stable_74.0.3729.108-1_amd64.deb 58545656 BLAKE2B ebac79a6110e27dd77b80bfb40ee84995cb2593a422e5d3b89c66f1bb59ecf2d8522c20a8fa5e31f779bbb091539014b513035ee2c620b62ffdd983ce2852b83 SHA512 734bced4dc29711988e2fb70c09739c55e05bc0ef4cb9cba9c46ff9ffdc8e26a921e77c1692cea3b508e3f4336fab8a6fb5f322afee2a164ec7e9e1c2ec307fc
DIST google-chrome-unstable_75.0.3770.9-1_amd64.deb 60223832 BLAKE2B 44d93dcf198f5c7760a079fe1e38988a459fa254490b9105809971df1c4958c7cb5bf3a850897ba8a3993d0a154163f421f9daeaf46ee618cd88ac8425affcb5 SHA512 19ef402d448134ec676da537cf9507a622a6f550c89a16080af3c987f861f679db689cdb6d3f9d050754387bd75c6af1a945b757b0436511fd7436231086a795

0 comments on commit 53616d0

Please sign in to comment.