Fix the circular latest symlinks by taking them out of the list of stages.
Sync amd64/x86 experimental script with base amd64/x86 script.
This commit is contained in:
parent
b08dd40cac
commit
6dcdad447a
|
@ -41,7 +41,7 @@ pre_build() {
|
||||||
# Symlink the latest stages3 to build from
|
# Symlink the latest stages3 to build from
|
||||||
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
|
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
|
||||||
pushd $d
|
pushd $d
|
||||||
for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
|
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=${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 $
|
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
|
||||||
ln -sf $f $of
|
ln -sf $f $of
|
||||||
|
|
|
@ -9,6 +9,7 @@ source /etc/catalyst/release/build.env
|
||||||
|
|
||||||
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
|
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
|
||||||
|
|
||||||
|
#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux"
|
||||||
SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
|
SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
|
||||||
|
|
||||||
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
|
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
|
||||||
|
@ -21,6 +22,10 @@ SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/
|
||||||
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
|
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
|
||||||
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
|
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
|
||||||
|
|
||||||
|
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
|
||||||
|
SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
|
||||||
|
SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
|
||||||
|
|
||||||
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
|
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
|
@ -41,7 +46,7 @@ pre_build() {
|
||||||
# Symlink the latest stages3 to build from
|
# Symlink the latest stages3 to build from
|
||||||
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
||||||
pushd $d
|
pushd $d
|
||||||
for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
|
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=${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
|
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
|
||||||
ln -sf $f $of
|
ln -sf $f $of
|
||||||
|
|
|
@ -46,7 +46,7 @@ pre_build() {
|
||||||
# Symlink the latest stages3 to build from
|
# Symlink the latest stages3 to build from
|
||||||
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
||||||
pushd $d
|
pushd $d
|
||||||
for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
|
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=${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
|
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
|
||||||
ln -sf $f $of
|
ln -sf $f $of
|
||||||
|
|
|
@ -40,7 +40,7 @@ pre_build() {
|
||||||
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
|
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
|
||||||
pushd $d
|
pushd $d
|
||||||
for t in hppa1.1 hppa2.0; do
|
for t in hppa1.1 hppa2.0; do
|
||||||
for f in $(ls stage3-${t}-*bz2 | give_latest_from_dates ) ; do
|
for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
|
||||||
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
|
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 $
|
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
|
||||||
ln -sf $f $of
|
ln -sf $f $of
|
||||||
|
|
|
@ -40,7 +40,7 @@ pre_build() {
|
||||||
# Symlink the latest stages3 to build from
|
# Symlink the latest stages3 to build from
|
||||||
for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
|
for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
|
||||||
pushd $d
|
pushd $d
|
||||||
for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
|
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=${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 $
|
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
|
||||||
ln -sf $f $of
|
ln -sf $f $of
|
||||||
|
|
|
@ -39,7 +39,7 @@ pre_build() {
|
||||||
# Symlink the latest stages3 to build from
|
# Symlink the latest stages3 to build from
|
||||||
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
|
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
|
||||||
pushd $d
|
pushd $d
|
||||||
for f in $(ls stage3-ppc-*bz2 | give_latest_from_dates ) ; do
|
for f in $(ls stage3-ppc-*bz2 | grep -v latest | give_latest_from_dates ) ; do
|
||||||
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
|
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 $
|
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
|
||||||
ln -sf $f $of
|
ln -sf $f $of
|
||||||
|
|
|
@ -42,7 +42,7 @@ pre_build() {
|
||||||
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
|
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
|
||||||
pushd $d
|
pushd $d
|
||||||
for t in ppc64-64ul ppc64-32ul; do
|
for t in ppc64-64ul ppc64-32ul; do
|
||||||
for f in $(ls stage3-${t}-*bz2 | give_latest_from_dates ) ; do
|
for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
|
||||||
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
|
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 $
|
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
|
||||||
ln -sf $f $of
|
ln -sf $f $of
|
||||||
|
|
|
@ -40,7 +40,7 @@ pre_build() {
|
||||||
# Symlink the latest stages3 to build from
|
# Symlink the latest stages3 to build from
|
||||||
for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
|
for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
|
||||||
pushd $d
|
pushd $d
|
||||||
for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
|
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=${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 $
|
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
|
||||||
ln -sf $f $of
|
ln -sf $f $of
|
||||||
|
|
|
@ -38,7 +38,7 @@ pre_build() {
|
||||||
# Symlink the latest stages3 to build from
|
# Symlink the latest stages3 to build from
|
||||||
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
||||||
pushd $d
|
pushd $d
|
||||||
for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
|
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=${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
|
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
|
||||||
ln -sf $f $of
|
ln -sf $f $of
|
||||||
|
|
|
@ -38,7 +38,7 @@ pre_build() {
|
||||||
# Symlink the latest stages3 to build from
|
# Symlink the latest stages3 to build from
|
||||||
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
||||||
pushd $d
|
pushd $d
|
||||||
for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
|
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=${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
|
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
|
||||||
ln -sf $f $of
|
ln -sf $f $of
|
||||||
|
|
Loading…
Reference in a new issue