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

SDK prefix: implement suggestions from code review

Browse Source 
- remove explicit "-multilib" from prefix keywordsas it is set in
  profile
- split heredoc for generating emerge wrapper so we don't need to
  escape
- add sys-apps/bubblewrap and virtual/tmpfiles to package update
  automation list
- use prefix build fix for libgpg-error from upstream

Signed-off-by: Thilo Fromm <thilofromm@microsoft.com>
This commit is contained in:
Thilo Fromm 2023-09-29 14:59:50 +02:00
parent ba4342d2b7
commit 17512925e7
3 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/portage-stable-packages-list vendored
View File

@ -378,6 +378,7 @@ sec-policy/selinux-unconfined
sys-apps/acl
sys-apps/attr
sys-apps/bubblewrap
sys-apps/checkpolicy
sys-apps/config-site
sys-apps/coreutils
@ -508,6 +509,7 @@ virtual/perl-IO
virtual/pkgconfig
virtual/service-manager
virtual/ssh
virtual/tmpfiles
x11-base/xorg-proto

35
build_library/prefix_util.sh
View File

@ -30,7 +30,7 @@ function set_prefix_vars() {
;;
arm64-usr)
PREFIX_CHOST="aarch64-cros-linux-gnu"
PREFIX_KEYWORDS="arm64 -~arm64 -multilib"
PREFIX_KEYWORDS="arm64 -~arm64"
;;
esac
@ -168,47 +168,50 @@ STAGINGROOT=${STAGINGROOT@Q}
FINALROOT=${FINALROOT@Q}
CB_ROOT=${CB_ROOT@Q}
if [ "\${1}" = "--help" ] ; then
echo "\$0 : emerge prefix wrapper for prefix '\${PREFIXNAME}'"
EOF
sudo_append "${filename}" <<'EOF'
if [ "${1}" = "--help" ] ; then
echo "$0 : emerge prefix wrapper for prefix '${PREFIXNAME}'"
echo "Usage:"
echo " \$0 [--install|--stage] <emerge-opts>"
echo " $0 [--install|--stage] <emerge-opts>"
echo " Builds packages in prefix' staging and installs w/ runtime dependencies"
echo " to prefix' final root."
echo " --stage Build binpkg in staging but don't install."
echo " --install Skip build, just install. Binpkg must exist in staging."
echo
echo " Prefix configuration:"
echo " PREFIXNAME=\${PREFIXNAME@Q}"
echo " EPREFIX=\${EPREFIX@Q}"
echo " STAGINGROOT=\${STAGINGROOT@Q}"
echo " FINALROOT=\${FINALROOT@Q}"
echo " CB_ROOT=\${CB_ROOT@Q}"
echo " PREFIXNAME=${PREFIXNAME@Q}"
echo " EPREFIX=${EPREFIX@Q}"
echo " STAGINGROOT=${STAGINGROOT@Q}"
echo " FINALROOT=${FINALROOT@Q}"
echo " CB_ROOT=${CB_ROOT@Q}"
exit
fi
skip_build="false"
skip_install="false"
case "\${1}" in
case "${1}" in
--install) skip_build="true"; shift;;
--stage) skip_install="true"; shift;;
esac
if [ "\${skip_build}" = "true" ] ; then
if [ "${skip_build}" = "true" ] ; then
echo "Skipping build into staging as requested."
echo "NOTE that install into final will fail if binpkgs are missing."
else
echo "Building in staging..."
sudo -E EPREFIX="\${EPREFIX}" "\${CB_ROOT}/bin/cb-emerge" "\${STAGINGROOT}" "\$@"
sudo -E EPREFIX="${EPREFIX}" "${CB_ROOT}/bin/cb-emerge" "${STAGINGROOT}" "$@"
fi
if [ "\${skip_install}" = "true" ] ; then
if [ "${skip_install}" = "true" ] ; then
echo "Skipping install into final as requested."
else
echo "Installing..."
sudo -E EPREFIX="\${EPREFIX}" \\
ROOT="\${FINALROOT}" \\
PORTAGE_CONFIGROOT="\${FINALROOT}\${EPREFIX}" emerge "\$@"
sudo -E EPREFIX="${EPREFIX}" \
ROOT="${FINALROOT}" \
PORTAGE_CONFIGROOT="${FINALROOT}${EPREFIX}" emerge "$@"
fi
EOF

13
sdk_container/src/third_party/prefix-overlay/dev-libs/libgpg-error/libgpg-error-1.47.ebuild vendored
View File

@ -55,16 +55,9 @@ src_prepare() {
# only necessary for as long as we run eautoreconf, configure.ac
# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
# not a pure /bin/sh script, so it fails on some hosts
# Flatcar / t-lo 2023-09-19: Use build root for hprefixify to
# prevent issues with prefix and cross-compiling, which causes
# VERSION to be emptied when eautoreconf runs. This, in turn, will break
# compilation with:
# usage: mkhe:ader host_triplet template.h config.h version version_number
if tc-is-cross-compiler ; then
hprefixify -e "s#${EPREFIX}#${BROOT}#" -w 1 autogen.sh
else
hprefixify -w 1 autogen.sh
fi
# Flatcar / t-lo 2023-09-27: pull in upstream fix https://github.com/gentoo/gentoo/pull/33010
# for prefix builds.
sed -i -e "1s:.*:#\!${BASH}:" autogen.sh || die
eautoreconf
}