public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/releng:master commit in: tools-systemd/
@ 2019-09-02 14:45 Anthony G. Basile
  0 siblings, 0 replies; 12+ messages in thread
From: Anthony G. Basile @ 2019-09-02 14:45 UTC (permalink / raw
  To: gentoo-commits

commit:     3b930c42f6251cc51fff878ef3b8c84e7fb2bb01
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  2 14:45:17 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 14:45:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=3b930c42

tools-systemd: bump to 17.1 profiles

 tools-systemd/run.sh                  | 3 +++
 tools-systemd/stage-all.conf.template | 2 +-
 tools-systemd/stage4-amd64.spec       | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index bdaf5a4d..057a06f4 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -30,6 +30,9 @@ prepare_confs() {
         -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
 }
 

diff --git a/tools-systemd/stage-all.conf.template b/tools-systemd/stage-all.conf.template
index fbfcf5eb..270352bd 100644
--- a/tools-systemd/stage-all.conf.template
+++ b/tools-systemd/stage-all.conf.template
@@ -2,7 +2,7 @@ subarch: SARCH
 target: CSTAGE
 version_stamp: systemd
 rel_type: systemd/SARCH
-profile: default/linux/PARCH/17.0/systemd
+profile: default/linux/PARCH/17.1/systemd
 snapshot: current
 source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd
 portage_confdir: MYCATALYST/portage.SARCH

diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec
index 72d49923..1ca4f029 100644
--- a/tools-systemd/stage4-amd64.spec
+++ b/tools-systemd/stage4-amd64.spec
@@ -2,7 +2,7 @@ subarch: SARCH
 target: CSTAGE
 version_stamp: systemd
 rel_type: systemd/SARCH
-profile: default/linux/PARCH/17.0/systemd
+profile: default/linux/PARCH/17.1/systemd
 snapshot: current
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-systemd/
@ 2019-04-10 12:12 Anthony G. Basile
  0 siblings, 0 replies; 12+ messages in thread
From: Anthony G. Basile @ 2019-04-10 12:12 UTC (permalink / raw
  To: gentoo-commits

commit:     0af725155ec24bc6c38df7e720b86b67e5f2e016
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 12:11:35 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 12:12:24 2019 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=0af72515

tools-systemd/run-arm64.sh: no grsec kernel

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 tools-systemd/run-arm64.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools-systemd/run-arm64.sh b/tools-systemd/run-arm64.sh
index 41c4afc8..95009f8a 100755
--- a/tools-systemd/run-arm64.sh
+++ b/tools-systemd/run-arm64.sh
@@ -31,8 +31,6 @@ prepare_confs() {
 main() {
   >zzz.log
 
-  undo_grsec
-
   catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
 
   for arch in arm64; do
@@ -43,7 +41,6 @@ main() {
     do_stages ${arch}
     [[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log
   done
-
 }
 
 main $1 &


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-systemd/
@ 2019-04-09 22:53 Anthony G. Basile
  0 siblings, 0 replies; 12+ messages in thread
From: Anthony G. Basile @ 2019-04-09 22:53 UTC (permalink / raw
  To: gentoo-commits

commit:     b5afdc366e209df26c47f086dc99fa15ab38e153
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  9 22:52:40 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Apr  9 22:52:57 2019 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=b5afdc36

tools-systemd: add scripts for arm64

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 tools-systemd/run-arm64.sh | 49 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/tools-systemd/run-arm64.sh b/tools-systemd/run-arm64.sh
new file mode 100755
index 00000000..41c4afc8
--- /dev/null
+++ b/tools-systemd/run-arm64.sh
@@ -0,0 +1,49 @@
+#!/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
+
+  undo_grsec
+
+  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 &


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-systemd/
@ 2018-03-03  8:43 Anthony G. Basile
  0 siblings, 0 replies; 12+ messages in thread
From: Anthony G. Basile @ 2018-03-03  8:43 UTC (permalink / raw
  To: gentoo-commits

commit:     92e87a5425c9645fb0e8ed6be5b12cf4c547ca67
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  3 08:43:06 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Mar  3 08:43:06 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=92e87a54

tools-systemd: improve stage4 build step

 tools-systemd/common.sh | 4 +---
 tools-systemd/run.sh    | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools-systemd/common.sh b/tools-systemd/common.sh
index d9570d05..bf52cd62 100644
--- a/tools-systemd/common.sh
+++ b/tools-systemd/common.sh
@@ -27,12 +27,10 @@ EOF
 do_stages() {
   local arch=$1
 
-  for s in 1 2 3 4; do
+  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"
-    # only run the amd64 stage4
-    [[ $arch == i686 ]] && [[ $s == 4 ]] && continue
     if [[ ! -f "${tgpath}/${tglink}" ]]; then
        touch stage${s}-${arch}-systemd.log
        echo "!!! ${tglink} at ${tgpath} doesn't exist" \

diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index 29869284..0f16c4d1 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -50,6 +50,8 @@ main() {
     do_stages ${arch}
     [[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log
   done
+
+  catalyst -f stage4-amd64-systemd.conf
 }
 
 main $1 &


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-systemd/
@ 2018-03-03  2:46 Anthony G. Basile
  0 siblings, 0 replies; 12+ messages in thread
From: Anthony G. Basile @ 2018-03-03  2:46 UTC (permalink / raw
  To: gentoo-commits

commit:     f4baf92b9ddf66119e94bc8945b10e3e935e92ad
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  3 02:45:58 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Mar  3 02:45:58 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=f4baf92b

tools-systemd: fix calculation of repo_dir

 tools-systemd/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index 170742e3..29869284 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -13,7 +13,7 @@ prepare_confs() {
     local p=$(( s - 1 ))
     [[ $p == 0 ]] && p=3
     local pstage=stage${p}
-    local repo_dir="$( cd "$( dirname ${BASH_SOURCE[0]} )../" && pwd )"
+    local repo_dir="$( dirname $(pwd) )"
     local template="stage-all.conf.template"
     # set the template file if stage4
     [[ $s == 4 ]] && template=stage4-amd64.spec


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-systemd/
@ 2018-03-03  2:43 Anthony G. Basile
  0 siblings, 0 replies; 12+ messages in thread
From: Anthony G. Basile @ 2018-03-03  2:43 UTC (permalink / raw
  To: gentoo-commits

commit:     eaabba1bec81036b3d21a728fd3aad29d3a90635
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  3 02:43:33 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Mar  3 02:43:33 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=eaabba1b

tools-systemd: fix the name of the template file

 tools-systemd/run.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index 9066d03d..170742e3 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -16,12 +16,12 @@ prepare_confs() {
     local repo_dir="$( cd "$( dirname ${BASH_SOURCE[0]} )../" && pwd )"
     local template="stage-all.conf.template"
     # set the template file if stage4
-    [[ $s == 4 ]] && specfile=stage4-amd64.spec
+    [[ $s == 4 ]] && template=stage4-amd64.spec
 
     local parch="${arch}"
     [[ "${arch}" == "i686" ]] && parch="x86"
 
-    cat ${specfile} | \
+    cat ${template} | \
       sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
         -e "s:CSTAGE:${cstage}:g" \
         -e "s:PSTAGE:${pstage}:g" \


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-systemd/
@ 2018-03-02 16:27 Anthony G. Basile
  0 siblings, 0 replies; 12+ messages in thread
From: Anthony G. Basile @ 2018-03-02 16:27 UTC (permalink / raw
  To: gentoo-commits

commit:     f3fb6696b11385be2646a45ee05670618500244f
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  2 16:27:08 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Mar  2 16:27:08 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=f3fb6696

tools-systemd: don't do parallel runs

 tools-systemd/run.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index 4535883c..9066d03d 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -47,10 +47,8 @@ main() {
   # 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
-    ) &
+    do_stages ${arch}
+    [[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log
   done
 }
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-systemd/
@ 2018-03-02 16:20 Matt Thode
  0 siblings, 0 replies; 12+ messages in thread
From: Matt Thode @ 2018-03-02 16:20 UTC (permalink / raw
  To: gentoo-commits

commit:     aa2c1085b5c4ee42eefe7fd69f7a30f94316a95e
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Fri Mar  2 16:17:20 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Mar  2 16:17:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=aa2c1085

add stage4 to systemd stage generation

 tools-systemd/common.sh         |  7 ++--
 tools-systemd/run.sh            | 11 +++++--
 tools-systemd/stage4-amd64.spec | 73 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/tools-systemd/common.sh b/tools-systemd/common.sh
index 9a0a03af..d9570d05 100644
--- a/tools-systemd/common.sh
+++ b/tools-systemd/common.sh
@@ -2,7 +2,7 @@
 
 source /etc/catalyst/catalyst.conf
 
-mydate=`date +%Y%m%d`
+mydate=$(date +%Y%m%d)
 
 
 undo_grsec() {
@@ -27,11 +27,12 @@ EOF
 do_stages() {
   local arch=$1
 
-  for s in 1 2 3; do
+  for s in 1 2 3 4; do
     local tgpath="${storedir}/builds/systemd/${arch}"
     local target="stage${s}-${arch}-systemd-${mydate}.tar.bz2"
     local tglink="stage${s}-${arch}-systemd.tar.bz2"
-
+    # only run the amd64 stage4
+    [[ $arch == i686 ]] && [[ $s == 4 ]] && continue
     if [[ ! -f "${tgpath}/${tglink}" ]]; then
        touch stage${s}-${arch}-systemd.log
        echo "!!! ${tglink} at ${tgpath} doesn't exist" \

diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh
index 064700fb..4535883c 100755
--- a/tools-systemd/run.sh
+++ b/tools-systemd/run.sh
@@ -5,22 +5,29 @@ source common.sh
 prepare_confs() {
   local arch=$1
 
-  for s in 1 2 3; do
+  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="$( cd "$( dirname ${BASH_SOURCE[0]} )../" && pwd )"
+    local template="stage-all.conf.template"
+    # set the template file if stage4
+    [[ $s == 4 ]] && specfile=stage4-amd64.spec
 
     local parch="${arch}"
     [[ "${arch}" == "i686" ]] && parch="x86"
 
-    cat stage-all.conf.template | \
+    cat ${specfile} | \
       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" \
         >  stage${s}-${arch}-systemd.conf
   done
 }

diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec
new file mode 100644
index 00000000..720fc694
--- /dev/null
+++ b/tools-systemd/stage4-amd64.spec
@@ -0,0 +1,73 @@
+subarch: SARCH
+target: CSTAGE
+version_stamp: systemd
+rel_type: systemd/SARCH
+profile: default/linux/PARCH/17.0/systemd
+snapshot: current
+source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd
+portage_confdir: @REPO_DIR@/releases/weekly/portage/stages/
+
+stage4/use:
+	bash-completion
+	bindist
+	bzip2
+	idm
+	ipv6
+	mmx
+	sse
+	sse2
+	urandom
+
+stage4/packages:
+	app-admin/sudo
+	net-misc/dhcp
+	net-misc/iputils
+	sys-boot/grub
+	sys-apps/gptfdisk
+	sys-apps/iproute2
+	sys-apps/lsb-release
+	sys-devel/bc
+	sys-power/acpid
+stage4/fsscript: @REPO_DIR@/releases/weekly/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/weekly/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-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


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-systemd/
@ 2018-01-21 19:01 Anthony G. Basile
  0 siblings, 0 replies; 12+ messages in thread
From: Anthony G. Basile @ 2018-01-21 19:01 UTC (permalink / raw
  To: gentoo-commits

commit:     12f0e45cfcd57fd4cbf7edcf2e9f8707e5c2f45e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 19:01:01 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 19:01:01 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=12f0e45c

tools-systemd: switch to 17.0 profiles

 tools-systemd/stage-all.conf.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools-systemd/stage-all.conf.template b/tools-systemd/stage-all.conf.template
index 5e4cb39f..eeff0e98 100644
--- a/tools-systemd/stage-all.conf.template
+++ b/tools-systemd/stage-all.conf.template
@@ -2,6 +2,6 @@ subarch: SARCH
 target: CSTAGE
 version_stamp: systemd
 rel_type: systemd/SARCH
-profile: default/linux/PARCH/13.0/systemd
+profile: default/linux/PARCH/17.0/systemd
 snapshot: current
 source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-systemd/
@ 2016-03-11 12:11 Anthony G. Basile
  0 siblings, 0 replies; 12+ messages in thread
From: Anthony G. Basile @ 2016-03-11 12:11 UTC (permalink / raw
  To: gentoo-commits

commit:     cbfccd2c98503f66d354ca3e197de432295ece05
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 12:21:24 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 12:21:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=cbfccd2c

tool-systemd: use consistent naming of script

 tools-systemd/{run-systemd.sh => run.sh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/tools-systemd/run-systemd.sh b/tools-systemd/run.sh
similarity index 100%
rename from tools-systemd/run-systemd.sh
rename to tools-systemd/run.sh


^ permalink raw reply	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-systemd/
@ 2016-03-09 11:38 Anthony G. Basile
  0 siblings, 0 replies; 12+ messages in thread
From: Anthony G. Basile @ 2016-03-09 11:38 UTC (permalink / raw
  To: gentoo-commits

commit:     4c530b61f9a5749fc57c3b784ada33f88a369744
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 11:48:52 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 11:48:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=4c530b61

tools-systemd: add common.sh

 tools-systemd/common.sh | 61 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/tools-systemd/common.sh b/tools-systemd/common.sh
new file mode 100644
index 0000000..9a0a03a
--- /dev/null
+++ b/tools-systemd/common.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+source /etc/catalyst/catalyst.conf
+
+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 -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
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-systemd/
@ 2016-03-09  9:52 Anthony G. Basile
  0 siblings, 0 replies; 12+ messages in thread
From: Anthony G. Basile @ 2016-03-09  9:52 UTC (permalink / raw
  To: gentoo-commits

commit:     151b14d68f31c86b08f8a99a1d6c01793562623e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 10:02:33 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 10:02:33 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=151b14d6

tools-systemd: do parallel runs of amd64 and i686

 tools-systemd/run-systemd.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools-systemd/run-systemd.sh b/tools-systemd/run-systemd.sh
index abf901e..064700f 100755
--- a/tools-systemd/run-systemd.sh
+++ b/tools-systemd/run-systemd.sh
@@ -40,8 +40,10 @@ main() {
   # 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
+    (
+      do_stages ${arch}
+      [[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log
+    ) &
   done
 }
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2019-09-02 14:45 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-02 14:45 [gentoo-commits] proj/releng:master commit in: tools-systemd/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2019-04-10 12:12 Anthony G. Basile
2019-04-09 22:53 Anthony G. Basile
2018-03-03  8:43 Anthony G. Basile
2018-03-03  2:46 Anthony G. Basile
2018-03-03  2:43 Anthony G. Basile
2018-03-02 16:27 Anthony G. Basile
2018-03-02 16:20 Matt Thode
2018-01-21 19:01 Anthony G. Basile
2016-03-11 12:11 Anthony G. Basile
2016-03-09 11:38 Anthony G. Basile
2016-03-09  9:52 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox