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

sys-apps/portage: Support new file command output

Browse Source
This commit is contained in:
David Michael 2018-06-29 00:55:07 +00:00
parent db1ebfc958
commit 272f970aac
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.3.8-file-update.patch vendored Normal file
View File

@ -0,0 +1,23 @@
Add support for new file command output.
--- bin/ebuild-helpers/prepstrip
+++ bin/ebuild-helpers/prepstrip
@@ -346,7 +346,7 @@
${STRIP} -g "${x}"
fi
fi
- elif [[ ${f} == *"SB executable"* || ${f} == *"SB shared object"* ]] ; then
+ elif [[ ${f} == *"SB executable"* || ${f} == *"SB pie executable"* || ${f} == *"SB shared object"* ]] ; then
process_elf "${x}" "${inode_link}" ${PORTAGE_STRIP_FLAGS}
elif [[ ${f} == *"SB relocatable"* ]] ; then
process_elf "${x}" "${inode_link}" ${SAFE_STRIP_FLAGS}
--- bin/install-qa-check.d/10ignored-flags
+++ bin/install-qa-check.d/10ignored-flags
@@ -33,6 +33,7 @@
f=$(file "${x}") || continue
[[ -z ${f} ]] && continue
if [[ ${f} == *"SB executable"* ||
+ ${f} == *"SB pie executable"* ||
${f} == *"SB shared object"* ]] ; then
echo "${x}" >> "${T}"/scanelf-ignored-CFLAGS.log
fi

2
sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.8.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.8-r1.ebuild vendored
View File

@ -87,6 +87,8 @@ PATCHES=(
"${FILESDIR}/${PN}-2.2.18-0002-environment-Filter-EROOT-for-all-EAPIs.patch"
# upstream bug:
"${FILESDIR}/${PN}-2.2.18-0003-depgraph-ensure-slot-rebuilds-happen-in-the-correct-.patch"
# support new file command output (this can be dropped when upgrading)
"${FILESDIR}/${P}-file-update.patch"
)
pkg_setup() {