[gentoo-commits] proj/releng:master commit in: tools-systemd/portage.amd64/package.use/, ...

2018-06-18 Thread Anthony G. Basile
commit: 7689550ee1abb97506de9ac118e2161d5eec1e17
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Jun 18 22:31:40 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Jun 18 22:31:40 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=7689550e

tools-systemd: add static-libs for util-linux

 tools-systemd/portage.amd64/package.use/util-linux | 1 +
 tools-systemd/portage.i686/package.use/util-linux  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tools-systemd/portage.amd64/package.use/util-linux 
b/tools-systemd/portage.amd64/package.use/util-linux
new file mode 100644
index ..2c80720e
--- /dev/null
+++ b/tools-systemd/portage.amd64/package.use/util-linux
@@ -0,0 +1 @@
+sys-apps/util-linux static-libs

diff --git a/tools-systemd/portage.i686/package.use/util-linux 
b/tools-systemd/portage.i686/package.use/util-linux
new file mode 100644
index ..2c80720e
--- /dev/null
+++ b/tools-systemd/portage.i686/package.use/util-linux
@@ -0,0 +1 @@
+sys-apps/util-linux static-libs



[gentoo-commits] proj/releng:master commit in: tools-systemd/, tools-systemd/portage.i686/package.use/, ...

2018-04-28 Thread Anthony G. Basile
commit: 6ca51d9ebebcf52984a80a6db95ab8623d95d1f3
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Apr 28 23:28:19 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Apr 28 23:28:19 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=6ca51d9e

tools-systemd: fix bug #653128

 tools-systemd/portage.amd64/package.use/iputils | 1 +
 tools-systemd/portage.amd64/package.use/pam | 1 +
 tools-systemd/portage.i686/package.use/iputils  | 1 +
 tools-systemd/portage.i686/package.use/pam  | 1 +
 tools-systemd/run.sh| 1 +
 tools-systemd/stage-all.conf.template   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/tools-systemd/portage.amd64/package.use/iputils 
b/tools-systemd/portage.amd64/package.use/iputils
new file mode 100644
index ..9cde931b
--- /dev/null
+++ b/tools-systemd/portage.amd64/package.use/iputils
@@ -0,0 +1 @@
+net-misc/iputils -caps -filecaps

diff --git a/tools-systemd/portage.amd64/package.use/pam 
b/tools-systemd/portage.amd64/package.use/pam
new file mode 100644
index ..6cec48a7
--- /dev/null
+++ b/tools-systemd/portage.amd64/package.use/pam
@@ -0,0 +1 @@
+sys-libs/pam -filecaps

diff --git a/tools-systemd/portage.i686/package.use/iputils 
b/tools-systemd/portage.i686/package.use/iputils
new file mode 100644
index ..9cde931b
--- /dev/null
+++ b/tools-systemd/portage.i686/package.use/iputils
@@ -0,0 +1 @@
+net-misc/iputils -caps -filecaps

diff --git a/tools-systemd/portage.i686/package.use/pam 
b/tools-systemd/portage.i686/package.use/pam
new file mode 100644
index ..6cec48a7
--- /dev/null
+++ b/tools-systemd/portage.i686/package.use/pam
@@ -0,0 +1 @@
+sys-libs/pam -filecaps

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

diff --git a/tools-systemd/stage-all.conf.template 
b/tools-systemd/stage-all.conf.template
index eeff0e98..2be2284f 100644
--- a/tools-systemd/stage-all.conf.template
+++ b/tools-systemd/stage-all.conf.template
@@ -5,3 +5,4 @@ rel_type: systemd/SARCH
 profile: default/linux/PARCH/17.0/systemd
 snapshot: current
 source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd
+portage_confdir: MYCATALYST/portage.SARCH



[gentoo-commits] proj/releng:master commit in: tools-systemd/

2018-03-03 Thread Anthony G. Basile
commit: 92e87a5425c9645fb0e8ed6be5b12cf4c547ca67
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Mar  3 08:43:06 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Mar  3 08:43:06 2018 +
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 &



[gentoo-commits] proj/releng:master commit in: tools-systemd/

2018-03-02 Thread Anthony G. Basile
commit: f4baf92b9ddf66119e94bc8945b10e3e935e92ad
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Mar  3 02:45:58 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Mar  3 02:45:58 2018 +
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



[gentoo-commits] proj/releng:master commit in: tools-systemd/

2018-03-02 Thread Anthony G. Basile
commit: eaabba1bec81036b3d21a728fd3aad29d3a90635
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Mar  3 02:43:33 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Mar  3 02:43:33 2018 +
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" \



[gentoo-commits] proj/releng:master commit in: tools-systemd/

2018-03-02 Thread Anthony G. Basile
commit: f3fb6696b11385be2646a45ee05670618500244f
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Mar  2 16:27:08 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Mar  2 16:27:08 2018 +
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
 }
 



[gentoo-commits] proj/releng:master commit in: tools-systemd/

2018-03-02 Thread Matt Thode
commit: aa2c1085b5c4ee42eefe7fd69f7a30f94316a95e
Author: Matthew Thode  mthode  org>
AuthorDate: Fri Mar  2 16:17:20 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Fri Mar  2 16:17:20 2018 +
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 ..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



[gentoo-commits] proj/releng:master commit in: tools-systemd/

2018-01-21 Thread Anthony G. Basile
commit: 12f0e45cfcd57fd4cbf7edcf2e9f8707e5c2f45e
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Jan 21 19:01:01 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Jan 21 19:01:01 2018 +
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



[gentoo-commits] proj/releng:master commit in: tools-systemd/

2016-03-11 Thread Anthony G. Basile
commit: cbfccd2c98503f66d354ca3e197de432295ece05
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Mar 11 12:21:24 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Mar 11 12:21:24 2016 +
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



[gentoo-commits] proj/releng:master commit in: tools-systemd/

2016-03-09 Thread Anthony G. Basile
commit: 4c530b61f9a5749fc57c3b784ada33f88a369744
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Mar  9 11:48:52 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Mar  9 11:48:52 2016 +
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 000..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
+}



[gentoo-commits] proj/releng:master commit in: tools-systemd/

2016-03-09 Thread Anthony G. Basile
commit: 151b14d68f31c86b08f8a99a1d6c01793562623e
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Mar  9 10:02:33 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Mar  9 10:02:33 2016 +
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
 }