mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-18 10:27:00 +02:00
sys-(devel|libs|kernel),profiles: make upstream gdb work, add gcc-9.3.0 changes
This PR includes the necessary changes to upgrade the SDK compiler to gcc-9.3.0. It also changes the gdb-9.2 recipe to work with the Flatcar SDK. The changes include: sys-devel/gdb/gdb-9.2.ebuild: use EAPI6 to work around BDEPEND emerge bug update sys-libs/nss-usrfiles to nss-usrfiles-2.30.ebuild to support glibc > 2.29 update sys-kernel/README.md to call out need for updating kernel-headers, perf add sys-libs/glibc/README.md outlining our changes to the glibc recipe update profiles/coreos/base/package.accept_keywords to include new toolchain The change also adds a README to sys-libs/glibc/README.md and it improves on a README in sys-kernel/README -> sys-kernel/README.md Signed-off-by: Thilo Fromm <thilo@kinvolk.io>
This commit is contained in:
Thilo Fromm
parent
abbb97f075
commit
7b0bad618f
@ -44,10 +44,14 @@ dev-util/checkbashisms
|
||||
# https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git/commit/?id=d6a4076b6ba6547d7e52c377a7c58c56eb5ea16e
|
||||
=sys-apps/iproute2-4.13.0 ~amd64 ~arm64
|
||||
|
||||
# Upgrade to GCC 7.3 for retpoline support.
|
||||
=sys-devel/gcc-7.3.0
|
||||
=cross-aarch64-cros-linux-gnu/gcc-7.3.0 ~arm64
|
||||
=cross-x86_64-cros-linux-gnu/gcc-7.3.0 ~amd64
|
||||
# Upgrade to GCC 9.3.0 to support latest glibc builds
|
||||
=sys-devel/gcc-config-1.9.1 ~amd64 ~arm64
|
||||
=sys-devel/binutils-2.35 ~amd64 ~arm64
|
||||
=sys-libs/binutils-libs-2.35 ~amd64 ~arm64
|
||||
=sys-devel/gcc-8.3.0 ~amd64 ~arm64
|
||||
=sys-devel/gcc-9.3.0-r1 ~amd64 ~arm64
|
||||
=cross-aarch64-cros-linux-gnu/gcc-9.3.0-r1 ~arm64
|
||||
=cross-x86_64-cros-linux-gnu/gcc-9.3.0-r1 ~amd64
|
||||
|
||||
# Force upgrades to work around catalyst problems while upgrading ncurses.
|
||||
=app-crypt/gnupg-2.2.20 ~amd64 ~arm64
|
||||
|
||||
@ -1,2 +1 @@
|
||||
DIST gdb-9.1.tar.xz 20980824 BLAKE2B b84b1dc627d7ba697dfd76ba7c0f4f88f1725e1e1b83134d08cf53bf867ebfa07e1d01eff2acd9a57d22a779077bf6ed95d6098e8a58c4d86eaed034ca62ac30 SHA512 84cdd408d80a3fc5779de459c5b26154d31b329ebde7e3aa78799fb1eb245d8b64b8c8ee7242382a1dbd95b4e6f9d84fef41d12a0646aa75d3dee4709ea1f6e7
|
||||
DIST gdb-9.2.tar.xz 20979436 BLAKE2B e83468f2d2fdcf4a7eb2943564750c7e9e9fa19b00bd832a9c149ad06b199cc7d6e7b8808d552e5f0e9e4f701a9262faf6b0b46ed4e0b4ecd3a0303d873d6d9a SHA512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274
|
||||
|
||||
@ -1,281 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python{3_6,3_7} )
|
||||
|
||||
inherit eutils flag-o-matic python-single-r1 toolchain-funcs
|
||||
|
||||
export CTARGET=${CTARGET:-${CHOST}}
|
||||
if [[ ${CTARGET} == ${CHOST} ]] ; then
|
||||
if [[ ${CATEGORY} == cross-* ]] ; then
|
||||
export CTARGET=${CATEGORY#cross-}
|
||||
fi
|
||||
fi
|
||||
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
|
||||
|
||||
case ${PV} in
|
||||
9999*)
|
||||
# live git tree
|
||||
EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
|
||||
inherit git-r3
|
||||
SRC_URI=""
|
||||
;;
|
||||
*.*.50.2???????)
|
||||
# weekly snapshots
|
||||
SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
|
||||
;;
|
||||
*)
|
||||
# Normal upstream release
|
||||
SRC_URI="mirror://gnu/gdb/${P}.tar.xz
|
||||
ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
|
||||
;;
|
||||
esac
|
||||
|
||||
PATCH_VER=""
|
||||
PATCH_DEV=""
|
||||
DESCRIPTION="GNU debugger"
|
||||
HOMEPAGE="https://sourceware.org/gdb/"
|
||||
SRC_URI="${SRC_URI}
|
||||
${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
|
||||
${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
|
||||
"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2"
|
||||
SLOT="0"
|
||||
if [[ ${PV} != 9999* ]] ; then
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
|
||||
REQUIRED_USE="
|
||||
python? ( ${PYTHON_REQUIRED_USE} )
|
||||
|| ( client server )
|
||||
"
|
||||
|
||||
# ia64 kernel crashes when gdb testsuite is running
|
||||
# hppa kernel crashes when gdb testsuite is running
|
||||
RESTRICT="
|
||||
hppa? ( test )
|
||||
ia64? ( test )
|
||||
|
||||
!test? ( test )
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
client? (
|
||||
dev-libs/mpfr:0=
|
||||
>=sys-libs/ncurses-5.2-r2:0=
|
||||
>=sys-libs/readline-7:0=
|
||||
lzma? ( app-arch/xz-utils )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
xml? ( dev-libs/expat )
|
||||
sys-libs/zlib
|
||||
)
|
||||
source-highlight? (
|
||||
dev-util/source-highlight
|
||||
)
|
||||
xxhash? (
|
||||
dev-libs/xxhash
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
app-arch/xz-utils
|
||||
sys-apps/texinfo
|
||||
client? (
|
||||
virtual/yacc
|
||||
test? ( dev-util/dejagnu )
|
||||
nls? ( sys-devel/gettext )
|
||||
)"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
|
||||
)
|
||||
|
||||
GDB_BUILD_DIR="${WORKDIR}"/${P}-build
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
strip-linguas -u bfd/po opcodes/po
|
||||
}
|
||||
|
||||
gdb_branding() {
|
||||
printf "Gentoo ${PV} "
|
||||
if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
|
||||
printf "p${PATCH_VER}"
|
||||
else
|
||||
printf "vanilla"
|
||||
fi
|
||||
[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
strip-unsupported-flags
|
||||
|
||||
local myconf=(
|
||||
# portage's econf() does not detect presence of --d-d-t
|
||||
# because it greps only top-level ./configure. But not
|
||||
# gnulib's or gdb's configure.
|
||||
--disable-dependency-tracking
|
||||
|
||||
--with-pkgversion="$(gdb_branding)"
|
||||
--with-bugurl='https://bugs.gentoo.org/'
|
||||
--disable-werror
|
||||
--without-libmpfr-prefix
|
||||
# Disable modules that are in a combined binutils/gdb tree. #490566
|
||||
--disable-{binutils,etc,gas,gold,gprof,ld}
|
||||
)
|
||||
local sysroot="${EPREFIX}/usr/${CTARGET}"
|
||||
is_cross && myconf+=(
|
||||
--with-sysroot="${sysroot}"
|
||||
--includedir="${sysroot}/usr/include"
|
||||
--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
|
||||
)
|
||||
|
||||
if use server && ! use client ; then
|
||||
# just configure+build in the gdbserver subdir to speed things up
|
||||
cd gdb/gdbserver
|
||||
myconf+=( --program-transform-name='' )
|
||||
else
|
||||
# gdbserver only works for native targets (CHOST==CTARGET).
|
||||
# it also doesn't support all targets, so rather than duplicate
|
||||
# the target list (which changes between versions), use the
|
||||
# "auto" value when things are turned on.
|
||||
is_cross \
|
||||
&& myconf+=( --disable-gdbserver ) \
|
||||
|| myconf+=( $(use_enable server gdbserver auto) )
|
||||
fi
|
||||
|
||||
if ! ( use server && ! use client ) ; then
|
||||
# if we are configuring in the top level, then use all
|
||||
# the additional global options
|
||||
myconf+=(
|
||||
--enable-64-bit-bfd
|
||||
--disable-install-libbfd
|
||||
--disable-install-libiberty
|
||||
# Disable guile for now as it requires guile-2.x #562902
|
||||
--without-guile
|
||||
# This only disables building in the readline subdir.
|
||||
# For gdb itself, it'll use the system version.
|
||||
--disable-readline
|
||||
--with-system-readline
|
||||
# This only disables building in the zlib subdir.
|
||||
# For gdb itself, it'll use the system version.
|
||||
--without-zlib
|
||||
--with-system-zlib
|
||||
--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
|
||||
$(use_with xml expat)
|
||||
$(use_with lzma)
|
||||
$(use_enable nls)
|
||||
$(use_enable source-highlight)
|
||||
$(use multitarget && echo --enable-targets=all)
|
||||
$(use_with python python "${EPYTHON}")
|
||||
$(use_with xxhash)
|
||||
)
|
||||
fi
|
||||
if use sparc-solaris || use x86-solaris ; then
|
||||
# disable largefile support
|
||||
# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
|
||||
myconf+=( --disable-largefile )
|
||||
fi
|
||||
|
||||
# source-highlight is detected with pkg-config: bug #716558
|
||||
export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
|
||||
|
||||
mkdir "${GDB_BUILD_DIR}" || die
|
||||
pushd "${GDB_BUILD_DIR}" || die
|
||||
ECONF_SOURCE=${S}
|
||||
econf "${myconf[@]}"
|
||||
popd
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C "${GDB_BUILD_DIR}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake -C "${GDB_BUILD_DIR}" check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use server && ! use client; then
|
||||
emake -C "${GDB_BUILD_DIR}"/gdb/gdbserver DESTDIR="${D}" install
|
||||
else
|
||||
emake -C "${GDB_BUILD_DIR}" DESTDIR="${D}" install
|
||||
fi
|
||||
|
||||
if use client; then
|
||||
find "${ED}"/usr -name libiberty.a -delete || die
|
||||
fi
|
||||
|
||||
# Delete translations that conflict with binutils-libs. #528088
|
||||
# Note: Should figure out how to store these in an internal gdb dir.
|
||||
if use nls ; then
|
||||
find "${ED}" \
|
||||
-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
|
||||
-delete || die
|
||||
fi
|
||||
|
||||
# Don't install docs when building a cross-gdb
|
||||
if [[ ${CTARGET} != ${CHOST} ]] ; then
|
||||
rm -rf "${ED}"/usr/share/{doc,info,locale} || die
|
||||
local f
|
||||
for f in "${ED}"/usr/share/man/*/* ; do
|
||||
if [[ ${f##*/} != ${CTARGET}-* ]] ; then
|
||||
mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
|
||||
fi
|
||||
done
|
||||
return 0
|
||||
fi
|
||||
# Install it by hand for now:
|
||||
# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
|
||||
# Only install if it exists due to the twisted behavior (see
|
||||
# notes in src_configure above).
|
||||
[[ -e "${GDB_BUILD_DIR}"/gdb/gdbserver/gdbreplay ]] && dobin "${GDB_BUILD_DIR}"/gdb/gdbserver/gdbreplay
|
||||
|
||||
if use client ; then
|
||||
docinto gdb
|
||||
dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
|
||||
gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
|
||||
fi
|
||||
docinto sim
|
||||
dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
|
||||
if use server ; then
|
||||
docinto gdbserver
|
||||
dodoc gdb/gdbserver/{ChangeLog,README}
|
||||
fi
|
||||
|
||||
if [[ -n ${PATCH_VER} ]] ; then
|
||||
dodoc "${WORKDIR}"/extra/gdbinit.sample
|
||||
fi
|
||||
|
||||
# Remove shared info pages
|
||||
rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
|
||||
|
||||
# gcore is part of ubin on freebsd
|
||||
if [[ ${CHOST} == *-freebsd* ]]; then
|
||||
rm "${ED}"/usr/bin/gcore || die
|
||||
fi
|
||||
|
||||
if use python; then
|
||||
python_optimize "${ED}"/usr/share/gdb/python/gdb
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# portage sucks and doesnt unmerge files in /etc
|
||||
rm -vf "${EROOT}"/etc/skel/.gdbinit
|
||||
|
||||
if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
|
||||
ewarn "gdb is unable to get a mach task port when installed by Prefix"
|
||||
ewarn "Portage, unprivileged. To make gdb fully functional you'll"
|
||||
ewarn "have to perform the following steps:"
|
||||
ewarn " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
|
||||
ewarn " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
|
||||
fi
|
||||
}
|
||||
@ -1,8 +1,8 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{6,7,8,9} )
|
||||
EAPI=6
|
||||
PYTHON_COMPAT=( python{3_6,3_7} )
|
||||
|
||||
inherit eutils flag-o-matic python-single-r1 toolchain-funcs
|
||||
|
||||
@ -44,7 +44,7 @@ SRC_URI="${SRC_URI}
|
||||
LICENSE="GPL-2 LGPL-2"
|
||||
SLOT="0"
|
||||
if [[ ${PV} != 9999* ]] ; then
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
|
||||
REQUIRED_USE="
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# Fatcar Container Linux kernel packages
|
||||
|
||||
The kernel is provided in three parts: coreos-sources, coreos-modules,
|
||||
and coreos-kernel.
|
||||
|
||||
@ -35,3 +37,11 @@ scripts need to be updated in order to support existing installs.
|
||||
The coreos-firmware package is a magic version of the upstream
|
||||
linux-firmware ebuild which scans the modules installed by coreos-modules
|
||||
and only installs files modules declare as required.
|
||||
|
||||
# Keep kernel, kernel headers, and perf aligned
|
||||
|
||||
When updating the kernel to a new major release please make sure to also update
|
||||
[the kernel headers](https://github.com/flatcar-linux/portage-stable/tree/main/sys-kernel/linux-headers)
|
||||
and
|
||||
[perf](https://github.com/flatcar-linux/portage-stable/tree/main/dev-util/perf)
|
||||
to the same major version.
|
||||
9
sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/README.md
vendored
Normal file
9
sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/README.md
vendored
Normal file
@ -0,0 +1,9 @@
|
||||
# GLibc
|
||||
|
||||
The system's C library, sometimes referred to as "service pack for the C
|
||||
language". The build recipe has a single modification over the one Gentoo
|
||||
upstream uses: in the installation callback `glibc_do_src_install`, we remove
|
||||
all of glibc's `/etc` files right after the stock glibc build diligently
|
||||
installed them, since we ship our own `/etc` stuff via the `baseimage` recipe.
|
||||
The addition sits at the end of the `glibc_do_src_install` function and is duly
|
||||
labelled `## Flatcar Container Linux: ...`.
|
||||
@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com"
|
||||
if [[ "${PV}" == 9999 ]]; then
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
else
|
||||
CROS_WORKON_COMMIT="42bec47544ad80d3e39342b11ea33da05ff9133d" # v2.23.0
|
||||
CROS_WORKON_COMMIT="c8e05a08a2e28eb48c6c788e3007d94f8d8de5cd" # flatcar-master
|
||||
KEYWORDS="amd64 arm arm64 x86"
|
||||
fi
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user