From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1FC721382C5 for ; Sat, 16 May 2020 23:29:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F5F0E08BB; Sat, 16 May 2020 23:29:54 +0000 (UTC) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 115DAE08BB for ; Sat, 16 May 2020 23:29:53 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id f15so2556866plr.3 for ; Sat, 16 May 2020 16:29:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lvlOukOmMMQ0X2djTTxG8tg+8G+xxAO09GCMnwaEDyI=; b=r8L4RDys3+I11lSK45SHNFW20lQpk11VDsZAPPKE481EiMYr7lX9gbHY44G/6+XmNw sXAD5+p39ZuKGl0cfvZvmGytQOD7WrZ3X33/z0nPZxN9KT8kQbh1/3i0aYHV1DDn+gO+ 8Vg5n6hYbRbo+UusO7RqfT1y1/+097uuRCYhLWp9uDHtOxBtAOCT1E/h/deqZ6WLik9k VPDq5IKLb+YtX+ultkfa5Y3ifgRKbj2ojIZ9eOMG1dX+uVJL7Xx04nZ/GwUshg9IHjrl Kr5Gn/mLgJKkPL5VQv9whgiXN5xjGEH9ko16Wm50eN1M16WgpLGgI95IKjQ+DLEMG1op Bpbg== X-Gm-Message-State: AOAM531YRRLaOP66o3Rnvt44TALcFhqZxIYl1hjI6BR+eLjQ31cbm69c 3WlKZ5zFZ+LX9X2Hu3KVvGig8PhN X-Google-Smtp-Source: ABdhPJxOndZdXUSn0wbDx+zUU3DZUxs2ZMHvKfptEiUCKEiu6NK6GWDTHIDqbnpQe9MryHQNrE1Scw== X-Received: by 2002:a17:90a:f98b:: with SMTP id cq11mr9826529pjb.193.1589671792491; Sat, 16 May 2020 16:29:52 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id z18sm5041259pfj.148.2020.05.16.16.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 May 2020 16:29:51 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH] targets: Don't delete pyc/pyo files Date: Sat, 16 May 2020 16:29:39 -0700 Message-Id: <20200516232939.2709013-1-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 2ae8ef41-69c8-4e01-b146-c9cd623118a1 X-Archives-Hash: d7a8316dc7d2a3e207af2fc22132853b 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 --- I'm minimally concerned about the potential for increasing the size of the ISO. I'll report back with numbers. targets/livecd-stage1/controller.sh | 4 ---- targets/livecd-stage2/controller.sh | 2 -- targets/stage1/preclean-chroot.sh | 2 -- 3 files changed, 8 deletions(-) diff --git a/targets/livecd-stage1/controller.sh b/targets/livecd-stage1/controller.sh index ced2634e..c4572ff9 100755 --- a/targets/livecd-stage1/controller.sh +++ b/targets/livecd-stage1/controller.sh @@ -13,9 +13,5 @@ case $1 in ${clst_shdir}/${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/controller.sh b/targets/livecd-stage2/controller.sh index 8ee46d7c..0701a26b 100755 --- a/targets/livecd-stage2/controller.sh +++ b/targets/livecd-stage2/controller.sh @@ -85,8 +85,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/preclean-chroot.sh b/targets/stage1/preclean-chroot.sh index ea9056e8..2dc761e9 100755 --- a/targets/stage1/preclean-chroot.sh +++ b/targets/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 -- 2.26.2