| 1 |
commit: e0a2e5d8861040c1709340c0e057e194b31cf94d |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 4 22:39:07 2016 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 4 22:39:36 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e0a2e5d8 |
| 7 |
|
| 8 |
Move cloud stage cleanup from fsscript to spec where possible. |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
releases/weekly/scripts/cloud-prep.sh | 11 +--------- |
| 13 |
releases/weekly/specs/amd64/stage4-cloud.spec | 30 +++++++++++++++++++++++++++ |
| 14 |
2 files changed, 31 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh |
| 17 |
index 1905f11..116e64d 100644 |
| 18 |
--- a/releases/weekly/scripts/cloud-prep.sh |
| 19 |
+++ b/releases/weekly/scripts/cloud-prep.sh |
| 20 |
@@ -68,13 +68,4 @@ sed -i '/^USE=\"\${USE}\ \ build\"$/d' /etc/portage/make.conf |
| 21 |
# clean up system |
| 22 |
passwd -d root |
| 23 |
passwd -l root |
| 24 |
-rm -R -f /usr/portage/distfiles/* |
| 25 |
-rm -f /etc/ssh/ssh_host_* |
| 26 |
-rm -f /root/.bash_history |
| 27 |
-rm -f /root/.nano_history |
| 28 |
-rm -f /root/.lesshst |
| 29 |
-rm -f /root/.ssh/known_hosts |
| 30 |
-rm -rf /usr/src/linux |
| 31 |
-rm -rf /usr/src/linux* |
| 32 |
-for i in $(find /var/log -type f); do echo > $i; done |
| 33 |
-for i in $(find /tmp -type f); do rm -f $i; done |
| 34 |
+for i in $(find /var/log -type f); do truncate -s 0 $i; done |
| 35 |
|
| 36 |
diff --git a/releases/weekly/specs/amd64/stage4-cloud.spec b/releases/weekly/specs/amd64/stage4-cloud.spec |
| 37 |
index 240d14e..2a95e05 100644 |
| 38 |
--- a/releases/weekly/specs/amd64/stage4-cloud.spec |
| 39 |
+++ b/releases/weekly/specs/amd64/stage4-cloud.spec |
| 40 |
@@ -57,3 +57,33 @@ boot/kernel/gentoo/sources: gentoo-sources |
| 41 |
boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config |
| 42 |
boot/kernel/gentoo/extraversion: openstack |
| 43 |
boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules |
| 44 |
+ |
| 45 |
+# all of the cleanup... |
| 46 |
+stage4/unmerge: |
| 47 |
+ sys-kernel/genkernel |
| 48 |
+ sys-kernel/gentoo-sources |
| 49 |
+ |
| 50 |
+stage4/empty: |
| 51 |
+ /root/.ccache |
| 52 |
+ /tmp |
| 53 |
+ /usr/portage/distfiles |
| 54 |
+ /usr/src |
| 55 |
+ /var/cache/edb/dep |
| 56 |
+ /var/cache/genkernel |
| 57 |
+ /var/empty |
| 58 |
+ /var/run |
| 59 |
+ /var/state |
| 60 |
+ /var/tmp |
| 61 |
+ |
| 62 |
+stage4/rm: |
| 63 |
+ /etc/*- |
| 64 |
+ /etc/*.old |
| 65 |
+ /etc/ssh/ssh_host_* |
| 66 |
+ /root/.*history |
| 67 |
+ /root/.lesshst |
| 68 |
+ /root/.ssh/known_hosts |
| 69 |
+ /root/.viminfo |
| 70 |
+ # Remove any generated stuff by genkernel |
| 71 |
+ /usr/share/genkernel |
| 72 |
+ # This is 3MB of crap for each copy |
| 73 |
+ /usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz |
Archives