[gentoo-commits] proj/releng:catalyst3 commit in: /
commit: 1b238be7fbba7bbcd603127374ae40ee05dd5391
Author: Robin H. Johnson gentoo org>
AuthorDate: Fri Dec 2 00:22:01 2016 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Fri Dec 2 00:22:01 2016 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=1b238be7
Merge remote-tracking branch 'origin/master' into catalyst3
...18.9.config => admincd-4.4.8-r1-selinux.config} | 822 +++--
...mincd-3.18.9.config => admincd-4.4.8-r1.config} | 813 ++--
...allcd-3.18.12.config => installcd-4.4.6.config} | 686 +
.../weekly/portage/stages/package.keywords/openssh | 2 -
releases/weekly/specs/alpha/installcd-stage1.spec | 3 -
.../amd64/hardened/admincd-stage1-selinux.spec | 3 -
.../specs/amd64/hardened/admincd-stage1.spec | 3 -
.../amd64/hardened/admincd-stage2-selinux.spec | 2 +-
.../specs/amd64/hardened/admincd-stage2.spec | 2 +-
releases/weekly/specs/amd64/installcd-stage1.spec | 3 +-
.../specs/amd64/installcd-stage2-minimal.spec | 2 +-
releases/weekly/specs/amd64/livecd-stage1.spec | 2 -
releases/weekly/specs/amd64/livedvd-stage1.spec| 1 -
releases/weekly/specs/hppa/installcd-stage1.spec | 1 -
releases/weekly/specs/ia64/installcd-stage1.spec | 3 -
.../weekly/specs/ppc/ppc64/installcd-stage1.spec | 2 -
.../specs/sparc/sparc64/installcd-stage1.spec | 3 -
.../weekly/specs/x86/hardened/admincd-stage1.spec | 3 -
.../specs/x86/hardened/installcd-stage1.spec | 2 -
releases/weekly/specs/x86/i686/livecd-stage1.spec | 2 -
releases/weekly/specs/x86/i686/livedvd-stage1.spec | 1 -
releases/weekly/specs/x86/installcd-stage1.spec| 3 +-
.../portage.amd64.hardened/package.accept_keywords | 2 +-
.../portage.amd64.vanilla/package.accept_keywords | 1 +
.../package.accept_keywords| 2 +-
.../portage.armv7a.vanilla/package.accept_keywords | 1 +
.../portage.i686.vanilla/package.accept_keywords | 1 +
.../package.accept_keywords| 1 +
.../package.accept_keywords| 1 +
.../portage.ppc.vanilla/package.accept_keywords| 1 +
.../portage.amd64.hardened/env/net-misc_iputils_0 | 1 +
.../portage.amd64.hardened/package.accept_keywords | 1 -
tools-uclibc/portage.amd64.hardened/package.env| 1 +
.../portage.amd64.hardened/package.use/uclibc | 1 -
.../portage.amd64.hardened/package.use/uclibc-ng | 1 +
.../savedconfig/sys-libs/uclibc-ng}| 43 +-
.../portage.amd64.vanilla/env/net-misc_iputils_0 | 1 +
tools-uclibc/portage.amd64.vanilla/package.env | 1 +
.../portage.amd64.vanilla/package.use/uclibc | 1 -
.../portage.amd64.vanilla/package.use/uclibc-ng| 1 +
.../savedconfig/sys-libs/uclibc-ng}| 43 +-
.../env/{perl.conf => dev-lang_perl_0} | 0
.../portage.armv7a.hardened/env/net-misc_iputils_0 | 1 +
.../package.accept_keywords| 1 -
tools-uclibc/portage.armv7a.hardened/package.env | 3 +-
.../portage.armv7a.hardened/package.use/uclibc | 1 -
.../portage.armv7a.hardened/package.use/uclibc-ng | 1 +
.../savedconfig/sys-libs/{uclibc => uclibc-ng} | 47 +-
.../env/{perl.conf => dev-lang_perl_0} | 0
.../portage.armv7a.vanilla/env/net-misc_iputils_0 | 1 +
tools-uclibc/portage.armv7a.vanilla/package.env| 3 +-
.../portage.armv7a.vanilla/package.use/uclibc | 1 -
.../portage.armv7a.vanilla/package.use/uclibc-ng | 1 +
.../savedconfig/sys-libs/{uclibc => uclibc-ng} | 49 +-
.../env/{perl.conf => dev-lang_perl_0} | 0
.../portage.i686.hardened/env/net-misc_iputils_0 | 1 +
.../portage.i686.hardened/package.accept_keywords | 1 -
tools-uclibc/portage.i686.hardened/package.env | 3 +-
.../portage.i686.hardened/package.use/uclibc | 1 -
.../portage.i686.hardened/package.use/uclibc-ng| 1 +
.../savedconfig/sys-libs/uclibc| 271 ---
.../savedconfig/sys-libs/uclibc-ng}| 56 +-
.../portage.i686.vanilla/env/net-misc_iputils_0| 1 +
tools-uclibc/portage.i686.vanilla/package.env | 1 +
.../portage.i686.vanilla/package.use/uclibc| 1 -
.../portage.i686.vanilla/package.use/uclibc-ng | 1 +
.../savedconfig/sys-libs/uclibc| 271 ---
.../savedconfig/sys-libs/uclibc-ng}| 56 +-
.../env/net-misc_iputils_0 | 1 +
tools-uclibc/portage.mips32r2.hardened/package.env | 1 +
.../portage.mips32r2.hardened/package.use/uclibc | 1 -
.../package.use/uclibc-ng | 1 +
.../savedconfig/sys-libs/{uclibc => uclibc-ng} | 53 +-
.../env/net-misc_iputils_0 | 1 +
tools-uclibc/portage.mips32r2.vanilla/package.env | 1 +
.../portage.mips32r2.vanilla/package.use/uclibc| 1 -
[gentoo-commits] proj/releng:catalyst3 commit in: releases/weekly/specs/x86/hardened/, releases/weekly/specs/amd64/hardened/
commit: fefbd35fbbfc4eff41acdd8e70acdcab7613378c Author: Robin H. Johnson gentoo org> AuthorDate: Fri Dec 2 00:20:55 2016 + Commit: Robin H. Johnson gentoo org> CommitDate: Fri Dec 2 00:20:55 2016 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=fefbd35f weekly: new app-arch/rar license is EULA and prohibits bundling (provision 3.b.) Signed-off-by: Robin H. Johnson gentoo.org> releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec | 1 - releases/weekly/specs/amd64/hardened/admincd-stage1.spec | 1 - releases/weekly/specs/x86/hardened/admincd-stage1.spec | 1 - 3 files changed, 3 deletions(-) diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec index 378dfed..695498a 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec @@ -42,7 +42,6 @@ livecd/packages: app-arch/mt-st app-arch/p7zip app-arch/pbzip2 - app-arch/rar app-arch/tar app-arch/unrar app-arch/unzip diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec index b49ffeb..fbb6cc9 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec @@ -43,7 +43,6 @@ livecd/packages: app-arch/mt-st app-arch/p7zip app-arch/pbzip2 - app-arch/rar app-arch/tar app-arch/unrar app-arch/unzip diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/weekly/specs/x86/hardened/admincd-stage1.spec index beafe8b..4e05ca5 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec @@ -43,7 +43,6 @@ livecd/packages: app-arch/mt-st app-arch/p7zip app-arch/pbzip2 - app-arch/rar app-arch/tar app-arch/unrar app-arch/unzip
[gentoo-commits] proj/releng:catalyst3 commit in: /
commit: ff288e1a8553b35e7af1aa39f5da0e29f987e1de Author: Robin H. Johnson gentoo org> AuthorDate: Mon Jul 18 23:27:30 2016 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon Jul 18 23:27:30 2016 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=ff288e1a Merge remote-tracking branch 'origin/master' into catalyst3 releases/weekly/portage/stages/package.keywords/openssh | 2 ++ 1 file changed, 2 insertions(+)
[gentoo-commits] proj/releng:catalyst3 commit in: config/
commit: 84765fb127ec929a95f34997684c515ae88ee925 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jun 18 08:30:58 2016 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jun 18 08:32:26 2016 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=84765fb1 config/*auto: update sharedir. Signed-off-by: Robin H. Johnson gentoo.org> config/amd64-auto.conf| 2 +- config/snapshot-auto.conf | 2 +- config/x86-auto.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/amd64-auto.conf b/config/amd64-auto.conf index 6120a6a..ffdfbfc 100644 --- a/config/amd64-auto.conf +++ b/config/amd64-auto.conf @@ -1,7 +1,7 @@ distdir="/release/tmp/distfiles/" portdir="/release/trees/portage-auto" options="autoresume bindist pkgcache preserve_libs seedcache snapcache" -sharedir="/usr/lib64/catalyst/" +sharedir="/usr/share/catalyst/" storedir="/release/buildroot/amd64-dev" snapshot_cache="/release/tmp/snapshots" envscript="/etc/catalyst/local/host.env" diff --git a/config/snapshot-auto.conf b/config/snapshot-auto.conf index 7b39cb8..7c84d1b 100644 --- a/config/snapshot-auto.conf +++ b/config/snapshot-auto.conf @@ -1,6 +1,6 @@ distdir="/usr/portage/distfiles" portdir="/release/trees/portage-auto" -sharedir="/usr/lib/catalyst" +sharedir="/usr/share/catalyst" storedir="/release" hash_function="crc32" digests="md5 sha1" diff --git a/config/x86-auto.conf b/config/x86-auto.conf index f4e934f..86362ae 100644 --- a/config/x86-auto.conf +++ b/config/x86-auto.conf @@ -1,7 +1,7 @@ distdir="/release/tmp/distfiles/" portdir="/release/trees/portage-auto" options="autoresume bindist pkgcache preserve_libs seedcache snapcache" -sharedir="/usr/lib64/catalyst/" +sharedir="/usr/share/catalyst/" storedir="/release/buildroot/x86-dev" snapshot_cache="/release/tmp/snapshots" envscript="/etc/catalyst/local/host.env"
[gentoo-commits] proj/releng:catalyst3 commit in: config/
commit: 4cc5bb17183ae897e9072740c59a1447b92b2289 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jun 18 08:32:53 2016 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jun 18 08:32:53 2016 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=4cc5bb17 config/*auto: match any source spec, as the only different in our lines is the compression suffix. Signed-off-by: Robin H. Johnson gentoo.org> config/amd64-auto.conf | 1 + config/x86-auto.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/config/amd64-auto.conf b/config/amd64-auto.conf index ffdfbfc..8481106 100644 --- a/config/amd64-auto.conf +++ b/config/amd64-auto.conf @@ -8,3 +8,4 @@ envscript="/etc/catalyst/local/host.env" hash_function="crc32" digests="sha512 whirlpool" contents="auto" +source_matching="loose" diff --git a/config/x86-auto.conf b/config/x86-auto.conf index 86362ae..655a83b 100644 --- a/config/x86-auto.conf +++ b/config/x86-auto.conf @@ -8,3 +8,4 @@ envscript="/etc/catalyst/local/host.env" hash_function="crc32" digests="sha512 whirlpool" contents="auto" +source_matching="loose"
[gentoo-commits] proj/releng:catalyst3 commit in: tools/
commit: b3a87345a06709538a85d77c6dffa43c97ec1a8e
Author: Robin H. Johnson gentoo org>
AuthorDate: Wed Jun 15 01:29:20 2016 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Wed Jun 15 01:33:50 2016 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=b3a87345
catalyst-auto: squelch all pushd/popd
Have some sed magic, including a negative match.
git grep -l -e pushd -e popd \
| xargs sed -i -r \
-e '/(pushd|popd)/{ /null/! { s,$, >/dev/null,g } }'
Signed-off-by: Robin H. Johnson gentoo.org>
tools/catalyst-auto-alpha.conf | 4 ++--
tools/catalyst-auto-amd64-experimental.conf | 14 +++---
tools/catalyst-auto-amd64.conf | 14 +++---
tools/catalyst-auto-armv4tl.conf| 4 ++--
tools/catalyst-auto-armv5tel.conf | 4 ++--
tools/catalyst-auto-armv6j.conf | 4 ++--
tools/catalyst-auto-armv6j_hardfp.conf | 4 ++--
tools/catalyst-auto-armv7a.conf | 4 ++--
tools/catalyst-auto-armv7a_hardfp.conf | 4 ++--
tools/catalyst-auto-hppa.conf | 4 ++--
tools/catalyst-auto-ia64.conf | 4 ++--
tools/catalyst-auto-ppc.conf| 4 ++--
tools/catalyst-auto-ppc64.conf | 4 ++--
tools/catalyst-auto-s390.conf | 4 ++--
tools/catalyst-auto-s390x.conf | 4 ++--
tools/catalyst-auto-sparc64.conf| 4 ++--
tools/catalyst-auto-x86-experimental.conf | 14 +++---
tools/catalyst-auto-x86.conf| 14 +++---
18 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index ae5ec8b..e98fba0 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -29,13 +29,13 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-pushd $d
+pushd $d >/dev/null
for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
-popd
+popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-amd64-experimental.conf
b/tools/catalyst-auto-amd64-experimental.conf
index dd5e270..674dadd 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -51,24 +51,24 @@ give_latest_from_dates() {
}
pre_build() {
- pushd ${REPO_DIR}
+ pushd ${REPO_DIR} >/dev/null
git pull
- popd
+ popd >/dev/null
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3*${EXTENSIONS} | grep -v latest |
give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for
20YYMMDD stuff
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
post_build() {
- pushd ${BUILD_SRCDIR_BASE}/default
+ pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then
@@ -78,9 +78,9 @@ post_build() {
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso*
${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
fi
- popd
+ popd >/dev/null
- pushd ${BUILD_SRCDIR_BASE}/hardened
+ pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP}
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 8017935..f812055 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -61,25 +61,25 @@ give_latest_from_dates() {
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3*${EXTENSIONS} | grep -v latest |
give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for
20YYMMDD stuff
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
pre_build() {
- pushd ${REPO_DIR}
+ pushd ${REPO_DIR} >/dev/null
git pull
- popd
+
[gentoo-commits] proj/releng:catalyst3 commit in: /
commit: 827d10f5cf3128ef72113d8b5eb0d15c286f5b9b Author: Robin H. Johnson gentoo org> AuthorDate: Wed Jun 15 01:36:39 2016 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed Jun 15 01:36:39 2016 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=827d10f5 Merge branch 'master' into catalyst3
[gentoo-commits] proj/releng:catalyst3 commit in: /
commit: 615e705fb8d75a259a8a311cfab992e34f918b9d
Author: Robin H. Johnson gentoo org>
AuthorDate: Wed Jun 15 01:31:40 2016 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Wed Jun 15 01:31:40 2016 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=615e705f
Merge remote-tracking branch 'origin/master' into catalyst3
tools-uclibc/portage.armv7a.hardened/env/perl.conf | 1 +
.../{portage.i686.hardened => portage.armv7a.hardened}/package.env | 0
tools-uclibc/portage.armv7a.vanilla/env/perl.conf| 1 +
.../{portage.i686.hardened => portage.armv7a.vanilla}/package.env| 0
4 files changed, 2 insertions(+)
