Move the code to update symlinks to a separate function, call it from pre_build and after each set build.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
This commit is contained in:
parent
a77a4ebce5
commit
bac6e3a2d7
|
@ -81,6 +81,13 @@ run_cmd() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
update_symlinks() {
|
||||||
|
# This is a skeleton function that you can override from the config file.
|
||||||
|
# It will be called by pre_build and after completing the build of a set
|
||||||
|
# to ensure the symlinks point to the latest built stages.
|
||||||
|
local foo=bar
|
||||||
|
}
|
||||||
|
|
||||||
pre_build() {
|
pre_build() {
|
||||||
# This is a skeleton function that you can override from the config file.
|
# This is a skeleton function that you can override from the config file.
|
||||||
# It will be executed before the build is started. You can use this to
|
# It will be executed before the build is started. You can use this to
|
||||||
|
@ -246,7 +253,7 @@ for i in $(find -name '*.spec'); do
|
||||||
sed -i 's|^snapshot:.*$|snapshot: '${DATESTAMP}'|' ${i}
|
sed -i 's|^snapshot:.*$|snapshot: '${DATESTAMP}'|' ${i}
|
||||||
|
|
||||||
# We don't want to mangle the source_subpath for our stage1 spec
|
# We don't want to mangle the source_subpath for our stage1 spec
|
||||||
if ! grep -q '^target: *stage1$' ${i}; then
|
if ! [[grep -q '^target: *stage1$' ${i} || grep -q '^target: *stage4$' ${i} ]]; then
|
||||||
sed -i 's|^source_subpath:.*$|source_subpath: '${new_source_subpath}'|' ${i}
|
sed -i 's|^source_subpath:.*$|source_subpath: '${new_source_subpath}'|' ${i}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -329,6 +336,7 @@ for a in "" ${SETS}; do
|
||||||
run_cmd "time catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
|
run_cmd "time catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
update_symlinks
|
||||||
done
|
done
|
||||||
|
|
||||||
if ! run_cmd "post_build" "${TMPDIR}/log/post_build.log"; then
|
if ! run_cmd "post_build" "${TMPDIR}/log/post_build.log"; then
|
||||||
|
|
|
@ -59,11 +59,7 @@ give_latest_from_dates() {
|
||||||
tr '~' '-'
|
tr '~' '-'
|
||||||
}
|
}
|
||||||
|
|
||||||
pre_build() {
|
update_symlinks() {
|
||||||
pushd ${REPO_DIR}
|
|
||||||
git pull
|
|
||||||
popd
|
|
||||||
|
|
||||||
# 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
|
||||||
|
@ -76,6 +72,13 @@ pre_build() {
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pre_build() {
|
||||||
|
pushd ${REPO_DIR}
|
||||||
|
git pull
|
||||||
|
popd
|
||||||
|
update_symlinks
|
||||||
|
}
|
||||||
|
|
||||||
post_build() {
|
post_build() {
|
||||||
pushd ${BUILD_SRCDIR_BASE}/default
|
pushd ${BUILD_SRCDIR_BASE}/default
|
||||||
mkdir -p ${BUILD_DESTDIR_BASE}
|
mkdir -p ${BUILD_DESTDIR_BASE}
|
||||||
|
|
Loading…
Reference in a new issue