| 1 |
On 5/15/2020 11:32 AM, Matt Turner wrote: |
| 2 |
>> Signed-off-by: Ben Kohler <bkohler@g.o> |
| 3 |
>> --- |
| 4 |
>> tools/catalyst-auto-amd64-experimental.conf | 87 ++++++++++++++------- |
| 5 |
> Do we actually use this file in production? It looks like the main |
| 6 |
> difference is TYPE="experimental" vs TYPE="auto" and I don't see TYPE |
| 7 |
> used anywhere. Can we just remove this file? |
| 8 |
I think it can probably be removed, but I will wait a bit for comments |
| 9 |
and look into removing it later (same for x86). |
| 10 |
>> tools/catalyst-auto-amd64.conf | 86 +++++++++++++------- |
| 11 |
>> 2 files changed, 113 insertions(+), 60 deletions(-) |
| 12 |
>> |
| 13 |
>> diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf |
| 14 |
>> index e7b1ea79..2aa91a03 100644 |
| 15 |
>> --- a/tools/catalyst-auto-amd64-experimental.conf |
| 16 |
>> +++ b/tools/catalyst-auto-amd64-experimental.conf |
| 17 |
>> @@ -26,6 +26,7 @@ SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec" |
| 18 |
>> |
| 19 |
>> SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec" |
| 20 |
>> |
| 21 |
>> + |
| 22 |
> Stray newline, but I see that this is to reduce the differences |
| 23 |
> between the experimental and non-experimental versions of the file. I |
| 24 |
> might remove the newline from the other instead, but I don't feel |
| 25 |
> strongly. |
| 26 |
Yeah this was just an artifact of trying to unify the 2 files, I will |
| 27 |
remove it along with the next other fixes. |
| 28 |
>> SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
| 29 |
>> SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" |
| 30 |
>> SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec" |
| 31 |
>> @@ -43,7 +44,7 @@ EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]" |
| 32 |
>> update_symlinks() { |
| 33 |
>> # Symlink the latest stages3 to build from |
| 34 |
>> for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do |
| 35 |
>> - pushd $d >/dev/null |
| 36 |
>> + pushd "${d}" >/dev/null || exit |
| 37 |
>> for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do |
| 38 |
>> # 20yymmddThhmmssZ |
| 39 |
>> # 20yymmddhhmmss |
| 40 |
>> @@ -57,11 +58,13 @@ update_symlinks() { |
| 41 |
>> <<<"$f") |
| 42 |
>> ln -svf "$f" "$of" |
| 43 |
>> done |
| 44 |
>> - popd >/dev/null |
| 45 |
>> + popd >/dev/null || exit |
| 46 |
>> done |
| 47 |
>> } |
| 48 |
>> |
| 49 |
>> post_build() { |
| 50 |
>> + local set=$1 spec=$2 |
| 51 |
>> + |
| 52 |
>> cmd=( |
| 53 |
>> rsync |
| 54 |
> This would be a good opportunity to create and use an upload() |
| 55 |
> function like the other conf files have. |
| 56 |
|
| 57 |
Yes I would like to do that too, I will follow up with another commit |
| 58 |
doing that. I didn't want to cram too many changes into this first patch. |
| 59 |
|
| 60 |
Thanks for the review. |
| 61 |
|
| 62 |
-Ben |
Archives