From c2551192129966e98a59bbab79721cdbd440d34f Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Sat, 19 Dec 2020 15:42:16 -0500 Subject: [PATCH] tools-systemd: deprecated Signed-off-by: Anthony G. Basile --- tools-systemd/.gitignore | 3 - tools-systemd/catalyst.conf.local | 31 -------- tools-systemd/clean.sh | 6 -- tools-systemd/common.sh | 61 --------------- .../portage.amd64/package.use/releng/iputils | 1 - .../portage.amd64/package.use/releng/pam | 1 - .../portage.amd64/package.use/util-linux | 1 - tools-systemd/portage.arm64/package.use/glibc | 1 - .../portage.arm64/package.use/releng/iputils | 1 - .../portage.arm64/package.use/releng/pam | 1 - .../portage.arm64/package.use/util-linux | 1 - .../portage.i686/package.use/releng/iputils | 1 - .../portage.i686/package.use/releng/pam | 1 - .../portage.i686/package.use/util-linux | 1 - tools-systemd/run-arm64.sh | 46 ------------ tools-systemd/run.sh | 61 --------------- tools-systemd/stage-all.conf.template | 9 --- tools-systemd/stage4-amd64.spec | 74 ------------------- 18 files changed, 301 deletions(-) delete mode 100644 tools-systemd/.gitignore delete mode 100644 tools-systemd/catalyst.conf.local delete mode 100755 tools-systemd/clean.sh delete mode 100644 tools-systemd/common.sh delete mode 100644 tools-systemd/portage.amd64/package.use/releng/iputils delete mode 100644 tools-systemd/portage.amd64/package.use/releng/pam delete mode 100644 tools-systemd/portage.amd64/package.use/util-linux delete mode 100644 tools-systemd/portage.arm64/package.use/glibc delete mode 100644 tools-systemd/portage.arm64/package.use/releng/iputils delete mode 100644 tools-systemd/portage.arm64/package.use/releng/pam delete mode 100644 tools-systemd/portage.arm64/package.use/util-linux delete mode 100644 tools-systemd/portage.i686/package.use/releng/iputils delete mode 100644 tools-systemd/portage.i686/package.use/releng/pam delete mode 100644 tools-systemd/portage.i686/package.use/util-linux delete mode 100755 tools-systemd/run-arm64.sh delete mode 100755 tools-systemd/run.sh delete mode 100644 tools-systemd/stage-all.conf.template delete mode 100644 tools-systemd/stage4-amd64.spec diff --git a/tools-systemd/.gitignore b/tools-systemd/.gitignore deleted file mode 100644 index 2315a4e4..00000000 --- a/tools-systemd/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*log -*err -stage*.conf diff --git a/tools-systemd/catalyst.conf.local b/tools-systemd/catalyst.conf.local deleted file mode 100644 index 91d3c926..00000000 --- a/tools-systemd/catalyst.conf.local +++ /dev/null @@ -1,31 +0,0 @@ -# Custom catalyst.conf file - -digests="sha512 whirlpool" - -contents="auto" - -distdir="/release/tmp/distfiles" - -envscript="/etc/catalyst/catalystrc" - -hash_function="crc32" - -#options="autoresume bindist kerncache pkgcache seedcache snapcache" -options="autoresume bindist kerncache pkgcache seedcache" - -portdir="/usr/portage" - -repo_basedir="/var/db/repos" -repo_name="gentoo" -target_distdir="/var/cache/distfiles" -target_pkgdir="/var/cache/binpkgs" - -sharedir="/usr/share/catalyst" - -shdir="%(sharedir)s/targets" - -snapshot_cache="/release/buildroot/alt-dev/snapshot_cache" - -storedir="/release/buildroot/alt-dev" - -source_matching="strict" diff --git a/tools-systemd/clean.sh b/tools-systemd/clean.sh deleted file mode 100755 index 916c4eb4..00000000 --- a/tools-systemd/clean.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# This just removes the temporary conf err and log -# files generated during a run - -rm -f *conf *err *log diff --git a/tools-systemd/common.sh b/tools-systemd/common.sh deleted file mode 100644 index 60aac2a2..00000000 --- a/tools-systemd/common.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash - -source $(pwd)/catalyst.conf.local - -mydate=$(date +%Y%m%d) - - -undo_grsec() { - [[ -d /proc/sys/kernel/grsecurity ]] || return - for i in /proc/sys/kernel/grsecurity/chroot_* ; do - echo 0 > $i - done -} - - -banner() { -cat << EOF | tee -a zzz.log > stage$1-$2-systemd.log - -************************************************************************ -* stage$1-$2-systemd -************************************************************************" - -EOF -} - - -do_stages() { - local arch=$1 - - for s in 1 2 3; do - local tgpath="${storedir}/builds/systemd/${arch}" - local target="stage${s}-${arch}-systemd-${mydate}.tar.bz2" - local tglink="stage${s}-${arch}-systemd.tar.bz2" - if [[ ! -f "${tgpath}/${tglink}" ]]; then - touch stage${s}-${arch}-systemd.log - echo "!!! ${tglink} at ${tgpath} doesn't exist" \ - | tee -a zzz.log \ - > stage${s}-${arch}-systemd.err - return 1 - fi - - banner ${s} ${arch} - catalyst -c $(pwd)/catalyst.conf.local \ - -f stage${s}-${arch}-systemd.conf \ - | tee -a zzz.log \ - > stage${s}-${arch}-systemd.log \ - 2> stage${s}-${arch}-systemd.err - - if [[ -f "${tgpath}/${target}" ]]; then - rm -f "${tgpath}/${tglink}" - ln -s ${target} "${tgpath}/${tglink}" - else - echo "!!! ${target} was not generated" \ - | tee -a zzz.log \ - >stage${s}-${arch}-systemd.err - return 1 - fi - done - - return 0 -} diff --git a/tools-systemd/portage.amd64/package.use/releng/iputils b/tools-systemd/portage.amd64/package.use/releng/iputils deleted file mode 100644 index 9cde931b..00000000 --- a/tools-systemd/portage.amd64/package.use/releng/iputils +++ /dev/null @@ -1 +0,0 @@ -net-misc/iputils -caps -filecaps diff --git a/tools-systemd/portage.amd64/package.use/releng/pam b/tools-systemd/portage.amd64/package.use/releng/pam deleted file mode 100644 index 6cec48a7..00000000 --- a/tools-systemd/portage.amd64/package.use/releng/pam +++ /dev/null @@ -1 +0,0 @@ -sys-libs/pam -filecaps diff --git a/tools-systemd/portage.amd64/package.use/util-linux b/tools-systemd/portage.amd64/package.use/util-linux deleted file mode 100644 index 2c80720e..00000000 --- a/tools-systemd/portage.amd64/package.use/util-linux +++ /dev/null @@ -1 +0,0 @@ -sys-apps/util-linux static-libs diff --git a/tools-systemd/portage.arm64/package.use/glibc b/tools-systemd/portage.arm64/package.use/glibc deleted file mode 100644 index 9c539187..00000000 --- a/tools-systemd/portage.arm64/package.use/glibc +++ /dev/null @@ -1 +0,0 @@ -sys-libs/glibc suid diff --git a/tools-systemd/portage.arm64/package.use/releng/iputils b/tools-systemd/portage.arm64/package.use/releng/iputils deleted file mode 100644 index 9cde931b..00000000 --- a/tools-systemd/portage.arm64/package.use/releng/iputils +++ /dev/null @@ -1 +0,0 @@ -net-misc/iputils -caps -filecaps diff --git a/tools-systemd/portage.arm64/package.use/releng/pam b/tools-systemd/portage.arm64/package.use/releng/pam deleted file mode 100644 index 6cec48a7..00000000 --- a/tools-systemd/portage.arm64/package.use/releng/pam +++ /dev/null @@ -1 +0,0 @@ -sys-libs/pam -filecaps diff --git a/tools-systemd/portage.arm64/package.use/util-linux b/tools-systemd/portage.arm64/package.use/util-linux deleted file mode 100644 index 2c80720e..00000000 --- a/tools-systemd/portage.arm64/package.use/util-linux +++ /dev/null @@ -1 +0,0 @@ -sys-apps/util-linux static-libs diff --git a/tools-systemd/portage.i686/package.use/releng/iputils b/tools-systemd/portage.i686/package.use/releng/iputils deleted file mode 100644 index 9cde931b..00000000 --- a/tools-systemd/portage.i686/package.use/releng/iputils +++ /dev/null @@ -1 +0,0 @@ -net-misc/iputils -caps -filecaps diff --git a/tools-systemd/portage.i686/package.use/releng/pam b/tools-systemd/portage.i686/package.use/releng/pam deleted file mode 100644 index 6cec48a7..00000000 --- a/tools-systemd/portage.i686/package.use/releng/pam +++ /dev/null @@ -1 +0,0 @@ -sys-libs/pam -filecaps diff --git a/tools-systemd/portage.i686/package.use/util-linux b/tools-systemd/portage.i686/package.use/util-linux deleted file mode 100644 index 2c80720e..00000000 --- a/tools-systemd/portage.i686/package.use/util-linux +++ /dev/null @@ -1 +0,0 @@ -sys-apps/util-linux static-libs diff --git a/tools-systemd/run-arm64.sh b/tools-systemd/run-arm64.sh deleted file mode 100755 index 95009f8a..00000000 --- a/tools-systemd/run-arm64.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -source common.sh - -prepare_confs() { - local arch=$1 - - for s in 1 2 3; do - - local cstage=stage${s} - local p=$(( s - 1 )) - [[ $p == 0 ]] && p=3 - local pstage=stage${p} - local repo_dir="$( dirname $(pwd) )" - local template="stage-all.conf.template" - local parch="${arch}" - - cat ${template} | \ - sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \ - -e "s:CSTAGE:${cstage}:g" \ - -e "s:PSTAGE:${pstage}:g" \ - -e "s:SARCH:${arch}:g" \ - -e "s:PARCH:${parch}:g" \ - -e "s:@REPO_DIR@:${repo_dir}:g" \ - -e "s:MYCATALYST:$(pwd):g" \ - > stage${s}-${arch}-systemd.conf - done -} - - -main() { - >zzz.log - - catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err - - for arch in arm64; do - prepare_confs ${arch} - done - - for arch in arm64; do - do_stages ${arch} - [[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log - done -} - -main $1 & diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh deleted file mode 100755 index 1a1a9200..00000000 --- a/tools-systemd/run.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash - -source common.sh - -prepare_confs() { - local arch=$1 - - for s in 1 2 3 4; do - # don't make i686 stage4 - [[ $arch == i686 ]] && [[ $s == 4 ]] && continue - - local cstage=stage${s} - local p=$(( s - 1 )) - [[ $p == 0 ]] && p=3 - local pstage=stage${p} - local repo_dir="$( dirname $(pwd) )" - local template="stage-all.conf.template" - # set the template file if stage4 - [[ $s == 4 ]] && template=stage4-amd64.spec - - local parch="${arch}" - [[ "${arch}" == "i686" ]] && parch="x86" - - cat ${template} | \ - sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \ - -e "s:CSTAGE:${cstage}:g" \ - -e "s:PSTAGE:${pstage}:g" \ - -e "s:SARCH:${arch}:g" \ - -e "s:PARCH:${parch}:g" \ - -e "s:@REPO_DIR@:${repo_dir}:g" \ - -e "s:MYCATALYST:$(pwd):g" \ - > stage${s}-${arch}-systemd.conf - - [[ $arch == i686 ]] && \ - sed -i -e 's/17.1/17.0/' stage${s}-${arch}-systemd.conf - done -} - - -main() { - >zzz.log - - undo_grsec - - catalyst -c $(pwd)/catalyst.conf.local -s current | tee -a zzz.log >snapshot.log 2>snapshot.err - - for arch in amd64 i686; do - prepare_confs ${arch} - done - - # The parallelization `( do_stages ... ) &` doesn't work here - # if catalyst is using snapcache, bug #519656 - for arch in amd64 i686; do - do_stages ${arch} - [[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log - done - - catalyst -f stage4-amd64-systemd.conf -} - -main $1 & diff --git a/tools-systemd/stage-all.conf.template b/tools-systemd/stage-all.conf.template deleted file mode 100644 index 270352bd..00000000 --- a/tools-systemd/stage-all.conf.template +++ /dev/null @@ -1,9 +0,0 @@ -subarch: SARCH -target: CSTAGE -version_stamp: systemd -rel_type: systemd/SARCH -profile: default/linux/PARCH/17.1/systemd -snapshot: current -source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd -portage_confdir: MYCATALYST/portage.SARCH -portage_prefix: releng diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec deleted file mode 100644 index 9fbe70e7..00000000 --- a/tools-systemd/stage4-amd64.spec +++ /dev/null @@ -1,74 +0,0 @@ -subarch: SARCH -target: CSTAGE -version_stamp: systemd -rel_type: systemd/SARCH -profile: default/linux/PARCH/17.1/systemd -snapshot: current -compression_mode: pixz_x -source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd -portage_confdir: @REPO_DIR@/tools-musl/portage.amd64.hardened.stage4 - -stage4/use: - bash-completion - bindist - bzip2 - idm - ipv6 - mmx - sse - sse2 - urandom - -stage4/packages: - net-misc/dhcp - net-misc/iputils - sys-boot/grub - sys-apps/gptfdisk - sys-apps/iproute2 - sys-devel/bc - sys-power/acpid - app-crypt/gentoo-keys -stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh -stage4/rcadd: - acpid|default - net.lo|default - netmount|default - sshd|default - -boot/kernel: gentoo -boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/cloud-amd64-gentoo.config -boot/kernel/gentoo/extraversion: openstack -boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules - -# all of the cleanup... -stage4/unmerge: - sys-devel/bc - sys-kernel/genkernel - sys-kernel/gentoo-sources - -stage4/empty: - /root/.ccache - /tmp - /usr/portage/distfiles - /usr/src - /var/cache/edb/dep - /var/cache/genkernel - /var/cache/portage/distfiles - /var/empty - /var/run - /var/state - /var/tmp - -stage4/rm: - /etc/*- - /etc/*.old - /etc/ssh/ssh_host_* - /root/.*history - /root/.lesshst - /root/.ssh/known_hosts - /root/.viminfo - # Remove any generated stuff by genkernel - /usr/share/genkernel - # This is 3MB of crap for each copy - /usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz