commit: f1b94efa34103727ba603919aaa758911b391a13 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sat May 16 23:24:09 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun May 17 03:28:16 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f1b94efa
targets: Don't delete pyc/pyo files These files are actually owned by their packages now, and removing them can break subsequent builds. See https://archives.gentoo.org/gentoo-releng-autobuilds/message/a115781f8e7fb4bd5adfb94a7f2e63b4 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> (cherry picked from commit ed82ff53408f1e3edb342f16c739c3c2b4012cb0) targets/livecd-stage1/livecd-stage1-controller.sh | 4 ---- targets/livecd-stage2/livecd-stage2-controller.sh | 2 -- targets/stage1/stage1-preclean-chroot.sh | 2 -- 3 files changed, 8 deletions(-) diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh index 7bf3bce1..da1ca0a7 100755 --- a/targets/livecd-stage1/livecd-stage1-controller.sh +++ b/targets/livecd-stage1/livecd-stage1-controller.sh @@ -13,9 +13,5 @@ case $1 in ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh echo "${clst_packages}" > ${clst_chroot_path}/tmp/packages.txt ;; - - clean) - find ${clst_chroot_path}/usr/lib -iname "*.pyc" -exec rm -f {} \; - ;; esac exit $? diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh index 5834c837..f631caf1 100755 --- a/targets/livecd-stage2/livecd-stage2-controller.sh +++ b/targets/livecd-stage2/livecd-stage2-controller.sh @@ -107,8 +107,6 @@ case $1 in then # Clean out man, info and doc files rm -rf ${clst_chroot_path}/usr/share/{man,doc,info}/* - # Zap all .pyc and .pyo files - find ${clst_chroot_path}/usr/lib* -iname "*.py[co]" -exec rm -f {} \; fi rm -f ${clst_chroot_path}/tmp/packages.txt ;; diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh index ea9056e8..2dc761e9 100755 --- a/targets/stage1/stage1-preclean-chroot.sh +++ b/targets/stage1/stage1-preclean-chroot.sh @@ -22,8 +22,6 @@ fi # Clean out man, info and doc files rm -rf "${ROOT}"/usr/share/{man,doc,info}/* -# Zap all .pyc and .pyo files -find "${ROOT}"/ -iname "*.py[co]" -exec rm -f {} \; # unset ROOT for safety (even though cleanup_stages doesn't use it) unset ROOT
